diff --git a/README.md b/README.md
index e70f4eed8..5cc8320d5 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,6 @@ Implementors should be aware of the following limitations and gaps in `cql-execu
   * Issues typically associated with floating point arithmetic
   * Decimals without a decimal portion (e.g., `2.0`) may be treated as CQL `Integer`s
 * The following STU (non-normative) features introduced in CQL 1.5 are not yet supported:
-  * `Long` datatype
-  * Fluent functions
   * Retrieve search paths
   * Retrieve includes
 * In addition the following features defined prior to CQL 1.5 are also not yet supported:
diff --git a/examples/browser/cql4browsers.js b/examples/browser/cql4browsers.js
index 9d78a17ad..53c357ead 100644
--- a/examples/browser/cql4browsers.js
+++ b/examples/browser/cql4browsers.js
@@ -77,7 +77,7 @@ class CodeService {
 }
 exports.CodeService = CodeService;
 
-},{"./datatypes/datatypes":6}],3:[function(require,module,exports){
+},{"./datatypes/datatypes":7}],3:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -115,6 +115,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PatientSource = exports.Patient = exports.Record = void 0;
 const DT = __importStar(require("./datatypes/datatypes"));
+const elmTypes_1 = require("./util/elmTypes");
 class Record {
     constructor(json) {
         this.json = json;
@@ -127,13 +128,13 @@ class Record {
         return [
             {
                 name: `{https://github.com/cqframework/cql-execution/simple}${this.json.recordType}`,
-                type: 'NamedTypeSpecifier'
+                type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER
             },
             {
                 name: '{https://github.com/cqframework/cql-execution/simple}Record',
-                type: 'NamedTypeSpecifier'
+                type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER
             },
-            { name: '{urn:hl7-org:elm-types:r1}Any', type: 'NamedTypeSpecifier' }
+            { name: '{urn:hl7-org:elm-types:r1}Any', type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER }
         ];
     }
     _recursiveGet(field) {
@@ -244,7 +245,7 @@ class PatientSource {
 }
 exports.PatientSource = PatientSource;
 
-},{"./datatypes/datatypes":6}],4:[function(require,module,exports){
+},{"./datatypes/datatypes":7,"./util/elmTypes":55}],4:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -331,7 +332,21 @@ exports.default = {
     ValueSet: datatypes_1.ValueSet
 };
 
-},{"./cql-code-service":2,"./cql-patient":3,"./datatypes/datatypes":6,"./elm/expression":22,"./elm/library":27,"./runtime/context":42,"./runtime/executor":43,"./runtime/messageListeners":44,"./runtime/repository":45,"./runtime/results":46,"./types":49,"./util/customErrors":53}],5:[function(require,module,exports){
+},{"./cql-code-service":2,"./cql-patient":3,"./datatypes/datatypes":7,"./elm/expression":23,"./elm/library":28,"./runtime/context":43,"./runtime/executor":44,"./runtime/messageListeners":45,"./runtime/repository":46,"./runtime/results":47,"./types":50,"./util/customErrors":54}],5:[function(require,module,exports){
+"use strict";
+// By default, BigInt throws a TypeError if you attempt to JSON.stringify it.
+// You can avoid the TypeError by defining a `toJSON()` function for BigInt.
+// We will use the same serialization approach as FHIR uses for integer64: a string.
+// See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt#use_within_json
+// See: https://hl7.org/fhir/R5/json.html#primitive
+Object.defineProperty(exports, "__esModule", { value: true });
+if (BigInt.prototype.toJSON === undefined) {
+    BigInt.prototype.toJSON = function () {
+        return this.toString();
+    };
+}
+
+},{}],6:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValueSet = exports.CQLValueSet = exports.CodeSystem = exports.Vocabulary = exports.Concept = exports.Code = void 0;
@@ -507,7 +522,7 @@ function codesMatch(code1, code2) {
     return code1.code === code2.code && code1.system === code2.system;
 }
 
-},{"../util/util":57}],6:[function(require,module,exports){
+},{"../util/util":59}],7:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -524,6 +539,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./bigint"), exports);
 __exportStar(require("./logic"), exports);
 __exportStar(require("./clinical"), exports);
 __exportStar(require("./uncertainty"), exports);
@@ -532,9 +548,8 @@ __exportStar(require("./interval"), exports);
 __exportStar(require("./quantity"), exports);
 __exportStar(require("./ratio"), exports);
 
-},{"./clinical":5,"./datetime":7,"./interval":9,"./logic":10,"./quantity":11,"./ratio":12,"./uncertainty":13}],7:[function(require,module,exports){
+},{"./bigint":5,"./clinical":6,"./datetime":8,"./interval":10,"./logic":11,"./quantity":12,"./ratio":13,"./uncertainty":14}],8:[function(require,module,exports){
 "use strict";
-var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MAX_TIME_VALUE = exports.MIN_TIME_VALUE = exports.MAX_DATE_VALUE = exports.MIN_DATE_VALUE = exports.MAX_DATETIME_VALUE = exports.MIN_DATETIME_VALUE = exports.Date = exports.DateTime = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
@@ -1294,18 +1309,17 @@ class DateTime extends AbstractDate {
             : DATETIME_PRECISION_VALUE_MAP.get(this.getPrecision());
     }
     toLuxonDateTime() {
-        var _a, _b, _c, _d, _e, _f, _g;
         const offsetMins = this.timezoneOffset != null
             ? this.timezoneOffset * 60
             : new util_1.jsDate().getTimezoneOffset() * -1;
         return luxon_1.DateTime.fromObject({
-            year: (_a = this.year) !== null && _a !== void 0 ? _a : undefined,
-            month: (_b = this.month) !== null && _b !== void 0 ? _b : undefined,
-            day: (_c = this.day) !== null && _c !== void 0 ? _c : undefined,
-            hour: (_d = this.hour) !== null && _d !== void 0 ? _d : undefined,
-            minute: (_e = this.minute) !== null && _e !== void 0 ? _e : undefined,
-            second: (_f = this.second) !== null && _f !== void 0 ? _f : undefined,
-            millisecond: (_g = this.millisecond) !== null && _g !== void 0 ? _g : undefined
+            year: this.year ?? undefined,
+            month: this.month ?? undefined,
+            day: this.day ?? undefined,
+            hour: this.hour ?? undefined,
+            minute: this.minute ?? undefined,
+            second: this.second ?? undefined,
+            millisecond: this.millisecond ?? undefined
         }, {
             zone: luxon_1.FixedOffsetZone.instance(offsetMins)
         });
@@ -1546,11 +1560,10 @@ class Date extends AbstractDate {
         return DATETIME_PRECISION_VALUE_MAP.get(this.getPrecision());
     }
     toLuxonDateTime() {
-        var _a, _b, _c;
         return luxon_1.DateTime.fromObject({
-            year: (_a = this.year) !== null && _a !== void 0 ? _a : undefined,
-            month: (_b = this.month) !== null && _b !== void 0 ? _b : undefined,
-            day: (_c = this.day) !== null && _c !== void 0 ? _c : undefined
+            year: this.year ?? undefined,
+            month: this.month ?? undefined,
+            day: this.day ?? undefined
         }, {
             zone: luxon_1.FixedOffsetZone.utcInstance
         });
@@ -1632,8 +1645,8 @@ exports.MIN_DATETIME_VALUE = DateTime.parse('0001-01-01T00:00:00.000');
 exports.MAX_DATETIME_VALUE = DateTime.parse('9999-12-31T23:59:59.999');
 exports.MIN_DATE_VALUE = Date.parse('0001-01-01');
 exports.MAX_DATE_VALUE = Date.parse('9999-12-31');
-exports.MIN_TIME_VALUE = (_a = DateTime.parse('0000-01-01T00:00:00.000')) === null || _a === void 0 ? void 0 : _a.getTime();
-exports.MAX_TIME_VALUE = (_b = DateTime.parse('0000-01-01T23:59:59.999')) === null || _b === void 0 ? void 0 : _b.getTime();
+exports.MIN_TIME_VALUE = DateTime.parse('0000-01-01T00:00:00.000')?.getTime();
+exports.MAX_TIME_VALUE = DateTime.parse('0000-01-01T23:59:59.999')?.getTime();
 const DATETIME_PRECISION_VALUE_MAP = (() => {
     const dtpvMap = new Map();
     dtpvMap.set(DateTime.Unit.YEAR, 4);
@@ -1731,7 +1744,7 @@ function isPrecisionUnspecifiedOrGreaterThanDay(precision) {
     return precision == null || /^h|mi|s/.test(precision);
 }
 
-},{"../util/util":57,"./uncertainty":13,"luxon":75}],8:[function(require,module,exports){
+},{"../util/util":59,"./uncertainty":14,"luxon":77}],9:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Exception = void 0;
@@ -1743,7 +1756,7 @@ class Exception {
 }
 exports.Exception = Exception;
 
-},{}],9:[function(require,module,exports){
+},{}],10:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -1785,6 +1798,7 @@ const quantity_1 = require("./quantity");
 const logic_1 = require("./logic");
 const math_1 = require("../util/math");
 const cmp = __importStar(require("../util/comparison"));
+const elmTypes_1 = require("../util/elmTypes");
 class Interval {
     constructor(low, high, lowClosed, highClosed, defaultPointType // defaultPointType is used in the case that both endpoints are null
     ) {
@@ -1810,21 +1824,22 @@ class Interval {
         const point = this.low != null ? this.low : this.high;
         if (point != null) {
             if (typeof point === 'number') {
-                pointType = Number.isInteger(point)
-                    ? '{urn:hl7-org:elm-types:r1}Integer'
-                    : '{urn:hl7-org:elm-types:r1}Decimal';
+                pointType = Number.isInteger(point) ? elmTypes_1.ELM_INTEGER_TYPE : elmTypes_1.ELM_DECIMAL_TYPE;
+            }
+            else if (typeof point === 'bigint') {
+                pointType = elmTypes_1.ELM_LONG_TYPE;
             }
             else if (point.isTime && point.isTime()) {
-                pointType = '{urn:hl7-org:elm-types:r1}Time';
+                pointType = elmTypes_1.ELM_TIME_TYPE;
             }
             else if (point.isDate) {
-                pointType = '{urn:hl7-org:elm-types:r1}Date';
+                pointType = elmTypes_1.ELM_DATE_TYPE;
             }
             else if (point.isDateTime) {
-                pointType = '{urn:hl7-org:elm-types:r1}DateTime';
+                pointType = elmTypes_1.ELM_DATETIME_TYPE;
             }
             else if (point.isQuantity) {
-                pointType = '{urn:hl7-org:elm-types:r1}Quantity';
+                pointType = elmTypes_1.ELM_QUANTITY_TYPE;
             }
         }
         if (pointType == null && this.defaultPointType != null) {
@@ -1903,7 +1918,7 @@ class Interval {
         if (this.isUnknownInterval || item == null || item.isUnknownInterval) {
             return null;
         }
-        else if (this.isBoundlessInterval || (item === null || item === void 0 ? void 0 : item.isBoundlessInterval)) {
+        else if (this.isBoundlessInterval || item?.isBoundlessInterval) {
             return true;
         }
         const closed = this.toClosed();
@@ -1926,7 +1941,7 @@ class Interval {
         if (this.isBoundlessInterval) {
             return cmp.lessThan(high, (0, math_1.maxValueForInstance)(high), precision);
         }
-        else if (item === null || item === void 0 ? void 0 : item.isBoundlessInterval) {
+        else if (item?.isBoundlessInterval) {
             return false;
         }
         const closed = this.toClosed();
@@ -1940,7 +1955,7 @@ class Interval {
         if (this.isBoundlessInterval) {
             return cmp.greaterThan(low, (0, math_1.minValueForInstance)(low), precision);
         }
-        else if (item === null || item === void 0 ? void 0 : item.isBoundlessInterval) {
+        else if (item?.isBoundlessInterval) {
             return false;
         }
         const closed = this.toClosed();
@@ -2088,7 +2103,7 @@ class Interval {
                 other.high == null &&
                 !other.highClosed &&
                 !this.highClosed)) {
-            if (typeof this.low === 'number') {
+            if (typeof this.low === 'number' || typeof this.low === 'bigint') {
                 if (!(this.start() === other.start())) {
                     return false;
                 }
@@ -2102,7 +2117,7 @@ class Interval {
         else if ((this.low != null && other.low == null && this.high != null && other.high != null) ||
             (this.low == null && other.low != null && this.high != null && other.high != null) ||
             (this.low == null && other.low == null && this.high != null && other.high != null)) {
-            if (typeof this.high === 'number') {
+            if (typeof this.high === 'number' || typeof this.high === 'bigint') {
                 if (!(this.end() === other.end())) {
                     return false;
                 }
@@ -2132,7 +2147,7 @@ class Interval {
         if (other.lowClosed && other.low == null && other.highClosed && other.high == null) {
             return false;
         }
-        if (typeof this.low === 'number') {
+        if (typeof this.low === 'number' || typeof this.low === 'bigint') {
             return this.start() === other.start() && this.end() === other.end();
         }
         else {
@@ -2198,7 +2213,7 @@ class Interval {
                 return cmp.equals(this.toClosed().low, (0, math_1.successor)(other.toClosed().high));
             }
         }
-        catch (_a) {
+        catch {
             return false;
         }
     }
@@ -2211,7 +2226,7 @@ class Interval {
                 return cmp.equals(this.toClosed().high, (0, math_1.predecessor)(other.toClosed().low));
             }
         }
-        catch (_a) {
+        catch {
             return false;
         }
     }
@@ -2273,20 +2288,20 @@ class Interval {
             if (closed.low.unit !== closed.high.unit) {
                 throw new Error('Cannot calculate width of Quantity Interval with different units');
             }
-            const lowValue = closed.low.value;
-            const highValue = closed.high.value;
-            let diff = Math.abs(highValue - lowValue);
+            let diff = closed.high.value - closed.low.value;
             diff = Math.round(diff * Math.pow(10, 8)) / Math.pow(10, 8);
             return new quantity_1.Quantity(diff, closed.low.unit);
         }
+        else if (typeof closed.low === 'bigint') {
+            return closed.high - closed.low;
+        }
         else {
             // TODO: Fix precision to 8 decimals in other places that return numbers
-            const diff = Math.abs(closed.high - closed.low);
+            const diff = closed.high - closed.low;
             return Math.round(diff * Math.pow(10, 8)) / Math.pow(10, 8);
         }
     }
     size() {
-        const pointSize = this.getPointSize();
         if ((this.low != null && (this.low.isDateTime || this.low.isDate)) ||
             (this.high != null && (this.high.isDateTime || this.high.isDate))) {
             throw new Error('Size of Date, DateTime, and Time intervals is not supported');
@@ -2296,18 +2311,20 @@ class Interval {
             (closed.high != null && closed.high.isUncertainty)) {
             return null;
         }
-        else if (closed.low.isQuantity) {
+        const pointSize = this.getPointSize();
+        if (closed.low.isQuantity) {
             if (closed.low.unit !== closed.high.unit) {
                 throw new Error('Cannot calculate size of Quantity Interval with different units');
             }
-            const lowValue = closed.low.value;
-            const highValue = closed.high.value;
-            let diff = Math.abs(highValue - lowValue) + pointSize.value;
+            let diff = closed.high.value - closed.low.value + pointSize.value;
             diff = Math.round(diff * Math.pow(10, 8)) / Math.pow(10, 8);
             return new quantity_1.Quantity(diff, closed.low.unit);
         }
+        else if (typeof closed.low === 'bigint') {
+            return closed.high - closed.low + pointSize;
+        }
         else {
-            const diff = Math.abs(closed.high - closed.low) + pointSize.value;
+            const diff = closed.high - closed.low + pointSize;
             return Math.round(diff * Math.pow(10, 8)) / Math.pow(10, 8);
         }
     }
@@ -2329,17 +2346,14 @@ class Interval {
                 pointSize = new quantity_1.Quantity(1, this.high.getPrecision());
             }
             else if (this.high.isQuantity) {
-                pointSize = (0, quantity_1.doSubtraction)((0, math_1.successor)(this.high), this.high);
+                pointSize = (0, quantity_1.doSubtraction)(this.high, (0, math_1.predecessor)(this.high));
             }
             else {
-                pointSize = (0, math_1.successor)(this.high) - this.high;
+                pointSize = this.high - (0, math_1.predecessor)(this.high);
             }
         }
         else {
-            throw new Error('Point type of intervals cannot be determined.');
-        }
-        if (typeof pointSize === 'number') {
-            pointSize = new quantity_1.Quantity(pointSize, '1');
+            throw new Error('Point type of interval cannot be determined.');
         }
         return pointSize;
     }
@@ -2393,7 +2407,9 @@ function areDateTimes(x, y) {
 }
 function areNumeric(x, y) {
     return [x, y].every(z => {
-        return typeof z === 'number' || (z != null && z.isUncertainty && typeof z.low === 'number');
+        return (typeof z === 'number' ||
+            typeof z === 'bigint' ||
+            (z != null && z.isUncertainty && (typeof z.low === 'number' || typeof z.low === 'bigint')));
     });
 }
 function lowestNumericUncertainty(x, y) {
@@ -2429,7 +2445,7 @@ function highestNumericUncertainty(x, y) {
     }
 }
 
-},{"../util/comparison":52,"../util/math":55,"./logic":10,"./quantity":11,"./uncertainty":13}],10:[function(require,module,exports){
+},{"../util/comparison":53,"../util/elmTypes":55,"../util/math":57,"./logic":11,"./quantity":12,"./uncertainty":14}],11:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThreeValuedLogic = void 0;
@@ -2488,7 +2504,7 @@ class ThreeValuedLogic {
 }
 exports.ThreeValuedLogic = ThreeValuedLogic;
 
-},{}],11:[function(require,module,exports){
+},{}],12:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Quantity = void 0;
@@ -2497,6 +2513,7 @@ exports.doAddition = doAddition;
 exports.doSubtraction = doSubtraction;
 exports.doDivision = doDivision;
 exports.doMultiplication = doMultiplication;
+const elmTypes_1 = require("../util/elmTypes");
 const math_1 = require("../util/math");
 const units_1 = require("../util/units");
 class Quantity {
@@ -2606,7 +2623,7 @@ class Quantity {
         const resultValue = val1 / val2;
         const resultUnit = (0, units_1.getQuotientOfUnits)(unit1, unit2);
         // Check for invalid unit or value
-        if (resultUnit == null || (0, math_1.overflowsOrUnderflows)(resultValue)) {
+        if (resultUnit == null || (0, math_1.overflowsOrUnderflows)(resultValue, elmTypes_1.ELM_DECIMAL_TYPE)) {
             return null;
         }
         return new Quantity((0, math_1.decimalAdjust)('round', resultValue, -8), resultUnit);
@@ -2623,7 +2640,7 @@ class Quantity {
         const resultValue = val1 * val2;
         const resultUnit = (0, units_1.getProductOfUnits)(unit1, unit2);
         // Check for invalid unit or value
-        if (resultUnit == null || (0, math_1.overflowsOrUnderflows)(resultValue)) {
+        if (resultUnit == null || (0, math_1.overflowsOrUnderflows)(resultValue, elmTypes_1.ELM_DECIMAL_TYPE)) {
             return null;
         }
         return new Quantity((0, math_1.decimalAdjust)('round', resultValue, -8), resultUnit);
@@ -2658,7 +2675,7 @@ function doScaledAddition(a, b, scaleForB) {
             return null;
         }
         const sum = val1 + val2;
-        if ((0, math_1.overflowsOrUnderflows)(sum)) {
+        if ((0, math_1.overflowsOrUnderflows)(sum, elmTypes_1.ELM_DECIMAL_TYPE)) {
             return null;
         }
         return new Quantity(sum, unit1);
@@ -2692,7 +2709,7 @@ function doMultiplication(a, b) {
     }
 }
 
-},{"../util/math":55,"../util/units":56}],12:[function(require,module,exports){
+},{"../util/elmTypes":55,"../util/math":57,"../util/units":58}],13:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ratio = void 0;
@@ -2720,7 +2737,7 @@ class Ratio {
         if (other != null && other.isRatio) {
             const divided_this = this.numerator.dividedBy(this.denominator);
             const divided_other = other.numerator.dividedBy(other.denominator);
-            return divided_this === null || divided_this === void 0 ? void 0 : divided_this.equals(divided_other);
+            return divided_this?.equals(divided_other);
         }
         else {
             return false;
@@ -2733,7 +2750,7 @@ class Ratio {
 }
 exports.Ratio = Ratio;
 
-},{}],13:[function(require,module,exports){
+},{}],14:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Uncertainty = void 0;
@@ -2752,7 +2769,7 @@ class Uncertainty {
         this.low = low;
         this.high = high;
         const gt = (a, b) => {
-            if (typeof a !== typeof b || (a === null || a === void 0 ? void 0 : a.constructor) !== (b === null || b === void 0 ? void 0 : b.constructor)) {
+            if (typeof a !== typeof b || a?.constructor !== b?.constructor) {
                 // TODO: This should probably throw rather than return false.
                 // Uncertainties with different types probably shouldn't be supported.
                 return false;
@@ -2790,11 +2807,10 @@ class Uncertainty {
         return new Uncertainty(newLow, newHigh);
     }
     isPoint() {
-        var _a, _b;
         // Note: Can't use normal equality, as that fails for Javascript dates
         // TODO: Fix after we don't need to support Javascript date uncertainties anymore
         const lte = (a, b) => {
-            if (typeof a !== typeof b || (a === null || a === void 0 ? void 0 : a.constructor) !== (b === null || b === void 0 ? void 0 : b.constructor)) {
+            if (typeof a !== typeof b || a?.constructor !== b?.constructor) {
                 return null;
             }
             if (typeof a.sameOrBefore === 'function') {
@@ -2805,7 +2821,7 @@ class Uncertainty {
             }
         };
         const gte = (a, b) => {
-            if (typeof a !== typeof b || (a === null || a === void 0 ? void 0 : a.constructor) !== (b === null || b === void 0 ? void 0 : b.constructor)) {
+            if (typeof a !== typeof b || a?.constructor !== b?.constructor) {
                 return null;
             }
             if (typeof a.sameOrBefore === 'function') {
@@ -2817,8 +2833,8 @@ class Uncertainty {
         };
         return (this.low != null &&
             this.high != null &&
-            ((_a = lte(this.low, this.high)) !== null && _a !== void 0 ? _a : false) &&
-            ((_b = gte(this.low, this.high)) !== null && _b !== void 0 ? _b : false));
+            (lte(this.low, this.high) ?? false) &&
+            (gte(this.low, this.high) ?? false));
     }
     equals(other) {
         // if this is a point, and other is not an uncertainty or a point, then we can compare directly
@@ -2835,7 +2851,7 @@ class Uncertainty {
     }
     lessThan(other) {
         const lt = (a, b) => {
-            if (typeof a !== typeof b || (a === null || a === void 0 ? void 0 : a.constructor) !== (b === null || b === void 0 ? void 0 : b.constructor)) {
+            if (typeof a !== typeof b || a?.constructor !== b?.constructor) {
                 return null;
             }
             if (typeof a.before === 'function') {
@@ -2867,7 +2883,7 @@ class Uncertainty {
 }
 exports.Uncertainty = Uncertainty;
 
-},{"../util/comparison":52,"./logic":10}],14:[function(require,module,exports){
+},{"../util/comparison":53,"./logic":11}],15:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnyTrue = exports.AllTrue = exports.PopulationVariance = exports.Variance = exports.PopulationStdDev = exports.GeometricMean = exports.Product = exports.StdDev = exports.Mode = exports.Median = exports.Avg = exports.Max = exports.Min = exports.Sum = exports.Count = void 0;
@@ -2877,6 +2893,8 @@ const datatypes_1 = require("../datatypes/datatypes");
 const exception_1 = require("../datatypes/exception");
 const comparison_1 = require("../util/comparison");
 const builder_1 = require("./builder");
+const math_1 = require("../util/math");
+const elmTypes_1 = require("../util/elmTypes");
 class AggregateExpression extends expression_1.Expression {
     constructor(json) {
         super(json);
@@ -2908,7 +2926,7 @@ class Sum extends AggregateExpression {
         try {
             items = processQuantities(items);
         }
-        catch (_a) {
+        catch {
             return null;
         }
         if (items.length === 0) {
@@ -2917,10 +2935,11 @@ class Sum extends AggregateExpression {
         if (hasOnlyQuantities(items)) {
             const values = getValuesFromQuantities(items);
             const sum = values.reduce((x, y) => x + y);
-            return new datatypes_1.Quantity(sum, items[0].unit);
+            return (0, math_1.overflowsOrUnderflows)(sum, elmTypes_1.ELM_DECIMAL_TYPE) ? null : new datatypes_1.Quantity(sum, items[0].unit);
         }
         else {
-            return items.reduce((x, y) => x + y);
+            const sum = items.reduce((x, y) => x + y);
+            return (0, math_1.overflowsOrUnderflows)(sum, this.resultTypeName) ? null : sum;
         }
     }
 }
@@ -2940,7 +2959,7 @@ class Min extends AggregateExpression {
         try {
             processQuantities(list);
         }
-        catch (_a) {
+        catch {
             return null;
         }
         if (listWithoutNulls.length === 0) {
@@ -2972,7 +2991,7 @@ class Max extends AggregateExpression {
         try {
             processQuantities(items);
         }
-        catch (_a) {
+        catch {
             return null;
         }
         if (listWithoutNulls.length === 0) {
@@ -3001,7 +3020,7 @@ class Avg extends AggregateExpression {
         try {
             items = processQuantities(items);
         }
-        catch (_a) {
+        catch {
             return null;
         }
         if (items.length === 0) {
@@ -3034,7 +3053,7 @@ class Median extends AggregateExpression {
         try {
             items = processQuantities(items);
         }
-        catch (_a) {
+        catch {
             return null;
         }
         if (!hasOnlyQuantities(items)) {
@@ -3062,7 +3081,7 @@ class Mode extends AggregateExpression {
         try {
             filtered = processQuantities(items);
         }
-        catch (_a) {
+        catch {
             return null;
         }
         if (hasOnlyQuantities(filtered)) {
@@ -3114,7 +3133,7 @@ class StdDev extends AggregateExpression {
         try {
             items = processQuantities(items);
         }
-        catch (_a) {
+        catch {
             return null;
         }
         if (items.length === 0) {
@@ -3167,7 +3186,7 @@ class Product extends AggregateExpression {
         try {
             items = processQuantities(items);
         }
-        catch (_a) {
+        catch {
             return null;
         }
         if (items.length === 0) {
@@ -3177,10 +3196,13 @@ class Product extends AggregateExpression {
             const values = getValuesFromQuantities(items);
             const product = values.reduce((x, y) => x * y);
             // Units are not multiplied for the geometric product
-            return new datatypes_1.Quantity(product, items[0].unit);
+            return (0, math_1.overflowsOrUnderflows)(product, elmTypes_1.ELM_DECIMAL_TYPE)
+                ? null
+                : new datatypes_1.Quantity(product, items[0].unit);
         }
         else {
-            return items.reduce((x, y) => x * y);
+            const product = items.reduce((x, y) => x * y);
+            return (0, math_1.overflowsOrUnderflows)(product, this.resultTypeName) ? null : product;
         }
     }
 }
@@ -3197,7 +3219,7 @@ class GeometricMean extends AggregateExpression {
         try {
             items = processQuantities(items);
         }
-        catch (_a) {
+        catch {
             return null;
         }
         if (items.length === 0) {
@@ -3300,7 +3322,7 @@ function medianOfNumbers(numbers) {
     }
 }
 
-},{"../datatypes/datatypes":6,"../datatypes/exception":8,"../util/comparison":52,"../util/util":57,"./builder":16,"./expression":22}],15:[function(require,module,exports){
+},{"../datatypes/datatypes":7,"../datatypes/exception":9,"../util/comparison":53,"../util/elmTypes":55,"../util/math":57,"../util/util":59,"./builder":17,"./expression":23}],16:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -3342,6 +3364,7 @@ const MathUtil = __importStar(require("../util/math"));
 const quantity_1 = require("../datatypes/quantity");
 const uncertainty_1 = require("../datatypes/uncertainty");
 const builder_1 = require("./builder");
+const elmTypes_1 = require("../util/elmTypes");
 class Add extends expression_1.Expression {
     constructor(json) {
         super(json);
@@ -3376,7 +3399,7 @@ class Add extends expression_1.Expression {
                 return x + y;
             }
         });
-        if (MathUtil.overflowsOrUnderflows(sum)) {
+        if (MathUtil.overflowsOrUnderflows(sum, this.resultTypeName)) {
             return null;
         }
         return sum;
@@ -3414,7 +3437,7 @@ class Subtract extends expression_1.Expression {
                 return x - y;
             }
         });
-        if (MathUtil.overflowsOrUnderflows(difference)) {
+        if (MathUtil.overflowsOrUnderflows(difference, this.resultTypeName)) {
             return null;
         }
         return difference;
@@ -3452,7 +3475,7 @@ class Multiply extends expression_1.Expression {
                 return x * y;
             }
         });
-        if (MathUtil.overflowsOrUnderflows(product)) {
+        if (MathUtil.overflowsOrUnderflows(product, this.resultTypeName)) {
             return null;
         }
         return product;
@@ -3492,7 +3515,7 @@ class Divide extends expression_1.Expression {
         });
         // Note, anything divided by 0 is Infinity in Javascript, which will be
         // considered as overflow by this check.
-        if (MathUtil.overflowsOrUnderflows(quotient)) {
+        if (MathUtil.overflowsOrUnderflows(quotient, this.resultTypeName)) {
             return null;
         }
         return quotient;
@@ -3508,9 +3531,22 @@ class TruncatedDivide extends expression_1.Expression {
         if (args == null || args.some((x) => x == null)) {
             return null;
         }
-        const quotient = args.reduce((x, y) => x / y);
-        const truncatedQuotient = quotient >= 0 ? Math.floor(quotient) : Math.ceil(quotient);
-        if (MathUtil.overflowsOrUnderflows(truncatedQuotient)) {
+        let truncatedQuotient;
+        if (typeof args[0] === 'bigint') {
+            // bigint division always truncates
+            try {
+                truncatedQuotient = args.reduce((x, y) => x / y);
+            }
+            catch {
+                // bigint divide by 0 throws an error
+                return null;
+            }
+        }
+        else {
+            const quotient = args.reduce((x, y) => x / y);
+            truncatedQuotient = quotient >= 0 ? Math.floor(quotient) : Math.ceil(quotient);
+        }
+        if (MathUtil.overflowsOrUnderflows(truncatedQuotient, this.resultTypeName)) {
             return null;
         }
         return truncatedQuotient;
@@ -3526,8 +3562,15 @@ class Modulo extends expression_1.Expression {
         if (args == null || args.some((x) => x == null)) {
             return null;
         }
-        const modulo = args.reduce((x, y) => x % y);
-        return MathUtil.decimalOrNull(modulo);
+        let modulo;
+        try {
+            modulo = args.reduce((x, y) => x % y);
+        }
+        catch {
+            // modulo divide by zero results in null according to specification
+            return null;
+        }
+        return MathUtil.decimalLongOrNull(modulo);
     }
 }
 exports.Modulo = Modulo;
@@ -3582,8 +3625,17 @@ class Abs extends expression_1.Expression {
         else if (arg.isQuantity) {
             return new quantity_1.Quantity(Math.abs(arg.value), arg.unit);
         }
+        else if (typeof arg === 'bigint') {
+            const absoluteValue = arg < 0n ? -arg : arg;
+            return MathUtil.overflowsOrUnderflows(absoluteValue, this.resultTypeName)
+                ? null
+                : absoluteValue;
+        }
         else {
-            return Math.abs(arg);
+            const absoluteValue = Math.abs(arg);
+            return MathUtil.overflowsOrUnderflows(absoluteValue, this.resultTypeName)
+                ? null
+                : absoluteValue;
         }
     }
 }
@@ -3600,8 +3652,17 @@ class Negate extends expression_1.Expression {
         else if (arg.isQuantity) {
             return new quantity_1.Quantity(arg.value * -1, arg.unit);
         }
+        else if (typeof arg === 'bigint') {
+            const negatedValue = arg * -1n;
+            return MathUtil.overflowsOrUnderflows(negatedValue, this.resultTypeName)
+                ? null
+                : negatedValue;
+        }
         else {
-            return arg * -1;
+            const negatedValue = arg * -1;
+            return MathUtil.overflowsOrUnderflows(negatedValue, this.resultTypeName)
+                ? null
+                : negatedValue;
         }
     }
 }
@@ -3645,7 +3706,7 @@ class Exp extends expression_1.Expression {
             return null;
         }
         const power = Math.exp(arg);
-        if (MathUtil.overflowsOrUnderflows(power)) {
+        if (MathUtil.overflowsOrUnderflows(power, this.resultTypeName)) {
             return null;
         }
         return power;
@@ -3675,14 +3736,36 @@ class Power extends expression_1.Expression {
         if (args == null || args.some((x) => x == null)) {
             return null;
         }
-        const power = args.reduce((x, y) => Math.pow(x, y));
-        if (MathUtil.overflowsOrUnderflows(power)) {
+        const power = args.reduce((x, y) => doPower(x, y));
+        // Note: The resultTypeName may be wrong if the exponent is a negative number. Math.overflowsOrUnderflows
+        // already accounts for this possibility by only considering it an integer if Number.isInteger(value).
+        // E.g., CQL-to-ELM says 10^-1 is an Integer result type, but the correct result is a 0.1 (a Decimal)
+        if (MathUtil.overflowsOrUnderflows(power, this.resultTypeName)) {
             return null;
         }
         return power;
     }
 }
 exports.Power = Power;
+function doPower(x, y) {
+    if (typeof x === 'bigint' && typeof y === 'bigint' && y < 0n) {
+        // x ** y does not support negative exponents for bigint, so downgrade to number if possible, otherwise return null
+        if (x < BigInt(Number.MIN_SAFE_INTEGER) ||
+            x > BigInt(Number.MAX_SAFE_INTEGER) ||
+            y < BigInt(Number.MIN_SAFE_INTEGER)) {
+            // can't safely convert to number so just return null
+            return null;
+        }
+        return Number(x) ** Number(y);
+    }
+    try {
+        return x ** y;
+    }
+    catch {
+        // will throw if BigInt goes out of range
+        return null;
+    }
+}
 class MinValue extends expression_1.Expression {
     constructor(json) {
         super(json);
@@ -3690,7 +3773,7 @@ class MinValue extends expression_1.Expression {
     }
     async exec(ctx) {
         if (MinValue.MIN_VALUES[this.valueType]) {
-            if (this.valueType === '{urn:hl7-org:elm-types:r1}DateTime') {
+            if (this.valueType === elmTypes_1.ELM_DATETIME_TYPE) {
                 const minDateTime = MinValue.MIN_VALUES[this.valueType].copy();
                 minDateTime.timezoneOffset = ctx.getTimezoneOffset();
                 return minDateTime;
@@ -3706,11 +3789,12 @@ class MinValue extends expression_1.Expression {
 }
 exports.MinValue = MinValue;
 MinValue.MIN_VALUES = {
-    '{urn:hl7-org:elm-types:r1}Integer': MathUtil.MIN_INT_VALUE,
-    '{urn:hl7-org:elm-types:r1}Decimal': MathUtil.MIN_FLOAT_VALUE,
-    '{urn:hl7-org:elm-types:r1}DateTime': MathUtil.MIN_DATETIME_VALUE,
-    '{urn:hl7-org:elm-types:r1}Date': MathUtil.MIN_DATE_VALUE,
-    '{urn:hl7-org:elm-types:r1}Time': MathUtil.MIN_TIME_VALUE
+    [elmTypes_1.ELM_INTEGER_TYPE]: MathUtil.MIN_INT_VALUE,
+    [elmTypes_1.ELM_LONG_TYPE]: MathUtil.MIN_LONG_VALUE,
+    [elmTypes_1.ELM_DECIMAL_TYPE]: MathUtil.MIN_FLOAT_VALUE,
+    [elmTypes_1.ELM_DATETIME_TYPE]: MathUtil.MIN_DATETIME_VALUE,
+    [elmTypes_1.ELM_DATE_TYPE]: MathUtil.MIN_DATE_VALUE,
+    [elmTypes_1.ELM_TIME_TYPE]: MathUtil.MIN_TIME_VALUE
 };
 class MaxValue extends expression_1.Expression {
     constructor(json) {
@@ -3719,7 +3803,7 @@ class MaxValue extends expression_1.Expression {
     }
     async exec(ctx) {
         if (MaxValue.MAX_VALUES[this.valueType] != null) {
-            if (this.valueType === '{urn:hl7-org:elm-types:r1}DateTime') {
+            if (this.valueType === elmTypes_1.ELM_DATETIME_TYPE) {
                 const maxDateTime = MaxValue.MAX_VALUES[this.valueType].copy();
                 maxDateTime.timezoneOffset = ctx.getTimezoneOffset();
                 return maxDateTime;
@@ -3735,11 +3819,12 @@ class MaxValue extends expression_1.Expression {
 }
 exports.MaxValue = MaxValue;
 MaxValue.MAX_VALUES = {
-    '{urn:hl7-org:elm-types:r1}Integer': MathUtil.MAX_INT_VALUE,
-    '{urn:hl7-org:elm-types:r1}Decimal': MathUtil.MAX_FLOAT_VALUE,
-    '{urn:hl7-org:elm-types:r1}DateTime': MathUtil.MAX_DATETIME_VALUE,
-    '{urn:hl7-org:elm-types:r1}Date': MathUtil.MAX_DATE_VALUE,
-    '{urn:hl7-org:elm-types:r1}Time': MathUtil.MAX_TIME_VALUE
+    [elmTypes_1.ELM_INTEGER_TYPE]: MathUtil.MAX_INT_VALUE,
+    [elmTypes_1.ELM_LONG_TYPE]: MathUtil.MAX_LONG_VALUE,
+    [elmTypes_1.ELM_DECIMAL_TYPE]: MathUtil.MAX_FLOAT_VALUE,
+    [elmTypes_1.ELM_DATETIME_TYPE]: MathUtil.MAX_DATETIME_VALUE,
+    [elmTypes_1.ELM_DATE_TYPE]: MathUtil.MAX_DATE_VALUE,
+    [elmTypes_1.ELM_TIME_TYPE]: MathUtil.MAX_TIME_VALUE
 };
 class Successor extends expression_1.Expression {
     constructor(json) {
@@ -3754,14 +3839,14 @@ class Successor extends expression_1.Expression {
         try {
             // MathUtil.successor throws on overflow, and the exception is used in
             // the logic for evaluating `meets`, so it can't be changed to just return null
-            successor = MathUtil.successor(arg);
+            successor = MathUtil.successor(arg, this.resultTypeName);
         }
         catch (e) {
             if (e instanceof MathUtil.OverFlowException) {
                 return null;
             }
         }
-        if (MathUtil.overflowsOrUnderflows(successor)) {
+        if (MathUtil.overflowsOrUnderflows(successor, this.resultTypeName)) {
             return null;
         }
         return successor;
@@ -3781,14 +3866,14 @@ class Predecessor extends expression_1.Expression {
         try {
             // MathUtil.predecessor throws on underflow, and the exception is used in
             // the logic for evaluating `meets`, so it can't be changed to just return null
-            predecessor = MathUtil.predecessor(arg);
+            predecessor = MathUtil.predecessor(arg, this.resultTypeName);
         }
         catch (e) {
             if (e instanceof MathUtil.OverFlowException) {
                 return null;
             }
         }
-        if (MathUtil.overflowsOrUnderflows(predecessor)) {
+        if (MathUtil.overflowsOrUnderflows(predecessor, this.resultTypeName)) {
             return null;
         }
         return predecessor;
@@ -3796,7 +3881,7 @@ class Predecessor extends expression_1.Expression {
 }
 exports.Predecessor = Predecessor;
 
-},{"../datatypes/quantity":11,"../datatypes/uncertainty":13,"../util/math":55,"./builder":16,"./expression":22}],16:[function(require,module,exports){
+},{"../datatypes/quantity":12,"../datatypes/uncertainty":14,"../util/elmTypes":55,"../util/math":57,"./builder":17,"./expression":23}],17:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -3865,7 +3950,7 @@ function constructByName(name, json) {
     return new E[name](json);
 }
 
-},{"../util/util":57,"./expressions":23}],17:[function(require,module,exports){
+},{"../util/util":59,"./expressions":24}],18:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -3908,12 +3993,11 @@ const builder_1 = require("./builder");
 const util_1 = require("../util/util");
 class ValueSetDef extends expression_1.Expression {
     constructor(json) {
-        var _a;
         super(json);
         this.name = json.name;
         this.id = json.id;
         this.version = json.version;
-        this.codesystems = (_a = json.codeSystem) === null || _a === void 0 ? void 0 : _a.map((cs) => new CodeSystemRef(cs));
+        this.codesystems = json.codeSystem?.map((cs) => new CodeSystemRef(cs));
     }
     async exec(ctx) {
         let codeSystems;
@@ -4182,7 +4266,7 @@ function calculateAge(precision, birthDate, asOf, timeZoneOffset) {
             birthDate = birthDate.getDateTime(timeZoneOffset);
         }
         const result = birthDate.durationBetween(asOf, precision.toLowerCase());
-        if (result === null || result === void 0 ? void 0 : result.isPoint()) {
+        if (result?.isPoint()) {
             return result.low;
         }
         else {
@@ -4192,7 +4276,7 @@ function calculateAge(precision, birthDate, asOf, timeZoneOffset) {
     return null;
 }
 
-},{"../datatypes/datatypes":6,"../util/util":57,"./builder":16,"./expression":22}],18:[function(require,module,exports){
+},{"../datatypes/datatypes":7,"../util/util":59,"./builder":17,"./expression":23}],19:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GreaterOrEqual = exports.Greater = exports.LessOrEqual = exports.Less = void 0;
@@ -4253,7 +4337,7 @@ class GreaterOrEqual extends expression_1.Expression {
 }
 exports.GreaterOrEqual = GreaterOrEqual;
 
-},{"../datatypes/datatypes":6,"./expression":22}],19:[function(require,module,exports){
+},{"../datatypes/datatypes":7,"./expression":23}],20:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Case = exports.CaseItem = exports.If = void 0;
@@ -4320,7 +4404,7 @@ class Case extends expression_1.Expression {
 }
 exports.Case = Case;
 
-},{"../util/comparison":52,"./builder":16,"./expression":22}],20:[function(require,module,exports){
+},{"../util/comparison":53,"./builder":17,"./expression":23}],21:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -4364,6 +4448,7 @@ const expression_1 = require("./expression");
 const builder_1 = require("./builder");
 const literal_1 = require("./literal");
 const DT = __importStar(require("../datatypes/datatypes"));
+const elmTypes_1 = require("../util/elmTypes");
 class DateTime extends expression_1.Expression {
     constructor(json) {
         super(json);
@@ -4381,7 +4466,7 @@ class DateTime extends expression_1.Expression {
                 this[property] = literal_1.Literal.from({
                     type: 'Literal',
                     value: ctx.getTimezoneOffset(),
-                    valueType: '{urn:hl7-org:elm-types:r1}Integer'
+                    valueType: elmTypes_1.ELM_INTEGER_TYPE
                 });
             }
         }
@@ -4586,7 +4671,7 @@ class DurationBetween extends expression_1.Expression {
 }
 exports.DurationBetween = DurationBetween;
 
-},{"../datatypes/datatypes":6,"./builder":16,"./expression":22,"./literal":29}],21:[function(require,module,exports){
+},{"../datatypes/datatypes":7,"../util/elmTypes":55,"./builder":17,"./expression":23,"./literal":30}],22:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersionedIdentifier = exports.IncludeDef = exports.UsingDef = void 0;
@@ -4601,7 +4686,7 @@ class VersionedIdentifier extends expression_1.UnimplementedExpression {
 }
 exports.VersionedIdentifier = VersionedIdentifier;
 
-},{"./expression":22}],22:[function(require,module,exports){
+},{"./expression":23}],23:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnimplementedExpression = exports.Expression = void 0;
@@ -4625,6 +4710,9 @@ class Expression {
         if (json.locator != null) {
             this.locator = json.locator;
         }
+        if (json.resultTypeName != null) {
+            this.resultTypeName = json.resultTypeName;
+        }
     }
     async execute(ctx) {
         try {
@@ -4673,8 +4761,8 @@ class Expression {
      * library identifier and version are found.
      */
     getRecursiveLibraryIdentifier(ctx) {
-        var _a, _b, _c;
-        const identifier = (_c = (_b = (_a = ctx.library) === null || _a === void 0 ? void 0 : _a.source) === null || _b === void 0 ? void 0 : _b.library) === null || _c === void 0 ? void 0 : _c.identifier;
+        const identifier = ctx.library?.source?.library
+            ?.identifier;
         if (identifier) {
             return `${identifier.id}${identifier.version ? `|${identifier.version}` : ''}`;
         }
@@ -4695,7 +4783,7 @@ class UnimplementedExpression extends Expression {
 }
 exports.UnimplementedExpression = UnimplementedExpression;
 
-},{"../util/customErrors":53,"../util/util":57,"./builder":16}],23:[function(require,module,exports){
+},{"../util/customErrors":54,"../util/util":59,"./builder":17}],24:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -4752,7 +4840,7 @@ Object.defineProperty(exports, "doIncludes", { enumerable: true, get: function (
 Object.defineProperty(exports, "doExcept", { enumerable: true, get: function () { return interval_1.doExcept; } });
 Object.defineProperty(exports, "doContains", { enumerable: true, get: function () { return interval_1.doContains; } });
 
-},{"./aggregate":14,"./arithmetic":15,"./clinical":17,"./comparison":18,"./conditional":19,"./datetime":20,"./declaration":21,"./expression":22,"./external":24,"./instance":25,"./interval":26,"./list":28,"./literal":29,"./logical":30,"./message":31,"./nullological":32,"./overloaded":33,"./parameters":34,"./quantity":35,"./query":36,"./ratio":37,"./reusable":38,"./string":39,"./structured":40,"./type":41}],24:[function(require,module,exports){
+},{"./aggregate":15,"./arithmetic":16,"./clinical":18,"./comparison":19,"./conditional":20,"./datetime":21,"./declaration":22,"./expression":23,"./external":25,"./instance":26,"./interval":27,"./list":29,"./literal":30,"./logical":31,"./message":32,"./nullological":33,"./overloaded":34,"./parameters":35,"./quantity":36,"./query":37,"./ratio":38,"./reusable":39,"./string":40,"./structured":41,"./type":42}],25:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Retrieve = void 0;
@@ -4772,7 +4860,11 @@ class Retrieve extends expression_1.Expression {
     async exec(ctx) {
         // Object with retrieve information to pass back to patient source
         // Always assign datatype. Assign codeProperty and dateProperty if present
-        const retrieveDetails = Object.assign(Object.assign({ datatype: this.datatype }, (this.codeProperty ? { codeProperty: this.codeProperty } : {})), (this.dateProperty ? { dateProperty: this.dateProperty } : {}));
+        const retrieveDetails = {
+            datatype: this.datatype,
+            ...(this.codeProperty ? { codeProperty: this.codeProperty } : {}),
+            ...(this.dateProperty ? { dateProperty: this.dateProperty } : {})
+        };
         if (this.codes) {
             const executedCodes = await this.codes.execute(ctx);
             if (executedCodes == null) {
@@ -4797,7 +4889,7 @@ class Retrieve extends expression_1.Expression {
             records = records.filter((r) => this.recordMatchesCodesOrVS(r, retrieveDetails.codes));
         }
         if (retrieveDetails.dateRange && this.dateProperty) {
-            records = records.filter((r) => { var _a; return (_a = retrieveDetails.dateRange) === null || _a === void 0 ? void 0 : _a.includes(r.getDateOrInterval(this.dateProperty)); });
+            records = records.filter((r) => retrieveDetails.dateRange?.includes(r.getDateOrInterval(this.dateProperty)));
         }
         if (Array.isArray(records)) {
             ctx.evaluatedRecords.push(...records);
@@ -4818,7 +4910,7 @@ class Retrieve extends expression_1.Expression {
 }
 exports.Retrieve = Retrieve;
 
-},{"../util/util":57,"./builder":16,"./expression":22}],25:[function(require,module,exports){
+},{"../util/util":59,"./builder":17,"./expression":23}],26:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Instance = void 0;
@@ -4826,6 +4918,7 @@ const expression_1 = require("./expression");
 const quantity_1 = require("../datatypes/quantity");
 const datatypes_1 = require("../datatypes/datatypes");
 const builder_1 = require("./builder");
+const elmTypes_1 = require("../util/elmTypes");
 class Element {
     constructor(json) {
         this.name = json.name;
@@ -4847,11 +4940,11 @@ class Instance extends expression_1.Expression {
             obj[el.name] = await el.exec(ctx);
         }
         switch (this.classType) {
-            case '{urn:hl7-org:elm-types:r1}Quantity':
+            case elmTypes_1.ELM_QUANTITY_TYPE:
                 return new quantity_1.Quantity(obj.value, obj.unit);
             case '{urn:hl7-org:elm-types:r1}Code':
                 return new datatypes_1.Code(obj.code, obj.system, obj.version, obj.display);
-            case '{urn:hl7-org:elm-types:r1}Concept':
+            case elmTypes_1.ELM_CONCEPT_TYPE:
                 return new datatypes_1.Concept(obj.codes, obj.display);
             default:
                 return obj;
@@ -4860,7 +4953,7 @@ class Instance extends expression_1.Expression {
 }
 exports.Instance = Instance;
 
-},{"../datatypes/datatypes":6,"../datatypes/quantity":11,"./builder":16,"./expression":22}],26:[function(require,module,exports){
+},{"../datatypes/datatypes":7,"../datatypes/quantity":12,"../util/elmTypes":55,"./builder":17,"./expression":23}],27:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -4911,6 +5004,7 @@ const math_1 = require("../util/math");
 const units_1 = require("../util/units");
 const dtivl = __importStar(require("../datatypes/interval"));
 const builder_1 = require("./builder");
+const elmTypes_1 = require("../util/elmTypes");
 class Interval extends expression_1.Expression {
     constructor(json) {
         super(json);
@@ -4938,11 +5032,11 @@ class Interval extends expression_1.Expression {
         let defaultPointType;
         if (lowValue == null && highValue == null) {
             // try to get the default point type from a cast
-            if (this.low.asTypeSpecifier && this.low.asTypeSpecifier.type === 'NamedTypeSpecifier') {
+            if (this.low.asTypeSpecifier && this.low.asTypeSpecifier.type === elmTypes_1.ELM_NAMED_TYPE_SPECIFIER) {
                 defaultPointType = this.low.asTypeSpecifier.name;
             }
             else if (this.high.asTypeSpecifier &&
-                this.high.asTypeSpecifier.type === 'NamedTypeSpecifier') {
+                this.high.asTypeSpecifier.type === elmTypes_1.ELM_NAMED_TYPE_SPECIFIER) {
                 defaultPointType = this.high.asTypeSpecifier.name;
             }
         }
@@ -5095,8 +5189,7 @@ class Width extends expression_1.Expression {
         super(json);
     }
     async exec(ctx) {
-        var _a;
-        const interval = await ((_a = this.arg) === null || _a === void 0 ? void 0 : _a.execute(ctx));
+        const interval = await this.arg?.execute(ctx);
         if (interval == null) {
             return null;
         }
@@ -5109,8 +5202,7 @@ class Size extends expression_1.Expression {
         super(json);
     }
     async exec(ctx) {
-        var _a;
-        const interval = await ((_a = this.arg) === null || _a === void 0 ? void 0 : _a.execute(ctx));
+        const interval = await this.arg?.execute(ctx);
         if (interval == null) {
             return null;
         }
@@ -5123,8 +5215,7 @@ class Start extends expression_1.Expression {
         super(json);
     }
     async exec(ctx) {
-        var _a;
-        const interval = await ((_a = this.arg) === null || _a === void 0 ? void 0 : _a.execute(ctx));
+        const interval = await this.arg?.execute(ctx);
         if (interval == null) {
             return null;
         }
@@ -5142,8 +5233,7 @@ class End extends expression_1.Expression {
         super(json);
     }
     async exec(ctx) {
-        var _a;
-        const interval = await ((_a = this.arg) === null || _a === void 0 ? void 0 : _a.execute(ctx));
+        const interval = await this.arg?.execute(ctx);
         if (interval == null) {
             return null;
         }
@@ -5189,7 +5279,7 @@ class Ends extends expression_1.Expression {
 }
 exports.Ends = Ends;
 function intervalListType(intervals) {
-    // Returns one of null, 'time', 'date', 'datetime', 'quantity', 'integer', 'decimal' or 'mismatch'
+    // Returns one of null, 'time', 'date', 'datetime', 'quantity', 'long', 'integer', 'decimal' or 'mismatch'
     let type = null;
     for (const itvl of intervals) {
         if (itvl == null) {
@@ -5249,6 +5339,17 @@ function intervalListType(intervals) {
                 return 'mismatch';
             }
         }
+        else if (typeof low === 'bigint' && typeof high === 'bigint') {
+            if (type == null) {
+                type = 'long';
+            }
+            else if (type === 'long') {
+                continue;
+            }
+            else {
+                return 'mismatch';
+            }
+        }
         else if (Number.isInteger(low) && Number.isInteger(high)) {
             if (type == null) {
                 type = 'integer';
@@ -5310,7 +5411,7 @@ class Expand extends expression_1.Expression {
             expandFunction = this.expandQuantityInterval;
             defaultPer = (interval) => new quantity_1.Quantity(1, interval.low.unit);
         }
-        else if (['integer', 'decimal'].includes(type)) {
+        else if (['long', 'integer', 'decimal'].includes(type)) {
             expandFunction = this.expandNumericInterval;
             defaultPer = (_interval) => new quantity_1.Quantity(1, '1');
         }
@@ -5429,8 +5530,36 @@ class Expand extends expression_1.Expression {
         // Integers should have 0 Decimal places
         const perIsDecimal = perValue.toString().includes('.');
         const decimalPrecision = perIsDecimal ? 8 : 0;
+        const hasLongBoundaries = typeof low === 'bigint' || typeof high === 'bigint';
         low = lowClosed ? low : (0, math_1.successor)(low);
         high = highClosed ? high : (0, math_1.predecessor)(high);
+        if (hasLongBoundaries && !perIsDecimal) {
+            const longLow = low;
+            const longHigh = high;
+            if (longLow > longHigh) {
+                return [];
+            }
+            if (longLow == null || longHigh == null) {
+                return [];
+            }
+            const perBigInt = BigInt(perValue);
+            if (perBigInt > longHigh - longLow + 1n) {
+                return [];
+            }
+            let current_low = longLow;
+            let current_high = current_low + perBigInt - 1n;
+            const results = [];
+            while (current_high <= longHigh) {
+                results.push(new dtivl.Interval(current_low, current_high, true, true));
+                current_low += perBigInt;
+                current_high = current_low + perBigInt - 1n;
+            }
+            return results;
+        }
+        else if (hasLongBoundaries) {
+            low = Number(low);
+            high = Number(high);
+        }
         // If the interval boundaries are more precise than the per quantity, the
         // more precise values will be truncated to the precision specified by the
         // per quantity.
@@ -5498,7 +5627,8 @@ function collapseIntervals(intervals, perWidth) {
         // of the intervals involved will be used (i.e. the interval that has a
         // width equal to the result of the successor function for the point type).
         if (perWidth == null) {
-            perWidth = intervalsClone[0].getPointSize();
+            const pointSize = intervalsClone[0].getPointSize();
+            perWidth = pointSize.isQuantity ? pointSize : new quantity_1.Quantity(Number(pointSize), '1');
         }
         // sort intervalsClone by start
         intervalsClone.sort(function (a, b) {
@@ -5583,7 +5713,14 @@ function collapseIntervals(intervals, perWidth) {
                 }
             }
             else {
-                if (b.low - a.high <= perWidth.value) {
+                const distance = b.low - a.high;
+                const comparablePerWidth = typeof distance === 'bigint' && Number.isInteger(perWidth.value)
+                    ? BigInt(perWidth.value)
+                    : perWidth.value;
+                const withinPerWidth = typeof distance === 'bigint' && typeof comparablePerWidth !== 'bigint'
+                    ? Number(distance) <= comparablePerWidth
+                    : distance <= comparablePerWidth;
+                if (withinPerWidth) {
                     if (b.high > a.high || b.high == null) {
                         a.high = b.high;
                     }
@@ -5606,18 +5743,17 @@ function truncateDecimal(decimal, decimalPlaces) {
     return parseFloat(decimal.toString().match(re)[0]);
 }
 
-},{"../datatypes/interval":9,"../datatypes/quantity":11,"../util/math":55,"../util/units":56,"./builder":16,"./expression":22}],27:[function(require,module,exports){
+},{"../datatypes/interval":10,"../datatypes/quantity":12,"../util/elmTypes":55,"../util/math":57,"../util/units":58,"./builder":17,"./expression":23}],28:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Library = void 0;
 const expressions_1 = require("./expressions");
 class Library {
     constructor(json, libraryManager) {
-        var _a, _b;
         this.source = json;
         // identifier
-        this.name = (_a = json.library.identifier) === null || _a === void 0 ? void 0 : _a.id;
-        this.version = (_b = json.library.identifier) === null || _b === void 0 ? void 0 : _b.version;
+        this.name = json.library.identifier?.id;
+        this.version = json.library.identifier?.version;
         // usings
         const usingDefs = (json.library.usings && json.library.usings.def) || [];
         this.usings = usingDefs
@@ -5713,7 +5849,7 @@ class Library {
 }
 exports.Library = Library;
 
-},{"./expressions":23}],28:[function(require,module,exports){
+},{"./expressions":24}],29:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Slice = exports.Last = exports.First = exports.Current = exports.toDistinctList = exports.Distinct = exports.Flatten = exports.ForEach = exports.IndexOf = exports.ToList = exports.SingletonFrom = exports.Filter = exports.Times = exports.Exists = exports.List = void 0;
@@ -5988,21 +6124,24 @@ class Slice extends expression_1.Expression {
 exports.Slice = Slice;
 // Length is completely handled by overloaded#Length
 
-},{"../util/comparison":52,"../util/immutableUtil":54,"../util/util":57,"./builder":16,"./expression":22,"immutable":72}],29:[function(require,module,exports){
+},{"../util/comparison":53,"../util/immutableUtil":56,"../util/util":59,"./builder":17,"./expression":23,"immutable":74}],30:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StringLiteral = exports.DecimalLiteral = exports.IntegerLiteral = exports.BooleanLiteral = exports.Literal = void 0;
+exports.StringLiteral = exports.DecimalLiteral = exports.LongLiteral = exports.IntegerLiteral = exports.BooleanLiteral = exports.Literal = void 0;
+const elmTypes_1 = require("../util/elmTypes");
 const expression_1 = require("./expression");
 class Literal extends expression_1.Expression {
     static from(json) {
         switch (json.valueType) {
-            case '{urn:hl7-org:elm-types:r1}Boolean':
+            case elmTypes_1.ELM_BOOLEAN_TYPE:
                 return new BooleanLiteral(json);
-            case '{urn:hl7-org:elm-types:r1}Integer':
+            case elmTypes_1.ELM_INTEGER_TYPE:
                 return new IntegerLiteral(json);
-            case '{urn:hl7-org:elm-types:r1}Decimal':
+            case elmTypes_1.ELM_LONG_TYPE:
+                return new LongLiteral(json);
+            case elmTypes_1.ELM_DECIMAL_TYPE:
                 return new DecimalLiteral(json);
-            case '{urn:hl7-org:elm-types:r1}String':
+            case elmTypes_1.ELM_STRING_TYPE:
                 return new StringLiteral(json);
             default:
                 return new Literal(json);
@@ -6049,6 +6188,21 @@ class IntegerLiteral extends Literal {
     }
 }
 exports.IntegerLiteral = IntegerLiteral;
+class LongLiteral extends Literal {
+    constructor(json) {
+        super(json);
+        this.value = BigInt(this.value);
+    }
+    // Define a simple getter to allow type-checking of this class without instanceof
+    // and in a way that survives minification (as opposed to checking constructor.name)
+    get isLongLiteral() {
+        return true;
+    }
+    async exec(_ctx) {
+        return this.value;
+    }
+}
+exports.LongLiteral = LongLiteral;
 class DecimalLiteral extends Literal {
     constructor(json) {
         super(json);
@@ -6080,7 +6234,7 @@ class StringLiteral extends Literal {
 }
 exports.StringLiteral = StringLiteral;
 
-},{"./expression":22}],30:[function(require,module,exports){
+},{"../util/elmTypes":55,"./expression":23}],31:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IsFalse = exports.IsTrue = exports.Xor = exports.Not = exports.Or = exports.Implies = exports.And = void 0;
@@ -6151,7 +6305,7 @@ class IsFalse extends expression_1.Expression {
 }
 exports.IsFalse = IsFalse;
 
-},{"../datatypes/datatypes":6,"./expression":22}],31:[function(require,module,exports){
+},{"../datatypes/datatypes":7,"./expression":23}],32:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Message = void 0;
@@ -6183,7 +6337,7 @@ class Message extends expression_1.Expression {
 }
 exports.Message = Message;
 
-},{"./builder":16,"./expression":22}],32:[function(require,module,exports){
+},{"./builder":17,"./expression":23}],33:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Coalesce = exports.IsNull = exports.Null = void 0;
@@ -6233,7 +6387,7 @@ class Coalesce extends expression_1.Expression {
 }
 exports.Coalesce = Coalesce;
 
-},{"./expression":22}],33:[function(require,module,exports){
+},{"./expression":23}],34:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -6279,6 +6433,7 @@ const comparison_1 = require("../util/comparison");
 const DT = __importStar(require("./datetime"));
 const LIST = __importStar(require("./list"));
 const IVL = __importStar(require("./interval"));
+const elmTypes_1 = require("../util/elmTypes");
 class Equal extends expression_1.Expression {
     constructor(json) {
         super(json);
@@ -6359,9 +6514,8 @@ class Union extends expression_1.Expression {
         return lib.doUnion(a, b);
     }
     listTypeArgs() {
-        var _a;
-        return (_a = this.args) === null || _a === void 0 ? void 0 : _a.some((arg) => {
-            return arg.asTypeSpecifier != null && arg.asTypeSpecifier.type === 'ListTypeSpecifier';
+        return this.args?.some((arg) => {
+            return arg.asTypeSpecifier != null && arg.asTypeSpecifier.type === elmTypes_1.ELM_LIST_TYPE_SPECIFIER;
         });
     }
 }
@@ -6526,7 +6680,7 @@ class Length extends expression_1.Expression {
         if (arg != null) {
             return arg.length;
         }
-        else if (this.arg.asTypeSpecifier.type === 'ListTypeSpecifier') {
+        else if (this.arg.asTypeSpecifier.type === elmTypes_1.ELM_LIST_TYPE_SPECIFIER) {
             return 0;
         }
         else {
@@ -6633,7 +6787,7 @@ class Precision extends expression_1.Expression {
 }
 exports.Precision = Precision;
 
-},{"../datatypes/datetime":7,"../datatypes/logic":10,"../util/comparison":52,"../util/util":57,"./datetime":20,"./expression":22,"./interval":26,"./list":28}],34:[function(require,module,exports){
+},{"../datatypes/datetime":8,"../datatypes/logic":11,"../util/comparison":53,"../util/elmTypes":55,"../util/util":59,"./datetime":21,"./expression":23,"./interval":27,"./list":29}],35:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParameterRef = exports.ParameterDef = void 0;
@@ -6677,7 +6831,7 @@ class ParameterRef extends expression_1.Expression {
 }
 exports.ParameterRef = ParameterRef;
 
-},{"./builder":16,"./expression":22}],35:[function(require,module,exports){
+},{"./builder":17,"./expression":23}],36:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -6730,7 +6884,7 @@ class Quantity extends expression_1.Expression {
 }
 exports.Quantity = Quantity;
 
-},{"../datatypes/datatypes":6,"./expression":22}],36:[function(require,module,exports){
+},{"../datatypes/datatypes":7,"./expression":23}],37:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryLetRef = exports.AliasRef = exports.Query = exports.SortClause = exports.ReturnClause = exports.ByColumn = exports.ByExpression = exports.ByDirection = exports.Sort = exports.Without = exports.With = exports.LetClause = exports.AliasedQuerySource = void 0;
@@ -7025,7 +7179,7 @@ function cartesianProductOf(sources) {
     }, [[]]);
 }
 
-},{"../util/util":57,"./builder":16,"./expression":22,"./list":28}],37:[function(require,module,exports){
+},{"../util/util":59,"./builder":17,"./expression":23,"./list":29}],38:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -7087,12 +7241,13 @@ class Ratio extends expression_1.Expression {
 }
 exports.Ratio = Ratio;
 
-},{"../datatypes/datatypes":6,"../datatypes/quantity":11,"./expression":22}],38:[function(require,module,exports){
+},{"../datatypes/datatypes":7,"../datatypes/quantity":12,"./expression":23}],39:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdentifierRef = exports.OperandRef = exports.FunctionRef = exports.FunctionDef = exports.ExpressionRef = exports.ExpressionDef = void 0;
 const expression_1 = require("./expression");
 const builder_1 = require("./builder");
+const elmTypes_1 = require("../util/elmTypes");
 class ExpressionDef extends expression_1.Expression {
     constructor(json) {
         super(json);
@@ -7167,7 +7322,7 @@ class FunctionRef extends expression_1.Expression {
                             // convert it to a NamedTypedSpecifier
                             operandTypeSpecifier = {
                                 name: f.parameters[i].operandType,
-                                type: 'NamedTypeSpecifier'
+                                type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER
                             };
                         }
                         match = ctx.matchesTypeSpecifier(args[i], operandTypeSpecifier);
@@ -7245,7 +7400,7 @@ class IdentifierRef extends expression_1.Expression {
 }
 exports.IdentifierRef = IdentifierRef;
 
-},{"./builder":16,"./expression":22}],39:[function(require,module,exports){
+},{"../util/elmTypes":55,"./builder":17,"./expression":23}],40:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReplaceMatches = exports.EndsWith = exports.StartsWith = exports.Substring = exports.Matches = exports.LastPositionOf = exports.PositionOf = exports.Lower = exports.Upper = exports.SplitOnMatches = exports.Split = exports.Combine = exports.Concatenate = void 0;
@@ -7476,7 +7631,7 @@ class ReplaceMatches extends expression_1.Expression {
 }
 exports.ReplaceMatches = ReplaceMatches;
 
-},{"./builder":16,"./expression":22}],40:[function(require,module,exports){
+},{"./builder":17,"./expression":23}],41:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TupleElementDefinition = exports.TupleElement = exports.Tuple = exports.Property = void 0;
@@ -7553,10 +7708,10 @@ class TupleElementDefinition extends expression_1.UnimplementedExpression {
 }
 exports.TupleElementDefinition = TupleElementDefinition;
 
-},{"./builder":16,"./expression":22}],41:[function(require,module,exports){
+},{"./builder":17,"./expression":23}],42:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TupleTypeSpecifier = exports.NamedTypeSpecifier = exports.ListTypeSpecifier = exports.IntervalTypeSpecifier = exports.Is = exports.CanConvertQuantity = exports.ConvertQuantity = exports.ConvertsToTime = exports.ConvertsToString = exports.ConvertsToRatio = exports.ConvertsToQuantity = exports.ConvertsToInteger = exports.ConvertsToDecimal = exports.ConvertsToDateTime = exports.ConvertsToDate = exports.ConvertsToBoolean = exports.Convert = exports.ToTime = exports.ToString = exports.ToRatio = exports.ToQuantity = exports.ToInteger = exports.ToDecimal = exports.ToDateTime = exports.ToDate = exports.ToConcept = exports.ToBoolean = exports.As = void 0;
+exports.TupleTypeSpecifier = exports.NamedTypeSpecifier = exports.ListTypeSpecifier = exports.IntervalTypeSpecifier = exports.Is = exports.CanConvertQuantity = exports.ConvertQuantity = exports.ConvertsToTime = exports.ConvertsToString = exports.ConvertsToRatio = exports.ConvertsToQuantity = exports.ConvertsToLong = exports.ConvertsToInteger = exports.ConvertsToDecimal = exports.ConvertsToDateTime = exports.ConvertsToDate = exports.ConvertsToBoolean = exports.Convert = exports.ToTime = exports.ToString = exports.ToRatio = exports.ToQuantity = exports.ToLong = exports.ToInteger = exports.ToDecimal = exports.ToDateTime = exports.ToDate = exports.ToConcept = exports.ToBoolean = exports.As = void 0;
 const expression_1 = require("./expression");
 const datetime_1 = require("../datatypes/datetime");
 const clinical_1 = require("../datatypes/clinical");
@@ -7565,6 +7720,7 @@ const math_1 = require("../util/math");
 const util_1 = require("../util/util");
 const ratio_1 = require("../datatypes/ratio");
 const uncertainty_1 = require("../datatypes/uncertainty");
+const elmTypes_1 = require("../util/elmTypes");
 // TODO: Casting and Conversion needs unit tests!
 class As extends expression_1.Expression {
     constructor(json) {
@@ -7576,7 +7732,7 @@ class As extends expression_1.Expression {
             // convert it to a NamedTypedSpecifier
             this.asTypeSpecifier = {
                 name: json.asType,
-                type: 'NamedTypeSpecifier'
+                type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER
             };
         }
         this.strict = json.strict != null ? json.strict : false;
@@ -7702,8 +7858,24 @@ class ToInteger extends expression_1.Expression {
     }
     async exec(ctx) {
         const arg = await this.execArgs(ctx);
-        if (typeof arg === 'string') {
-            const integer = parseInt(arg);
+        if (typeof arg === 'number') {
+            if ((0, math_1.isValidInteger)(arg)) {
+                return arg;
+            }
+        }
+        else if (typeof arg === 'bigint') {
+            const integer = Number(arg);
+            if ((0, math_1.isValidInteger)(integer)) {
+                return integer;
+            }
+        }
+        else if (typeof arg === 'string') {
+            // check for blank string because Number('') and Number(' ') evaluate to 0.
+            if (arg.trim().length === 0) {
+                return null;
+            }
+            // note: invalid strings will result in NaN and fail isValidInteger
+            const integer = Number(arg);
             if ((0, math_1.isValidInteger)(integer)) {
                 return integer;
             }
@@ -7715,6 +7887,45 @@ class ToInteger extends expression_1.Expression {
     }
 }
 exports.ToInteger = ToInteger;
+class ToLong extends expression_1.Expression {
+    constructor(json) {
+        super(json);
+    }
+    async exec(ctx) {
+        const arg = await this.execArgs(ctx);
+        if (typeof arg === 'bigint') {
+            if ((0, math_1.isValidLong)(arg)) {
+                return arg;
+            }
+        }
+        else if (typeof arg === 'number') {
+            try {
+                const long = BigInt(arg);
+                if ((0, math_1.isValidLong)(long)) {
+                    return long;
+                }
+            }
+            catch {
+                return null;
+            }
+        }
+        else if (typeof arg === 'string') {
+            // check string format because BigInt throws for invalid strings
+            if (!/^[+-]?\d+$/.test(arg)) {
+                return null;
+            }
+            const long = BigInt(arg);
+            if ((0, math_1.isValidLong)(long)) {
+                return long;
+            }
+        }
+        else if (typeof arg === 'boolean') {
+            return arg ? 1n : 0n;
+        }
+        return null;
+    }
+}
+exports.ToLong = ToLong;
 class ToQuantity extends expression_1.Expression {
     constructor(json) {
         super(json);
@@ -7729,6 +7940,9 @@ class ToQuantity extends expression_1.Expression {
         else if (typeof val === 'number') {
             return new quantity_1.Quantity(val, '1');
         }
+        else if (typeof val === 'bigint') {
+            return new quantity_1.Quantity(Number(val), '1');
+        }
         else if (val.isRatio) {
             // numerator and denominator are guaranteed non-null
             return val.numerator.dividedBy(val.denominator);
@@ -7763,7 +7977,7 @@ class ToRatio extends expression_1.Expression {
                 numerator = (0, quantity_1.parseQuantity)(splitRatioString[1]);
                 denominator = (0, quantity_1.parseQuantity)(splitRatioString[4]);
             }
-            catch (_a) {
+            catch {
                 // If the input string is not formatted correctly, or cannot be
                 // interpreted as a valid Quantity value, the result is null.
                 return null;
@@ -7852,23 +8066,25 @@ class Convert extends expression_1.Expression {
     }
     async exec(ctx) {
         switch (this.toType) {
-            case '{urn:hl7-org:elm-types:r1}Boolean':
+            case elmTypes_1.ELM_BOOLEAN_TYPE:
                 return new ToBoolean({ type: 'ToBoolean', operand: this.operand }).execute(ctx);
-            case '{urn:hl7-org:elm-types:r1}Concept':
+            case elmTypes_1.ELM_CONCEPT_TYPE:
                 return new ToConcept({ type: 'ToConcept', operand: this.operand }).execute(ctx);
-            case '{urn:hl7-org:elm-types:r1}Decimal':
+            case elmTypes_1.ELM_DECIMAL_TYPE:
                 return new ToDecimal({ type: 'ToDecimal', operand: this.operand }).execute(ctx);
-            case '{urn:hl7-org:elm-types:r1}Integer':
+            case elmTypes_1.ELM_INTEGER_TYPE:
                 return new ToInteger({ type: 'ToInteger', operand: this.operand }).execute(ctx);
-            case '{urn:hl7-org:elm-types:r1}String':
+            case elmTypes_1.ELM_LONG_TYPE:
+                return new ToLong({ type: 'ToLong', operand: this.operand }).execute(ctx);
+            case elmTypes_1.ELM_STRING_TYPE:
                 return new ToString({ type: 'ToString', operand: this.operand }).execute(ctx);
-            case '{urn:hl7-org:elm-types:r1}Quantity':
+            case elmTypes_1.ELM_QUANTITY_TYPE:
                 return new ToQuantity({ type: 'ToQuantity', operand: this.operand }).execute(ctx);
-            case '{urn:hl7-org:elm-types:r1}DateTime':
+            case elmTypes_1.ELM_DATETIME_TYPE:
                 return new ToDateTime({ type: 'ToDateTime', operand: this.operand }).execute(ctx);
-            case '{urn:hl7-org:elm-types:r1}Date':
+            case elmTypes_1.ELM_DATE_TYPE:
                 return new ToDate({ type: 'ToDate', operand: this.operand }).execute(ctx);
-            case '{urn:hl7-org:elm-types:r1}Time':
+            case elmTypes_1.ELM_TIME_TYPE:
                 return new ToTime({ type: 'ToTime', operand: this.operand }).execute(ctx);
             default:
                 return this.execArgs(ctx);
@@ -7956,6 +8172,22 @@ class ConvertsToInteger extends expression_1.Expression {
     }
 }
 exports.ConvertsToInteger = ConvertsToInteger;
+class ConvertsToLong extends expression_1.Expression {
+    constructor(json) {
+        super(json);
+        this.operand = json.operand;
+    }
+    async exec(ctx) {
+        const operatorValue = await this.execArgs(ctx);
+        if (operatorValue === null) {
+            return null;
+        }
+        else {
+            return canConvertToType(ToLong, this.operand, ctx);
+        }
+    }
+}
+exports.ConvertsToLong = ConvertsToLong;
 class ConvertsToQuantity extends expression_1.Expression {
     constructor(json) {
         super(json);
@@ -8031,7 +8263,7 @@ async function canConvertToType(ConversionClass, operand, ctx) {
             return false;
         }
     }
-    catch (_a) {
+    catch {
         return false;
     }
 }
@@ -8045,7 +8277,7 @@ class ConvertQuantity extends expression_1.Expression {
             try {
                 return quantity.convertUnit(newUnit);
             }
-            catch (_a) {
+            catch {
                 // Cannot convert input to target unit, spec says to return null
                 return null;
             }
@@ -8064,7 +8296,7 @@ class CanConvertQuantity extends expression_1.Expression {
                 quantity.convertUnit(newUnit);
                 return true;
             }
-            catch (_a) {
+            catch {
                 return false;
             }
         }
@@ -8082,7 +8314,7 @@ class Is extends expression_1.Expression {
             // Convert it to a NamedTypeSpecifier
             this.isTypeSpecifier = {
                 name: json.isType,
-                type: 'NamedTypeSpecifier'
+                type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER
             };
         }
     }
@@ -8101,15 +8333,15 @@ class Is extends expression_1.Expression {
 exports.Is = Is;
 function isSystemType(spec) {
     switch (spec.type) {
-        case 'NamedTypeSpecifier':
+        case elmTypes_1.ELM_NAMED_TYPE_SPECIFIER:
             return spec.name.startsWith('{urn:hl7-org:elm-types:r1}');
-        case 'ListTypeSpecifier':
+        case elmTypes_1.ELM_LIST_TYPE_SPECIFIER:
             return isSystemType(spec.elementType);
-        case 'TupleTypeSpecifier':
+        case elmTypes_1.ELM_TUPLE_TYPE_SPECIFIER:
             return spec.element.every((e) => isSystemType(e.elementType));
-        case 'IntervalTypeSpecifier':
+        case elmTypes_1.ELM_INTERVAL_TYPE_SPECIFIER:
             return isSystemType(spec.pointType);
-        case 'ChoiceTypeSpecifier':
+        case elmTypes_1.ELM_CHOICE_TYPE_SPECIFIER:
             return spec.choice.every((c) => isSystemType(c));
         default:
             return false;
@@ -8123,17 +8355,17 @@ function specifierToString(spec) {
         return '';
     }
     switch (spec.type) {
-        case 'NamedTypeSpecifier':
+        case elmTypes_1.ELM_NAMED_TYPE_SPECIFIER:
             return spec.name;
-        case 'ListTypeSpecifier':
+        case elmTypes_1.ELM_LIST_TYPE_SPECIFIER:
             return `List<${specifierToString(spec.elementType)}>`;
-        case 'TupleTypeSpecifier':
+        case elmTypes_1.ELM_TUPLE_TYPE_SPECIFIER:
             return `Tuple<${spec.element
                 .map((e) => `${e.name} ${specifierToString(e.elementType)}`)
                 .join(', ')}>`;
-        case 'IntervalTypeSpecifier':
+        case elmTypes_1.ELM_INTERVAL_TYPE_SPECIFIER:
             return `Interval<${specifierToString(spec.pointType)}>`;
-        case 'ChoiceTypeSpecifier':
+        case elmTypes_1.ELM_CHOICE_TYPE_SPECIFIER:
             return `Choice<${spec.choice.map((c) => specifierToString(c)).join(', ')}>`;
         default:
             return JSON.stringify(spec);
@@ -8148,54 +8380,57 @@ function guessSpecifierType(val) {
         return typeHierarchy[0];
     }
     else if (typeof val === 'boolean') {
-        return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Boolean' };
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: elmTypes_1.ELM_BOOLEAN_TYPE };
     }
     else if (typeof val === 'number' && Math.floor(val) === val) {
         // it could still be a decimal, but we have to just take our best guess!
-        return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Integer' };
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: elmTypes_1.ELM_INTEGER_TYPE };
     }
     else if (typeof val === 'number') {
-        return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Decimal' };
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: elmTypes_1.ELM_DECIMAL_TYPE };
+    }
+    else if (typeof val === 'bigint') {
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: elmTypes_1.ELM_LONG_TYPE };
     }
     else if (typeof val === 'string') {
-        return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}String' };
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: elmTypes_1.ELM_STRING_TYPE };
     }
     else if (val.isConcept) {
-        return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Concept' };
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: elmTypes_1.ELM_CONCEPT_TYPE };
     }
     else if (val.isCode) {
-        return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Code' };
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: '{urn:hl7-org:elm-types:r1}Code' };
     }
     else if (val.isDate) {
-        return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Date' };
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: elmTypes_1.ELM_DATE_TYPE };
     }
     else if (val.isTime && val.isTime()) {
-        return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Time' };
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: elmTypes_1.ELM_TIME_TYPE };
     }
     else if (val.isDateTime) {
-        return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}DateTime' };
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: elmTypes_1.ELM_DATETIME_TYPE };
     }
     else if (val.isQuantity) {
-        return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}DateTime' };
+        return { type: elmTypes_1.ELM_NAMED_TYPE_SPECIFIER, name: elmTypes_1.ELM_DATETIME_TYPE };
     }
     else if (Array.isArray(val)) {
         // Get unique types from the array (by converting to string and putting in a Set)
         const typesAsStrings = Array.from(new Set(val.map(v => JSON.stringify(guessSpecifierType(v)))));
         const types = typesAsStrings.map(ts => (/^{/.test(ts) ? JSON.parse(ts) : ts));
         return {
-            type: 'ListTypeSpecifier',
-            elementType: types.length == 1 ? types[0] : { type: 'ChoiceTypeSpecifier', choice: types }
+            type: elmTypes_1.ELM_LIST_TYPE_SPECIFIER,
+            elementType: types.length == 1 ? types[0] : { type: elmTypes_1.ELM_CHOICE_TYPE_SPECIFIER, choice: types }
         };
     }
     else if (val.isInterval) {
         return {
-            type: 'IntervalTypeSpecifier',
+            type: elmTypes_1.ELM_INTERVAL_TYPE_SPECIFIER,
             pointType: val.pointType
         };
     }
     else if (typeof val === 'object' && Object.keys(val).length > 0) {
         return {
-            type: 'TupleTypeSpecifier',
+            type: elmTypes_1.ELM_TUPLE_TYPE_SPECIFIER,
             element: Object.keys(val).map(k => ({ name: k, elementType: guessSpecifierType(val[k]) }))
         };
     }
@@ -8214,7 +8449,7 @@ class TupleTypeSpecifier extends expression_1.UnimplementedExpression {
 }
 exports.TupleTypeSpecifier = TupleTypeSpecifier;
 
-},{"../datatypes/clinical":5,"../datatypes/datetime":7,"../datatypes/quantity":11,"../datatypes/ratio":12,"../datatypes/uncertainty":13,"../util/math":55,"../util/util":57,"./expression":22}],42:[function(require,module,exports){
+},{"../datatypes/clinical":6,"../datatypes/datetime":8,"../datatypes/quantity":12,"../datatypes/ratio":13,"../datatypes/uncertainty":14,"../util/elmTypes":55,"../util/math":57,"../util/util":59,"./expression":23}],43:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -8253,6 +8488,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnfilteredContext = exports.PatientContext = exports.Context = void 0;
 const dt = __importStar(require("../datatypes/datatypes"));
 const exception_1 = require("../datatypes/exception");
+const elmTypes_1 = require("../util/elmTypes");
 const util_1 = require("../util/util");
 const messageListeners_1 = require("./messageListeners");
 class Context {
@@ -8264,7 +8500,7 @@ class Context {
         this.localId_context = {};
         this.evaluatedRecords = [];
         // TODO: If there is an issue with number of parameters look into cql4browsers fix: 387ea77538182833283af65e6341e7a05192304c
-        this.checkParameters(_parameters !== null && _parameters !== void 0 ? _parameters : {}); // not crazy about possibly throwing an error in a constructor, but...
+        this.checkParameters(_parameters ?? {}); // not crazy about possibly throwing an error in a constructor, but...
         this._parameters = _parameters || {};
         this.executionDateTime = executionDateTime;
         this.messageListener = messageListener;
@@ -8303,7 +8539,7 @@ class Context {
     }
     childContext(context_values) {
         const ctx = new Context(this);
-        ctx.context_values = context_values !== null && context_values !== void 0 ? context_values : {};
+        ctx.context_values = context_values ?? {};
         return ctx;
     }
     getLibraryContext(library) {
@@ -8465,15 +8701,15 @@ class Context {
     }
     matchesTypeSpecifier(val, spec) {
         switch (spec.type) {
-            case 'NamedTypeSpecifier':
+            case elmTypes_1.ELM_NAMED_TYPE_SPECIFIER:
                 return this.matchesNamedTypeSpecifier(val, spec);
-            case 'ListTypeSpecifier':
+            case elmTypes_1.ELM_LIST_TYPE_SPECIFIER:
                 return this.matchesListTypeSpecifier(val, spec);
-            case 'TupleTypeSpecifier':
+            case elmTypes_1.ELM_TUPLE_TYPE_SPECIFIER:
                 return this.matchesTupleTypeSpecifier(val, spec);
-            case 'IntervalTypeSpecifier':
+            case elmTypes_1.ELM_INTERVAL_TYPE_SPECIFIER:
                 return this.matchesIntervalTypeSpecifier(val, spec);
-            case 'ChoiceTypeSpecifier':
+            case elmTypes_1.ELM_CHOICE_TYPE_SPECIFIER:
                 return this.matchesChoiceTypeSpecifier(val, spec);
             default:
                 return true; // default to true when we don't know
@@ -8509,25 +8745,27 @@ class Context {
             return true;
         }
         switch (spec.name) {
-            case '{urn:hl7-org:elm-types:r1}Boolean':
+            case elmTypes_1.ELM_BOOLEAN_TYPE:
                 return typeof val === 'boolean';
-            case '{urn:hl7-org:elm-types:r1}Decimal':
+            case elmTypes_1.ELM_DECIMAL_TYPE:
                 return typeof val === 'number';
-            case '{urn:hl7-org:elm-types:r1}Integer':
+            case elmTypes_1.ELM_INTEGER_TYPE:
                 return typeof val === 'number' && Math.floor(val) === val;
-            case '{urn:hl7-org:elm-types:r1}String':
+            case elmTypes_1.ELM_LONG_TYPE:
+                return typeof val === 'bigint';
+            case elmTypes_1.ELM_STRING_TYPE:
                 return typeof val === 'string';
-            case '{urn:hl7-org:elm-types:r1}Concept':
+            case elmTypes_1.ELM_CONCEPT_TYPE:
                 return val && val.isConcept;
             case '{urn:hl7-org:elm-types:r1}Code':
                 return val && val.isCode;
-            case '{urn:hl7-org:elm-types:r1}DateTime':
+            case elmTypes_1.ELM_DATETIME_TYPE:
                 return val && val.isDateTime;
-            case '{urn:hl7-org:elm-types:r1}Date':
+            case elmTypes_1.ELM_DATE_TYPE:
                 return val && val.isDate;
-            case '{urn:hl7-org:elm-types:r1}Quantity':
+            case elmTypes_1.ELM_QUANTITY_TYPE:
                 return val && val.isQuantity;
-            case '{urn:hl7-org:elm-types:r1}Time':
+            case elmTypes_1.ELM_TIME_TYPE:
                 return val && val.isTime && val.isTime();
             default:
                 // Use the data model's implementation of _is, if it is available
@@ -8562,6 +8800,9 @@ class Context {
         else if (inst.isIntegerLiteral) {
             return typeof val === 'number' && Math.floor(val) === val;
         }
+        else if (inst.isLongLiteral) {
+            return typeof val === 'bigint';
+        }
         else if (inst.isStringLiteral) {
             return typeof val === 'string';
         }
@@ -8668,7 +8909,7 @@ class UnfilteredContext extends Context {
 }
 exports.UnfilteredContext = UnfilteredContext;
 
-},{"../datatypes/datatypes":6,"../datatypes/exception":8,"../util/util":57,"./messageListeners":44}],43:[function(require,module,exports){
+},{"../datatypes/datatypes":7,"../datatypes/exception":9,"../util/elmTypes":55,"../util/util":59,"./messageListeners":45}],44:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Executor = void 0;
@@ -8748,7 +8989,7 @@ class Executor {
 }
 exports.Executor = Executor;
 
-},{"./context":42,"./messageListeners":44,"./results":46}],44:[function(require,module,exports){
+},{"./context":43,"./messageListeners":45,"./results":47}],45:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleMessageListener = exports.NullMessageListener = void 0;
@@ -8774,7 +9015,7 @@ class ConsoleMessageListener {
 }
 exports.ConsoleMessageListener = ConsoleMessageListener;
 
-},{}],45:[function(require,module,exports){
+},{}],46:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Repository = void 0;
@@ -8805,7 +9046,7 @@ class Repository {
 }
 exports.Repository = Repository;
 
-},{"../elm/library":27}],46:[function(require,module,exports){
+},{"../elm/library":28}],47:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Results = void 0;
@@ -8842,15 +9083,15 @@ class Results {
 }
 exports.Results = Results;
 
-},{}],47:[function(require,module,exports){
+},{}],48:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 
-},{}],48:[function(require,module,exports){
+},{}],49:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 
-},{}],49:[function(require,module,exports){
+},{}],50:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -8872,16 +9113,15 @@ __exportStar(require("./cql-patient.interfaces"), exports);
 __exportStar(require("./runtime.types"), exports);
 __exportStar(require("./type-specifiers.interfaces"), exports);
 
-},{"./cql-code-service.interfaces":47,"./cql-patient.interfaces":48,"./runtime.types":50,"./type-specifiers.interfaces":51}],50:[function(require,module,exports){
+},{"./cql-code-service.interfaces":48,"./cql-patient.interfaces":49,"./runtime.types":51,"./type-specifiers.interfaces":52}],51:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 
-},{}],51:[function(require,module,exports){
+},{}],52:[function(require,module,exports){
 "use strict";
-// Types derived from http://cql.hl7.org/04-logicalspecification.html#typespecifier
 Object.defineProperty(exports, "__esModule", { value: true });
 
-},{}],52:[function(require,module,exports){
+},{}],53:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lessThan = lessThan;
@@ -8894,6 +9134,9 @@ const datatypes_1 = require("../datatypes/datatypes");
 function areNumbers(a, b) {
     return typeof a === 'number' && typeof b === 'number';
 }
+function areBigInts(a, b) {
+    return typeof a === 'bigint' && typeof b === 'bigint';
+}
 function areStrings(a, b) {
     return typeof a === 'string' && typeof b === 'string';
 }
@@ -8906,7 +9149,7 @@ function isUncertainty(x) {
     return x instanceof datatypes_1.Uncertainty;
 }
 function lessThan(a, b, precision) {
-    if (areNumbers(a, b) || areStrings(a, b)) {
+    if (areNumbers(a, b) || areBigInts(a, b) || areStrings(a, b)) {
         return a < b;
     }
     else if (areDateTimesOrQuantities(a, b)) {
@@ -8923,7 +9166,7 @@ function lessThan(a, b, precision) {
     }
 }
 function lessThanOrEquals(a, b, precision) {
-    if (areNumbers(a, b) || areStrings(a, b)) {
+    if (areNumbers(a, b) || areBigInts(a, b) || areStrings(a, b)) {
         return a <= b;
     }
     else if (areDateTimesOrQuantities(a, b)) {
@@ -8940,7 +9183,7 @@ function lessThanOrEquals(a, b, precision) {
     }
 }
 function greaterThan(a, b, precision) {
-    if (areNumbers(a, b) || areStrings(a, b)) {
+    if (areNumbers(a, b) || areBigInts(a, b) || areStrings(a, b)) {
         return a > b;
     }
     else if (areDateTimesOrQuantities(a, b)) {
@@ -8957,7 +9200,7 @@ function greaterThan(a, b, precision) {
     }
 }
 function greaterThanOrEquals(a, b, precision) {
-    if (areNumbers(a, b) || areStrings(a, b)) {
+    if (areNumbers(a, b) || areBigInts(a, b) || areStrings(a, b)) {
         return a >= b;
     }
     else if (areDateTimesOrQuantities(a, b)) {
@@ -9093,6 +9336,7 @@ function equals(a, b) {
     // Return true of the objects are primitives and are strictly equal
     if ((typeof a === typeof b && typeof a === 'string') ||
         typeof a === 'number' ||
+        typeof a === 'bigint' ||
         typeof a === 'boolean') {
         return a === b;
     }
@@ -9125,7 +9369,7 @@ function equals(a, b) {
     return false;
 }
 
-},{"../datatypes/datatypes":6}],53:[function(require,module,exports){
+},{"../datatypes/datatypes":7}],54:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnnotatedError = void 0;
@@ -9145,7 +9389,29 @@ class AnnotatedError extends Error {
 }
 exports.AnnotatedError = AnnotatedError;
 
-},{}],54:[function(require,module,exports){
+},{}],55:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ELM_CHOICE_TYPE_SPECIFIER = exports.ELM_INTERVAL_TYPE_SPECIFIER = exports.ELM_TUPLE_TYPE_SPECIFIER = exports.ELM_LIST_TYPE_SPECIFIER = exports.ELM_NAMED_TYPE_SPECIFIER = exports.ELM_TIME_TYPE = exports.ELM_STRING_TYPE = exports.ELM_QUANTITY_TYPE = exports.ELM_LONG_TYPE = exports.ELM_INTEGER_TYPE = exports.ELM_DECIMAL_TYPE = exports.ELM_DATETIME_TYPE = exports.ELM_DATE_TYPE = exports.ELM_CONCEPT_TYPE = exports.ELM_BOOLEAN_TYPE = void 0;
+// Simple Types
+exports.ELM_BOOLEAN_TYPE = '{urn:hl7-org:elm-types:r1}Boolean';
+exports.ELM_CONCEPT_TYPE = '{urn:hl7-org:elm-types:r1}Concept';
+exports.ELM_DATE_TYPE = '{urn:hl7-org:elm-types:r1}Date';
+exports.ELM_DATETIME_TYPE = '{urn:hl7-org:elm-types:r1}DateTime';
+exports.ELM_DECIMAL_TYPE = '{urn:hl7-org:elm-types:r1}Decimal';
+exports.ELM_INTEGER_TYPE = '{urn:hl7-org:elm-types:r1}Integer';
+exports.ELM_LONG_TYPE = '{urn:hl7-org:elm-types:r1}Long';
+exports.ELM_QUANTITY_TYPE = '{urn:hl7-org:elm-types:r1}Quantity';
+exports.ELM_STRING_TYPE = '{urn:hl7-org:elm-types:r1}String';
+exports.ELM_TIME_TYPE = '{urn:hl7-org:elm-types:r1}Time';
+// Type Specifiers
+exports.ELM_NAMED_TYPE_SPECIFIER = 'NamedTypeSpecifier';
+exports.ELM_LIST_TYPE_SPECIFIER = 'ListTypeSpecifier';
+exports.ELM_TUPLE_TYPE_SPECIFIER = 'TupleTypeSpecifier';
+exports.ELM_INTERVAL_TYPE_SPECIFIER = 'IntervalTypeSpecifier';
+exports.ELM_CHOICE_TYPE_SPECIFIER = 'ChoiceTypeSpecifier';
+
+},{}],56:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -9193,7 +9459,6 @@ const ucumUtilInstance = ucum.UcumLhcUtils.getInstance();
  * A key is normalized such that representations for quantities, dates, intervals, etc. are comparable.
  */
 const toNormalizedKey = (js) => {
-    var _a, _b, _c, _d, _e;
     // This is necessary because of the oddities of CQL
     // It allows ignoring non-set values in tuples to be compared correctly with set as null values in tuples
     if (js === null || js === undefined) {
@@ -9250,7 +9515,7 @@ const toNormalizedKey = (js) => {
         case datatypes_1.Quantity:
             if (!js.unit) {
                 return (0, immutable_1.Map)({
-                    value: (_a = js.value) !== null && _a !== void 0 ? _a : null,
+                    value: js.value ?? null,
                     unit: null,
                     __instance: js.constructor
                 });
@@ -9260,8 +9525,8 @@ const toNormalizedKey = (js) => {
             if (!baseUnitKey) {
                 // No units found - normalization not possible and use provided values
                 return (0, immutable_1.Map)({
-                    value: (_b = js.value) !== null && _b !== void 0 ? _b : null,
-                    unit: (_c = js.unit) !== null && _c !== void 0 ? _c : null,
+                    value: js.value ?? null,
+                    unit: js.unit ?? null,
                     __instance: js.constructor
                 });
             }
@@ -9271,8 +9536,8 @@ const toNormalizedKey = (js) => {
                 const conversionValue = (0, units_1.convertUnit)(js.value, js.unit, baseUnitKeyCode);
                 const finalValue = conversionValue ? (0, math_1.decimalAdjust)('round', conversionValue, -8) : null;
                 return (0, immutable_1.Map)({
-                    value: finalValue !== null && finalValue !== void 0 ? finalValue : null,
-                    unit: baseUnitKeyCode !== null && baseUnitKeyCode !== void 0 ? baseUnitKeyCode : null,
+                    value: finalValue ?? null,
+                    unit: baseUnitKeyCode ?? null,
                     __instance: js.constructor
                 });
             }
@@ -9307,17 +9572,18 @@ const toNormalizedKey = (js) => {
             return (0, immutable_1.Seq)(js)
                 .map((x) => (0, exports.toNormalizedKey)(x))
                 .toMap()
-                .set('__instance', (_e = (0, exports.toNormalizedKey)((_d = js._typeHierarchy) === null || _d === void 0 ? void 0 : _d.call(js))) !== null && _e !== void 0 ? _e : js.constructor);
+                .set('__instance', (0, exports.toNormalizedKey)(js._typeHierarchy?.()) ?? js.constructor);
     }
 };
 exports.toNormalizedKey = toNormalizedKey;
 
-},{"../datatypes/datatypes":6,"./math":55,"./units":56,"@lhncbc/ucum-lhc":68,"immutable":72}],55:[function(require,module,exports){
+},{"../datatypes/datatypes":7,"./math":57,"./units":58,"@lhncbc/ucum-lhc":70,"immutable":74}],57:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OverFlowException = exports.MAX_TIME_VALUE = exports.MIN_TIME_VALUE = exports.MAX_DATE_VALUE = exports.MIN_DATE_VALUE = exports.MAX_DATETIME_VALUE = exports.MIN_DATETIME_VALUE = exports.MIN_FLOAT_PRECISION_VALUE = exports.MIN_FLOAT_VALUE = exports.MAX_FLOAT_VALUE = exports.MIN_INT_VALUE = exports.MAX_INT_VALUE = void 0;
+exports.OverFlowException = exports.MAX_TIME_VALUE = exports.MIN_TIME_VALUE = exports.MAX_DATE_VALUE = exports.MIN_DATE_VALUE = exports.MAX_DATETIME_VALUE = exports.MIN_DATETIME_VALUE = exports.MIN_FLOAT_PRECISION_VALUE = exports.MIN_FLOAT_VALUE = exports.MAX_FLOAT_VALUE = exports.MIN_LONG_VALUE = exports.MAX_LONG_VALUE = exports.MIN_INT_VALUE = exports.MAX_INT_VALUE = void 0;
 exports.overflowsOrUnderflows = overflowsOrUnderflows;
 exports.isValidInteger = isValidInteger;
+exports.isValidLong = isValidLong;
 exports.isValidDecimal = isValidDecimal;
 exports.limitDecimalPrecision = limitDecimalPrecision;
 exports.successor = successor;
@@ -9328,11 +9594,15 @@ exports.minValueForInstance = minValueForInstance;
 exports.minValueForType = minValueForType;
 exports.decimalAdjust = decimalAdjust;
 exports.decimalOrNull = decimalOrNull;
+exports.decimalLongOrNull = decimalLongOrNull;
 const exception_1 = require("../datatypes/exception");
 const datetime_1 = require("../datatypes/datetime");
 const uncertainty_1 = require("../datatypes/uncertainty");
-exports.MAX_INT_VALUE = Math.pow(2, 31) - 1;
-exports.MIN_INT_VALUE = Math.pow(-2, 31);
+const elmTypes_1 = require("./elmTypes");
+exports.MAX_INT_VALUE = Math.pow(2, 31) - 1; // 2147483647
+exports.MIN_INT_VALUE = Math.pow(-2, 31); // -2147483648
+exports.MAX_LONG_VALUE = 9223372036854775807n;
+exports.MIN_LONG_VALUE = -9223372036854775808n;
 exports.MAX_FLOAT_VALUE = 99999999999999999999.99999999;
 exports.MIN_FLOAT_VALUE = -99999999999999999999.99999999;
 exports.MIN_FLOAT_PRECISION_VALUE = Math.pow(10, -8);
@@ -9342,7 +9612,7 @@ exports.MIN_DATE_VALUE = datetime_1.MIN_DATE_VALUE;
 exports.MAX_DATE_VALUE = datetime_1.MAX_DATE_VALUE;
 exports.MIN_TIME_VALUE = datetime_1.MIN_TIME_VALUE;
 exports.MAX_TIME_VALUE = datetime_1.MAX_TIME_VALUE;
-function overflowsOrUnderflows(value) {
+function overflowsOrUnderflows(value, type) {
     if (value == null) {
         return false;
     }
@@ -9375,23 +9645,32 @@ function overflowsOrUnderflows(value) {
             return true;
         }
     }
-    else if (Number.isInteger(value)) {
-        if (!isValidInteger(value)) {
+    else if (typeof value === 'bigint') {
+        if (!isValidLong(value)) {
             return true;
         }
     }
-    else if (value.isUncertainty) {
-        return overflowsOrUnderflows(value.low) || overflowsOrUnderflows(value.high);
-    }
-    else {
-        if (!isValidDecimal(value)) {
+    else if (typeof value === 'number') {
+        // Only consider it an integer if it looks like an integer (even if the type says it's an integer).
+        // We need to do this because the CQL-to-ELM Translator's implementation of Power may incorrectly tag
+        // a result as an Integer when it really is a decimal (e.g., when the exponent is a negative number).
+        const isInteger = Number.isInteger(value) && (type === elmTypes_1.ELM_INTEGER_TYPE || type == null);
+        if (isInteger) {
+            if (!isValidInteger(value)) {
+                return true;
+            }
+        }
+        else if (!isValidDecimal(value)) {
             return true;
         }
     }
+    else if (value.isUncertainty) {
+        return overflowsOrUnderflows(value.low, type) || overflowsOrUnderflows(value.high, type);
+    }
     return false;
 }
 function isValidInteger(integer) {
-    if (isNaN(integer)) {
+    if (!Number.isInteger(integer)) {
         return false;
     }
     if (integer > exports.MAX_INT_VALUE) {
@@ -9402,10 +9681,25 @@ function isValidInteger(integer) {
     }
     return true;
 }
+function isValidLong(long) {
+    if (typeof long !== 'bigint') {
+        return false;
+    }
+    if (long > exports.MAX_LONG_VALUE) {
+        return false;
+    }
+    if (long < exports.MIN_LONG_VALUE) {
+        return false;
+    }
+    return true;
+}
 function isValidDecimal(decimal) {
     if (isNaN(decimal)) {
         return false;
     }
+    if (typeof decimal !== 'number') {
+        return false;
+    }
     if (decimal > exports.MAX_FLOAT_VALUE) {
         return false;
     }
@@ -9432,9 +9726,10 @@ function limitDecimalPrecision(decimal) {
 class OverFlowException extends exception_1.Exception {
 }
 exports.OverFlowException = OverFlowException;
-function successor(val) {
+function successor(val, type) {
     if (typeof val === 'number') {
-        if (Number.isInteger(val)) {
+        const isInteger = type === elmTypes_1.ELM_INTEGER_TYPE || (type == null && Number.isInteger(val));
+        if (isInteger) {
             if (val >= exports.MAX_INT_VALUE) {
                 throw new OverFlowException();
             }
@@ -9451,6 +9746,14 @@ function successor(val) {
             }
         }
     }
+    else if (typeof val === 'bigint') {
+        if (val >= exports.MAX_LONG_VALUE) {
+            throw new OverFlowException();
+        }
+        else {
+            return val + 1n;
+        }
+    }
     else if (val && val.isTime && val.isTime()) {
         if (val.sameAs(exports.MAX_TIME_VALUE)) {
             throw new OverFlowException();
@@ -9479,9 +9782,9 @@ function successor(val) {
         // For uncertainties, if the high is the max val, don't increment it
         const high = (() => {
             try {
-                return successor(val.high);
+                return successor(val.high, type);
             }
-            catch (_a) {
+            catch {
                 return val.high;
             }
         })();
@@ -9489,16 +9792,17 @@ function successor(val) {
     }
     else if (val && val.isQuantity) {
         const succ = val.clone();
-        succ.value = successor(val.value);
+        succ.value = successor(val.value, elmTypes_1.ELM_DECIMAL_TYPE);
         return succ;
     }
     else if (val == null) {
         return null;
     }
 }
-function predecessor(val) {
+function predecessor(val, type) {
     if (typeof val === 'number') {
-        if (Number.isInteger(val)) {
+        const isInteger = type === elmTypes_1.ELM_INTEGER_TYPE || (type == null && Number.isInteger(val));
+        if (isInteger) {
             if (val <= exports.MIN_INT_VALUE) {
                 throw new OverFlowException();
             }
@@ -9515,6 +9819,14 @@ function predecessor(val) {
             }
         }
     }
+    else if (typeof val === 'bigint') {
+        if (val <= exports.MIN_LONG_VALUE) {
+            throw new OverFlowException();
+        }
+        else {
+            return val - 1n;
+        }
+    }
     else if (val && val.isTime && val.isTime()) {
         if (val.sameAs(exports.MIN_TIME_VALUE)) {
             throw new OverFlowException();
@@ -9543,9 +9855,9 @@ function predecessor(val) {
         // For uncertainties, if the low is the min val, don't decrement it
         const low = (() => {
             try {
-                return predecessor(val.low);
+                return predecessor(val.low, type);
             }
-            catch (_a) {
+            catch {
                 return val.low;
             }
         })();
@@ -9553,7 +9865,7 @@ function predecessor(val) {
     }
     else if (val && val.isQuantity) {
         const pred = val.clone();
-        pred.value = predecessor(val.value);
+        pred.value = predecessor(val.value, elmTypes_1.ELM_DECIMAL_TYPE);
         return pred;
     }
     else if (val == null) {
@@ -9569,14 +9881,17 @@ function maxValueForInstance(val) {
             return exports.MAX_FLOAT_VALUE;
         }
     }
+    else if (typeof val === 'bigint') {
+        return exports.MAX_LONG_VALUE;
+    }
     else if (val && val.isTime && val.isTime()) {
-        return exports.MAX_TIME_VALUE === null || exports.MAX_TIME_VALUE === void 0 ? void 0 : exports.MAX_TIME_VALUE.copy();
+        return exports.MAX_TIME_VALUE?.copy();
     }
     else if (val && val.isDateTime) {
-        return exports.MAX_DATETIME_VALUE === null || exports.MAX_DATETIME_VALUE === void 0 ? void 0 : exports.MAX_DATETIME_VALUE.copy();
+        return exports.MAX_DATETIME_VALUE?.copy();
     }
     else if (val && val.isDate) {
-        return exports.MAX_DATE_VALUE === null || exports.MAX_DATE_VALUE === void 0 ? void 0 : exports.MAX_DATE_VALUE.copy();
+        return exports.MAX_DATE_VALUE?.copy();
     }
     else if (val && val.isQuantity) {
         const val2 = val.clone();
@@ -9589,23 +9904,25 @@ function maxValueForInstance(val) {
 }
 function maxValueForType(type, quantityInstance) {
     switch (type) {
-        case '{urn:hl7-org:elm-types:r1}Integer':
+        case elmTypes_1.ELM_INTEGER_TYPE:
             return exports.MAX_INT_VALUE;
-        case '{urn:hl7-org:elm-types:r1}Decimal':
+        case elmTypes_1.ELM_LONG_TYPE:
+            return exports.MAX_LONG_VALUE;
+        case elmTypes_1.ELM_DECIMAL_TYPE:
             return exports.MAX_FLOAT_VALUE;
-        case '{urn:hl7-org:elm-types:r1}DateTime':
-            return exports.MAX_DATETIME_VALUE === null || exports.MAX_DATETIME_VALUE === void 0 ? void 0 : exports.MAX_DATETIME_VALUE.copy();
-        case '{urn:hl7-org:elm-types:r1}Date':
-            return exports.MAX_DATE_VALUE === null || exports.MAX_DATE_VALUE === void 0 ? void 0 : exports.MAX_DATE_VALUE.copy();
-        case '{urn:hl7-org:elm-types:r1}Time':
-            return exports.MAX_TIME_VALUE === null || exports.MAX_TIME_VALUE === void 0 ? void 0 : exports.MAX_TIME_VALUE.copy();
-        case '{urn:hl7-org:elm-types:r1}Quantity': {
+        case elmTypes_1.ELM_DATETIME_TYPE:
+            return exports.MAX_DATETIME_VALUE?.copy();
+        case elmTypes_1.ELM_DATE_TYPE:
+            return exports.MAX_DATE_VALUE?.copy();
+        case elmTypes_1.ELM_TIME_TYPE:
+            return exports.MAX_TIME_VALUE?.copy();
+        case elmTypes_1.ELM_QUANTITY_TYPE: {
             if (quantityInstance == null) {
                 // can't infer a quantity unit type from nothing]
                 return null;
             }
             const maxQty = quantityInstance.clone();
-            maxQty.value = maxValueForInstance(maxQty.value);
+            maxQty.value = exports.MAX_FLOAT_VALUE;
             return maxQty;
         }
     }
@@ -9620,14 +9937,17 @@ function minValueForInstance(val) {
             return exports.MIN_FLOAT_VALUE;
         }
     }
+    else if (typeof val === 'bigint') {
+        return exports.MIN_LONG_VALUE;
+    }
     else if (val && val.isTime && val.isTime()) {
-        return exports.MIN_TIME_VALUE === null || exports.MIN_TIME_VALUE === void 0 ? void 0 : exports.MIN_TIME_VALUE.copy();
+        return exports.MIN_TIME_VALUE?.copy();
     }
     else if (val && val.isDateTime) {
-        return exports.MIN_DATETIME_VALUE === null || exports.MIN_DATETIME_VALUE === void 0 ? void 0 : exports.MIN_DATETIME_VALUE.copy();
+        return exports.MIN_DATETIME_VALUE?.copy();
     }
     else if (val && val.isDate) {
-        return exports.MIN_DATE_VALUE === null || exports.MIN_DATE_VALUE === void 0 ? void 0 : exports.MIN_DATE_VALUE.copy();
+        return exports.MIN_DATE_VALUE?.copy();
     }
     else if (val && val.isQuantity) {
         const val2 = val.clone();
@@ -9640,23 +9960,25 @@ function minValueForInstance(val) {
 }
 function minValueForType(type, quantityInstance) {
     switch (type) {
-        case '{urn:hl7-org:elm-types:r1}Integer':
+        case elmTypes_1.ELM_INTEGER_TYPE:
             return exports.MIN_INT_VALUE;
-        case '{urn:hl7-org:elm-types:r1}Decimal':
+        case elmTypes_1.ELM_LONG_TYPE:
+            return exports.MIN_LONG_VALUE;
+        case elmTypes_1.ELM_DECIMAL_TYPE:
             return exports.MIN_FLOAT_VALUE;
-        case '{urn:hl7-org:elm-types:r1}DateTime':
-            return exports.MIN_DATETIME_VALUE === null || exports.MIN_DATETIME_VALUE === void 0 ? void 0 : exports.MIN_DATETIME_VALUE.copy();
-        case '{urn:hl7-org:elm-types:r1}Date':
-            return exports.MIN_DATE_VALUE === null || exports.MIN_DATE_VALUE === void 0 ? void 0 : exports.MIN_DATE_VALUE.copy();
-        case '{urn:hl7-org:elm-types:r1}Time':
-            return exports.MIN_TIME_VALUE === null || exports.MIN_TIME_VALUE === void 0 ? void 0 : exports.MIN_TIME_VALUE.copy();
-        case '{urn:hl7-org:elm-types:r1}Quantity': {
+        case elmTypes_1.ELM_DATETIME_TYPE:
+            return exports.MIN_DATETIME_VALUE?.copy();
+        case elmTypes_1.ELM_DATE_TYPE:
+            return exports.MIN_DATE_VALUE?.copy();
+        case elmTypes_1.ELM_TIME_TYPE:
+            return exports.MIN_TIME_VALUE?.copy();
+        case elmTypes_1.ELM_QUANTITY_TYPE: {
             if (quantityInstance == null) {
                 // can't infer a quantity unit type from nothing]
                 return null;
             }
             const minQty = quantityInstance.clone();
-            minQty.value = minValueForInstance(minQty.value);
+            minQty.value = exports.MIN_FLOAT_VALUE;
             return minQty;
         }
     }
@@ -9685,8 +10007,14 @@ function decimalAdjust(type, value, exp) {
 function decimalOrNull(value) {
     return isValidDecimal(value) ? value : null;
 }
+function decimalLongOrNull(value) {
+    return (typeof value === 'number' && isValidDecimal(value)) ||
+        (typeof value === 'bigint' && isValidLong(value))
+        ? value
+        : null;
+}
 
-},{"../datatypes/datetime":7,"../datatypes/exception":8,"../datatypes/uncertainty":13}],56:[function(require,module,exports){
+},{"../datatypes/datetime":8,"../datatypes/exception":9,"../datatypes/uncertainty":14,"./elmTypes":55}],58:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -9853,7 +10181,7 @@ function compareUnits(unit1, unit2) {
         //units are the same
         return 0;
     }
-    catch (_a) {
+    catch {
         return null;
     }
 }
@@ -9987,7 +10315,7 @@ function fixUnit(unit) {
     return fixCQLDateUnit(fixEmptyUnit(unit));
 }
 
-},{"./math":55,"@lhncbc/ucum-lhc":68}],57:[function(require,module,exports){
+},{"./math":57,"@lhncbc/ucum-lhc":70}],59:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsDate = exports.typeIsArray = void 0;
@@ -10103,10 +10431,10 @@ async function resolveValueSet(vs, ctx) {
     return vsExpansion;
 }
 
-},{}],58:[function(require,module,exports){
+},{}],60:[function(require,module,exports){
 module.exports={"license":"The following data (prefixes and units) was generated by the UCUM LHC code from the UCUM data and selected LOINC combinations of UCUM units.  The license for the UCUM LHC code (demo and library code as well as the combined units) is located at https://github.com/lhncbc/ucum-lhc/blob/LICENSE.md.","prefixes":{"config":["code_","ciCode_","name_","printSymbol_","value_","exp_"],"data":[["E","EX","exa","E",1000000000000000000,"18"],["G","GA","giga","G",1000000000,"9"],["Gi","GIB","gibi","Gi",1073741824,null],["Ki","KIB","kibi","Ki",1024,null],["M","MA","mega","M",1000000,"6"],["Mi","MIB","mebi","Mi",1048576,null],["P","PT","peta","P",1000000000000000,"15"],["T","TR","tera","T",1000000000000,"12"],["Ti","TIB","tebi","Ti",1099511627776,null],["Y","YA","yotta","Y",1e+24,"24"],["Z","ZA","zetta","Z",1e+21,"21"],["a","A","atto","a",1e-18,"-18"],["c","C","centi","c",0.01,"-2"],["d","D","deci","d",0.1,"-1"],["da","DA","deka","da",10,"1"],["f","F","femto","f",1e-15,"-15"],["h","H","hecto","h",100,"2"],["k","K","kilo","k",1000,"3"],["m","M","milli","m",0.001,"-3"],["n","N","nano","n",1e-9,"-9"],["p","P","pico","p",1e-12,"-12"],["u","U","micro","μ",0.000001,"-6"],["y","YO","yocto","y",1e-24,"-24"],["z","ZO","zepto","z",1e-21,"-21"]]},"units":{"config":["isBase_","name_","csCode_","ciCode_","property_","magnitude_",["dim_","dimVec_"],"printSymbol_","class_","isMetric_","variable_","cnv_","cnvPfx_","isSpecial_","isArbitrary_","moleExp_","equivalentExp_","synonyms_","source_","loincProperty_","category_","guidance_","csUnitString_","ciUnitString_","baseFactorStr_","baseFactor_","defError_"],"data":[[true,"meter","m","M","length",1,[1,0,0,0,0,0,0],"m",null,false,"L",null,1,false,false,0,0,"meters; metres; distance","UCUM","Len","Clinical","unit of length = 1.09361 yards",null,null,null,null,false],[true,"second - time","s","S","time",1,[0,1,0,0,0,0,0],"s",null,false,"T",null,1,false,false,0,0,"seconds","UCUM","Time","Clinical","",null,null,null,null,false],[true,"gram","g","G","mass",1,[0,0,1,0,0,0,0],"g",null,false,"M",null,1,false,false,0,0,"grams; gm","UCUM","Mass","Clinical","",null,null,null,null,false],[true,"radian","rad","RAD","plane angle",1,[0,0,0,1,0,0,0],"rad",null,false,"A",null,1,false,false,0,0,"radians","UCUM","Angle","Clinical","unit of angular measure where 1 radian = 1/2π turn =  57.296 degrees. ",null,null,null,null,false],[true,"degree Kelvin","K","K","temperature",1,[0,0,0,0,1,0,0],"K",null,false,"C",null,1,false,false,0,0,"Kelvin; degrees","UCUM","Temp","Clinical","absolute, thermodynamic temperature scale ",null,null,null,null,false],[true,"coulomb","C","C","electric charge",1,[0,0,0,0,0,1,0],"C",null,false,"Q",null,1,false,false,0,0,"coulombs","UCUM","","Clinical","defined as amount of 1 electron charge = 6.2415093×10^18 e, and equivalent to 1 Ampere-second",null,null,null,null,false],[true,"candela","cd","CD","luminous intensity",1,[0,0,0,0,0,0,1],"cd",null,false,"F",null,1,false,false,0,0,"candelas","UCUM","","Clinical","SI base unit of luminous intensity",null,null,null,null,false],[false,"the number ten for arbitrary powers","10*","10*","number",10,[0,0,0,0,0,0,0],"10","dimless",false,null,null,1,false,false,0,0,"10^; 10 to the arbitrary powers","UCUM","Num","Clinical","10* by itself is the same as 10, but users can add digits after the *. For example, 10*3 = 1000.","1","1","10",10,false],[false,"the number ten for arbitrary powers","10^","10^","number",10,[0,0,0,0,0,0,0],"10","dimless",false,null,null,1,false,false,0,0,"10*; 10 to the arbitrary power","UCUM","Num","Clinical","10* by itself is the same as 10, but users can add digits after the *. For example, 10*3 = 1000.","1","1","10",10,false],[false,"the number pi","[pi]","[PI]","number",3.141592653589793,[0,0,0,0,0,0,0],"π","dimless",false,null,null,1,false,false,0,0,"π","UCUM","","Constant","a mathematical constant; the ratio of a circle's circumference to its diameter ≈ 3.14159","1","1","3.1415926535897932384626433832795028841971693993751058209749445923",3.141592653589793,false],[false,"","%","%","fraction",0.01,[0,0,0,0,0,0,0],"%","dimless",false,null,null,1,false,false,0,0,"percents","UCUM","FR; NFR; MFR; CFR; SFR Rto; etc. ","Clinical","","10*-2","10*-2","1",1,false],[false,"parts per thousand","[ppth]","[PPTH]","fraction",0.001,[0,0,0,0,0,0,0],"ppth","dimless",false,null,null,1,false,false,0,0,"ppth; 10^-3","UCUM","MCnc; MCnt","Clinical","[ppth] is often used in solution concentrations as 1 g/L or 1 g/kg.\n\nCan be ambigous and would be better if the metric units was used directly. ","10*-3","10*-3","1",1,false],[false,"parts per million","[ppm]","[PPM]","fraction",0.000001,[0,0,0,0,0,0,0],"ppm","dimless",false,null,null,1,false,false,0,0,"ppm; 10^-6","UCUM","MCnt; MCnc; SFr","Clinical","[ppm] is often used in solution concentrations as 1 mg/L  or 1 mg/kg. Also used to express mole fractions as 1 mmol/mol.\n\n[ppm] is also used in nuclear magnetic resonance (NMR) to represent chemical shift - the difference of a measured frequency in parts per million from the reference frequency.\n\nCan be ambigous and would be better if the metric units was used directly. ","10*-6","10*-6","1",1,false],[false,"parts per billion","[ppb]","[PPB]","fraction",1e-9,[0,0,0,0,0,0,0],"ppb","dimless",false,null,null,1,false,false,0,0,"ppb; 10^-9","UCUM","MCnt; MCnc; SFr","Clinical","[ppb] is often used in solution concentrations as 1 ug/L  or 1 ug/kg. Also used to express mole fractions as 1 umol/mol.\n\nCan be ambigous and would be better if the metric units was used directly. ","10*-9","10*-9","1",1,false],[false,"parts per trillion","[pptr]","[PPTR]","fraction",1e-12,[0,0,0,0,0,0,0],"pptr","dimless",false,null,null,1,false,false,0,0,"pptr; 10^-12","UCUM","MCnt; MCnc; SFr","Clinical","[pptr] is often used in solution concentrations as 1 ng/L or 1 ng/kg. Also used to express mole fractions as 1 nmol/mol.\n\nCan be ambigous and would be better if the metric units was used directly. ","10*-12","10*-12","1",1,false],[false,"mole","mol","MOL","amount of substance",6.0221367e+23,[0,0,0,0,0,0,0],"mol","si",true,null,null,1,false,false,1,0,"moles","UCUM","Sub","Clinical","Measure the number of molecules ","10*23","10*23","6.0221367",6.0221367,false],[false,"steradian - solid angle","sr","SR","solid angle",1,[0,0,0,2,0,0,0],"sr","si",true,null,null,1,false,false,0,0,"square radian; rad2; rad^2","UCUM","Angle","Clinical","unit of solid angle in three-dimensional geometry analagous to radian; used in photometry which measures the perceived brightness of object by human eye (e.g. radiant intensity = watt/steradian)","rad2","RAD2","1",1,false],[false,"hertz","Hz","HZ","frequency",1,[0,-1,0,0,0,0,0],"Hz","si",true,null,null,1,false,false,0,0,"Herz; frequency; frequencies","UCUM","Freq; Num","Clinical","equal to one cycle per second","s-1","S-1","1",1,false],[false,"newton","N","N","force",1000,[1,-2,1,0,0,0,0],"N","si",true,null,null,1,false,false,0,0,"Newtons","UCUM","Force","Clinical","unit of force with base units kg.m/s2","kg.m/s2","KG.M/S2","1",1,false],[false,"pascal","Pa","PAL","pressure",1000,[-1,-2,1,0,0,0,0],"Pa","si",true,null,null,1,false,false,0,0,"pascals","UCUM","Pres","Clinical","standard unit of pressure equal to 1 newton per square meter (N/m2)","N/m2","N/M2","1",1,false],[false,"joule","J","J","energy",1000,[2,-2,1,0,0,0,0],"J","si",true,null,null,1,false,false,0,0,"joules","UCUM","Enrg","Clinical","unit of energy defined as the work required to move an object 1 m with a force of 1 N (N.m) or an electric charge of 1 C through 1 V (C.V), or to produce 1 W for 1 s (W.s) ","N.m","N.M","1",1,false],[false,"watt","W","W","power",1000,[2,-3,1,0,0,0,0],"W","si",true,null,null,1,false,false,0,0,"watts","UCUM","EngRat","Clinical","unit of power equal to 1 Joule per second (J/s) =  kg⋅m2⋅s−3","J/s","J/S","1",1,false],[false,"Ampere","A","A","electric current",1,[0,-1,0,0,0,1,0],"A","si",true,null,null,1,false,false,0,0,"Amperes","UCUM","ElpotRat","Clinical","unit of electric current equal to flow rate of electrons equal to 6.2415×10^18 elementary charges moving past a boundary in one second or 1 Coulomb/second","C/s","C/S","1",1,false],[false,"volt","V","V","electric potential",1000,[2,-2,1,0,0,-1,0],"V","si",true,null,null,1,false,false,0,0,"volts","UCUM","Elpot","Clinical","unit of electric potential (voltage) = 1 Joule per Coulomb (J/C)","J/C","J/C","1",1,false],[false,"farad","F","F","electric capacitance",0.001,[-2,2,-1,0,0,2,0],"F","si",true,null,null,1,false,false,0,0,"farads; electric capacitance","UCUM","","Clinical","CGS unit of electric capacitance with base units C/V (Coulomb per Volt)","C/V","C/V","1",1,false],[false,"ohm","Ohm","OHM","electric resistance",1000,[2,-1,1,0,0,-2,0],"Ω","si",true,null,null,1,false,false,0,0,"Ω; resistance; ohms","UCUM","","Clinical","unit of electrical resistance with units of Volt per Ampere","V/A","V/A","1",1,false],[false,"siemens","S","SIE","electric conductance",0.001,[-2,1,-1,0,0,2,0],"S","si",true,null,null,1,false,false,0,0,"Reciprocal ohm; mho; Ω−1; conductance","UCUM","","Clinical","unit of electric conductance (the inverse of electrical resistance) equal to ohm^-1","Ohm-1","OHM-1","1",1,false],[false,"weber","Wb","WB","magnetic flux",1000,[2,-1,1,0,0,-1,0],"Wb","si",true,null,null,1,false,false,0,0,"magnetic flux; webers","UCUM","","Clinical","unit of magnetic flux equal to Volt second","V.s","V.S","1",1,false],[false,"degree Celsius","Cel","CEL","temperature",1,[0,0,0,0,1,0,0],"°C","si",true,null,"Cel",1,true,false,0,0,"°C; degrees","UCUM","Temp","Clinical","","K",null,null,1,false],[false,"tesla","T","T","magnetic flux density",1000,[0,-1,1,0,0,-1,0],"T","si",true,null,null,1,false,false,0,0,"Teslas; magnetic field","UCUM","","Clinical","SI unit of magnetic field strength for magnetic field B equal to 1 Weber/square meter =  1 kg/(s2*A)","Wb/m2","WB/M2","1",1,false],[false,"henry","H","H","inductance",1000,[2,0,1,0,0,-2,0],"H","si",true,null,null,1,false,false,0,0,"henries; inductance","UCUM","","Clinical","unit of electrical inductance; usually expressed in millihenrys (mH) or microhenrys (uH).","Wb/A","WB/A","1",1,false],[false,"lumen","lm","LM","luminous flux",1,[0,0,0,2,0,0,1],"lm","si",true,null,null,1,false,false,0,0,"luminous flux; lumens","UCUM","","Clinical","unit of luminous flux defined as 1 lm = 1 cd⋅sr (candela times sphere)","cd.sr","CD.SR","1",1,false],[false,"lux","lx","LX","illuminance",1,[-2,0,0,2,0,0,1],"lx","si",true,null,null,1,false,false,0,0,"illuminance; luxes","UCUM","","Clinical","unit of illuminance equal to one lumen per square meter. ","lm/m2","LM/M2","1",1,false],[false,"becquerel","Bq","BQ","radioactivity",1,[0,-1,0,0,0,0,0],"Bq","si",true,null,null,1,false,false,0,0,"activity; radiation; becquerels","UCUM","","Clinical","measure of the atomic radiation rate with units s^-1","s-1","S-1","1",1,false],[false,"gray","Gy","GY","energy dose",1,[2,-2,0,0,0,0,0],"Gy","si",true,null,null,1,false,false,0,0,"absorbed doses; ionizing radiation doses; kerma; grays","UCUM","EngCnt","Clinical","unit of ionizing radiation dose with base units of 1 joule of radiation energy per kilogram of matter","J/kg","J/KG","1",1,false],[false,"sievert","Sv","SV","dose equivalent",1,[2,-2,0,0,0,0,0],"Sv","si",true,null,null,1,false,false,0,0,"sieverts; radiation dose quantities; equivalent doses; effective dose; operational dose; committed dose","UCUM","","Clinical","SI unit for radiation dose equivalent equal to 1 Joule/kilogram.","J/kg","J/KG","1",1,false],[false,"degree - plane angle","deg","DEG","plane angle",0.017453292519943295,[0,0,0,1,0,0,0],"°","iso1000",false,null,null,1,false,false,0,0,"°; degree of arc; arc degree; arcdegree; angle","UCUM","Angle","Clinical","one degree is equivalent to π/180 radians.","[pi].rad/360","[PI].RAD/360","2",2,false],[false,"gon","gon","GON","plane angle",0.015707963267948967,[0,0,0,1,0,0,0],"□<sup>g</sup>","iso1000",false,null,null,1,false,false,0,0,"gon (grade); gons","UCUM","Angle","Nonclinical","unit of plane angle measurement equal to 1/400 circle","deg","DEG","0.9",0.9,false],[false,"arc minute","'","'","plane angle",0.0002908882086657216,[0,0,0,1,0,0,0],"'","iso1000",false,null,null,1,false,false,0,0,"arcminutes; arcmin; arc minutes; arc mins","UCUM","Angle","Clinical","equal to 1/60 degree; used in optometry and opthamology (e.g. visual acuity tests)","deg/60","DEG/60","1",1,false],[false,"arc second","''","''","plane angle",0.00000484813681109536,[0,0,0,1,0,0,0],"''","iso1000",false,null,null,1,false,false,0,0,"arcseconds; arcsecs","UCUM","Angle","Clinical","equal to 1/60 arcminute = 1/3600 degree; used in optometry and opthamology (e.g. visual acuity tests)","'/60","'/60","1",1,false],[false,"Liters","l","L","volume",0.001,[3,0,0,0,0,0,0],"l","iso1000",true,null,null,1,false,false,0,0,"cubic decimeters; decimeters cubed; decimetres; dm3; dm^3; litres; liters, LT ","UCUM","Vol","Clinical","Because lower case \"l\" can be read as the number \"1\", though this is a valid UCUM units. UCUM strongly reccomends using  \"L\"","dm3","DM3","1",1,false],[false,"Liters","L","L","volume",0.001,[3,0,0,0,0,0,0],"L","iso1000",true,null,null,1,false,false,0,0,"cubic decimeters; decimeters cubed; decimetres; dm3; dm^3; litres; liters, LT ","UCUM","Vol","Clinical","Because lower case \"l\" can be read as the number \"1\", though this is a valid UCUM units. UCUM strongly reccomends using  \"L\"","l",null,"1",1,false],[false,"are","ar","AR","area",100,[2,0,0,0,0,0,0],"a","iso1000",true,null,null,1,false,false,0,0,"100 m2; 100 m^2; 100 square meter; meters squared; metres","UCUM","Area","Clinical","metric base unit for area defined as 100 m^2","m2","M2","100",100,false],[false,"minute","min","MIN","time",60,[0,1,0,0,0,0,0],"min","iso1000",false,null,null,1,false,false,0,0,"minutes","UCUM","Time","Clinical","","s","S","60",60,false],[false,"hour","h","HR","time",3600,[0,1,0,0,0,0,0],"h","iso1000",false,null,null,1,false,false,0,0,"hours; hrs; age","UCUM","Time","Clinical","","min","MIN","60",60,false],[false,"day","d","D","time",86400,[0,1,0,0,0,0,0],"d","iso1000",false,null,null,1,false,false,0,0,"days; age; dy; 24 hours; 24 hrs","UCUM","Time","Clinical","","h","HR","24",24,false],[false,"tropical year","a_t","ANN_T","time",31556925.216,[0,1,0,0,0,0,0],"a<sub>t</sub>","iso1000",false,null,null,1,false,false,0,0,"solar years; a tropical; years","UCUM","Time","Clinical","has an average of 365.242181 days but is constantly changing.","d","D","365.24219",365.24219,false],[false,"mean Julian year","a_j","ANN_J","time",31557600,[0,1,0,0,0,0,0],"a<sub>j</sub>","iso1000",false,null,null,1,false,false,0,0,"mean Julian yr; a julian; years","UCUM","Time","Clinical","has an average of 365.25 days, and in everyday use, has been replaced by the Gregorian year. However, this unit is used in astronomy to calculate light year. ","d","D","365.25",365.25,false],[false,"mean Gregorian year","a_g","ANN_G","time",31556952,[0,1,0,0,0,0,0],"a<sub>g</sub>","iso1000",false,null,null,1,false,false,0,0,"mean Gregorian yr; a gregorian; years","UCUM","Time","Clinical","has an average of 365.2425 days and is the most internationally used civil calendar.","d","D","365.2425",365.2425,false],[false,"year","a","ANN","time",31557600,[0,1,0,0,0,0,0],"a","iso1000",false,null,null,1,false,false,0,0,"years; a; yr, yrs; annum","UCUM","Time","Clinical","","a_j","ANN_J","1",1,false],[false,"week","wk","WK","time",604800,[0,1,0,0,0,0,0],"wk","iso1000",false,null,null,1,false,false,0,0,"weeks; wks","UCUM","Time","Clinical","","d","D","7",7,false],[false,"synodal month","mo_s","MO_S","time",2551442.976,[0,1,0,0,0,0,0],"mo<sub>s</sub>","iso1000",false,null,null,1,false,false,0,0,"Moon; synodic month; lunar month; mo-s; mo s; months; moons","UCUM","Time","Nonclinical","has an average of 29.53 days per month, unit used in astronomy","d","D","29.53059",29.53059,false],[false,"mean Julian month","mo_j","MO_J","time",2629800,[0,1,0,0,0,0,0],"mo<sub>j</sub>","iso1000",false,null,null,1,false,false,0,0,"mo-julian; mo Julian; months","UCUM","Time","Clinical","has an average of 30.435 days per month","a_j/12","ANN_J/12","1",1,false],[false,"mean Gregorian month","mo_g","MO_G","time",2629746,[0,1,0,0,0,0,0],"mo<sub>g</sub>","iso1000",false,null,null,1,false,false,0,0,"months; month-gregorian; mo-gregorian","UCUM","Time","Clinical","has an average 30.436875 days per month and is from the most internationally used civil calendar.","a_g/12","ANN_G/12","1",1,false],[false,"month","mo","MO","time",2629800,[0,1,0,0,0,0,0],"mo","iso1000",false,null,null,1,false,false,0,0,"months; duration","UCUM","Time","Clinical","based on Julian calendar which has an average of 30.435 days per month (this unit is used in astronomy but not in everyday life - see mo_g)","mo_j","MO_J","1",1,false],[false,"metric ton","t","TNE","mass",1000000,[0,0,1,0,0,0,0],"t","iso1000",true,null,null,1,false,false,0,0,"tonnes; megagrams; tons","UCUM","Mass","Nonclinical","equal to 1000 kg used in the US (recognized by NIST as metric ton), and internationally (recognized as tonne)","kg","KG","1e3",1000,false],[false,"bar","bar","BAR","pressure",100000000,[-1,-2,1,0,0,0,0],"bar","iso1000",true,null,null,1,false,false,0,0,"bars","UCUM","Pres","Nonclinical","unit of pressure equal to 10^5 Pascals, primarily used by meteorologists and in weather forecasting","Pa","PAL","1e5",100000,false],[false,"unified atomic mass unit","u","AMU","mass",1.6605402e-24,[0,0,1,0,0,0,0],"u","iso1000",true,null,null,1,false,false,0,0,"unified atomic mass units; amu; Dalton; Da","UCUM","Mass","Clinical","the mass of 1/12 of an unbound Carbon-12 atom nuclide equal to 1.6606x10^-27 kg ","g","G","1.6605402e-24",1.6605402e-24,false],[false,"astronomic unit","AU","ASU","length",149597870691,[1,0,0,0,0,0,0],"AU","iso1000",false,null,null,1,false,false,0,0,"AU; units","UCUM","Len","Clinical","unit of length used in astronomy for measuring distance in Solar system","Mm","MAM","149597.870691",149597.870691,false],[false,"parsec","pc","PRS","length",30856780000000000,[1,0,0,0,0,0,0],"pc","iso1000",true,null,null,1,false,false,0,0,"parsecs","UCUM","Len","Clinical","unit of length equal to 3.26 light years, and used to measure large distances to objects outside our Solar System","m","M","3.085678e16",30856780000000000,false],[false,"velocity of light in a vacuum","[c]","[C]","velocity",299792458,[1,-1,0,0,0,0,0],"<i>c</i>","const",true,null,null,1,false,false,0,0,"speed of light","UCUM","Vel","Constant","equal to 299792458 m/s (approximately 3 x 10^8 m/s)","m/s","M/S","299792458",299792458,false],[false,"Planck constant","[h]","[H]","action",6.6260755e-31,[2,-1,1,0,0,0,0],"<i>h</i>","const",true,null,null,1,false,false,0,0,"Planck's constant","UCUM","","Constant","constant = 6.62607004 × 10-34 m2.kg/s; defined as quantum of action","J.s","J.S","6.6260755e-34",6.6260755e-34,false],[false,"Boltzmann constant","[k]","[K]","(unclassified)",1.380658e-20,[2,-2,1,0,-1,0,0],"<i>k</i>","const",true,null,null,1,false,false,0,0,"k; kB","UCUM","","Constant","physical constant relating energy at the individual particle level with temperature = 1.38064852 ×10^−23 J/K","J/K","J/K","1.380658e-23",1.380658e-23,false],[false,"permittivity of vacuum - electric","[eps_0]","[EPS_0]","electric permittivity",8.854187817000001e-15,[-3,2,-1,0,0,2,0],"<i>ε<sub><r>0</r></sub></i>","const",true,null,null,1,false,false,0,0,"ε0; Electric Constant; vacuum permittivity; permittivity of free space ","UCUM","","Constant","approximately equal to 8.854 × 10^−12 F/m (farads per meter)","F/m","F/M","8.854187817e-12",8.854187817e-12,false],[false,"permeability of vacuum - magnetic","[mu_0]","[MU_0]","magnetic permeability",0.0012566370614359172,[1,0,1,0,0,-2,0],"<i>μ<sub><r>0</r></sub></i>","const",true,null,null,1,false,false,0,0,"μ0; vacuum permeability; permeability of free space; magnetic constant","UCUM","","Constant","equal to 4π×10^−7 N/A2 (Newtons per square ampere) ≈ 1.2566×10^−6 H/m (Henry per meter)","N/A2","4.[PI].10*-7.N/A2","1",0.0000012566370614359173,false],[false,"elementary charge","[e]","[E]","electric charge",1.60217733e-19,[0,0,0,0,0,1,0],"<i>e</i>","const",true,null,null,1,false,false,0,0,"e; q; electric charges","UCUM","","Constant","the magnitude of the electric charge carried by a single electron or proton ≈ 1.60217×10^-19 Coulombs","C","C","1.60217733e-19",1.60217733e-19,false],[false,"electronvolt","eV","EV","energy",1.60217733e-16,[2,-2,1,0,0,0,0],"eV","iso1000",true,null,null,1,false,false,0,0,"Electron Volts; electronvolts","UCUM","Eng","Clinical","unit of kinetic energy = 1 V * 1.602×10^−19 C = 1.6×10−19 Joules","[e].V","[E].V","1",1,false],[false,"electron mass","[m_e]","[M_E]","mass",9.1093897e-28,[0,0,1,0,0,0,0],"<i>m<sub><r>e</r></sub></i>","const",true,null,null,1,false,false,0,0,"electron rest mass; me","UCUM","Mass","Constant","approximately equal to 9.10938356 × 10-31 kg; defined as the mass of a stationary electron","g","g","9.1093897e-28",9.1093897e-28,false],[false,"proton mass","[m_p]","[M_P]","mass",1.6726231e-24,[0,0,1,0,0,0,0],"<i>m<sub><r>p</r></sub></i>","const",true,null,null,1,false,false,0,0,"mp; masses","UCUM","Mass","Constant","approximately equal to 1.672622×10−27 kg","g","g","1.6726231e-24",1.6726231e-24,false],[false,"Newtonian constant of gravitation","[G]","[GC]","(unclassified)",6.67259e-14,[3,-2,-1,0,0,0,0],"<i>G</i>","const",true,null,null,1,false,false,0,0,"G; gravitational constant; Newton's constant","UCUM","","Constant","gravitational constant = 6.674×10−11 N⋅m2/kg2","m3.kg-1.s-2","M3.KG-1.S-2","6.67259e-11",6.67259e-11,false],[false,"standard acceleration of free fall","[g]","[G]","acceleration",9.80665,[1,-2,0,0,0,0,0],"<i>g<sub>n</sub></i>","const",true,null,null,1,false,false,0,0,"standard gravity; g; ɡ0; ɡn","UCUM","Accel","Constant","defined by standard = 9.80665 m/s2","m/s2","M/S2","980665e-5",9.80665,false],[false,"Torr","Torr","Torr","pressure",133322,[-1,-2,1,0,0,0,0],"Torr","const",false,null,null,1,false,false,0,0,"torrs","UCUM","Pres","Clinical","1 torr = 1 mmHg; unit used to measure blood pressure","Pa","PAL","133.322",133.322,false],[false,"standard atmosphere","atm","ATM","pressure",101325000,[-1,-2,1,0,0,0,0],"atm","const",false,null,null,1,false,false,0,0,"reference pressure; atmos; std atmosphere","UCUM","Pres","Clinical","defined as being precisely equal to 101,325 Pa","Pa","PAL","101325",101325,false],[false,"light-year","[ly]","[LY]","length",9460730472580800,[1,0,0,0,0,0,0],"l.y.","const",true,null,null,1,false,false,0,0,"light years; ly","UCUM","Len","Constant","unit of astronomal distance = 5.88×10^12 mi","[c].a_j","[C].ANN_J","1",1,false],[false,"gram-force","gf","GF","force",9.80665,[1,-2,1,0,0,0,0],"gf","const",true,null,null,1,false,false,0,0,"Newtons; gram forces","UCUM","Force","Clinical","May be specific to unit related to cardiac output","g.[g]","G.[G]","1",1,false],[false,"Kayser","Ky","KY","lineic number",100,[-1,0,0,0,0,0,0],"K","cgs",true,null,null,1,false,false,0,0,"wavenumbers; kaysers","UCUM","InvLen","Clinical","unit of wavelength equal to cm^-1","cm-1","CM-1","1",1,false],[false,"Gal","Gal","GL","acceleration",0.01,[1,-2,0,0,0,0,0],"Gal","cgs",true,null,null,1,false,false,0,0,"galileos; Gals","UCUM","Accel","Clinical","unit of acceleration used in gravimetry; equivalent to cm/s2 ","cm/s2","CM/S2","1",1,false],[false,"dyne","dyn","DYN","force",0.01,[1,-2,1,0,0,0,0],"dyn","cgs",true,null,null,1,false,false,0,0,"dynes","UCUM","Force","Clinical","unit of force equal to 10^-5 Newtons","g.cm/s2","G.CM/S2","1",1,false],[false,"erg","erg","ERG","energy",0.0001,[2,-2,1,0,0,0,0],"erg","cgs",true,null,null,1,false,false,0,0,"10^-7 Joules, 10-7 Joules; 100 nJ; 100 nanoJoules; 1 dyne cm; 1 g.cm2/s2","UCUM","Eng","Clinical","unit of energy = 1 dyne centimeter = 10^-7 Joules","dyn.cm","DYN.CM","1",1,false],[false,"Poise","P","P","dynamic viscosity",100.00000000000001,[-1,-1,1,0,0,0,0],"P","cgs",true,null,null,1,false,false,0,0,"dynamic viscosity; poises","UCUM","Visc","Clinical","unit of dynamic viscosity where 1 Poise = 1/10 Pascal second","dyn.s/cm2","DYN.S/CM2","1",1,false],[false,"Biot","Bi","BI","electric current",10,[0,-1,0,0,0,1,0],"Bi","cgs",true,null,null,1,false,false,0,0,"Bi; abamperes; abA","UCUM","ElpotRat","Clinical","equal to 10 amperes","A","A","10",10,false],[false,"Stokes","St","ST","kinematic viscosity",0.00009999999999999999,[2,-1,0,0,0,0,0],"St","cgs",true,null,null,1,false,false,0,0,"kinematic viscosity","UCUM","Visc","Clinical","unit of kimematic viscosity with units cm2/s","cm2/s","CM2/S","1",1,false],[false,"Maxwell","Mx","MX","flux of magnetic induction",0.00001,[2,-1,1,0,0,-1,0],"Mx","cgs",true,null,null,1,false,false,0,0,"magnetix flux; Maxwells","UCUM","","Clinical","unit of magnetic flux","Wb","WB","1e-8",1e-8,false],[false,"Gauss","G","GS","magnetic flux density",0.1,[0,-1,1,0,0,-1,0],"Gs","cgs",true,null,null,1,false,false,0,0,"magnetic fields; magnetic flux density; induction; B","UCUM","magnetic","Clinical","CGS unit of magnetic flux density, known as magnetic field B; defined as one maxwell unit per square centimeter (see Oersted for CGS unit for H field)","T","T","1e-4",0.0001,false],[false,"Oersted","Oe","OE","magnetic field intensity",79.57747154594767,[-1,-1,0,0,0,1,0],"Oe","cgs",true,null,null,1,false,false,0,0,"H magnetic B field; Oersteds","UCUM","","Clinical","CGS unit of the auxiliary magnetic field H defined as 1 dyne per unit pole = 1000/4π amperes per meter (see Gauss for CGS unit for B field)","A/m","/[PI].A/M","250",79.57747154594767,false],[false,"Gilbert","Gb","GB","magnetic tension",0.7957747154594768,[0,-1,0,0,0,1,0],"Gb","cgs",true,null,null,1,false,false,0,0,"Gi; magnetomotive force; Gilberts","UCUM","","Clinical","unit of magnetomotive force (magnetic potential)","Oe.cm","OE.CM","1",1,false],[false,"stilb","sb","SB","lum. intensity density",10000,[-2,0,0,0,0,0,1],"sb","cgs",true,null,null,1,false,false,0,0,"stilbs","UCUM","","Obsolete","unit of luminance; equal to and replaced by unit candela per square centimeter (cd/cm2)","cd/cm2","CD/CM2","1",1,false],[false,"Lambert","Lmb","LMB","brightness",3183.098861837907,[-2,0,0,0,0,0,1],"L","cgs",true,null,null,1,false,false,0,0,"luminance; lamberts","UCUM","","Clinical","unit of luminance defined as 1 lambert = 1/ π candela per square meter","cd/cm2/[pi]","CD/CM2/[PI]","1",1,false],[false,"phot","ph","PHT","illuminance",0.0001,[-2,0,0,2,0,0,1],"ph","cgs",true,null,null,1,false,false,0,0,"phots","UCUM","","Clinical","CGS photometric unit of illuminance, or luminous flux through an area equal to 10000 lumens per square meter = 10000 lux","lx","LX","1e-4",0.0001,false],[false,"Curie","Ci","CI","radioactivity",37000000000,[0,-1,0,0,0,0,0],"Ci","cgs",true,null,null,1,false,false,0,0,"curies","UCUM","","Obsolete","unit for measuring atomic disintegration rate; replaced by the Bequerel (Bq) unit","Bq","BQ","37e9",37000000000,false],[false,"Roentgen","R","ROE","ion dose",2.58e-7,[0,0,-1,0,0,1,0],"R","cgs",true,null,null,1,false,false,0,0,"röntgen; Roentgens","UCUM","","Clinical","unit of exposure of X-rays and gamma rays in air; unit used primarily in the US but strongly discouraged by NIST","C/kg","C/KG","2.58e-4",0.000258,false],[false,"radiation absorbed dose","RAD","[RAD]","energy dose",0.01,[2,-2,0,0,0,0,0],"RAD","cgs",true,null,null,1,false,false,0,0,"doses","UCUM","","Clinical","unit of radiation absorbed dose used primarily in the US with base units 100 ergs per gram of material. Also see the SI unit Gray (Gy).","erg/g","ERG/G","100",100,false],[false,"radiation equivalent man","REM","[REM]","dose equivalent",0.01,[2,-2,0,0,0,0,0],"REM","cgs",true,null,null,1,false,false,0,0,"Roentgen Equivalent in Man; rems; dose equivalents","UCUM","","Clinical","unit of equivalent dose which measures the effect of radiation on humans equal to 0.01 sievert. Used primarily in the US. Also see SI unit Sievert (Sv)","RAD","[RAD]","1",1,false],[false,"inch","[in_i]","[IN_I]","length",0.025400000000000002,[1,0,0,0,0,0,0],"in","intcust",false,null,null,1,false,false,0,0,"inches; in; international inch; body height","UCUM","Len","Clinical","standard unit for inch in the US and internationally","cm","CM","254e-2",2.54,false],[false,"foot","[ft_i]","[FT_I]","length",0.3048,[1,0,0,0,0,0,0],"ft","intcust",false,null,null,1,false,false,0,0,"ft; fts; foot; international foot; feet; international feet; height","UCUM","Len","Clinical","unit used in the US and internationally","[in_i]","[IN_I]","12",12,false],[false,"yard","[yd_i]","[YD_I]","length",0.9144000000000001,[1,0,0,0,0,0,0],"yd","intcust",false,null,null,1,false,false,0,0,"international yards; yds; distance","UCUM","Len","Clinical","standard unit used in the US and internationally","[ft_i]","[FT_I]","3",3,false],[false,"mile","[mi_i]","[MI_I]","length",1609.344,[1,0,0,0,0,0,0],"mi","intcust",false,null,null,1,false,false,0,0,"international miles; mi I; statute mile","UCUM","Len","Clinical","standard unit used in the US and internationally","[ft_i]","[FT_I]","5280",5280,false],[false,"fathom","[fth_i]","[FTH_I]","depth of water",1.8288000000000002,[1,0,0,0,0,0,0],"fth","intcust",false,null,null,1,false,false,0,0,"international fathoms","UCUM","Len","Nonclinical","unit used in the US and internationally to measure depth of water; same length as the US fathom","[ft_i]","[FT_I]","6",6,false],[false,"nautical mile","[nmi_i]","[NMI_I]","length",1852,[1,0,0,0,0,0,0],"n.mi","intcust",false,null,null,1,false,false,0,0,"nautical mile; nautical miles; international nautical mile; international nautical miles; nm; n.m.; nmi","UCUM","Len","Nonclinical","standard unit used in the US and internationally","m","M","1852",1852,false],[false,"knot","[kn_i]","[KN_I]","velocity",0.5144444444444445,[1,-1,0,0,0,0,0],"knot","intcust",false,null,null,1,false,false,0,0,"kn; kt; international knots","UCUM","Vel","Nonclinical","defined as equal to one nautical mile (1.852 km) per hour","[nmi_i]/h","[NMI_I]/H","1",1,false],[false,"square inch","[sin_i]","[SIN_I]","area",0.0006451600000000001,[2,0,0,0,0,0,0],null,"intcust",false,null,null,1,false,false,0,0,"in2; in^2; inches squared; sq inch; inches squared; international","UCUM","Area","Clinical","standard unit used in the US and internationally","[in_i]2","[IN_I]2","1",1,false],[false,"square foot","[sft_i]","[SFT_I]","area",0.09290304,[2,0,0,0,0,0,0],null,"intcust",false,null,null,1,false,false,0,0,"ft2; ft^2; ft squared; sq ft; feet; international","UCUM","Area","Clinical","standard unit used in the US and internationally","[ft_i]2","[FT_I]2","1",1,false],[false,"square yard","[syd_i]","[SYD_I]","area",0.8361273600000002,[2,0,0,0,0,0,0],null,"intcust",false,null,null,1,false,false,0,0,"yd2; yd^2; sq. yds; yards squared; international","UCUM","Area","Clinical","standard unit used in the US and internationally","[yd_i]2","[YD_I]2","1",1,false],[false,"cubic inch","[cin_i]","[CIN_I]","volume",0.000016387064000000006,[3,0,0,0,0,0,0],null,"intcust",false,null,null,1,false,false,0,0,"in3; in^3; in*3; inches^3; inches*3; cu. in; cu in; cubic inches; inches cubed; cin","UCUM","Vol","Clinical","standard unit used in the US and internationally","[in_i]3","[IN_I]3","1",1,false],[false,"cubic foot","[cft_i]","[CFT_I]","volume",0.028316846592000004,[3,0,0,0,0,0,0],null,"intcust",false,null,null,1,false,false,0,0,"ft3; ft^3; ft*3; cu. ft; cubic feet; cubed; [ft_i]3; international","UCUM","Vol","Clinical","","[ft_i]3","[FT_I]3","1",1,false],[false,"cubic yard","[cyd_i]","[CYD_I]","volume",0.7645548579840002,[3,0,0,0,0,0,0],"cu.yd","intcust",false,null,null,1,false,false,0,0,"cubic yards; cubic yds; cu yards; CYs; yards^3; yd^3; yds^3; yd3; yds3","UCUM","Vol","Nonclinical","standard unit used in the US and internationally","[yd_i]3","[YD_I]3","1",1,false],[false,"board foot","[bf_i]","[BF_I]","volume",0.0023597372160000006,[3,0,0,0,0,0,0],null,"intcust",false,null,null,1,false,false,0,0,"BDFT; FBM; BF; board feet; international","UCUM","Vol","Nonclinical","unit of volume used to measure lumber","[in_i]3","[IN_I]3","144",144,false],[false,"cord","[cr_i]","[CR_I]","volume",3.6245563637760005,[3,0,0,0,0,0,0],null,"intcust",false,null,null,1,false,false,0,0,"crd I; international cords","UCUM","Vol","Nonclinical","unit of measure of dry volume used to measure firewood equal 128 ft3","[ft_i]3","[FT_I]3","128",128,false],[false,"mil","[mil_i]","[MIL_I]","length",0.000025400000000000004,[1,0,0,0,0,0,0],"mil","intcust",false,null,null,1,false,false,0,0,"thou, thousandth; mils; international","UCUM","Len","Clinical","equal to 0.001 international inch","[in_i]","[IN_I]","1e-3",0.001,false],[false,"circular mil","[cml_i]","[CML_I]","area",5.067074790974979e-10,[2,0,0,0,0,0,0],"circ.mil","intcust",false,null,null,1,false,false,0,0,"circular mils; cml I; international","UCUM","Area","Clinical","","[pi]/4.[mil_i]2","[PI]/4.[MIL_I]2","1",1,false],[false,"hand","[hd_i]","[HD_I]","height of horses",0.10160000000000001,[1,0,0,0,0,0,0],"hd","intcust",false,null,null,1,false,false,0,0,"hands; international","UCUM","Len","Nonclinical","used to measure horse height","[in_i]","[IN_I]","4",4,false],[false,"foot - US","[ft_us]","[FT_US]","length",0.3048006096012192,[1,0,0,0,0,0,0],"ft<sub>us</sub>","us-lengths",false,null,null,1,false,false,0,0,"US foot; foot US; us ft; ft us; height; visual distance; feet","UCUM","Len","Obsolete","Better to use [ft_i] which refers to the length used worldwide, including in the US;  [ft_us] may be confused with land survey units. ","m/3937","M/3937","1200",1200,false],[false,"yard - US","[yd_us]","[YD_US]","length",0.9144018288036575,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"US yards; us yds; distance","UCUM","Len; Nrat","Obsolete","Better to use [yd_i] which refers to the length used worldwide, including in the US; [yd_us] refers to unit used in land surveys in the US","[ft_us]","[FT_US]","3",3,false],[false,"inch - US","[in_us]","[IN_US]","length",0.0254000508001016,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"US inches; in us; us in; inch US","UCUM","Len","Obsolete","Better to use [in_i] which refers to the length used worldwide, including in the US","[ft_us]/12","[FT_US]/12","1",1,false],[false,"rod - US","[rd_us]","[RD_US]","length",5.029210058420117,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"US rod; US rods; rd US; US rd","UCUM","Len","Obsolete","","[ft_us]","[FT_US]","16.5",16.5,false],[false,"Gunter's chain - US","[ch_us]","[CH_US]","length",20.116840233680467,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"surveyor's chain; Surveyor's chain USA; Gunter’s measurement; surveyor’s measurement; Gunter's Chain USA","UCUM","Len","Obsolete","historical unit used for land survey used only in the US","[rd_us]","[RD_US]","4",4,false],[false,"link for Gunter's chain - US","[lk_us]","[LK_US]","length",0.20116840233680466,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"Links for Gunter's Chain USA","UCUM","Len","Obsolete","","[ch_us]/100","[CH_US]/100","1",1,false],[false,"Ramden's chain - US","[rch_us]","[RCH_US]","length",30.480060960121918,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"Ramsden's chain; engineer's chains","UCUM","Len","Obsolete","distance measuring device used for land survey","[ft_us]","[FT_US]","100",100,false],[false,"link for Ramden's chain - US","[rlk_us]","[RLK_US]","length",0.3048006096012192,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"links for Ramsden's chain","UCUM","Len","Obsolete","","[rch_us]/100","[RCH_US]/100","1",1,false],[false,"fathom - US","[fth_us]","[FTH_US]","length",1.828803657607315,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"US fathoms; fathom USA; fth us","UCUM","Len","Obsolete","same length as the international fathom - better to use international fathom ([fth_i])","[ft_us]","[FT_US]","6",6,false],[false,"furlong - US","[fur_us]","[FUR_US]","length",201.16840233680466,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"US furlongs; fur us","UCUM","Len","Nonclinical","distance unit in horse racing","[rd_us]","[RD_US]","40",40,false],[false,"mile - US","[mi_us]","[MI_US]","length",1609.3472186944373,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"U.S. Survey Miles; US statute miles; survey mi; US mi; distance","UCUM","Len","Nonclinical","Better to use [mi_i] which refers to the length used worldwide, including in the US","[fur_us]","[FUR_US]","8",8,false],[false,"acre - US","[acr_us]","[ACR_US]","area",4046.872609874252,[2,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"Acre USA Survey; Acre USA; survey acres","UCUM","Area","Nonclinical","an older unit based on pre 1959 US statute lengths that is still sometimes used in the US only for land survey purposes. ","[rd_us]2","[RD_US]2","160",160,false],[false,"square rod - US","[srd_us]","[SRD_US]","area",25.292953811714074,[2,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"rod2; rod^2; sq. rod; rods squared","UCUM","Area","Nonclinical","Used only in the US to measure land area, based on US statute land survey length units","[rd_us]2","[RD_US]2","1",1,false],[false,"square mile - US","[smi_us]","[SMI_US]","area",2589998.470319521,[2,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"mi2; mi^2; sq mi; miles squared","UCUM","Area","Nonclinical","historical unit used only in the US for land survey purposes (based on the US survey mile), not the internationally recognized [mi_i]","[mi_us]2","[MI_US]2","1",1,false],[false,"section","[sct]","[SCT]","area",2589998.470319521,[2,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"sct; sections","UCUM","Area","Nonclinical","tract of land approximately equal to 1 mile square containing 640 acres","[mi_us]2","[MI_US]2","1",1,false],[false,"township","[twp]","[TWP]","area",93239944.93150276,[2,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"twp; townships","UCUM","Area","Nonclinical","land measurement equal to 6 mile square","[sct]","[SCT]","36",36,false],[false,"mil - US","[mil_us]","[MIL_US]","length",0.0000254000508001016,[1,0,0,0,0,0,0],null,"us-lengths",false,null,null,1,false,false,0,0,"thou, thousandth; mils","UCUM","Len","Obsolete","better to use [mil_i] which is based on the internationally recognized inch","[in_us]","[IN_US]","1e-3",0.001,false],[false,"inch - British","[in_br]","[IN_BR]","length",0.025399980000000003,[1,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"imperial inches; imp in; br in; british inches","UCUM","Len","Obsolete","","cm","CM","2.539998",2.539998,false],[false,"foot - British","[ft_br]","[FT_BR]","length",0.30479976000000003,[1,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"British Foot; Imperial Foot; feet; imp fts; br fts","UCUM","Len","Obsolete","","[in_br]","[IN_BR]","12",12,false],[false,"rod - British","[rd_br]","[RD_BR]","length",5.02919604,[1,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"British rods; br rd","UCUM","Len","Obsolete","","[ft_br]","[FT_BR]","16.5",16.5,false],[false,"Gunter's chain - British","[ch_br]","[CH_BR]","length",20.11678416,[1,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"Gunter's Chain British; Gunters Chain British; Surveyor's Chain British","UCUM","Len","Obsolete","historical unit used for land survey used only in Great Britain","[rd_br]","[RD_BR]","4",4,false],[false,"link for Gunter's chain - British","[lk_br]","[LK_BR]","length",0.2011678416,[1,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"Links for Gunter's Chain British","UCUM","Len","Obsolete","","[ch_br]/100","[CH_BR]/100","1",1,false],[false,"fathom - British","[fth_br]","[FTH_BR]","length",1.82879856,[1,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"British fathoms; imperial fathoms; br fth; imp fth","UCUM","Len","Obsolete","","[ft_br]","[FT_BR]","6",6,false],[false,"pace - British","[pc_br]","[PC_BR]","length",0.7619994000000001,[1,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"British paces; br pc","UCUM","Len","Nonclinical","traditional unit of length equal to 152.4 centimeters, or 1.52 meter. ","[ft_br]","[FT_BR]","2.5",2.5,false],[false,"yard - British","[yd_br]","[YD_BR]","length",0.91439928,[1,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"British yards; Br yds; distance","UCUM","Len","Obsolete","","[ft_br]","[FT_BR]","3",3,false],[false,"mile - British","[mi_br]","[MI_BR]","length",1609.3427328000002,[1,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"imperial miles; British miles; English statute miles; imp mi, br mi","UCUM","Len","Obsolete","","[ft_br]","[FT_BR]","5280",5280,false],[false,"nautical mile - British","[nmi_br]","[NMI_BR]","length",1853.1825408000002,[1,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"British nautical miles; Imperial nautical miles; Admiralty miles; n.m. br; imp nm","UCUM","Len","Obsolete","","[ft_br]","[FT_BR]","6080",6080,false],[false,"knot - British","[kn_br]","[KN_BR]","velocity",0.5147729280000001,[1,-1,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"British knots; kn br; kt","UCUM","Vel","Obsolete","based on obsolete British nautical mile ","[nmi_br]/h","[NMI_BR]/H","1",1,false],[false,"acre","[acr_br]","[ACR_BR]","area",4046.850049400269,[2,0,0,0,0,0,0],null,"brit-length",false,null,null,1,false,false,0,0,"Imperial acres; British; a; ac; ar; acr","UCUM","Area","Nonclinical","the standard unit for acre used in the US and internationally","[yd_br]2","[YD_BR]2","4840",4840,false],[false,"gallon - US","[gal_us]","[GAL_US]","fluid volume",0.0037854117840000014,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"US gallons; US liquid gallon; gal us; Queen Anne's wine gallon","UCUM","Vol","Nonclinical","only gallon unit used in the US; [gal_us] is only used in some other countries in South American and Africa to measure gasoline volume","[in_i]3","[IN_I]3","231",231,false],[false,"barrel - US","[bbl_us]","[BBL_US]","fluid volume",0.15898729492800007,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"bbl","UCUM","Vol","Nonclinical","[bbl_us] is the standard unit for oil barrel, which is a unit only used in the US to measure the volume oil. ","[gal_us]","[GAL_US]","42",42,false],[false,"quart - US","[qt_us]","[QT_US]","fluid volume",0.0009463529460000004,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"US quarts; us qts","UCUM","Vol","Clinical","Used only in the US","[gal_us]/4","[GAL_US]/4","1",1,false],[false,"pint - US","[pt_us]","[PT_US]","fluid volume",0.0004731764730000002,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"US pints; pint US; liquid pint; pt us; us pt","UCUM","Vol","Clinical","Used only in the US","[qt_us]/2","[QT_US]/2","1",1,false],[false,"gill - US","[gil_us]","[GIL_US]","fluid volume",0.00011829411825000005,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"US gills; gil us","UCUM","Vol","Nonclinical","only used in the context of alcohol volume in the US","[pt_us]/4","[PT_US]/4","1",1,false],[false,"fluid ounce - US","[foz_us]","[FOZ_US]","fluid volume",0.00002957352956250001,[3,0,0,0,0,0,0],"oz fl","us-volumes",false,null,null,1,false,false,0,0,"US fluid ounces; fl ozs; FO; fl. oz.; foz us","UCUM","Vol","Clinical","unit used only in the US","[gil_us]/4","[GIL_US]/4","1",1,false],[false,"fluid dram - US","[fdr_us]","[FDR_US]","fluid volume",0.0000036966911953125014,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"US fluid drams; fdr us","UCUM","Vol","Nonclinical","equal to 1/8 US fluid ounce = 3.69 mL; used informally to mean small amount of liquor, especially Scotch whiskey","[foz_us]/8","[FOZ_US]/8","1",1,false],[false,"minim - US","[min_us]","[MIN_US]","fluid volume",6.161151992187503e-8,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"min US; US min; ♏ US","UCUM","Vol","Obsolete","","[fdr_us]/60","[FDR_US]/60","1",1,false],[false,"cord - US","[crd_us]","[CRD_US]","fluid volume",3.6245563637760005,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"US cord; US cords; crd us; us crd","UCUM","Vol","Nonclinical","unit of measure of dry volume used to measure firewood equal 128 ft3 (the same as international cord [cr_i])","[ft_i]3","[FT_I]3","128",128,false],[false,"bushel - US","[bu_us]","[BU_US]","dry volume",0.035239070166880014,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"US bushels; US bsh; US bu","UCUM","Vol","Obsolete","Historical unit of dry volume that is rarely used today","[in_i]3","[IN_I]3","2150.42",2150.42,false],[false,"gallon - historical","[gal_wi]","[GAL_WI]","dry volume",0.004404883770860002,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"Corn Gallon British; Dry Gallon US; Gallons Historical; Grain Gallon British; Winchester Corn Gallon; historical winchester gallons; wi gal","UCUM","Vol","Obsolete","historical unit of dry volume no longer used","[bu_us]/8","[BU_US]/8","1",1,false],[false,"peck - US","[pk_us]","[PK_US]","dry volume",0.008809767541720004,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"US pecks; US pk","UCUM","Vol","Nonclinical","unit of dry volume rarely used today (can be used to measure volume of apples)","[bu_us]/4","[BU_US]/4","1",1,false],[false,"dry quart - US","[dqt_us]","[DQT_US]","dry volume",0.0011012209427150004,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"dry quarts; dry quart US; US dry quart; dry qt; us dry qt; dqt; dqt us","UCUM","Vol","Nonclinical","historical unit of dry volume only in the US, but is rarely used today","[pk_us]/8","[PK_US]/8","1",1,false],[false,"dry pint - US","[dpt_us]","[DPT_US]","dry volume",0.0005506104713575002,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"dry pints; dry pint US; US dry pint; dry pt; dpt; dpt us","UCUM","Vol","Nonclinical","historical unit of dry volume only in the US, but is rarely used today","[dqt_us]/2","[DQT_US]/2","1",1,false],[false,"tablespoon - US","[tbs_us]","[TBS_US]","volume",0.000014786764781250006,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"Tbs; tbsp; tbs us; US tablespoons","UCUM","Vol","Clinical","unit defined as 0.5 US fluid ounces or 3 teaspoons - used only in the US. See [tbs_m] for the unit used internationally and in the US for nutrional labelling. ","[foz_us]/2","[FOZ_US]/2","1",1,false],[false,"teaspoon - US","[tsp_us]","[TSP_US]","volume",0.000004928921593750002,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"tsp; t; US teaspoons","UCUM","Vol","Nonclinical","unit defined as 1/6 US fluid ounces - used only in the US. See [tsp_m] for the unit used internationally and in the US for nutrional labelling. ","[tbs_us]/3","[TBS_US]/3","1",1,false],[false,"cup - US customary","[cup_us]","[CUP_US]","volume",0.0002365882365000001,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"cup us; us cups","UCUM","Vol","Nonclinical","Unit defined as 1/2 US pint or 16 US tablespoons ≈ 236.59 mL, which is not the standard unit defined by the FDA of 240 mL - see [cup_m] (metric cup)","[tbs_us]","[TBS_US]","16",16,false],[false,"fluid ounce - metric","[foz_m]","[FOZ_M]","fluid volume",0.000029999999999999997,[3,0,0,0,0,0,0],"oz fl","us-volumes",false,null,null,1,false,false,0,0,"metric fluid ounces; fozs m; fl ozs m","UCUM","Vol","Clinical","unit used only in the US for nutritional labelling, as set by the FDA","mL","ML","30",30,false],[false,"cup - US legal","[cup_m]","[CUP_M]","volume",0.00023999999999999998,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"cup m; metric cups","UCUM","Vol","Clinical","standard unit equal to 240 mL used in the US for nutritional labelling, as defined by the FDA. Note that this is different from the US customary cup (236.59 mL) and the metric cup used in Commonwealth nations (250 mL).","mL","ML","240",240,false],[false,"teaspoon - metric","[tsp_m]","[TSP_M]","volume",0.0000049999999999999996,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"tsp; t; metric teaspoons","UCUM","Vol","Clinical","standard unit used in the US and internationally","mL","mL","5",5,false],[false,"tablespoon - metric","[tbs_m]","[TBS_M]","volume",0.000014999999999999999,[3,0,0,0,0,0,0],null,"us-volumes",false,null,null,1,false,false,0,0,"metric tablespoons; Tbs; tbsp; T; tbs m","UCUM","Vol","Clinical","standard unit used in the US and internationally","mL","mL","15",15,false],[false,"gallon- British","[gal_br]","[GAL_BR]","volume",0.004546090000000001,[3,0,0,0,0,0,0],null,"brit-volumes",false,null,null,1,false,false,0,0,"imperial gallons, UK gallons; British gallons; br gal; imp gal","UCUM","Vol","Nonclinical","Used only in Great Britain and other Commonwealth countries","l","L","4.54609",4.54609,false],[false,"peck - British","[pk_br]","[PK_BR]","volume",0.009092180000000002,[3,0,0,0,0,0,0],null,"brit-volumes",false,null,null,1,false,false,0,0,"imperial pecks; British pecks; br pk; imp pk","UCUM","Vol","Nonclinical","unit of dry volume rarely used today (can be used to measure volume of apples)","[gal_br]","[GAL_BR]","2",2,false],[false,"bushel - British","[bu_br]","[BU_BR]","volume",0.03636872000000001,[3,0,0,0,0,0,0],null,"brit-volumes",false,null,null,1,false,false,0,0,"British bushels; imperial; br bsh; br bu; imp","UCUM","Vol","Obsolete","Historical unit of dry volume that is rarely used today","[pk_br]","[PK_BR]","4",4,false],[false,"quart - British","[qt_br]","[QT_BR]","volume",0.0011365225000000002,[3,0,0,0,0,0,0],null,"brit-volumes",false,null,null,1,false,false,0,0,"British quarts; imperial quarts; br qts","UCUM","Vol","Clinical","Used only in Great Britain and other Commonwealth countries","[gal_br]/4","[GAL_BR]/4","1",1,false],[false,"pint - British","[pt_br]","[PT_BR]","volume",0.0005682612500000001,[3,0,0,0,0,0,0],null,"brit-volumes",false,null,null,1,false,false,0,0,"British pints; imperial pints; pt br; br pt; imp pt; pt imp","UCUM","Vol","Clinical","Used only in Great Britain and other Commonwealth countries","[qt_br]/2","[QT_BR]/2","1",1,false],[false,"gill - British","[gil_br]","[GIL_BR]","volume",0.00014206531250000003,[3,0,0,0,0,0,0],null,"brit-volumes",false,null,null,1,false,false,0,0,"imperial gills; British gills; imp gill, br gill","UCUM","Vol","Nonclinical","only used in the context of alcohol volume in Great Britain","[pt_br]/4","[PT_BR]/4","1",1,false],[false,"fluid ounce - British","[foz_br]","[FOZ_BR]","volume",0.000028413062500000005,[3,0,0,0,0,0,0],null,"brit-volumes",false,null,null,1,false,false,0,0,"British fluid ounces; Imperial fluid ounces; br fozs; imp fozs; br fl ozs","UCUM","Vol","Clinical","Used only in Great Britain and other Commonwealth countries","[gil_br]/5","[GIL_BR]/5","1",1,false],[false,"fluid dram - British","[fdr_br]","[FDR_BR]","volume",0.0000035516328125000006,[3,0,0,0,0,0,0],null,"brit-volumes",false,null,null,1,false,false,0,0,"British fluid drams; fdr br","UCUM","Vol","Nonclinical","equal to 1/8 Imperial fluid ounce = 3.55 mL; used informally to mean small amount of liquor, especially Scotch whiskey","[foz_br]/8","[FOZ_BR]/8","1",1,false],[false,"minim - British","[min_br]","[MIN_BR]","volume",5.919388020833334e-8,[3,0,0,0,0,0,0],null,"brit-volumes",false,null,null,1,false,false,0,0,"min br; br min; ♏ br","UCUM","Vol","Obsolete","","[fdr_br]/60","[FDR_BR]/60","1",1,false],[false,"grain","[gr]","[GR]","mass",0.06479891,[0,0,1,0,0,0,0],null,"avoirdupois",false,null,null,1,false,false,0,0,"gr; grains","UCUM","Mass","Nonclinical","an apothecary measure of mass rarely used today","mg","MG","64.79891",64.79891,false],[false,"pound","[lb_av]","[LB_AV]","mass",453.59237,[0,0,1,0,0,0,0],"lb","avoirdupois",false,null,null,1,false,false,0,0,"avoirdupois pounds, international pounds; av lbs; pounds","UCUM","Mass","Clinical","standard unit used in the US and internationally","[gr]","[GR]","7000",7000,false],[false,"pound force - US","[lbf_av]","[LBF_AV]","force",4448.2216152605,[1,-2,1,0,0,0,0],"lbf","const",false,null,null,1,false,false,0,0,"lbfs; US lbf; US pound forces","UCUM","Force","Clinical","only rarely needed in health care - see [lb_av] which is the more common unit to express weight","[lb_av].[g]","[LB_AV].[G]","1",1,false],[false,"ounce","[oz_av]","[OZ_AV]","mass",28.349523125,[0,0,1,0,0,0,0],"oz","avoirdupois",false,null,null,1,false,false,0,0,"ounces; international ounces; avoirdupois ounces; av ozs","UCUM","Mass","Clinical","standard unit used in the US and internationally","[lb_av]/16","[LB_AV]/16","1",1,false],[false,"Dram mass unit","[dr_av]","[DR_AV]","mass",1.7718451953125,[0,0,1,0,0,0,0],null,"avoirdupois",false,null,null,1,false,false,0,0,"Dram; drams avoirdupois; avoidupois dram; international dram","UCUM","Mass","Clinical","unit from the avoirdupois system, which is used in the US and internationally","[oz_av]/16","[OZ_AV]/16","1",1,false],[false,"short hundredweight","[scwt_av]","[SCWT_AV]","mass",45359.237,[0,0,1,0,0,0,0],null,"avoirdupois",false,null,null,1,false,false,0,0,"hundredweights; s cwt; scwt; avoirdupois","UCUM","Mass","Nonclinical","Used only in the US to equal 100 pounds","[lb_av]","[LB_AV]","100",100,false],[false,"long hundredweight","[lcwt_av]","[LCWT_AV]","mass",50802.345440000005,[0,0,1,0,0,0,0],null,"avoirdupois",false,null,null,1,false,false,0,0,"imperial hundredweights; imp cwt; lcwt; avoirdupois","UCUM","Mass","Obsolete","","[lb_av]","[LB_AV]","112",112,false],[false,"short ton - US","[ston_av]","[STON_AV]","mass",907184.74,[0,0,1,0,0,0,0],null,"avoirdupois",false,null,null,1,false,false,0,0,"ton; US tons; avoirdupois tons","UCUM","Mass","Clinical","Used only in the US","[scwt_av]","[SCWT_AV]","20",20,false],[false,"long ton - British","[lton_av]","[LTON_AV]","mass",1016046.9088000001,[0,0,1,0,0,0,0],null,"avoirdupois",false,null,null,1,false,false,0,0,"imperial tons; weight tons; British long tons; long ton avoirdupois","UCUM","Mass","Nonclinical","Used only in Great Britain and other Commonwealth countries","[lcwt_av]","[LCWT_AV]","20",20,false],[false,"stone - British","[stone_av]","[STONE_AV]","mass",6350.293180000001,[0,0,1,0,0,0,0],null,"avoirdupois",false,null,null,1,false,false,0,0,"British stones; avoirdupois","UCUM","Mass","Nonclinical","Used primarily in the UK and Ireland to measure body weight","[lb_av]","[LB_AV]","14",14,false],[false,"pennyweight - troy","[pwt_tr]","[PWT_TR]","mass",1.5551738400000001,[0,0,1,0,0,0,0],null,"troy",false,null,null,1,false,false,0,0,"dwt; denarius weights","UCUM","Mass","Obsolete","historical unit used to measure mass and cost of precious metals","[gr]","[GR]","24",24,false],[false,"ounce - troy","[oz_tr]","[OZ_TR]","mass",31.103476800000003,[0,0,1,0,0,0,0],null,"troy",false,null,null,1,false,false,0,0,"troy ounces; tr ozs","UCUM","Mass","Nonclinical","unit of mass for precious metals and gemstones only","[pwt_tr]","[PWT_TR]","20",20,false],[false,"pound - troy","[lb_tr]","[LB_TR]","mass",373.2417216,[0,0,1,0,0,0,0],null,"troy",false,null,null,1,false,false,0,0,"troy pounds; tr lbs","UCUM","Mass","Nonclinical","only used for weighing precious metals","[oz_tr]","[OZ_TR]","12",12,false],[false,"scruple","[sc_ap]","[SC_AP]","mass",1.2959782,[0,0,1,0,0,0,0],null,"apoth",false,null,null,1,false,false,0,0,"scruples; sc ap","UCUM","Mass","Obsolete","","[gr]","[GR]","20",20,false],[false,"dram - apothecary","[dr_ap]","[DR_AP]","mass",3.8879346,[0,0,1,0,0,0,0],null,"apoth",false,null,null,1,false,false,0,0,"ʒ; drachm; apothecaries drams; dr ap; dram ap","UCUM","Mass","Nonclinical","unit still used in the US occasionally to measure amount of drugs in pharmacies","[sc_ap]","[SC_AP]","3",3,false],[false,"ounce - apothecary","[oz_ap]","[OZ_AP]","mass",31.1034768,[0,0,1,0,0,0,0],null,"apoth",false,null,null,1,false,false,0,0,"apothecary ounces; oz ap; ap ozs; ozs ap","UCUM","Mass","Obsolete","","[dr_ap]","[DR_AP]","8",8,false],[false,"pound - apothecary","[lb_ap]","[LB_AP]","mass",373.2417216,[0,0,1,0,0,0,0],null,"apoth",false,null,null,1,false,false,0,0,"apothecary pounds; apothecaries pounds; ap lb; lb ap; ap lbs; lbs ap","UCUM","Mass","Obsolete","","[oz_ap]","[OZ_AP]","12",12,false],[false,"ounce - metric","[oz_m]","[OZ_M]","mass",28,[0,0,1,0,0,0,0],null,"apoth",false,null,null,1,false,false,0,0,"metric ounces; m ozs","UCUM","Mass","Clinical","see [oz_av] (the avoirdupois ounce) for the standard ounce used internationally; [oz_m] is equal to 28 grams and is based on the apothecaries' system of mass units which is used in some US pharmacies. ","g","g","28",28,false],[false,"line","[lne]","[LNE]","length",0.002116666666666667,[1,0,0,0,0,0,0],null,"typeset",false,null,null,1,false,false,0,0,"British lines; br L; L; l","UCUM","Len","Obsolete","","[in_i]/12","[IN_I]/12","1",1,false],[false,"point (typography)","[pnt]","[PNT]","length",0.0003527777777777778,[1,0,0,0,0,0,0],null,"typeset",false,null,null,1,false,false,0,0,"DTP points; desktop publishing point; pt; pnt","UCUM","Len","Nonclinical","typography unit for typesetter's length","[lne]/6","[LNE]/6","1",1,false],[false,"pica (typography)","[pca]","[PCA]","length",0.004233333333333334,[1,0,0,0,0,0,0],null,"typeset",false,null,null,1,false,false,0,0,"picas","UCUM","Len","Nonclinical","typography unit for typesetter's length","[pnt]","[PNT]","12",12,false],[false,"Printer's point (typography)","[pnt_pr]","[PNT_PR]","length",0.00035145980000000004,[1,0,0,0,0,0,0],null,"typeset",false,null,null,1,false,false,0,0,"pnt pr","UCUM","Len","Nonclinical","typography unit for typesetter's length","[in_i]","[IN_I]","0.013837",0.013837,false],[false,"Printer's pica  (typography)","[pca_pr]","[PCA_PR]","length",0.004217517600000001,[1,0,0,0,0,0,0],null,"typeset",false,null,null,1,false,false,0,0,"pca pr; Printer's picas","UCUM","Len","Nonclinical","typography unit for typesetter's length","[pnt_pr]","[PNT_PR]","12",12,false],[false,"pied","[pied]","[PIED]","length",0.3248,[1,0,0,0,0,0,0],null,"typeset",false,null,null,1,false,false,0,0,"pieds du roi; Paris foot; royal; French; feet","UCUM","Len","Obsolete","","cm","CM","32.48",32.48,false],[false,"pouce","[pouce]","[POUCE]","length",0.027066666666666666,[1,0,0,0,0,0,0],null,"typeset",false,null,null,1,false,false,0,0,"historical French inches; French royal inches","UCUM","Len","Obsolete","","[pied]/12","[PIED]/12","1",1,false],[false,"ligne","[ligne]","[LIGNE]","length",0.0022555555555555554,[1,0,0,0,0,0,0],null,"typeset",false,null,null,1,false,false,0,0,"Paris lines; lignes","UCUM","Len","Obsolete","","[pouce]/12","[POUCE]/12","1",1,false],[false,"didot","[didot]","[DIDOT]","length",0.0003759259259259259,[1,0,0,0,0,0,0],null,"typeset",false,null,null,1,false,false,0,0,"Didot point; dd; Didots Point; didots; points","UCUM","Len","Obsolete","typography unit for typesetter's length","[ligne]/6","[LIGNE]/6","1",1,false],[false,"cicero","[cicero]","[CICERO]","length",0.004511111111111111,[1,0,0,0,0,0,0],null,"typeset",false,null,null,1,false,false,0,0,"Didot's pica; ciceros; picas","UCUM","Len","Obsolete","typography unit for typesetter's length","[didot]","[DIDOT]","12",12,false],[false,"degrees Fahrenheit","[degF]","[DEGF]","temperature",0.5555555555555556,[0,0,0,0,1,0,0],"°F","heat",false,null,"degF",1,true,false,0,0,"°F; deg F","UCUM","Temp","Clinical","","K",null,null,0.5555555555555556,false],[false,"degrees Rankine","[degR]","[degR]","temperature",0.5555555555555556,[0,0,0,0,1,0,0],"°R","heat",false,null,null,1,false,false,0,0,"°R; °Ra; Rankine","UCUM","Temp","Obsolete","Replaced by Kelvin","K/9","K/9","5",5,false],[false,"degrees Réaumur","[degRe]","[degRe]","temperature",1.25,[0,0,0,0,1,0,0],"°Ré","heat",false,null,"degRe",1,true,false,0,0,"°Ré, °Re, °r; Réaumur; degree Reaumur; Reaumur","UCUM","Temp","Obsolete","replaced by Celsius","K",null,null,1.25,false],[false,"calorie at 15°C","cal_[15]","CAL_[15]","energy",4185.8,[2,-2,1,0,0,0,0],"cal<sub>15°C</sub>","heat",true,null,null,1,false,false,0,0,"calorie 15 C; cals 15 C; calories at 15 C","UCUM","Enrg","Nonclinical","equal to 4.1855 joules; calorie most often used in engineering","J","J","4.18580",4.1858,false],[false,"calorie at 20°C","cal_[20]","CAL_[20]","energy",4181.9,[2,-2,1,0,0,0,0],"cal<sub>20°C</sub>","heat",true,null,null,1,false,false,0,0,"calorie 20 C; cal 20 C; calories at 20 C","UCUM","Enrg","Clinical","equal to 4.18190  joules. ","J","J","4.18190",4.1819,false],[false,"mean calorie","cal_m","CAL_M","energy",4190.0199999999995,[2,-2,1,0,0,0,0],"cal<sub>m</sub>","heat",true,null,null,1,false,false,0,0,"mean cals; mean calories","UCUM","Enrg","Clinical","equal to 4.19002 joules. ","J","J","4.19002",4.19002,false],[false,"international table calorie","cal_IT","CAL_IT","energy",4186.8,[2,-2,1,0,0,0,0],"cal<sub>IT</sub>","heat",true,null,null,1,false,false,0,0,"calories IT; IT cals; international steam table calories","UCUM","Enrg","Nonclinical","used in engineering steam tables and defined as 1/860 international watt-hour; equal to 4.1868 joules","J","J","4.1868",4.1868,false],[false,"thermochemical calorie","cal_th","CAL_TH","energy",4184,[2,-2,1,0,0,0,0],"cal<sub>th</sub>","heat",true,null,null,1,false,false,0,0,"thermochemical calories; th cals","UCUM","Enrg","Clinical","equal to 4.184 joules; used as the unit in medicine and biochemistry (equal to cal)","J","J","4.184",4.184,false],[false,"calorie","cal","CAL","energy",4184,[2,-2,1,0,0,0,0],"cal","heat",true,null,null,1,false,false,0,0,"gram calories; small calories","UCUM","Enrg","Clinical","equal to 4.184 joules (the same value as the thermochemical calorie, which is the most common calorie used in medicine and biochemistry)","cal_th","CAL_TH","1",1,false],[false,"nutrition label Calories","[Cal]","[CAL]","energy",4184000,[2,-2,1,0,0,0,0],"Cal","heat",false,null,null,1,false,false,0,0,"food calories; Cal; kcal","UCUM","Eng","Clinical","","kcal_th","KCAL_TH","1",1,false],[false,"British thermal unit at 39°F","[Btu_39]","[BTU_39]","energy",1059670,[2,-2,1,0,0,0,0],"Btu<sub>39°F</sub>","heat",false,null,null,1,false,false,0,0,"BTU 39F; BTU 39 F; B.T.U. 39 F; B.Th.U. 39 F; BThU 39 F; British thermal units","UCUM","Eng","Nonclinical","equal to 1.05967 kJ; used as a measure of power in the electric power, steam generation, heating, and air conditioning industries","kJ","kJ","1.05967",1.05967,false],[false,"British thermal unit at 59°F","[Btu_59]","[BTU_59]","energy",1054800,[2,-2,1,0,0,0,0],"Btu<sub>59°F</sub>","heat",false,null,null,1,false,false,0,0,"BTU 59 F; BTU 59F; B.T.U. 59 F; B.Th.U. 59 F; BThU 59F; British thermal units","UCUM","Eng","Nonclinical","equal to  1.05480 kJ; used as a measure of power in the electric power, steam generation, heating, and air conditioning industries","kJ","kJ","1.05480",1.0548,false],[false,"British thermal unit at 60°F","[Btu_60]","[BTU_60]","energy",1054680,[2,-2,1,0,0,0,0],"Btu<sub>60°F</sub>","heat",false,null,null,1,false,false,0,0,"BTU 60 F; BTU 60F; B.T.U. 60 F; B.Th.U. 60 F; BThU 60 F; British thermal units 60 F","UCUM","Eng","Nonclinical","equal to 1.05468 kJ; used as a measure of power in the electric power, steam generation, heating, and air conditioning industries","kJ","kJ","1.05468",1.05468,false],[false,"mean British thermal unit","[Btu_m]","[BTU_M]","energy",1055870,[2,-2,1,0,0,0,0],"Btu<sub>m</sub>","heat",false,null,null,1,false,false,0,0,"BTU mean; B.T.U. mean; B.Th.U. mean; BThU mean; British thermal units mean; ","UCUM","Eng","Nonclinical","equal to 1.05587 kJ; used as a measure of power in the electric power, steam generation, heating, and air conditioning industries","kJ","kJ","1.05587",1.05587,false],[false,"international table British thermal unit","[Btu_IT]","[BTU_IT]","energy",1055055.85262,[2,-2,1,0,0,0,0],"Btu<sub>IT</sub>","heat",false,null,null,1,false,false,0,0,"BTU IT; B.T.U. IT; B.Th.U. IT; BThU IT; British thermal units IT","UCUM","Eng","Nonclinical","equal to 1.055 kJ; used as a measure of power in the electric power, steam generation, heating, and air conditioning industries","kJ","kJ","1.05505585262",1.05505585262,false],[false,"thermochemical British thermal unit","[Btu_th]","[BTU_TH]","energy",1054350,[2,-2,1,0,0,0,0],"Btu<sub>th</sub>","heat",false,null,null,1,false,false,0,0,"BTU Th; B.T.U. Th; B.Th.U. Th; BThU Th; thermochemical British thermal units","UCUM","Eng","Nonclinical","equal to 1.054350 kJ; used as a measure of power in the electric power, steam generation, heating, and air conditioning industries","kJ","kJ","1.054350",1.05435,false],[false,"British thermal unit","[Btu]","[BTU]","energy",1054350,[2,-2,1,0,0,0,0],"btu","heat",false,null,null,1,false,false,0,0,"BTU; B.T.U. ; B.Th.U.; BThU; British thermal units","UCUM","Eng","Nonclinical","equal to the thermochemical British thermal unit equal to 1.054350 kJ; used as a measure of power in the electric power, steam generation, heating, and air conditioning industries","[Btu_th]","[BTU_TH]","1",1,false],[false,"horsepower - mechanical","[HP]","[HP]","power",745699.8715822703,[2,-3,1,0,0,0,0],null,"heat",false,null,null,1,false,false,0,0,"imperial horsepowers","UCUM","EngRat","Nonclinical","refers to mechanical horsepower, which is unit used to measure engine power primarily in the US. ","[ft_i].[lbf_av]/s","[FT_I].[LBF_AV]/S","550",550,false],[false,"tex","tex","TEX","linear mass density (of textile thread)",0.001,[-1,0,1,0,0,0,0],"tex","heat",true,null,null,1,false,false,0,0,"linear mass density; texes","UCUM","","Clinical","unit of linear mass density for fibers equal to gram per 1000 meters","g/km","G/KM","1",1,false],[false,"Denier (linear mass density)","[den]","[DEN]","linear mass density (of textile thread)",0.0001111111111111111,[-1,0,1,0,0,0,0],"den","heat",false,null,null,1,false,false,0,0,"den; deniers","UCUM","","Nonclinical","equal to the mass in grams per 9000 meters of the fiber (1 denier = 1 strand of silk)","g/9/km","G/9/KM","1",1,false],[false,"meter of water column","m[H2O]","M[H2O]","pressure",9806650,[-1,-2,1,0,0,0,0],"m HO<sub><r>2</r></sub>","clinical",true,null,null,1,false,false,0,0,"mH2O; m H2O; meters of water column; metres; pressure","UCUM","Pres","Clinical","","kPa","KPAL","980665e-5",9.80665,false],[false,"meter of mercury column","m[Hg]","M[HG]","pressure",133322000,[-1,-2,1,0,0,0,0],"m Hg","clinical",true,null,null,1,false,false,0,0,"mHg; m Hg; meters of mercury column; metres; pressure","UCUM","Pres","Clinical","","kPa","KPAL","133.3220",133.322,false],[false,"inch of water column","[in_i'H2O]","[IN_I'H2O]","pressure",249088.91000000003,[-1,-2,1,0,0,0,0],"in HO<sub><r>2</r></sub>","clinical",false,null,null,1,false,false,0,0,"inches WC; inAq; in H2O; inch of water gauge; iwg; pressure","UCUM","Pres","Clinical","unit of pressure, especially in respiratory and ventilation care","m[H2O].[in_i]/m","M[H2O].[IN_I]/M","1",1,false],[false,"inch of mercury column","[in_i'Hg]","[IN_I'HG]","pressure",3386378.8000000003,[-1,-2,1,0,0,0,0],"in Hg","clinical",false,null,null,1,false,false,0,0,"inHg; in Hg; pressure; inches","UCUM","Pres","Clinical","unit of pressure used in US to measure barometric pressure and occasionally blood pressure (see mm[Hg] for unit used internationally)","m[Hg].[in_i]/m","M[HG].[IN_I]/M","1",1,false],[false,"peripheral vascular resistance unit","[PRU]","[PRU]","fluid resistance",133322000000,[-4,-1,1,0,0,0,0],"P.R.U.","clinical",false,null,null,1,false,false,0,0,"peripheral vascular resistance units; peripheral resistance unit; peripheral resistance units; PRU","UCUM","FldResist","Clinical","used to assess blood flow in the capillaries; equal to 1 mmH.min/mL = 133.3 Pa·min/mL","mm[Hg].s/ml","MM[HG].S/ML","1",1,false],[false,"Wood unit","[wood'U]","[WOOD'U]","fluid resistance",7999320000,[-4,-1,1,0,0,0,0],"Wood U.","clinical",false,null,null,1,false,false,0,0,"hybrid reference units; HRU; mmHg.min/L; vascular resistance","UCUM","Pres","Clinical","simplified unit of measurement for for measuring pulmonary vascular resistance that uses pressure; equal to mmHg.min/L","mm[Hg].min/L","MM[HG].MIN/L","1",1,false],[false,"diopter (lens)","[diop]","[DIOP]","refraction of a lens",1,[1,0,0,0,0,0,0],"dpt","clinical",false,null,"inv",1,false,false,0,0,"diopters; diop; dioptre; dpt; refractive power","UCUM","InvLen","Clinical","unit of optical power of lens represented by inverse meters (m^-1)","m","/M","1",1,false],[false,"prism diopter (magnifying power)","[p'diop]","[P'DIOP]","refraction of a prism",1,[0,0,0,1,0,0,0],"PD","clinical",false,null,"tanTimes100",1,true,false,0,0,"diopters; dioptres; p diops; pdiop; dpt; pdptr; Δ; cm/m; centimeter per meter; centimetre; metre","UCUM","Angle","Clinical","unit for prism correction in eyeglass prescriptions","rad",null,null,1,false],[false,"percent of slope","%[slope]","%[SLOPE]","slope",0.017453292519943295,[0,0,0,1,0,0,0],"%","clinical",false,null,"100tan",1,true,false,0,0,"% slope; %slope; percents slopes","UCUM","VelFr; ElpotRatFr; VelRtoFr; AccelFr","Clinical","","deg",null,null,1,false],[false,"mesh","[mesh_i]","[MESH_I]","lineic number",0.025400000000000002,[1,0,0,0,0,0,0],null,"clinical",false,null,"inv",1,false,false,0,0,"meshes","UCUM","NLen (lineic number)","Clinical","traditional unit of length defined as the number of strands or particles per inch","[in_i]","/[IN_I]","1",1,false],[false,"French (catheter gauge) ","[Ch]","[CH]","gauge of catheters",0.0003333333333333333,[1,0,0,0,0,0,0],"Ch","clinical",false,null,null,1,false,false,0,0,"Charrières, French scales; French gauges; Fr, Fg, Ga, FR, Ch","UCUM","Len; Circ; Diam","Clinical","","mm/3","MM/3","1",1,false],[false,"drop - metric (1/20 mL)","[drp]","[DRP]","volume",5e-8,[3,0,0,0,0,0,0],"drp","clinical",false,null,null,1,false,false,0,0,"drop dosing units; metric drops; gtt","UCUM","Vol","Clinical","standard unit used in the US and internationally for clinical medicine but note that although [drp] is defined as 1/20 milliliter, in practice, drop sizes will vary due to external factors","ml/20","ML/20","1",1,false],[false,"Hounsfield unit","[hnsf'U]","[HNSF'U]","x-ray attenuation",1,[0,0,0,0,0,0,0],"HF","clinical",false,null,null,1,false,false,0,0,"HU; units","UCUM","","Clinical","used to measure X-ray attenuation, especially in CT scans.","1","1","1",1,false],[false,"Metabolic Equivalent of Task ","[MET]","[MET]","metabolic cost of physical activity",5.833333333333334e-11,[3,-1,-1,0,0,0,0],"MET","clinical",false,null,null,1,false,false,0,0,"metabolic equivalents","UCUM","RelEngRat","Clinical","unit used to measure rate of energy expenditure per power in treadmill and other functional tests","mL/min/kg","ML/MIN/KG","3.5",3.5,false],[false,"homeopathic potency of decimal series (retired)","[hp'_X]","[HP'_X]","homeopathic potency (retired)",1,[0,0,0,0,0,0,0],"X","clinical",false,null,"hpX",1,true,false,0,0,null,"UCUM",null,null,null,"1",null,null,1,false],[false,"homeopathic potency of centesimal series (retired)","[hp'_C]","[HP'_C]","homeopathic potency (retired)",1,[0,0,0,0,0,0,0],"C","clinical",false,null,"hpC",1,true,false,0,0,null,"UCUM",null,null,null,"1",null,null,1,false],[false,"homeopathic potency of millesimal series (retired)","[hp'_M]","[HP'_M]","homeopathic potency (retired)",1,[0,0,0,0,0,0,0],"M","clinical",false,null,"hpM",1,true,false,0,0,null,"UCUM",null,null,null,"1",null,null,1,false],[false,"homeopathic potency of quintamillesimal series (retired)","[hp'_Q]","[HP'_Q]","homeopathic potency (retired)",1,[0,0,0,0,0,0,0],"Q","clinical",false,null,"hpQ",1,true,false,0,0,null,"UCUM",null,null,null,"1",null,null,1,false],[false,"homeopathic potency of decimal hahnemannian series","[hp_X]","[HP_X]","homeopathic potency (Hahnemann)",1,[0,0,0,0,0,0,0],"X","clinical",false,null,null,1,false,true,0,0,null,"UCUM",null,null,null,"1","1","1",1,false],[false,"homeopathic potency of centesimal hahnemannian series","[hp_C]","[HP_C]","homeopathic potency (Hahnemann)",1,[0,0,0,0,0,0,0],"C","clinical",false,null,null,1,false,true,0,0,null,"UCUM",null,null,null,"1","1","1",1,false],[false,"homeopathic potency of millesimal hahnemannian series","[hp_M]","[HP_M]","homeopathic potency (Hahnemann)",1,[0,0,0,0,0,0,0],"M","clinical",false,null,null,1,false,true,0,0,null,"UCUM",null,null,null,"1","1","1",1,false],[false,"homeopathic potency of quintamillesimal hahnemannian series","[hp_Q]","[HP_Q]","homeopathic potency (Hahnemann)",1,[0,0,0,0,0,0,0],"Q","clinical",false,null,null,1,false,true,0,0,null,"UCUM",null,null,null,"1","1","1",1,false],[false,"homeopathic potency of decimal korsakovian series","[kp_X]","[KP_X]","homeopathic potency (Korsakov)",1,[0,0,0,0,0,0,0],"X","clinical",false,null,null,1,false,true,0,0,null,"UCUM",null,null,null,"1","1","1",1,false],[false,"homeopathic potency of centesimal korsakovian series","[kp_C]","[KP_C]","homeopathic potency (Korsakov)",1,[0,0,0,0,0,0,0],"C","clinical",false,null,null,1,false,true,0,0,null,"UCUM",null,null,null,"1","1","1",1,false],[false,"homeopathic potency of millesimal korsakovian series","[kp_M]","[KP_M]","homeopathic potency (Korsakov)",1,[0,0,0,0,0,0,0],"M","clinical",false,null,null,1,false,true,0,0,null,"UCUM",null,null,null,"1","1","1",1,false],[false,"homeopathic potency of quintamillesimal korsakovian series","[kp_Q]","[KP_Q]","homeopathic potency (Korsakov)",1,[0,0,0,0,0,0,0],"Q","clinical",false,null,null,1,false,true,0,0,null,"UCUM",null,null,null,"1","1","1",1,false],[false,"equivalent","eq","EQ","amount of substance",6.0221367e+23,[0,0,0,0,0,0,0],"eq","chemical",true,null,null,1,false,false,0,1,"equivalents","UCUM","Sub","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"osmole","osm","OSM","amount of substance (dissolved particles)",6.0221367e+23,[0,0,0,0,0,0,0],"osm","chemical",true,null,null,1,false,false,1,0,"osmoles; osmols","UCUM","Osmol","Clinical","the number of moles of solute that contribute to the osmotic pressure of a solution","mol","MOL","1",1,false],[false,"pH","[pH]","[PH]","acidity",6.0221366999999994e+26,[-3,0,0,0,0,0,0],"pH","chemical",false,null,"pH",1,true,false,0,0,"pH scale","UCUM","LogCnc","Clinical","Log concentration of H+","mol/l",null,null,1,false],[false,"gram percent","g%","G%","mass concentration",10000,[-3,0,1,0,0,0,0],"g%","chemical",true,null,null,1,false,false,0,0,"gram %; gram%; grams per deciliter; g/dL; gm per dL; gram percents","UCUM","MCnc","Clinical","equivalent to unit gram per deciliter (g/dL), a unit often used in medical tests to represent solution concentrations","g/dl","G/DL","1",1,false],[false,"Svedberg unit","[S]","[S]","sedimentation coefficient",1e-13,[0,1,0,0,0,0,0],"S","chemical",false,null,null,1,false,false,0,0,"Sv; 10^-13 seconds; 100 fs; 100 femtoseconds","UCUM","Time","Clinical","unit of time used in measuring particle's sedimentation rate, usually after centrifugation. ","s","10*-13.S","1",1e-13,false],[false,"high power field (microscope)","[HPF]","[HPF]","view area in microscope",1,[0,0,0,0,0,0,0],"HPF","chemical",false,null,null,1,false,false,0,0,"HPF","UCUM","Area","Clinical","area visible under the maximum magnification power of the objective in microscopy (usually 400x)\n","1","1","1",1,false],[false,"low power field (microscope)","[LPF]","[LPF]","view area in microscope",1,[0,0,0,0,0,0,0],"LPF","chemical",false,null,null,1,false,false,0,0,"LPF; fields","UCUM","Area","Clinical","area visible under the low magnification of the objective in microscopy (usually 100 x)\n","1","1","100",100,false],[false,"katal","kat","KAT","catalytic activity",6.0221367e+23,[0,-1,0,0,0,0,0],"kat","chemical",true,null,null,1,false,false,1,0,"mol/secs; moles per second; mol*sec-1; mol*s-1; mol.s-1; katals; catalytic activity; enzymatic; enzyme units; activities","UCUM","CAct","Clinical","kat is a unit of catalytic activity with base units = mol/s. Rarely used because its units are too large to practically express catalytic activity. See enzyme unit [U] which is the standard unit for catalytic activity.","mol/s","MOL/S","1",1,false],[false,"enzyme unit","U","U","catalytic activity",10036894500000000,[0,-1,0,0,0,0,0],"U","chemical",true,null,null,1,false,false,1,0,"micromoles per minute; umol/min; umol per minute; umol min-1; enzymatic activity; enzyme activity","UCUM","CAct","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"international unit - arbitrary","[iU]","[IU]","arbitrary",1,[0,0,0,0,0,0,0],"IU","chemical",true,null,null,1,false,true,0,0,"international units; IE; F2","UCUM","Arb","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","1","1","1",1,false],[false,"international unit - arbitrary","[IU]","[IU]","arbitrary",1,[0,0,0,0,0,0,0],"i.U.","chemical",true,null,null,1,false,true,0,0,"international units; IE; F2","UCUM","Arb","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"arbitary unit","[arb'U]","[ARB'U]","arbitrary",1,[0,0,0,0,0,0,0],"arb. U","chemical",false,null,null,1,false,true,0,0,"arbitary units; arb units; arbU","UCUM","Arb","Clinical","relative unit of measurement to show the ratio of test measurement to reference measurement","1","1","1",1,false],[false,"United States Pharmacopeia unit","[USP'U]","[USP'U]","arbitrary",1,[0,0,0,0,0,0,0],"U.S.P.","chemical",false,null,null,1,false,true,0,0,"USP U; USP'U","UCUM","Arb","Clinical","a dose unit to express potency of drugs and vitamins defined by the United States Pharmacopoeia; usually 1 USP = 1 IU","1","1","1",1,false],[false,"GPL unit","[GPL'U]","[GPL'U]","biologic activity of anticardiolipin IgG",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"GPL Units; GPL U; IgG anticardiolipin units; IgG Phospholipid","UCUM","ACnc; AMass","Clinical","Units for an antiphospholipid test","1","1","1",1,false],[false,"MPL unit","[MPL'U]","[MPL'U]","biologic activity of anticardiolipin IgM",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"MPL units; MPL U; MPL'U; IgM anticardiolipin units; IgM Phospholipid Units ","UCUM","ACnc","Clinical","units for antiphospholipid test","1","1","1",1,false],[false,"APL unit","[APL'U]","[APL'U]","biologic activity of anticardiolipin IgA",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"APL units; APL U; IgA anticardiolipin; IgA Phospholipid; biologic activity of","UCUM","AMass; ACnc","Clinical","Units for an anti phospholipid syndrome test","1","1","1",1,false],[false,"Bethesda unit","[beth'U]","[BETH'U]","biologic activity of factor VIII inhibitor",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"BU","UCUM","ACnc","Clinical","measures of blood coagulation inhibitior for many blood factors","1","1","1",1,false],[false,"anti factor Xa unit","[anti'Xa'U]","[ANTI'XA'U]","biologic activity of factor Xa inhibitor (heparin)",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"units","UCUM","ACnc","Clinical","[anti'Xa'U] unit is equivalent to and can be converted to IU/mL. ","1","1","1",1,false],[false,"Todd unit","[todd'U]","[TODD'U]","biologic activity antistreptolysin O",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"units","UCUM","InvThres; RtoThres","Clinical","the unit for the results of the testing for antistreptolysin O (ASO)","1","1","1",1,false],[false,"Dye unit","[dye'U]","[DYE'U]","biologic activity of amylase",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"units","UCUM","CCnc","Obsolete","equivalent to the Somogyi unit, which is an enzyme unit for amylase but better to use U, the standard enzyme unit for measuring catalytic activity","1","1","1",1,false],[false,"Somogyi unit","[smgy'U]","[SMGY'U]","biologic activity of amylase",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"Somogyi units; smgy U","UCUM","CAct","Clinical","measures the enzymatic activity of amylase in blood serum - better to use base units mg/mL ","1","1","1",1,false],[false,"Bodansky unit","[bdsk'U]","[BDSK'U]","biologic activity of phosphatase",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"","UCUM","ACnc","Obsolete","Enzyme unit specific to alkaline phosphatase - better to use standard enzyme unit of U","1","1","1",1,false],[false,"King-Armstrong unit","[ka'U]","[KA'U]","biologic activity of phosphatase",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"King-Armstrong Units; King units","UCUM","AMass","Obsolete","enzyme units for acid phosphatase - better to use enzyme unit [U]","1","1","1",1,false],[false,"Kunkel unit","[knk'U]","[KNK'U]","arbitrary biologic activity",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,null,"UCUM",null,null,null,"1","1","1",1,false],[false,"Mac Lagan unit","[mclg'U]","[MCLG'U]","arbitrary biologic activity",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"galactose index; galactose tolerance test; thymol turbidity test unit; mclg U; units; indexes","UCUM","ACnc","Obsolete","unit for liver tests - previously used in thymol turbidity tests for liver disease diagnoses, and now is sometimes referred to in the oral galactose tolerance test","1","1","1",1,false],[false,"tuberculin unit","[tb'U]","[TB'U]","biologic activity of tuberculin",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"TU; units","UCUM","Arb","Clinical","amount of tuberculin antigen -usually in reference to a TB skin test ","1","1","1",1,false],[false,"50% cell culture infectious dose","[CCID_50]","[CCID_50]","biologic activity (infectivity) of an infectious agent preparation",1,[0,0,0,0,0,0,0],"CCID<sub>50</sub>","chemical",false,null,null,1,false,true,0,0,"CCID50; 50% cell culture infective doses","UCUM","NumThres","Clinical","","1","1","1",1,false],[false,"50% tissue culture infectious dose","[TCID_50]","[TCID_50]","biologic activity (infectivity) of an infectious agent preparation",1,[0,0,0,0,0,0,0],"TCID<sub>50</sub>","chemical",false,null,null,1,false,true,0,0,"TCID50; 50% tissue culture infective dose","UCUM","NumThres","Clinical","","1","1","1",1,false],[false,"50% embryo infectious dose","[EID_50]","[EID_50]","biologic activity (infectivity) of an infectious agent preparation",1,[0,0,0,0,0,0,0],"EID<sub>50</sub>","chemical",false,null,null,1,false,true,0,0,"EID50; 50% embryo infective doses; EID50 Egg Infective Dosage","UCUM","thresNum","Clinical","","1","1","1",1,false],[false,"plaque forming units","[PFU]","[PFU]","amount of an infectious agent",1,[0,0,0,0,0,0,0],"PFU","chemical",false,null,null,1,false,true,0,0,"PFU","UCUM","ACnc","Clinical","tests usually report unit as number of PFU per unit volume","1","1","1",1,false],[false,"focus forming units (cells)","[FFU]","[FFU]","amount of an infectious agent",1,[0,0,0,0,0,0,0],"FFU","chemical",false,null,null,1,false,true,0,0,"FFU","UCUM","EntNum","Clinical","","1","1","1",1,false],[false,"colony forming units","[CFU]","[CFU]","amount of a proliferating organism",1,[0,0,0,0,0,0,0],"CFU","chemical",false,null,null,1,false,true,0,0,"CFU","UCUM","Num","Clinical","","1","1","1",1,false],[false,"index of reactivity (allergen)","[IR]","[IR]","amount of an allergen callibrated through in-vivo testing using the Stallergenes® method.",1,[0,0,0,0,0,0,0],"IR","chemical",false,null,null,1,false,true,0,0,"IR; indexes","UCUM","Acnc","Clinical","amount of an allergen callibrated through in-vivo testing using the Stallergenes method. Usually reported in tests as IR/mL","1","1","1",1,false],[false,"bioequivalent allergen unit","[BAU]","[BAU]","amount of an allergen callibrated through in-vivo testing based on the ID50EAL method of (intradermal dilution for 50mm sum of erythema diameters",1,[0,0,0,0,0,0,0],"BAU","chemical",false,null,null,1,false,true,0,0,"BAU; Bioequivalent Allergy Units; bioequivalent allergen units","UCUM","Arb","Clinical","","1","1","1",1,false],[false,"allergy unit","[AU]","[AU]","procedure defined amount of an allergen using some reference standard",1,[0,0,0,0,0,0,0],"AU","chemical",false,null,null,1,false,true,0,0,"allergy units; allergen units; AU","UCUM","Arb","Clinical","Most standard test allergy units are reported as [IU] or as %. ","1","1","1",1,false],[false,"allergen unit for Ambrosia artemisiifolia","[Amb'a'1'U]","[AMB'A'1'U]","procedure defined amount of the major allergen of ragweed.",1,[0,0,0,0,0,0,0],"Amb a 1 U","chemical",false,null,null,1,false,true,0,0,"Amb a 1 unit; Antigen E; AgE U; allergen units","UCUM","Arb","Clinical","Amb a 1 is the major allergen in short ragweed, and can be converted Bioequivalent allergen units (BAU) where 350 Amb a 1 U/mL = 100,000 BAU/mL","1","1","1",1,false],[false,"protein nitrogen unit (allergen testing)","[PNU]","[PNU]","procedure defined amount of a protein substance",1,[0,0,0,0,0,0,0],"PNU","chemical",false,null,null,1,false,true,0,0,"protein nitrogen units; PNU","UCUM","Mass","Clinical","defined as 0.01 ug of phosphotungstic acid-precipitable protein nitrogen. Being replaced by bioequivalent allergy units (BAU).","1","1","1",1,false],[false,"Limit of flocculation","[Lf]","[LF]","procedure defined amount of an antigen substance",1,[0,0,0,0,0,0,0],"Lf","chemical",false,null,null,1,false,true,0,0,"Lf doses","UCUM","Arb","Clinical","the antigen content  forming 1:1 ratio against 1 unit of antitoxin","1","1","1",1,false],[false,"D-antigen unit (polio)","[D'ag'U]","[D'AG'U]","procedure defined amount of a poliomyelitis d-antigen substance",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"DAgU; units","UCUM","Acnc","Clinical","unit of potency of poliovirus vaccine used for poliomyelitis prevention reported as D antigen units/mL. The unit is poliovirus type-specific.","1","1","1",1,false],[false,"fibrinogen equivalent units","[FEU]","[FEU]","amount of fibrinogen broken down into the measured d-dimers",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"FEU","UCUM","MCnc","Clinical","Note both the FEU and DDU units are used to report D-dimer measurements. 1 DDU = 1/2 FFU","1","1","1",1,false],[false,"ELISA unit","[ELU]","[ELU]","arbitrary ELISA unit",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"Enzyme-Linked Immunosorbent Assay Units; ELU; EL. U","UCUM","ACnc","Clinical","","1","1","1",1,false],[false,"Ehrlich units (urobilinogen)","[EU]","[EU]","Ehrlich unit",1,[0,0,0,0,0,0,0],null,"chemical",false,null,null,1,false,true,0,0,"EU/dL; mg{urobilinogen}/dL","UCUM","ACnc","Clinical","","1","1","1",1,false],[false,"neper","Np","NEP","level",1,[0,0,0,0,0,0,0],"Np","levels",true,null,"ln",1,true,false,0,0,"nepers","UCUM","LogRto","Clinical","logarithmic unit for ratios of measurements of physical field and power quantities, such as gain and loss of electronic signals","1",null,null,1,false],[false,"bel","B","B","level",1,[0,0,0,0,0,0,0],"B","levels",true,null,"lg",1,true,false,0,0,"bels","UCUM","LogRto","Clinical","Logarithm of the ratio of power- or field-type quantities; usually expressed in decibels ","1",null,null,1,false],[false,"bel sound pressure","B[SPL]","B[SPL]","pressure level",0.019999999999999997,[-1,-2,1,0,0,0,0],"B(SPL)","levels",true,null,"lgTimes2",1,true,false,0,0,"bel SPL; B SPL; sound pressure bels","UCUM","LogRto","Clinical","used to measure sound level in acoustics","Pa",null,null,0.000019999999999999998,false],[false,"bel volt","B[V]","B[V]","electric potential level",1000,[2,-2,1,0,0,-1,0],"B(V)","levels",true,null,"lgTimes2",1,true,false,0,0,"bel V; B V; volts bels","UCUM","LogRtoElp","Clinical","used to express power gain in electrical circuits","V",null,null,1,false],[false,"bel millivolt","B[mV]","B[MV]","electric potential level",1,[2,-2,1,0,0,-1,0],"B(mV)","levels",true,null,"lgTimes2",1,true,false,0,0,"bel mV; B mV; millivolt bels; 10^-3V bels; 10*-3V ","UCUM","LogRtoElp","Clinical","used to express power gain in electrical circuits","mV",null,null,1,false],[false,"bel microvolt","B[uV]","B[UV]","electric potential level",0.001,[2,-2,1,0,0,-1,0],"B(μV)","levels",true,null,"lgTimes2",1,true,false,0,0,"bel uV; B uV; microvolts bels; 10^-6V bel; 10*-6V bel","UCUM","LogRto","Clinical","used to express power gain in electrical circuits","uV",null,null,1,false],[false,"bel 10 nanovolt","B[10.nV]","B[10.NV]","electric potential level",0.000010000000000000003,[2,-2,1,0,0,-1,0],"B(10 nV)","levels",true,null,"lgTimes2",1,true,false,0,0,"bel 10 nV; B 10 nV; 10 nanovolts bels","UCUM","LogRtoElp","Clinical","used to express power gain in electrical circuits","nV",null,null,10,false],[false,"bel watt","B[W]","B[W]","power level",1000,[2,-3,1,0,0,0,0],"B(W)","levels",true,null,"lg",1,true,false,0,0,"bel W; b W; b Watt; Watts bels","UCUM","LogRto","Clinical","used to express power","W",null,null,1,false],[false,"bel kilowatt","B[kW]","B[KW]","power level",1000000,[2,-3,1,0,0,0,0],"B(kW)","levels",true,null,"lg",1,true,false,0,0,"bel kW; B kW; kilowatt bel; kW bel; kW B","UCUM","LogRto","Clinical","used to express power","kW",null,null,1,false],[false,"stere","st","STR","volume",1,[3,0,0,0,0,0,0],"st","misc",true,null,null,1,false,false,0,0,"stère; m3; cubic meter; m^3; meters cubed; metre","UCUM","Vol","Nonclinical","equal to one cubic meter, usually used for measuring firewood","m3","M3","1",1,false],[false,"Ångström","Ao","AO","length",1.0000000000000002e-10,[1,0,0,0,0,0,0],"Å","misc",false,null,null,1,false,false,0,0,"Å; Angstroms; Ao; Ångströms","UCUM","Len","Clinical","equal to 10^-10 meters; used to express wave lengths and atom scaled differences ","nm","NM","0.1",0.1,false],[false,"barn","b","BRN","action area",1.0000000000000001e-28,[2,0,0,0,0,0,0],"b","misc",false,null,null,1,false,false,0,0,"barns","UCUM","Area","Clinical","used in high-energy physics to express cross-sectional areas","fm2","FM2","100",100,false],[false,"technical atmosphere","att","ATT","pressure",98066500,[-1,-2,1,0,0,0,0],"at","misc",false,null,null,1,false,false,0,0,"at; tech atm; tech atmosphere; kgf/cm2; atms; atmospheres","UCUM","Pres","Obsolete","non-SI unit of pressure equal to one kilogram-force per square centimeter","kgf/cm2","KGF/CM2","1",1,false],[false,"mho","mho","MHO","electric conductance",0.001,[-2,1,-1,0,0,2,0],"mho","misc",true,null,null,1,false,false,0,0,"siemens; ohm reciprocals; Ω^−1; Ω-1 ","UCUM","","Obsolete","unit of electric conductance (the inverse of electrical resistance) equal to ohm^-1","S","S","1",1,false],[false,"pound per square inch","[psi]","[PSI]","pressure",6894757.293168359,[-1,-2,1,0,0,0,0],"psi","misc",false,null,null,1,false,false,0,0,"psi; lb/in2; lb per in2","UCUM","Pres","Clinical","","[lbf_av]/[in_i]2","[LBF_AV]/[IN_I]2","1",1,false],[false,"circle - plane angle","circ","CIRC","plane angle",6.283185307179586,[0,0,0,1,0,0,0],"circ","misc",false,null,null,1,false,false,0,0,"angles; circles","UCUM","Angle","Clinical","","[pi].rad","[PI].RAD","2",2,false],[false,"spere - solid angle","sph","SPH","solid angle",12.566370614359172,[0,0,0,2,0,0,0],"sph","misc",false,null,null,1,false,false,0,0,"speres","UCUM","Angle","Clinical","equal to the solid angle of an entire sphere = 4πsr (sr = steradian) ","[pi].sr","[PI].SR","4",4,false],[false,"metric carat","[car_m]","[CAR_M]","mass",0.2,[0,0,1,0,0,0,0],"ct<sub>m</sub>","misc",false,null,null,1,false,false,0,0,"carats; ct; car m","UCUM","Mass","Nonclinical","unit of mass for gemstones","g","G","2e-1",0.2,false],[false,"carat of gold alloys","[car_Au]","[CAR_AU]","mass fraction",0.041666666666666664,[0,0,0,0,0,0,0],"ct<sub><r>Au</r></sub>","misc",false,null,null,1,false,false,0,0,"karats; k; kt; car au; carats","UCUM","MFr","Nonclinical","unit of purity for gold alloys","/24","/24","1",1,false],[false,"Smoot","[smoot]","[SMOOT]","length",1.7018000000000002,[1,0,0,0,0,0,0],null,"misc",false,null,null,1,false,false,0,0,"","UCUM","Len","Nonclinical","prank unit of length from MIT","[in_i]","[IN_I]","67",67,false],[false,"meter per square seconds per square root of hertz","[m/s2/Hz^(1/2)]","[M/S2/HZ^(1/2)]","amplitude spectral density",1,[2,-3,0,0,0,0,0],null,"misc",false,null,"sqrt",1,true,false,0,0,"m/s2/(Hz^.5); m/s2/(Hz^(1/2)); m per s2 per Hz^1/2","UCUM","","Constant","measures amplitude spectral density, and is equal to the square root of power spectral density\n ","m2/s4/Hz",null,null,1,false],[false,"bit - logarithmic","bit_s","BIT_S","amount of information",1,[0,0,0,0,0,0,0],"bit<sub>s</sub>","infotech",false,null,"ld",1,true,false,0,0,"bit-s; bit s; bit logarithmic","UCUM","LogA","Nonclinical","defined as the log base 2 of the number of distinct signals; cannot practically be used to express more than 1000 bits\n\nIn information theory, the definition of the amount of self-information and information entropy is often expressed with the binary logarithm (log base 2)","1",null,null,1,false],[false,"bit","bit","BIT","amount of information",1,[0,0,0,0,0,0,0],"bit","infotech",true,null,null,1,false,false,0,0,"bits","UCUM","","Nonclinical","dimensionless information unit of 1 used in computing and digital communications","1","1","1",1,false],[false,"byte","By","BY","amount of information",8,[0,0,0,0,0,0,0],"B","infotech",true,null,null,1,false,false,0,0,"bytes","UCUM","","Nonclinical","equal to 8 bits","bit","bit","8",8,false],[false,"baud","Bd","BD","signal transmission rate",1,[0,1,0,0,0,0,0],"Bd","infotech",true,null,"inv",1,false,false,0,0,"Bd; bauds","UCUM","Freq","Nonclinical","unit to express rate in symbols per second or pulses per second. ","s","/s","1",1,false],[false,"per twelve hour","/(12.h)","1/(12.HR)","",0.000023148148148148147,[0,-1,0,0,0,0,0],"/h",null,false,null,null,1,false,false,0,0,"per 12 hours; 12hrs; 12 hrs; /12hrs","LOINC","Rat","Clinical","",null,null,null,null,false],[false,"per arbitrary unit","/[arb'U]","1/[ARB'U]","",1,[0,0,0,0,0,0,0],"/arb/ U",null,false,null,null,1,false,true,0,0,"/arbU","LOINC","InvA ","Clinical","",null,null,null,null,false],[false,"per high power field","/[HPF]","1/[HPF]","",1,[0,0,0,0,0,0,0],"/HPF",null,false,null,null,1,false,false,0,0,"/HPF; per HPF","LOINC","Naric","Clinical","",null,null,null,null,false],[false,"per international unit","/[IU]","1/[IU]","",1,[0,0,0,0,0,0,0],"/i/U.",null,false,null,null,1,false,true,0,0,"international units; /IU; per IU","LOINC","InvA","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)",null,null,null,null,false],[false,"per low power field","/[LPF]","1/[LPF]","",1,[0,0,0,0,0,0,0],"/LPF",null,false,null,null,1,false,false,0,0,"/LPF; per LPF","LOINC","Naric","Clinical","",null,null,null,null,false],[false,"per 10 billion  ","/10*10","1/(10*10)","",1e-10,[0,0,0,0,0,0,0],"/10<sup>10</sup>",null,false,null,null,1,false,false,0,0,"/10^10; per 10*10","LOINC","NFr","Clinical","used for counting entities, e.g. blood cells; usually these kinds of terms have numerators such as moles or milligrams, and counting that amount per the number in the denominator",null,null,null,null,false],[false,"per trillion ","/10*12","1/(10*12)","",1e-12,[0,0,0,0,0,0,0],"/10<sup>12</sup>",null,false,null,null,1,false,false,0,0,"/10^12; per 10*12","LOINC","NFr","Clinical","used for counting entities, e.g. blood cells; usually these kinds of terms have numerators such as moles or milligrams, and counting that amount per the number in the denominator",null,null,null,null,false],[false,"per thousand","/10*3","1/(10*3)","",0.001,[0,0,0,0,0,0,0],"/10<sup>3</sup>",null,false,null,null,1,false,false,0,0,"/10^3; per 10*3","LOINC","NFr","Clinical","used for counting entities, e.g. blood cells; usually these kinds of terms have numerators such as moles or milligrams, and counting that amount per the number in the denominator",null,null,null,null,false],[false,"per million","/10*6","1/(10*6)","",0.000001,[0,0,0,0,0,0,0],"/10<sup>6</sup>",null,false,null,null,1,false,false,0,0,"/10^6; per 10*6;","LOINC","NFr","Clinical","used for counting entities, e.g. blood cells; usually these kinds of terms have numerators such as moles or milligrams, and counting that amount per the number in the denominator",null,null,null,null,false],[false,"per billion","/10*9","1/(10*9)","",1e-9,[0,0,0,0,0,0,0],"/10<sup>9</sup>",null,false,null,null,1,false,false,0,0,"/10^9; per 10*9","LOINC","NFr","Clinical","used for counting entities, e.g. blood cells; usually these kinds of terms have numerators such as moles or milligrams, and counting that amount per the number in the denominator",null,null,null,null,false],[false,"per 100","/100","1/100","",0.01,[0,0,0,0,0,0,0],null,null,false,null,null,1,false,false,0,0,"per hundred; 10^2; 10*2","LOINC","NFr","Clinical","used for counting entities, e.g. blood cells; usually these kinds of terms have numerators such as moles or milligrams, and counting that amount per the number in the denominator",null,null,null,null,false],[false,"per 100 cells","/100{cells}","/100{CELLS}","",0.01,[0,0,0,0,0,0,0],null,null,false,null,null,1,false,false,0,0,"/100 cells; /100cells; per hundred","LOINC","EntMass; EntNum; NFr","Clinical","",null,null,null,null,false],[false,"per 100 neutrophils","/100{neutrophils}","/100{NEUTROPHILS}","",0.01,[0,0,0,0,0,0,0],null,null,false,null,null,1,false,false,0,0,"/100 neutrophils; /100neutrophils; per hundred","LOINC","EntMass; EntNum; NFr","Clinical","",null,null,null,null,false],[false,"per 100 spermatozoa","/100{spermatozoa}","/100{SPERMATOZOA}","",0.01,[0,0,0,0,0,0,0],null,null,false,null,null,1,false,false,0,0,"/100 spermatozoa; /100spermatozoa; per hundred","LOINC","NFr","Clinical","",null,null,null,null,false],[false,"per 100 white blood cells","/100{WBCs}","/100{WBCS}","",0.01,[0,0,0,0,0,0,0],null,null,false,null,null,1,false,false,0,0,"/100 WBCs; /100WBCs; per hundred","LOINC","Ratio; NFr","Clinical","",null,null,null,null,false],[false,"per year","/a","1/ANN","",3.168808781402895e-8,[0,-1,0,0,0,0,0],"/a",null,false,null,null,1,false,false,0,0,"/Years; /yrs; yearly","LOINC","NRat","Clinical","",null,null,null,null,false],[false,"per centimeter of water","/cm[H2O]","1/CM[H2O]","",0.000010197162129779282,[1,2,-1,0,0,0,0],"/cm HO<sub><r>2</r></sub>",null,false,null,null,1,false,false,0,0,"/cmH2O; /cm H2O; centimeters; centimetres","LOINC","InvPress","Clinical","",null,null,null,null,false],[false,"per day","/d","1/D","",0.000011574074074074073,[0,-1,0,0,0,0,0],"/d",null,false,null,null,1,false,false,0,0,"/dy; per day","LOINC","NRat","Clinical","",null,null,null,null,false],[false,"per deciliter","/dL","1/DL","",10000,[-3,0,0,0,0,0,0],"/dL",null,false,null,null,1,false,false,0,0,"per dL; /deciliter; decilitre","LOINC","NCnc","Clinical","",null,null,null,null,false],[false,"per gram","/g","1/G","",1,[0,0,-1,0,0,0,0],"/g",null,false,null,null,1,false,false,0,0,"/gm; /gram; per g","LOINC","NCnt","Clinical","",null,null,null,null,false],[false,"per hour","/h","1/HR","",0.0002777777777777778,[0,-1,0,0,0,0,0],"/h",null,false,null,null,1,false,false,0,0,"/hr; /hour; per hr","LOINC","NRat","Clinical","",null,null,null,null,false],[false,"per kilogram","/kg","1/KG","",0.001,[0,0,-1,0,0,0,0],"/kg",null,false,null,null,1,false,false,0,0,"per kg; per kilogram","LOINC","NCnt","Clinical","",null,null,null,null,false],[false,"per liter","/L","1/L","",1000,[-3,0,0,0,0,0,0],"/L",null,false,null,null,1,false,false,0,0,"/liter; litre","LOINC","NCnc","Clinical","",null,null,null,null,false],[false,"per square meter","/m2","1/M2","",1,[-2,0,0,0,0,0,0],"/m<sup>2</sup>",null,false,null,null,1,false,false,0,0,"/m^2; /m*2; /sq. m; per square meter; meter squared; metre","LOINC","Naric","Clinical","",null,null,null,null,false],[false,"per cubic meter","/m3","1/M3","",1,[-3,0,0,0,0,0,0],"/m<sup>3</sup>",null,false,null,null,1,false,false,0,0,"/m^3; /m*3; /cu. m; per cubic meter; meter cubed; per m3; metre","LOINC","NCncn","Clinical","",null,null,null,null,false],[false,"per milligram","/mg","1/MG","",1000,[0,0,-1,0,0,0,0],"/mg",null,false,null,null,1,false,false,0,0,"/milligram; per mg","LOINC","NCnt","Clinical","",null,null,null,null,false],[false,"per minute","/min","1/MIN","",0.016666666666666666,[0,-1,0,0,0,0,0],"/min",null,false,null,null,1,false,false,0,0,"/minute; per mins; breaths beats per minute","LOINC","NRat","Clinical","",null,null,null,null,false],[false,"per milliliter","/mL","1/ML","",1000000,[-3,0,0,0,0,0,0],"/mL",null,false,null,null,1,false,false,0,0,"/milliliter; per mL; millilitre","LOINC","NCncn","Clinical","",null,null,null,null,false],[false,"per millimeter","/mm","1/MM","",1000,[-1,0,0,0,0,0,0],"/mm",null,false,null,null,1,false,false,0,0,"/millimeter; per mm; millimetre","LOINC","InvLen","Clinical","",null,null,null,null,false],[false,"per month","/mo","1/MO","",3.802570537683474e-7,[0,-1,0,0,0,0,0],"/mo",null,false,null,null,1,false,false,0,0,"/month; per mo; monthly; month","LOINC","NRat","Clinical","",null,null,null,null,false],[false,"per second","/s","1/S","",1,[0,-1,0,0,0,0,0],"/s",null,false,null,null,1,false,false,0,0,"/second; /sec; per sec; frequency; Hertz; Herz; Hz; becquerels; Bq; s-1; s^-1","LOINC","NRat","Clinical","",null,null,null,null,false],[false,"per enzyme unit","/U","1/U","",9.963241120049633e-17,[0,1,0,0,0,0,0],"/U",null,false,null,null,1,false,false,-1,0,"/enzyme units; per U","LOINC","InvC; NCat","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)",null,null,null,null,false],[false,"per microliter","/uL","1/UL","",999999999.9999999,[-3,0,0,0,0,0,0],"/μL",null,false,null,null,1,false,false,0,0,"/microliter; microlitre; /mcl; per uL","LOINC","ACnc","Clinical","",null,null,null,null,false],[false,"per week","/wk","1/WK","",0.0000016534391534391535,[0,-1,0,0,0,0,0],"/wk",null,false,null,null,1,false,false,0,0,"/week; per wk; weekly, weeks","LOINC","NRat","Clinical","",null,null,null,null,false],[false,"APL unit per milliliter","[APL'U]/mL","[APL'U]/ML","biologic activity of anticardiolipin IgA",1000000,[-3,0,0,0,0,0,0],"/mL","chemical",false,null,null,1,false,true,0,0,"APL/mL; APL'U/mL; APL U/mL; APL/milliliter; IgA anticardiolipin units per milliliter; IgA Phospholipid Units; millilitre; biologic activity of","LOINC","ACnc","Clinical","Units for an anti phospholipid syndrome test","1","1","1",1,false],[false,"arbitrary unit per milliliter","[arb'U]/mL","[ARB'U]/ML","arbitrary",1000000,[-3,0,0,0,0,0,0],"(arb. U)/mL","chemical",false,null,null,1,false,true,0,0,"arb'U/mL; arbU/mL; arb U/mL; arbitrary units per milliliter; millilitre","LOINC","ACnc","Clinical","relative unit of measurement to show the ratio of test measurement to reference measurement","1","1","1",1,false],[false,"colony forming units per liter","[CFU]/L","[CFU]/L","amount of a proliferating organism",1000,[-3,0,0,0,0,0,0],"CFU/L","chemical",false,null,null,1,false,true,0,0,"CFU per Liter; CFU/L","LOINC","NCnc","Clinical","","1","1","1",1,false],[false,"colony forming units per milliliter","[CFU]/mL","[CFU]/ML","amount of a proliferating organism",1000000,[-3,0,0,0,0,0,0],"CFU/mL","chemical",false,null,null,1,false,true,0,0,"CFU per mL; CFU/mL","LOINC","NCnc","Clinical","","1","1","1",1,false],[false,"foot per foot - US","[ft_us]/[ft_us]","[FT_US]/[FT_US]","length",1,[0,0,0,0,0,0,0],"(ft<sub>us</sub>)/(ft<sub>us</sub>)","us-lengths",false,null,null,1,false,false,0,0,"ft/ft; ft per ft; feet per feet; visual acuity","","LenRto","Clinical","distance ratio to measure 20:20 vision","m/3937","M/3937","1200",1200,false],[false,"GPL unit per milliliter","[GPL'U]/mL","[GPL'U]/ML","biologic activity of anticardiolipin IgG",1000000,[-3,0,0,0,0,0,0],"/mL","chemical",false,null,null,1,false,true,0,0,"GPL U/mL; GPL'U/mL; GPL/mL; GPL U per mL; IgG Phospholipid Units per milliliters; IgG anticardiolipin units; millilitres ","LOINC","ACnc; AMass","Clinical","Units for an antiphospholipid test","1","1","1",1,false],[false,"international unit per 2 hour","[IU]/(2.h)","[IU]/(2.HR)","arbitrary",0.0001388888888888889,[0,-1,0,0,0,0,0],"(i.U.)/h","chemical",true,null,null,1,false,true,0,0,"IU/2hrs; IU/2 hours; IU per 2 hrs; international units per 2 hours","LOINC","ARat","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"international unit per 24 hour","[IU]/(24.h)","[IU]/(24.HR)","arbitrary",0.000011574074074074073,[0,-1,0,0,0,0,0],"(i.U.)/h","chemical",true,null,null,1,false,true,0,0,"IU/24hr; IU/24 hours; IU per 24 hrs; international units per 24 hours","LOINC","ARat","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"international unit per day","[IU]/d","[IU]/D","arbitrary",0.000011574074074074073,[0,-1,0,0,0,0,0],"(i.U.)/d","chemical",true,null,null,1,false,true,0,0,"IU/dy; IU/days; IU per dys; international units per day","LOINC","ARat","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"international unit per deciliter","[IU]/dL","[IU]/DL","arbitrary",10000,[-3,0,0,0,0,0,0],"(i.U.)/dL","chemical",true,null,null,1,false,true,0,0,"IU/dL; IU per dL; international units per deciliters; decilitres","LOINC","ACnc","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"international unit per gram","[IU]/g","[IU]/G","arbitrary",1,[0,0,-1,0,0,0,0],"(i.U.)/g","chemical",true,null,null,1,false,true,0,0,"IU/gm; IU/gram; IU per gm; IU per g; international units per gram","LOINC","ACnt","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"international unit per hour","[IU]/h","[IU]/HR","arbitrary",0.0002777777777777778,[0,-1,0,0,0,0,0],"(i.U.)/h","chemical",true,null,null,1,false,true,0,0,"IU/hrs; IU per hours; international units per hour","LOINC","ARat","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"international unit per kilogram","[IU]/kg","[IU]/KG","arbitrary",0.001,[0,0,-1,0,0,0,0],"(i.U.)/kg","chemical",true,null,null,1,false,true,0,0,"IU/kg; IU/kilogram; IU per kg; units","LOINC","ACnt","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"international unit per kilogram per day","[IU]/kg/d","([IU]/KG)/D","arbitrary",1.1574074074074074e-8,[0,-1,-1,0,0,0,0],"((i.U.)/kg)/d","chemical",true,null,null,1,false,true,0,0,"IU/kg/dy; IU/kg/day; IU/kilogram/day; IU per kg per day; units","LOINC","ACntRat","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"international unit per liter","[IU]/L","[IU]/L","arbitrary",1000,[-3,0,0,0,0,0,0],"(i.U.)/L","chemical",true,null,null,1,false,true,0,0,"IU/L; IU/liter; IU per liter; units; litre","LOINC","ACnc","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"international unit per minute","[IU]/min","[IU]/MIN","arbitrary",0.016666666666666666,[0,-1,0,0,0,0,0],"(i.U.)/min","chemical",true,null,null,1,false,true,0,0,"IU/min; IU/minute; IU per minute; international units","LOINC","ARat","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"international unit per milliliter","[IU]/mL","[IU]/ML","arbitrary",1000000,[-3,0,0,0,0,0,0],"(i.U.)/mL","chemical",true,null,null,1,false,true,0,0,"IU/mL; IU per mL; international units per milliliter; millilitre","LOINC","ACnc","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"MPL unit per milliliter","[MPL'U]/mL","[MPL'U]/ML","biologic activity of anticardiolipin IgM",1000000,[-3,0,0,0,0,0,0],"/mL","chemical",false,null,null,1,false,true,0,0,"MPL/mL; MPL U/mL; MPL'U/mL; IgM anticardiolipin units; IgM Phospholipid Units; millilitre ","LOINC","ACnc","Clinical","units for antiphospholipid test\n","1","1","1",1,false],[false,"number per high power field","{#}/[HPF]","{#}/[HPF]","",1,[0,0,0,0,0,0,0],"/HPF",null,false,null,null,1,false,false,0,0,"#/HPF; # per HPF; number/HPF; numbers per high power field","LOINC","Naric","Clinical","",null,null,null,null,false],[false,"number per low power field","{#}/[LPF]","{#}/[LPF]","",1,[0,0,0,0,0,0,0],"/LPF",null,false,null,null,1,false,false,0,0,"#/LPF; # per LPF; number/LPF; numbers per low power field","LOINC","Naric","Clinical","",null,null,null,null,false],[false,"IgA antiphosphatidylserine unit ","{APS'U}","{APS'U}","",1,[0,0,0,0,0,0,0],null,null,false,null,null,1,false,false,0,0,"APS Unit; Phosphatidylserine Antibody IgA Units","LOINC","ACnc","Clinical","unit for antiphospholipid test",null,null,null,null,false],[false,"EIA index","{EIA_index}","{EIA_index}","",1,[0,0,0,0,0,0,0],null,null,false,null,null,1,false,false,0,0,"enzyme immunoassay index","LOINC","ACnc","Clinical","",null,null,null,null,false],[false,"kaolin clotting time","{KCT'U}","{KCT'U}","",1,[0,0,0,0,0,0,0],null,null,false,null,null,1,false,false,0,0,"KCT","LOINC","Time","Clinical","sensitive test to detect lupus anticoagulants; measured in seconds",null,null,null,null,false],[false,"IgM antiphosphatidylserine unit","{MPS'U}","{MPS'U}","",1,[0,0,0,0,0,0,0],null,null,false,null,null,1,false,false,0,0,"Phosphatidylserine Antibody IgM Measurement ","LOINC","ACnc","Clinical","",null,null,null,null,false],[false,"trillion per liter","10*12/L","(10*12)/L","number",1000000000000000,[-3,0,0,0,0,0,0],"(10<sup>12</sup>)/L","dimless",false,null,null,1,false,false,0,0,"10^12/L; 10*12 per Liter; trillion per liter; litre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"10^3 (used for cell count)","10*3","10*3","number",1000,[0,0,0,0,0,0,0],"10<sup>3</sup>","dimless",false,null,null,1,false,false,0,0,"10^3; thousand","LOINC","Num","Clinical","usually used for counting entities (e.g. blood cells) per volume","1","1","10",10,false],[false,"thousand per liter","10*3/L","(10*3)/L","number",1000000,[-3,0,0,0,0,0,0],"(10<sup>3</sup>)/L","dimless",false,null,null,1,false,false,0,0,"10^3/L; 10*3 per liter; litre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"thousand per milliliter","10*3/mL","(10*3)/ML","number",1000000000,[-3,0,0,0,0,0,0],"(10<sup>3</sup>)/mL","dimless",false,null,null,1,false,false,0,0,"10^3/mL; 10*3 per mL; thousand per milliliter; millilitre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"thousand per microliter","10*3/uL","(10*3)/UL","number",999999999999.9999,[-3,0,0,0,0,0,0],"(10<sup>3</sup>)/μL","dimless",false,null,null,1,false,false,0,0,"10^3/uL; 10*3 per uL; thousand per microliter; microlitre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"10 thousand per microliter","10*4/uL","(10*4)/UL","number",10000000000000,[-3,0,0,0,0,0,0],"(10<sup>4</sup>)/μL","dimless",false,null,null,1,false,false,0,0,"10^4/uL; 10*4 per uL; microlitre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"10^5 ","10*5","10*5","number",100000,[0,0,0,0,0,0,0],"10<sup>5</sup>","dimless",false,null,null,1,false,false,0,0,"one hundred thousand","LOINC","Num","Clinical","","1","1","10",10,false],[false,"10^6","10*6","10*6","number",1000000,[0,0,0,0,0,0,0],"10<sup>6</sup>","dimless",false,null,null,1,false,false,0,0,"","LOINC","Num","Clinical","","1","1","10",10,false],[false,"million colony forming unit per liter","10*6.[CFU]/L","((10*6).[CFU])/L","number",1000000000,[-3,0,0,0,0,0,0],"((10<sup>6</sup>).CFU)/L","dimless",false,null,null,1,false,true,0,0,"10*6 CFU/L; 10^6 CFU/L; 10^6CFU; 10^6 CFU per liter; million colony forming units; litre","LOINC","ACnc","Clinical","","1","1","10",10,false],[false,"million international unit","10*6.[IU]","(10*6).[IU]","number",1000000,[0,0,0,0,0,0,0],"(10<sup>6</sup>).(i.U.)","dimless",false,null,null,1,false,true,0,0,"10*6 IU; 10^6 IU; international units","LOINC","arb","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","1","1","10",10,false],[false,"million per 24 hour","10*6/(24.h)","(10*6)/(24.HR)","number",11.574074074074074,[0,-1,0,0,0,0,0],"(10<sup>6</sup>)/h","dimless",false,null,null,1,false,false,0,0,"10*6/24hrs; 10^6/24 hrs; 10*6 per 24 hrs; 10^6 per 24 hours","LOINC","NRat","Clinical","","1","1","10",10,false],[false,"million per kilogram","10*6/kg","(10*6)/KG","number",1000,[0,0,-1,0,0,0,0],"(10<sup>6</sup>)/kg","dimless",false,null,null,1,false,false,0,0,"10^6/kg; 10*6 per kg; 10*6 per kilogram; millions","LOINC","NCnt","Clinical","","1","1","10",10,false],[false,"million per liter","10*6/L","(10*6)/L","number",1000000000,[-3,0,0,0,0,0,0],"(10<sup>6</sup>)/L","dimless",false,null,null,1,false,false,0,0,"10^6/L; 10*6 per Liter; 10^6 per Liter; litre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"million per milliliter","10*6/mL","(10*6)/ML","number",1000000000000,[-3,0,0,0,0,0,0],"(10<sup>6</sup>)/mL","dimless",false,null,null,1,false,false,0,0,"10^6/mL; 10*6 per mL; 10*6 per milliliter; millilitre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"million per microliter","10*6/uL","(10*6)/UL","number",1000000000000000,[-3,0,0,0,0,0,0],"(10<sup>6</sup>)/μL","dimless",false,null,null,1,false,false,0,0,"10^6/uL; 10^6 per uL; 10^6/mcl; 10^6 per mcl; 10^6 per microliter; microlitre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"10^8","10*8","10*8","number",100000000,[0,0,0,0,0,0,0],"10<sup>8</sup>","dimless",false,null,null,1,false,false,0,0,"100 million; one hundred million; 10^8","LOINC","Num","Clinical","","1","1","10",10,false],[false,"billion per liter","10*9/L","(10*9)/L","number",1000000000000,[-3,0,0,0,0,0,0],"(10<sup>9</sup>)/L","dimless",false,null,null,1,false,false,0,0,"10^9/L; 10*9 per Liter; litre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"billion per milliliter","10*9/mL","(10*9)/ML","number",1000000000000000,[-3,0,0,0,0,0,0],"(10<sup>9</sup>)/mL","dimless",false,null,null,1,false,false,0,0,"10^9/mL; 10*9 per mL; 10^9 per mL; 10*9 per milliliter; millilitre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"billion per microliter","10*9/uL","(10*9)/UL","number",1000000000000000000,[-3,0,0,0,0,0,0],"(10<sup>9</sup>)/μL","dimless",false,null,null,1,false,false,0,0,"10^9/uL; 10^9 per uL; 10^9/mcl; 10^9 per mcl; 10*9 per uL; 10*9 per mcl; 10*9/mcl; 10^9 per microliter; microlitre","LOINC","NCncn","Clinical","","1","1","10",10,false],[false,"10 liter per minute per square meter","10.L/(min.m2)","(10.L)/(MIN.M2)","",0.00016666666666666666,[1,-1,0,0,0,0,0],"L/(min.(m<sup>2</sup>))",null,false,null,null,1,false,false,0,0,"10 liters per minutes per square meter; 10 L per min per m2; m^2; 10 L/(min*m2); 10L/(min*m^2); litres; sq. meter; metre; meters squared","LOINC","ArVRat","Clinical","",null,null,null,null,false],[false,"10 liter per minute","10.L/min","(10.L)/MIN","",0.00016666666666666666,[3,-1,0,0,0,0,0],"L/min",null,false,null,null,1,false,false,0,0,"10 liters per minute; 10 L per min; 10L; 10 L/min; litre","LOINC","VRat","Clinical","",null,null,null,null,false],[false,"10 micronewton second per centimeter to the fifth power per square meter","10.uN.s/(cm5.m2)","((10.UN).S)/(CM5.M2)","",100000000,[-6,-1,1,0,0,0,0],"(μN.s)/(cm<sup>5</sup>).(m<sup>2</sup>)",null,false,null,null,1,false,false,0,0,"dyne seconds per centimeter5 and square meter; dyn.s/(cm5.m2); dyn.s/cm5/m2; cm^5; m^2","LOINC","","Clinical","unit to measure systemic vascular resistance per body surface area",null,null,null,null,false],[false,"24 hour","24.h","24.HR","",86400,[0,1,0,0,0,0,0],"h",null,false,null,null,1,false,false,0,0,"24hrs; 24 hrs; 24 hours; days; dy","LOINC","Time","Clinical","",null,null,null,null,false],[false,"ampere per meter","A/m","A/M","electric current",1,[-1,-1,0,0,0,1,0],"A/m","si",true,null,null,1,false,false,0,0,"A/m; amp/meter; magnetic field strength; H; B; amperes per meter; metre","LOINC","","Clinical","unit of magnetic field strength","C/s","C/S","1",1,false],[false,"centigram","cg","CG","mass",0.01,[0,0,1,0,0,0,0],"cg",null,false,"M",null,1,false,false,0,0,"centigrams; cg; cgm","LOINC","Mass","Clinical","",null,null,null,null,false],[false,"centiliter","cL","CL","volume",0.00001,[3,0,0,0,0,0,0],"cL","iso1000",true,null,null,1,false,false,0,0,"centiliters; centilitres","LOINC","Vol","Clinical","","l",null,"1",1,false],[false,"centimeter","cm","CM","length",0.01,[1,0,0,0,0,0,0],"cm",null,false,"L",null,1,false,false,0,0,"centimeters; centimetres","LOINC","Len","Clinical","",null,null,null,null,false],[false,"centimeter of water","cm[H2O]","CM[H2O]","pressure",98066.5,[-1,-2,1,0,0,0,0],"cm HO<sub><r>2</r></sub>","clinical",true,null,null,1,false,false,0,0,"cm H2O; cmH2O; centimetres; pressure","LOINC","Pres","Clinical","unit of pressure mostly applies to blood pressure","kPa","KPAL","980665e-5",9.80665,false],[false,"centimeter of water per liter per second","cm[H2O]/L/s","(CM[H2O]/L)/S","pressure",98066500,[-4,-3,1,0,0,0,0],"((cm HO<sub><r>2</r></sub>)/L)/s","clinical",true,null,null,1,false,false,0,0,"cm[H2O]/(L/s); cm[H2O].s/L; cm H2O/L/sec; cmH2O/L/sec; cmH2O/Liter; cmH2O per L per secs; centimeters of water per liters per second; centimetres; litres; cm[H2O]/(L/s)","LOINC","PresRat","Clinical","unit used to measure mean pulmonary resistance","kPa","KPAL","980665e-5",9.80665,false],[false,"centimeter of water per second per meter","cm[H2O]/s/m","(CM[H2O]/S)/M","pressure",98066.5,[-2,-3,1,0,0,0,0],"((cm HO<sub><r>2</r></sub>)/s)/m","clinical",true,null,null,1,false,false,0,0,"cm[H2O]/(s.m); cm H2O/s/m; cmH2O; cmH2O/sec/m; cmH2O per secs per meters; centimeters of water per seconds per meter; centimetres; metre","LOINC","PresRat","Clinical","unit used to measure pulmonary pressure time product","kPa","KPAL","980665e-5",9.80665,false],[false,"centimeter of mercury","cm[Hg]","CM[HG]","pressure",1333220,[-1,-2,1,0,0,0,0],"cm Hg","clinical",true,null,null,1,false,false,0,0,"centimeters of mercury; centimetres; cmHg; cm Hg","LOINC","Pres","Clinical","unit of pressure where 1 cmHg = 10 torr","kPa","KPAL","133.3220",133.322,false],[false,"square centimeter","cm2","CM2","length",0.0001,[2,0,0,0,0,0,0],"cm<sup>2</sup>",null,false,"L",null,1,false,false,0,0,"cm^2; sq cm; centimeters squared; square centimeters; centimetre; area","LOINC","Area","Clinical","",null,null,null,null,false],[false,"square centimeter per second","cm2/s","CM2/S","length",0.0001,[2,-1,0,0,0,0,0],"(cm<sup>2</sup>)/s",null,false,"L",null,1,false,false,0,0,"cm^2/sec; square centimeters per second; sq cm per sec; cm2; centimeters squared; centimetres","LOINC","AreaRat","Clinical","",null,null,null,null,false],[false,"centipoise","cP","CP","dynamic viscosity",1.0000000000000002,[-1,-1,1,0,0,0,0],"cP","cgs",true,null,null,1,false,false,0,0,"cps; centiposes","LOINC","Visc","Clinical","unit of dynamic viscosity in the CGS system with base units: 10^−3 Pa.s = 1 mPa·.s (1 millipascal second)","dyn.s/cm2","DYN.S/CM2","1",1,false],[false,"centistoke","cSt","CST","kinematic viscosity",0.000001,[2,-1,0,0,0,0,0],"cSt","cgs",true,null,null,1,false,false,0,0,"centistokes","LOINC","Visc","Clinical","unit for kinematic viscosity with base units of mm^2/s (square millimeter per second)","cm2/s","CM2/S","1",1,false],[false,"dekaliter per minute","daL/min","DAL/MIN","volume",0.00016666666666666666,[3,-1,0,0,0,0,0],"daL/min","iso1000",true,null,null,1,false,false,0,0,"dekalitres; dekaliters per minute; per min","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"dekaliter per minute per square meter","daL/min/m2","(DAL/MIN)/M2","volume",0.00016666666666666666,[1,-1,0,0,0,0,0],"(daL/min)/(m<sup>2</sup>)","iso1000",true,null,null,1,false,false,0,0,"daL/min/m^2; daL/minute/m2; sq. meter; dekaliters per minutes per square meter; meter squared; dekalitres; metre","LOINC","ArVRat","Clinical","The area usually is the body surface area used to normalize cardiovascular measures for patient's size","l",null,"1",1,false],[false,"decibel","dB","DB","level",1,[0,0,0,0,0,0,0],"dB","levels",true,null,"lg",0.1,true,false,0,0,"decibels","LOINC","LogRto","Clinical","unit most commonly used in acoustics as unit of sound pressure level. (also see B[SPL] or bel sound pressure level). ","1",null,null,1,false],[false,"degree per second","deg/s","DEG/S","plane angle",0.017453292519943295,[0,-1,0,1,0,0,0],"°/s","iso1000",false,null,null,1,false,false,0,0,"deg/sec; deg per sec; °/sec; twist rate; angular speed; rotational speed","LOINC","ARat","Clinical","unit of angular (rotational) speed used to express turning rate","[pi].rad/360","[PI].RAD/360","2",2,false],[false,"decigram","dg","DG","mass",0.1,[0,0,1,0,0,0,0],"dg",null,false,"M",null,1,false,false,0,0,"decigrams; dgm; 0.1 grams; 1/10 gm","LOINC","Mass","Clinical","equal to 1/10 gram",null,null,null,null,false],[false,"deciliter","dL","DL","volume",0.0001,[3,0,0,0,0,0,0],"dL","iso1000",true,null,null,1,false,false,0,0,"deciliters; decilitres; 0.1 liters; 1/10 L","LOINC","Vol","Clinical","equal to 1/10 liter","l",null,"1",1,false],[false,"decimeter","dm","DM","length",0.1,[1,0,0,0,0,0,0],"dm",null,false,"L",null,1,false,false,0,0,"decimeters; decimetres; 0.1 meters; 1/10 m; 10 cm; centimeters","LOINC","Len","Clinical","equal to 1/10 meter or 10 centimeters",null,null,null,null,false],[false,"square decimeter per square second","dm2/s2","DM2/S2","length",0.010000000000000002,[2,-2,0,0,0,0,0],"(dm<sup>2</sup>)/(s<sup>2</sup>)",null,false,"L",null,1,false,false,0,0,"dm2 per s2; dm^2/s^2; decimeters squared per second squared; sq dm; sq sec","LOINC","EngMass (massic energy)","Clinical","units for energy per unit mass or Joules per kilogram (J/kg = kg.m2/s2/kg = m2/s2) ",null,null,null,null,false],[false,"dyne second per centimeter per square meter","dyn.s/(cm.m2)","(DYN.S)/(CM.M2)","force",1,[-2,-1,1,0,0,0,0],"(dyn.s)/(cm.(m<sup>2</sup>))","cgs",true,null,null,1,false,false,0,0,"(dyn*s)/(cm*m2); (dyn*s)/(cm*m^2); dyn s per cm per m2; m^2; dyne seconds per centimeters per square meter; centimetres; sq. meter; squared","LOINC","","Clinical","","g.cm/s2","G.CM/S2","1",1,false],[false,"dyne second per centimeter","dyn.s/cm","(DYN.S)/CM","force",1,[0,-1,1,0,0,0,0],"(dyn.s)/cm","cgs",true,null,null,1,false,false,0,0,"(dyn*s)/cm; dyn sec per cm; seconds; centimetre; dyne seconds","LOINC","","Clinical","","g.cm/s2","G.CM/S2","1",1,false],[false,"equivalent per liter","eq/L","EQ/L","amount of substance",6.0221366999999994e+26,[-3,0,0,0,0,0,0],"eq/L","chemical",true,null,null,1,false,false,0,1,"eq/liter; eq/litre; eqs; equivalents per liter; litre","LOINC","SCnc","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"equivalent per milliliter","eq/mL","EQ/ML","amount of substance",6.0221367e+29,[-3,0,0,0,0,0,0],"eq/mL","chemical",true,null,null,1,false,false,0,1,"equivalent/milliliter; equivalents per milliliter; eq per mL; millilitre","LOINC","SCnc","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"equivalent per millimole","eq/mmol","EQ/MMOL","amount of substance",1000,[0,0,0,0,0,0,0],"eq/mmol","chemical",true,null,null,1,false,false,-1,1,"equivalent/millimole; equivalents per millimole; eq per mmol","LOINC","SRto","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"equivalent per micromole","eq/umol","EQ/UMOL","amount of substance",1000000,[0,0,0,0,0,0,0],"eq/μmol","chemical",true,null,null,1,false,false,-1,1,"equivalent/micromole; equivalents per micromole; eq per umol","LOINC","SRto","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"femtogram","fg","FG","mass",1e-15,[0,0,1,0,0,0,0],"fg",null,false,"M",null,1,false,false,0,0,"fg; fgm; femtograms; weight","LOINC","Mass","Clinical","equal to 10^-15 grams",null,null,null,null,false],[false,"femtoliter","fL","FL","volume",1e-18,[3,0,0,0,0,0,0],"fL","iso1000",true,null,null,1,false,false,0,0,"femtolitres; femtoliters","LOINC","Vol; EntVol","Clinical","equal to 10^-15 liters","l",null,"1",1,false],[false,"femtometer","fm","FM","length",1e-15,[1,0,0,0,0,0,0],"fm",null,false,"L",null,1,false,false,0,0,"femtometres; femtometers","LOINC","Len","Clinical","equal to 10^-15 meters",null,null,null,null,false],[false,"femtomole","fmol","FMOL","amount of substance",602213670,[0,0,0,0,0,0,0],"fmol","si",true,null,null,1,false,false,1,0,"femtomoles","LOINC","EntSub","Clinical","equal to 10^-15 moles","10*23","10*23","6.0221367",6.0221367,false],[false,"femtomole per gram","fmol/g","FMOL/G","amount of substance",602213670,[0,0,-1,0,0,0,0],"fmol/g","si",true,null,null,1,false,false,1,0,"femtomoles; fmol/gm; fmol per gm","LOINC","SCnt","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"femtomole per liter","fmol/L","FMOL/L","amount of substance",602213670000,[-3,0,0,0,0,0,0],"fmol/L","si",true,null,null,1,false,false,1,0,"femtomoles; fmol per liter; litre","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"femtomole per milligram","fmol/mg","FMOL/MG","amount of substance",602213670000,[0,0,-1,0,0,0,0],"fmol/mg","si",true,null,null,1,false,false,1,0,"fmol per mg; femtomoles","LOINC","SCnt","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"femtomole per milliliter","fmol/mL","FMOL/ML","amount of substance",602213670000000,[-3,0,0,0,0,0,0],"fmol/mL","si",true,null,null,1,false,false,1,0,"femtomoles; millilitre; fmol per mL; fmol per milliliter","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"gram meter","g.m","G.M","mass",1,[1,0,1,0,0,0,0],"g.m",null,false,"M",null,1,false,false,0,0,"g*m; gxm; meters; metres","LOINC","Enrg","Clinical","Unit for measuring stroke work (heart work)",null,null,null,null,false],[false,"gram per 100 gram","g/(100.g)","G/(100.G)","mass",0.01,[0,0,0,0,0,0,0],"g/g",null,false,"M",null,1,false,false,0,0,"g/100 gm; 100gm; grams per 100 grams; gm per 100 gm","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"gram per 12 hour","g/(12.h)","G/(12.HR)","mass",0.000023148148148148147,[0,-1,1,0,0,0,0],"g/h",null,false,"M",null,1,false,false,0,0,"gm/12hrs; 12 hrs; gm per 12 hrs; 12hrs; grams per 12 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per 24 hour","g/(24.h)","G/(24.HR)","mass",0.000011574074074074073,[0,-1,1,0,0,0,0],"g/h",null,false,"M",null,1,false,false,0,0,"gm/24hrs; gm/24 hrs; gm per 24 hrs; 24hrs; grams per 24 hours; gm/dy; gm per dy; grams per day","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per 3 days","g/(3.d)","G/(3.D)","mass",0.000003858024691358025,[0,-1,1,0,0,0,0],"g/d",null,false,"M",null,1,false,false,0,0,"gm/3dy; gm/3 dy; gm per 3 days; grams","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per 4 hour","g/(4.h)","G/(4.HR)","mass",0.00006944444444444444,[0,-1,1,0,0,0,0],"g/h",null,false,"M",null,1,false,false,0,0,"gm/4hrs; gm/4 hrs; gm per 4 hrs; 4hrs; grams per 4 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per 48 hour","g/(48.h)","G/(48.HR)","mass",0.000005787037037037037,[0,-1,1,0,0,0,0],"g/h",null,false,"M",null,1,false,false,0,0,"gm/48hrs; gm/48 hrs; gm per 48 hrs; 48hrs; grams per 48 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per 5 hour","g/(5.h)","G/(5.HR)","mass",0.00005555555555555556,[0,-1,1,0,0,0,0],"g/h",null,false,"M",null,1,false,false,0,0,"gm/5hrs; gm/5 hrs; gm per 5 hrs; 5hrs; grams per 5 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per 6 hour","g/(6.h)","G/(6.HR)","mass",0.000046296296296296294,[0,-1,1,0,0,0,0],"g/h",null,false,"M",null,1,false,false,0,0,"gm/6hrs; gm/6 hrs; gm per 6 hrs; 6hrs; grams per 6 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per 72 hour","g/(72.h)","G/(72.HR)","mass",0.000003858024691358025,[0,-1,1,0,0,0,0],"g/h",null,false,"M",null,1,false,false,0,0,"gm/72hrs; gm/72 hrs; gm per 72 hrs; 72hrs; grams per 72 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per cubic centimeter","g/cm3","G/CM3","mass",999999.9999999999,[-3,0,1,0,0,0,0],"g/(cm<sup>3</sup>)",null,false,"M",null,1,false,false,0,0,"g/cm^3; gm per cm3; g per cm^3; grams per centimeter cubed; cu. cm; centimetre; g/mL; gram per milliliter; millilitre","LOINC","MCnc","Clinical","g/cm3 = g/mL",null,null,null,null,false],[false,"gram per day","g/d","G/D","mass",0.000011574074074074073,[0,-1,1,0,0,0,0],"g/d",null,false,"M",null,1,false,false,0,0,"gm/dy; gm per dy; grams per day; gm/24hrs; gm/24 hrs; gm per 24 hrs; 24hrs; grams per 24 hours; serving","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per deciliter","g/dL","G/DL","mass",10000,[-3,0,1,0,0,0,0],"g/dL",null,false,"M",null,1,false,false,0,0,"gm/dL; gm per dL; grams per deciliter; decilitre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"gram per gram","g/g","G/G","mass",1,[0,0,0,0,0,0,0],"g/g",null,false,"M",null,1,false,false,0,0,"gm; grams","LOINC","MRto ","Clinical","",null,null,null,null,false],[false,"gram per hour","g/h","G/HR","mass",0.0002777777777777778,[0,-1,1,0,0,0,0],"g/h",null,false,"M",null,1,false,false,0,0,"gm/hr; gm per hr; grams; intake; output","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per hour per square meter","g/h/m2","(G/HR)/M2","mass",0.0002777777777777778,[-2,-1,1,0,0,0,0],"(g/h)/(m<sup>2</sup>)",null,false,"M",null,1,false,false,0,0,"gm/hr/m2; gm/h/m2; /m^2; sq. m; g per hr per m2; grams per hours per square meter; meter squared; metre","LOINC","ArMRat","Clinical","",null,null,null,null,false],[false,"gram per kilogram","g/kg ","G/KG","mass",0.001,[0,0,0,0,0,0,0],"g/kg",null,false,"M",null,1,false,false,0,0,"g per kg; gram per kilograms","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"gram per kilogram per 8 hour ","g/kg/(8.h)","(G/KG)/(8.HR)","mass",3.472222222222222e-8,[0,-1,0,0,0,0,0],"(g/kg)/h",null,false,"M",null,1,false,false,0,0,"g/(8.kg.h); gm/kg/8hrs; 8 hrs; g per kg per 8 hrs; 8hrs; grams per kilograms per 8 hours; shift","LOINC","MCntRat; RelMRat","Clinical","unit often used to describe mass in grams of protein consumed in a 8 hours, divided by the subject's body weight in kilograms. Also used to measure mass dose rate per body mass",null,null,null,null,false],[false,"gram per kilogram per day","g/kg/d","(G/KG)/D","mass",1.1574074074074074e-8,[0,-1,0,0,0,0,0],"(g/kg)/d",null,false,"M",null,1,false,false,0,0,"g/(kg.d); gm/kg/dy; gm per kg per dy; grams per kilograms per day","LOINC","RelMRat","Clinical","unit often used to describe mass in grams of protein consumed in a day, divided by the subject's body weight in kilograms. Also used to measure mass dose rate per body mass",null,null,null,null,false],[false,"gram per kilogram per hour","g/kg/h","(G/KG)/HR","mass",2.7777777777777776e-7,[0,-1,0,0,0,0,0],"(g/kg)/h",null,false,"M",null,1,false,false,0,0,"g/(kg.h); g/kg/hr; g per kg per hrs; grams per kilograms per hour","LOINC","MCntRat; RelMRat","Clinical","unit used to measure mass dose rate per body mass",null,null,null,null,false],[false,"gram per kilogram per minute","g/kg/min","(G/KG)/MIN","mass",0.000016666666666666667,[0,-1,0,0,0,0,0],"(g/kg)/min",null,false,"M",null,1,false,false,0,0,"g/(kg.min); g/kg/min; g per kg per min; grams per kilograms per minute","LOINC","MCntRat; RelMRat","Clinical","unit used to measure mass dose rate per body mass",null,null,null,null,false],[false,"gram per liter","g/L","G/L","mass",1000,[-3,0,1,0,0,0,0],"g/L",null,false,"M",null,1,false,false,0,0,"gm per liter; g/liter; grams per liter; litre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"gram per square meter","g/m2","G/M2","mass",1,[-2,0,1,0,0,0,0],"g/(m<sup>2</sup>)",null,false,"M",null,1,false,false,0,0,"g/m^2; gram/square meter; g/sq m; g per m2; g per m^2; grams per square meter; meters squared; metre","LOINC","ArMass","Clinical","Tests measure myocardial mass (heart ventricle system) per body surface area; unit used to measure mass dose per body surface area",null,null,null,null,false],[false,"gram per milligram","g/mg","G/MG","mass",1000,[0,0,0,0,0,0,0],"g/mg",null,false,"M",null,1,false,false,0,0,"g per mg; grams per milligram","LOINC","MCnt; MRto","Clinical","",null,null,null,null,false],[false,"gram per minute","g/min","G/MIN","mass",0.016666666666666666,[0,-1,1,0,0,0,0],"g/min",null,false,"M",null,1,false,false,0,0,"g per min; grams per minute; gram/minute","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"gram per milliliter","g/mL","G/ML","mass",1000000,[-3,0,1,0,0,0,0],"g/mL",null,false,"M",null,1,false,false,0,0,"g per mL; grams per milliliter; millilitre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"gram per millimole","g/mmol","G/MMOL","mass",1.6605401866749388e-21,[0,0,1,0,0,0,0],"g/mmol",null,false,"M",null,1,false,false,-1,0,"grams per millimole; g per mmol","LOINC","Ratio","Clinical","",null,null,null,null,false],[false,"joule per liter","J/L","J/L","energy",1000000,[-1,-2,1,0,0,0,0],"J/L","si",true,null,null,1,false,false,0,0,"joules per liter; litre; J per L","LOINC","EngCnc","Clinical","","N.m","N.M","1",1,false],[false,"degree Kelvin per Watt","K/W","K/W","temperature",0.001,[-2,3,-1,0,1,0,0],"K/W",null,false,"C",null,1,false,false,0,0,"degree Kelvin/Watt; K per W; thermal ohm; thermal resistance; degrees","LOINC","TempEngRat","Clinical","unit for absolute thermal resistance equal to the reciprocal of thermal conductance. Unit used for tests to measure work of breathing",null,null,null,null,false],[false,"kilo international unit per liter","k[IU]/L","K[IU]/L","arbitrary",1000000,[-3,0,0,0,0,0,0],"(ki.U.)/L","chemical",true,null,null,1,false,true,0,0,"kIU/L; kIU per L; kIU per liter; kilo international units; litre; allergens; allergy units","LOINC","ACnc","Clinical","IgE has an WHO reference standard so IgE allergen testing can be reported as k[IU]/L","[iU]","[IU]","1",1,false],[false,"kilo international unit per milliliter","k[IU]/mL","K[IU]/ML","arbitrary",1000000000,[-3,0,0,0,0,0,0],"(ki.U.)/mL","chemical",true,null,null,1,false,true,0,0,"kIU/mL; kIU per mL; kIU per milliliter; kilo international units; millilitre; allergens; allergy units","LOINC","ACnc","Clinical","IgE has an WHO reference standard so IgE allergen testing can be reported as k[IU]/mL","[iU]","[IU]","1",1,false],[false,"katal per kilogram","kat/kg","KAT/KG","catalytic activity",602213670000000000000,[0,-1,-1,0,0,0,0],"kat/kg","chemical",true,null,null,1,false,false,1,0,"kat per kg; katals per kilogram; mol/s/kg; moles per seconds per kilogram","LOINC","CCnt","Clinical","kat is a unit of catalytic activity with base units = mol/s. Rarely used because its units are too large to practically express catalytic activity. See enzyme unit [U] which is the standard unit for catalytic activity.","mol/s","MOL/S","1",1,false],[false,"katal per liter","kat/L","KAT/L","catalytic activity",6.0221366999999994e+26,[-3,-1,0,0,0,0,0],"kat/L","chemical",true,null,null,1,false,false,1,0,"kat per L; katals per liter; litre; mol/s/L; moles per seconds per liter","LOINC","CCnc","Clinical","kat is a unit of catalytic activity with base units = mol/s. Rarely used because its units are too large to practically express catalytic activity. See enzyme unit [U] which is the standard unit for catalytic activity.","mol/s","MOL/S","1",1,false],[false,"kilocalorie","kcal","KCAL","energy",4184000,[2,-2,1,0,0,0,0],"kcal","heat",true,null,null,1,false,false,0,0,"kilogram calories; large calories; food calories; kcals","LOINC","EngRat","Clinical","It is equal to 1000 calories (equal to 4.184 kJ). But in practical usage, kcal refers to food calories which excludes caloric content in fiber and other constitutes that is not digestible by humans. Also see nutrition label Calories ([Cal])","cal_th","CAL_TH","1",1,false],[false,"kilocalorie per 24 hour","kcal/(24.h)","KCAL/(24.HR)","energy",48.425925925925924,[2,-3,1,0,0,0,0],"kcal/h","heat",true,null,null,1,false,false,0,0,"kcal/24hrs; kcal/24 hrs; kcal per 24hrs; kilocalories per 24 hours; kilojoules; kJ/24hr; kJ/(24.h); kJ/dy; kilojoules per days; intake; calories burned; metabolic rate; food calories","","EngRat","Clinical","","cal_th","CAL_TH","1",1,false],[false,"kilocalorie per ounce","kcal/[oz_av]","KCAL/[OZ_AV]","energy",147586.25679704445,[2,-2,0,0,0,0,0],"kcal/oz","heat",true,null,null,1,false,false,0,0,"kcal/oz; kcal per ozs; large calories per ounces; food calories; servings; international","LOINC","EngCnt","Clinical","used in nutrition to represent calorie of food","cal_th","CAL_TH","1",1,false],[false,"kilocalorie per day","kcal/d","KCAL/D","energy",48.425925925925924,[2,-3,1,0,0,0,0],"kcal/d","heat",true,null,null,1,false,false,0,0,"kcal/dy; kcal per day; kilocalories per days; kilojoules; kJ/dy; kilojoules per days; intake; calories burned; metabolic rate; food calories","LOINC","EngRat","Clinical","unit in nutrition for food intake (measured in calories) in a day","cal_th","CAL_TH","1",1,false],[false,"kilocalorie per hour","kcal/h","KCAL/HR","energy",1162.2222222222222,[2,-3,1,0,0,0,0],"kcal/h","heat",true,null,null,1,false,false,0,0,"kcal/hrs; kcals per hr; intake; kilocalories per hours; kilojoules","LOINC","EngRat","Clinical","used in nutrition to represent caloric requirement or consumption","cal_th","CAL_TH","1",1,false],[false,"kilocalorie per kilogram per 24 hour","kcal/kg/(24.h)","(KCAL/KG)/(24.HR)","energy",0.04842592592592593,[2,-3,0,0,0,0,0],"(kcal/kg)/h","heat",true,null,null,1,false,false,0,0,"kcal/kg/24hrs; 24 hrs; kcal per kg per 24hrs; kilocalories per kilograms per 24 hours; kilojoules","LOINC","EngCntRat","Clinical","used in nutrition to represent caloric requirement per day based on subject's body weight in kilograms","cal_th","CAL_TH","1",1,false],[false,"kilogram","kg","KG","mass",1000,[0,0,1,0,0,0,0],"kg",null,false,"M",null,1,false,false,0,0,"kilograms; kgs","LOINC","Mass","Clinical","",null,null,null,null,false],[false,"kilogram meter per second","kg.m/s","(KG.M)/S","mass",1000,[1,-1,1,0,0,0,0],"(kg.m)/s",null,false,"M",null,1,false,false,0,0,"kg*m/s; kg.m per sec; kg*m per sec; p; momentum","LOINC","","Clinical","unit for momentum =  mass times velocity",null,null,null,null,false],[false,"kilogram per second per square meter","kg/(s.m2)","KG/(S.M2)","mass",1000,[-2,-1,1,0,0,0,0],"kg/(s.(m<sup>2</sup>))",null,false,"M",null,1,false,false,0,0,"kg/(s*m2); kg/(s*m^2); kg per s per m2; per sec; per m^2; kilograms per seconds per square meter; meter squared; metre","LOINC","ArMRat","Clinical","",null,null,null,null,false],[false,"kilogram per hour","kg/h","KG/HR","mass",0.2777777777777778,[0,-1,1,0,0,0,0],"kg/h",null,false,"M",null,1,false,false,0,0,"kg/hr; kg per hr; kilograms per hour","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"kilogram per liter","kg/L","KG/L","mass",1000000,[-3,0,1,0,0,0,0],"kg/L",null,false,"M",null,1,false,false,0,0,"kg per liter; litre; kilograms","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"kilogram per square meter","kg/m2","KG/M2","mass",1000,[-2,0,1,0,0,0,0],"kg/(m<sup>2</sup>)",null,false,"M",null,1,false,false,0,0,"kg/m^2; kg/sq. m; kg per m2; per m^2; per sq. m; kilograms; meter squared; metre; BMI","LOINC","Ratio","Clinical","units for body mass index (BMI)",null,null,null,null,false],[false,"kilogram per cubic meter","kg/m3","KG/M3","mass",1000,[-3,0,1,0,0,0,0],"kg/(m<sup>3</sup>)",null,false,"M",null,1,false,false,0,0,"kg/m^3; kg/cu. m; kg per m3; per m^3; per cu. m; kilograms; meters cubed; metre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"kilogram per minute","kg/min","KG/MIN","mass",16.666666666666668,[0,-1,1,0,0,0,0],"kg/min",null,false,"M",null,1,false,false,0,0,"kilogram/minute; kg per min; kilograms per minute","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"kilogram per mole","kg/mol","KG/MOL","mass",1.6605401866749388e-21,[0,0,1,0,0,0,0],"kg/mol",null,false,"M",null,1,false,false,-1,0,"kilogram/mole; kg per mol; kilograms per mole","LOINC","SCnt","Clinical","",null,null,null,null,false],[false,"kilogram per second","kg/s","KG/S","mass",1000,[0,-1,1,0,0,0,0],"kg/s",null,false,"M",null,1,false,false,0,0,"kg/sec; kilogram/second; kg per sec; kilograms; second","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"kiloliter","kL","KL","volume",1,[3,0,0,0,0,0,0],"kL","iso1000",true,null,null,1,false,false,0,0,"kiloliters; kilolitres; m3; m^3; meters cubed; metre","LOINC","Vol","Clinical","","l",null,"1",1,false],[false,"kilometer","km","KM","length",1000,[1,0,0,0,0,0,0],"km",null,false,"L",null,1,false,false,0,0,"kilometers; kilometres; distance","LOINC","Len","Clinical","",null,null,null,null,false],[false,"kilopascal","kPa","KPAL","pressure",1000000,[-1,-2,1,0,0,0,0],"kPa","si",true,null,null,1,false,false,0,0,"kilopascals; pressure","LOINC","Pres; PPresDiff","Clinical","","N/m2","N/M2","1",1,false],[false,"kilosecond","ks","KS","time",1000,[0,1,0,0,0,0,0],"ks",null,false,"T",null,1,false,false,0,0,"kiloseconds; ksec","LOINC","Time","Clinical","",null,null,null,null,false],[false,"kilo enzyme unit","kU","KU","catalytic activity",10036894500000000000,[0,-1,0,0,0,0,0],"kU","chemical",true,null,null,1,false,false,1,0,"units; mmol/min; millimoles per minute","LOINC","CAct","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 kU = 1 mmol/min","umol/min","UMOL/MIN","1",1,false],[false,"kilo enzyme unit per gram","kU/g","KU/G","catalytic activity",10036894500000000000,[0,-1,-1,0,0,0,0],"kU/g","chemical",true,null,null,1,false,false,1,0,"units per grams; kU per gm","LOINC","CCnt","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 kU = 1 mmol/min","umol/min","UMOL/MIN","1",1,false],[false,"kilo enzyme unit per liter","kU/L","KU/L","catalytic activity",1.00368945e+22,[-3,-1,0,0,0,0,0],"kU/L","chemical",true,null,null,1,false,false,1,0,"units per liter; litre; enzymatic activity; enzyme activity per volume; activities","LOINC","ACnc; CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 kU = 1 mmol/min","umol/min","UMOL/MIN","1",1,false],[false,"kilo enzyme unit per milliliter","kU/mL","KU/ML","catalytic activity",1.00368945e+25,[-3,-1,0,0,0,0,0],"kU/mL","chemical",true,null,null,1,false,false,1,0,"kU per mL; units per milliliter; millilitre; enzymatic activity per volume; enzyme activities","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 kU = 1 mmol/min","umol/min","UMOL/MIN","1",1,false],[false,"Liters per 24 hour","L/(24.h)","L/(24.HR)","volume",1.1574074074074074e-8,[3,-1,0,0,0,0,0],"L/h","iso1000",true,null,null,1,false,false,0,0,"L/24hrs; L/24 hrs; L per 24hrs; liters per 24 hours; day; dy; litres; volume flow rate","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"Liters per 8 hour","L/(8.h)","L/(8.HR)","volume",3.472222222222222e-8,[3,-1,0,0,0,0,0],"L/h","iso1000",true,null,null,1,false,false,0,0,"L/8hrs; L/8 hrs; L per 8hrs; liters per 8 hours; litres; volume flow rate; shift","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"Liters per minute per square meter","L/(min.m2) ","L/(MIN.M2)","volume",0.000016666666666666667,[1,-1,0,0,0,0,0],"L/(min.(m<sup>2</sup>))","iso1000",true,null,null,1,false,false,0,0,"L/(min.m2); L/min/m^2; L/min/sq. meter; L per min per m2; m^2; liters per minutes per square meter; meter squared; litres; metre ","LOINC","ArVRat","Clinical","unit for tests that measure cardiac output per body surface area (cardiac index)","l",null,"1",1,false],[false,"Liters per day","L/d","L/D","volume",1.1574074074074074e-8,[3,-1,0,0,0,0,0],"L/d","iso1000",true,null,null,1,false,false,0,0,"L/dy; L per day; 24hrs; 24 hrs; 24 hours; liters; litres","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"Liters per hour","L/h","L/HR","volume",2.7777777777777776e-7,[3,-1,0,0,0,0,0],"L/h","iso1000",true,null,null,1,false,false,0,0,"L/hr; L per hr; litres","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"Liters per kilogram","L/kg","L/KG","volume",0.000001,[3,0,-1,0,0,0,0],"L/kg","iso1000",true,null,null,1,false,false,0,0,"L per kg; litre","LOINC","VCnt","Clinical","","l",null,"1",1,false],[false,"Liters per liter","L/L","L/L","volume",1,[0,0,0,0,0,0,0],"L/L","iso1000",true,null,null,1,false,false,0,0,"L per L; liter/liter; litre","LOINC","VFr","Clinical","","l",null,"1",1,false],[false,"Liters per minute","L/min","L/MIN","volume",0.000016666666666666667,[3,-1,0,0,0,0,0],"L/min","iso1000",true,null,null,1,false,false,0,0,"liters per minute; litre","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"Liters per minute per square meter","L/min/m2","(L/MIN)/M2","volume",0.000016666666666666667,[1,-1,0,0,0,0,0],"(L/min)/(m<sup>2</sup>)","iso1000",true,null,null,1,false,false,0,0,"L/(min.m2); L/min/m^2; L/min/sq. meter; L per min per m2; m^2; liters per minutes per square meter; meter squared; litres; metre ","","ArVRat","Clinical","unit for tests that measure cardiac output per body surface area (cardiac index)","l",null,"1",1,false],[false,"Liters per second","L/s","L/S","volume",0.001,[3,-1,0,0,0,0,0],"L/s","iso1000",true,null,null,1,false,false,0,0,"L per sec; litres","LOINC","VRat","Clinical","unit used often to measure gas flow and peak expiratory flow","l",null,"1",1,false],[false,"Liters per second per square second","L/s/s2","(L/S)/S2","volume",0.001,[3,-3,0,0,0,0,0],"(L/s)/(s<sup>2</sup>)","iso1000",true,null,null,1,false,false,0,0,"L/s/s^2; L/sec/sec2; L/sec/sec^2; L/sec/sq. sec; L per s per s2; L per sec per sec2; s^2; sec^2; liters per seconds per square second; second squared; litres ","LOINC","ArVRat","Clinical","unit for tests that measure cardiac output/body surface area","l",null,"1",1,false],[false,"lumen square meter","lm.m2","LM.M2","luminous flux",1,[2,0,0,2,0,0,1],"lm.(m<sup>2</sup>)","si",true,null,null,1,false,false,0,0,"lm*m2; lm*m^2; lumen meters squared; lumen sq. meters; metres","LOINC","","Clinical","","cd.sr","CD.SR","1",1,false],[false,"meter per second","m/s","M/S","length",1,[1,-1,0,0,0,0,0],"m/s",null,false,"L",null,1,false,false,0,0,"meter/second; m per sec; meters per second; metres; velocity; speed","LOINC","Vel","Clinical","unit of velocity",null,null,null,null,false],[false,"meter per square second","m/s2","M/S2","length",1,[1,-2,0,0,0,0,0],"m/(s<sup>2</sup>)",null,false,"L",null,1,false,false,0,0,"m/s^2; m/sq. sec; m per s2; per s^2; meters per square second; second squared; sq second; metres; acceleration","LOINC","Accel","Clinical","unit of acceleration",null,null,null,null,false],[false,"milli international unit per liter","m[IU]/L","M[IU]/L","arbitrary",1,[-3,0,0,0,0,0,0],"(mi.U.)/L","chemical",true,null,null,1,false,true,0,0,"mIU/L; m IU/L; mIU per liter; units; litre","LOINC","ACnc","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"milli  international unit per milliliter","m[IU]/mL","M[IU]/ML","arbitrary",1000.0000000000001,[-3,0,0,0,0,0,0],"(mi.U.)/mL","chemical",true,null,null,1,false,true,0,0,"mIU/mL; m IU/mL; mIU per mL; milli international units per milliliter; millilitre","LOINC","ACnc","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"square meter","m2","M2","length",1,[2,0,0,0,0,0,0],"m<sup>2</sup>",null,false,"L",null,1,false,false,0,0,"m^2; sq m; square meters; meters squared; metres","LOINC","Area","Clinical","unit often used to represent body surface area",null,null,null,null,false],[false,"square meter per second","m2/s","M2/S","length",1,[2,-1,0,0,0,0,0],"(m<sup>2</sup>)/s",null,false,"L",null,1,false,false,0,0,"m^2/sec; m2 per sec; m^2 per sec; sq m/sec; meters squared/seconds; sq m per sec; meters squared; metres","LOINC","ArRat","Clinical","",null,null,null,null,false],[false,"cubic meter per second","m3/s","M3/S","length",1,[3,-1,0,0,0,0,0],"(m<sup>3</sup>)/s",null,false,"L",null,1,false,false,0,0,"m^3/sec; m3 per sec; m^3 per sec; cu m/sec; cubic meters per seconds; meters cubed; metres","LOINC","VRat","Clinical","",null,null,null,null,false],[false,"milliampere","mA","MA","electric current",0.001,[0,-1,0,0,0,1,0],"mA","si",true,null,null,1,false,false,0,0,"mamp; milliamperes","LOINC","ElpotRat","Clinical","unit of electric current","C/s","C/S","1",1,false],[false,"millibar","mbar","MBAR","pressure",100000,[-1,-2,1,0,0,0,0],"mbar","iso1000",true,null,null,1,false,false,0,0,"millibars","LOINC","Pres","Clinical","unit of pressure","Pa","PAL","1e5",100000,false],[false,"millibar second per liter","mbar.s/L","(MBAR.S)/L","pressure",100000000,[-4,-1,1,0,0,0,0],"(mbar.s)/L","iso1000",true,null,null,1,false,false,0,0,"mbar*s/L; mbar.s per L; mbar*s per L; millibar seconds per liter; millibar second per litre","LOINC","","Clinical","unit to measure expiratory resistance","Pa","PAL","1e5",100000,false],[false,"millibar per liter per second","mbar/L/s","(MBAR/L)/S","pressure",100000000,[-4,-3,1,0,0,0,0],"(mbar/L)/s","iso1000",true,null,null,1,false,false,0,0,"mbar/(L.s); mbar/L/sec; mbar/liter/second; mbar per L per sec; mbar per liter per second; millibars per liters per seconds; litres","LOINC","PresCncRat","Clinical","unit to measure expiratory resistance","Pa","PAL","1e5",100000,false],[false,"milliequivalent","meq","MEQ","amount of substance",602213670000000000000,[0,0,0,0,0,0,0],"meq","chemical",true,null,null,1,false,false,0,1,"milliequivalents; meqs","LOINC","Sub","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milliequivalent per 2 hour","meq/(2.h)","MEQ/(2.HR)","amount of substance",83640787500000000,[0,-1,0,0,0,0,0],"meq/h","chemical",true,null,null,1,false,false,0,1,"meq/2hrs; meq/2 hrs; meq per 2 hrs; milliequivalents per 2 hours","LOINC","SRat","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milliequivalent per 24 hour","meq/(24.h)","MEQ/(24.HR)","amount of substance",6970065625000000,[0,-1,0,0,0,0,0],"meq/h","chemical",true,null,null,1,false,false,0,1,"meq/24hrs; meq/24 hrs; meq per 24 hrs; milliequivalents per 24 hours","LOINC","SRat","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milliequivalent per 8 hour","meq/(8.h)","MEQ/(8.HR)","amount of substance",20910196875000000,[0,-1,0,0,0,0,0],"meq/h","chemical",true,null,null,1,false,false,0,1,"meq/8hrs; meq/8 hrs; meq per 8 hrs; milliequivalents per 8 hours; shift","LOINC","SRat","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milliequivalent per day","meq/d","MEQ/D","amount of substance",6970065625000000,[0,-1,0,0,0,0,0],"meq/d","chemical",true,null,null,1,false,false,0,1,"meq/dy; meq per day; milliquivalents per days; meq/24hrs; meq/24 hrs; meq per 24 hrs; milliequivalents per 24 hours","LOINC","SRat","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milliequivalent per deciliter","meq/dL","MEQ/DL","amount of substance",6.022136699999999e+24,[-3,0,0,0,0,0,0],"meq/dL","chemical",true,null,null,1,false,false,0,1,"meq per dL; milliequivalents per deciliter; decilitre","LOINC","SCnc","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milliequivalent per gram","meq/g","MEQ/G","amount of substance",602213670000000000000,[0,0,-1,0,0,0,0],"meq/g","chemical",true,null,null,1,false,false,0,1,"mgq/gm; meq per gm; milliequivalents per gram","LOINC","MCnt","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milliequivalent per hour","meq/h","MEQ/HR","amount of substance",167281575000000000,[0,-1,0,0,0,0,0],"meq/h","chemical",true,null,null,1,false,false,0,1,"meq/hrs; meq per hrs; milliequivalents per hour","LOINC","SRat","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milliequivalent per kilogram","meq/kg","MEQ/KG","amount of substance",602213670000000000,[0,0,-1,0,0,0,0],"meq/kg","chemical",true,null,null,1,false,false,0,1,"meq per kg; milliequivalents per kilogram","LOINC","SCnt","Clinical","equivalence equals moles per valence; used to measure dose per patient body mass","mol","MOL","1",1,false],[false,"milliequivalent per kilogram per hour","meq/kg/h","(MEQ/KG)/HR","amount of substance",167281575000000,[0,-1,-1,0,0,0,0],"(meq/kg)/h","chemical",true,null,null,1,false,false,0,1,"meq/(kg.h); meq/kg/hr; meq per kg per hr; milliequivalents per kilograms per hour","LOINC","SCntRat","Clinical","equivalence equals moles per valence; unit used to measure dose rate per patient body mass","mol","MOL","1",1,false],[false,"milliequivalent per liter","meq/L","MEQ/L","amount of substance",6.0221367e+23,[-3,0,0,0,0,0,0],"meq/L","chemical",true,null,null,1,false,false,0,1,"milliequivalents per liter; litre; meq per l; acidity","LOINC","SCnc","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milliequivalent per square meter","meq/m2","MEQ/M2","amount of substance",602213670000000000000,[-2,0,0,0,0,0,0],"meq/(m<sup>2</sup>)","chemical",true,null,null,1,false,false,0,1,"meq/m^2; meq/sq. m; milliequivalents per square meter; meter squared; metre","LOINC","ArSub","Clinical","equivalence equals moles per valence; note that the use of m2 in clinical units ofter refers to body surface area","mol","MOL","1",1,false],[false,"milliequivalent per minute","meq/min","MEQ/MIN","amount of substance",10036894500000000000,[0,-1,0,0,0,0,0],"meq/min","chemical",true,null,null,1,false,false,0,1,"meq per min; milliequivalents per minute","LOINC","SRat","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milliequivalent per milliliter","meq/mL","MEQ/ML","amount of substance",6.0221367e+26,[-3,0,0,0,0,0,0],"meq/mL","chemical",true,null,null,1,false,false,0,1,"meq per mL; milliequivalents per milliliter; millilitre","LOINC","SCnc","Clinical","equivalence equals moles per valence","mol","MOL","1",1,false],[false,"milligram","mg","MG","mass",0.001,[0,0,1,0,0,0,0],"mg",null,false,"M",null,1,false,false,0,0,"milligrams","LOINC","Mass","Clinical","",null,null,null,null,false],[false,"milligram per 10 hour","mg/(10.h)","MG/(10.HR)","mass",2.7777777777777777e-8,[0,-1,1,0,0,0,0],"mg/h",null,false,"M",null,1,false,false,0,0,"mg/10hrs; mg/10 hrs; mg per 10 hrs; milligrams per 10 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"milligram per 12 hour","mg/(12.h)","MG/(12.HR)","mass",2.3148148148148148e-8,[0,-1,1,0,0,0,0],"mg/h",null,false,"M",null,1,false,false,0,0,"mg/12hrs; mg/12 hrs; per 12 hrs; 12hrs; milligrams per 12 hours","LOINC","MRat","Clinical","units used for tests in urine",null,null,null,null,false],[false,"milligram per 2 hour","mg/(2.h)","MG/(2.HR)","mass",1.3888888888888888e-7,[0,-1,1,0,0,0,0],"mg/h",null,false,"M",null,1,false,false,0,0,"mg/2hrs; mg/2 hrs; mg per 2 hrs; 2hrs; milligrams per 2 hours","LOINC","MRat","Clinical","units used for tests in urine",null,null,null,null,false],[false,"milligram per 24 hour","mg/(24.h)","MG/(24.HR)","mass",1.1574074074074074e-8,[0,-1,1,0,0,0,0],"mg/h",null,false,"M",null,1,false,false,0,0,"mg/24hrs; mg/24 hrs; milligrams per 24 hours; mg/kg/dy; mg per kg per day; milligrams per kilograms per days","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"milligram per 6 hour","mg/(6.h)","MG/(6.HR)","mass",4.6296296296296295e-8,[0,-1,1,0,0,0,0],"mg/h",null,false,"M",null,1,false,false,0,0,"mg/6hrs; mg/6 hrs; mg per 6 hrs; 6hrs; milligrams per 6 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"milligram per 72 hour","mg/(72.h)","MG/(72.HR)","mass",3.858024691358025e-9,[0,-1,1,0,0,0,0],"mg/h",null,false,"M",null,1,false,false,0,0,"mg/72hrs; mg/72 hrs; 72 hrs; 72hrs; milligrams per 72 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"milligram per 8 hour","mg/(8.h)","MG/(8.HR)","mass",3.472222222222222e-8,[0,-1,1,0,0,0,0],"mg/h",null,false,"M",null,1,false,false,0,0,"mg/8hrs; mg/8 hrs; milligrams per 8 hours; shift","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"milligram per day","mg/d","MG/D","mass",1.1574074074074074e-8,[0,-1,1,0,0,0,0],"mg/d",null,false,"M",null,1,false,false,0,0,"mg/24hrs; mg/24 hrs; milligrams per 24 hours; mg/dy; mg per day; milligrams","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"milligram per deciliter","mg/dL","MG/DL","mass",10,[-3,0,1,0,0,0,0],"mg/dL",null,false,"M",null,1,false,false,0,0,"mg per dL; milligrams per deciliter; decilitre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"milligram per gram","mg/g","MG/G","mass",0.001,[0,0,0,0,0,0,0],"mg/g",null,false,"M",null,1,false,false,0,0,"mg per gm; milligrams per gram","LOINC","MCnt; MRto","Clinical","",null,null,null,null,false],[false,"milligram per hour","mg/h","MG/HR","mass",2.7777777777777776e-7,[0,-1,1,0,0,0,0],"mg/h",null,false,"M",null,1,false,false,0,0,"mg/hr; mg per hr; milligrams","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"milligram per kilogram","mg/kg","MG/KG","mass",0.000001,[0,0,0,0,0,0,0],"mg/kg",null,false,"M",null,1,false,false,0,0,"mg per kg; milligrams per kilograms","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"milligram per kilogram per 8 hour","mg/kg/(8.h)","(MG/KG)/(8.HR)","mass",3.472222222222222e-11,[0,-1,0,0,0,0,0],"(mg/kg)/h",null,false,"M",null,1,false,false,0,0,"mg/(8.h.kg); mg/kg/8hrs; mg/kg/8 hrs; mg per kg per 8hrs; 8 hrs; milligrams per kilograms per 8 hours; shift","LOINC","RelMRat; MCntRat","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"milligram per kilogram per day","mg/kg/d","(MG/KG)/D","mass",1.1574074074074074e-11,[0,-1,0,0,0,0,0],"(mg/kg)/d",null,false,"M",null,1,false,false,0,0,"mg/(kg.d); mg/(kg.24.h)mg/kg/dy; mg per kg per day; milligrams per kilograms per days; mg/kg/(24.h); mg/kg/24hrs; 24 hrs; 24 hours","LOINC","RelMRat ","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"milligram per kilogram per hour","mg/kg/h","(MG/KG)/HR","mass",2.7777777777777777e-10,[0,-1,0,0,0,0,0],"(mg/kg)/h",null,false,"M",null,1,false,false,0,0,"mg/(kg.h); mg/kg/hr; mg per kg per hr; milligrams per kilograms per hour","LOINC","RelMRat; MCntRat","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"milligram per kilogram per minute","mg/kg/min","(MG/KG)/MIN","mass",1.6666666666666667e-8,[0,-1,0,0,0,0,0],"(mg/kg)/min",null,false,"M",null,1,false,false,0,0,"mg/(kg.min); mg per kg per min; milligrams per kilograms per minute","LOINC","RelMRat; MCntRat","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"milligram per liter","mg/L","MG/L","mass",1,[-3,0,1,0,0,0,0],"mg/L",null,false,"M",null,1,false,false,0,0,"mg per l; milligrams per liter; litre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"milligram per square meter","mg/m2","MG/M2","mass",0.001,[-2,0,1,0,0,0,0],"mg/(m<sup>2</sup>)",null,false,"M",null,1,false,false,0,0,"mg/m^2; mg/sq. m; mg per m2; mg per m^2; mg per sq. milligrams; meter squared; metre","LOINC","ArMass","Clinical","",null,null,null,null,false],[false,"milligram per cubic meter","mg/m3","MG/M3","mass",0.001,[-3,0,1,0,0,0,0],"mg/(m<sup>3</sup>)",null,false,"M",null,1,false,false,0,0,"mg/m^3; mg/cu. m; mg per m3; milligrams per cubic meter; meter cubed; metre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"milligram per milligram","mg/mg","MG/MG","mass",1,[0,0,0,0,0,0,0],"mg/mg",null,false,"M",null,1,false,false,0,0,"mg per mg; milligrams; milligram/milligram","LOINC","MRto","Clinical","",null,null,null,null,false],[false,"milligram per minute","mg/min","MG/MIN","mass",0.000016666666666666667,[0,-1,1,0,0,0,0],"mg/min",null,false,"M",null,1,false,false,0,0,"mg per min; milligrams per minutes; milligram/minute","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"milligram per milliliter","mg/mL","MG/ML","mass",1000.0000000000001,[-3,0,1,0,0,0,0],"mg/mL",null,false,"M",null,1,false,false,0,0,"mg per mL; milligrams per milliliters; millilitre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"milligram per millimole","mg/mmol","MG/MMOL","mass",1.660540186674939e-24,[0,0,1,0,0,0,0],"mg/mmol",null,false,"M",null,1,false,false,-1,0,"mg per mmol; milligrams per millimole; ","LOINC","Ratio","Clinical","",null,null,null,null,false],[false,"milligram per week","mg/wk","MG/WK","mass",1.6534391534391535e-9,[0,-1,1,0,0,0,0],"mg/wk",null,false,"M",null,1,false,false,0,0,"mg/week; mg per wk; milligrams per weeks; milligram/week","LOINC","Mrat","Clinical","",null,null,null,null,false],[false,"milliliter","mL","ML","volume",0.000001,[3,0,0,0,0,0,0],"mL","iso1000",true,null,null,1,false,false,0,0,"milliliters; millilitres","LOINC","Vol","Clinical","","l",null,"1",1,false],[false,"milliliter per 10 hour","mL/(10.h)","ML/(10.HR)","volume",2.7777777777777777e-11,[3,-1,0,0,0,0,0],"mL/h","iso1000",true,null,null,1,false,false,0,0,"ml/10hrs; ml/10 hrs; mL per 10hrs; 10 hrs; milliliters per 10 hours; millilitres","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per 12 hour","mL/(12.h)","ML/(12.HR)","volume",2.3148148148148147e-11,[3,-1,0,0,0,0,0],"mL/h","iso1000",true,null,null,1,false,false,0,0,"ml/12hrs; ml/12 hrs; mL per 12hrs; 12 hrs; milliliters per 12 hours; millilitres","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per 2 hour","mL/(2.h)","ML/(2.HR)","volume",1.3888888888888888e-10,[3,-1,0,0,0,0,0],"mL/h","iso1000",true,null,null,1,false,false,0,0,"ml/2hrs; ml/2 hrs; mL per 2hrs; 2 hrs; milliliters per 2 hours; millilitres ","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per 24 hour","mL/(24.h)","ML/(24.HR)","volume",1.1574074074074074e-11,[3,-1,0,0,0,0,0],"mL/h","iso1000",true,null,null,1,false,false,0,0,"ml/24hrs; ml/24 hrs; mL per 24hrs; 24 hrs; milliliters per 24 hours; millilitres; ml/dy; /day; ml per dy; days; fluid outputs; fluid inputs; flow rate","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per 4 hour","mL/(4.h)","ML/(4.HR)","volume",6.944444444444444e-11,[3,-1,0,0,0,0,0],"mL/h","iso1000",true,null,null,1,false,false,0,0,"ml/4hrs; ml/4 hrs; mL per 4hrs; 4 hrs; milliliters per 4 hours; millilitres","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per 5 hour","mL/(5.h)","ML/(5.HR)","volume",5.5555555555555553e-11,[3,-1,0,0,0,0,0],"mL/h","iso1000",true,null,null,1,false,false,0,0,"ml/5hrs; ml/5 hrs; mL per 5hrs; 5 hrs; milliliters per 5 hours; millilitres","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per 6 hour","mL/(6.h)","ML/(6.HR)","volume",4.6296296296296294e-11,[3,-1,0,0,0,0,0],"mL/h","iso1000",true,null,null,1,false,false,0,0,"ml/6hrs; ml/6 hrs; mL per 6hrs; 6 hrs; milliliters per 6 hours; millilitres","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per 72 hour","mL/(72.h)","ML/(72.HR)","volume",3.8580246913580245e-12,[3,-1,0,0,0,0,0],"mL/h","iso1000",true,null,null,1,false,false,0,0,"ml/72hrs; ml/72 hrs; mL per 72hrs; 72 hrs; milliliters per 72 hours; millilitres","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per 8 hour","mL/(8.h)","ML/(8.HR)","volume",3.472222222222222e-11,[3,-1,0,0,0,0,0],"mL/h","iso1000",true,null,null,1,false,false,0,0,"ml/8hrs; ml/8 hrs; mL per 8hrs; 8 hrs; milliliters per 8 hours; millilitres; shift","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per 8 hour per kilogram","mL/(8.h)/kg","(ML/(8.HR))/KG","volume",3.472222222222222e-14,[3,-1,-1,0,0,0,0],"(mL/h)/kg","iso1000",true,null,null,1,false,false,0,0,"mL/kg/(8.h); ml/8h/kg; ml/8 h/kg; ml/8hr/kg; ml/8 hr/kgr; mL per 8h per kg; 8 h; 8hr; 8 hr; milliliters per 8 hours per kilogram; millilitres; shift","LOINC","VRatCnt","Clinical","unit used to measure renal excretion volume rate per body mass","l",null,"1",1,false],[false,"milliliter per square inch (international)","mL/[sin_i]","ML/[SIN_I]","volume",0.0015500031000061998,[1,0,0,0,0,0,0],"mL","iso1000",true,null,null,1,false,false,0,0,"mL/sin; mL/in2; mL/in^2; mL per sin; in2; in^2; sq. in; milliliters per square inch; inch squared","LOINC","ArVol","Clinical","","l",null,"1",1,false],[false,"milliliter per centimeter of water","mL/cm[H2O]","ML/CM[H2O]","volume",1.0197162129779282e-11,[4,2,-1,0,0,0,0],"mL/(cm HO<sub><r>2</r></sub>)","iso1000",true,null,null,1,false,false,0,0,"milliliters per centimeter of water; millilitre per centimetre of water; millilitres per centimetre of water; mL/cmH2O; mL/cm H2O; mL per cmH2O; mL per cm H2O","LOINC","Compli","Clinical","unit used to measure dynamic lung compliance","l",null,"1",1,false],[false,"milliliter per day","mL/d","ML/D","volume",1.1574074074074074e-11,[3,-1,0,0,0,0,0],"mL/d","iso1000",true,null,null,1,false,false,0,0,"ml/day; ml per day; milliliters per day; 24 hours; 24hrs; millilitre;","LOINC","VRat","Clinical","usually used to measure fluid output or input; flow rate","l",null,"1",1,false],[false,"milliliter per deciliter","mL/dL","ML/DL","volume",0.009999999999999998,[0,0,0,0,0,0,0],"mL/dL","iso1000",true,null,null,1,false,false,0,0,"mL per dL; millilitres; decilitre; milliliters","LOINC","VFr; VFrDiff","Clinical","","l",null,"1",1,false],[false,"milliliter per hour","mL/h","ML/HR","volume",2.7777777777777777e-10,[3,-1,0,0,0,0,0],"mL/h","iso1000",true,null,null,1,false,false,0,0,"mL/hr; mL per hr; milliliters per hour; millilitres; fluid intake; fluid output","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per kilogram","mL/kg","ML/KG","volume",9.999999999999999e-10,[3,0,-1,0,0,0,0],"mL/kg","iso1000",true,null,null,1,false,false,0,0,"mL per kg; milliliters per kilogram; millilitres","LOINC","VCnt","Clinical","","l",null,"1",1,false],[false,"milliliter per kilogram per 8 hour","mL/kg/(8.h)","(ML/KG)/(8.HR)","volume",3.472222222222222e-14,[3,-1,-1,0,0,0,0],"(mL/kg)/h","iso1000",true,null,null,1,false,false,0,0,"mL/(8.h.kg); mL/kg/8hrs; mL/kg/8 hrs; mL per kg per 8hrs; 8 hrs; milliliters per kilograms per 8 hours; millilitres; shift","LOINC","VCntRat; RelEngRat","Clinical","unit used to measure renal excretion volume rate per body mass","l",null,"1",1,false],[false,"milliliter per kilogram per day","mL/kg/d","(ML/KG)/D","volume",1.1574074074074072e-14,[3,-1,-1,0,0,0,0],"(mL/kg)/d","iso1000",true,null,null,1,false,false,0,0,"mL/(kg.d); mL/kg/dy; mL per kg per day; milliliters per kilograms per day; mg/kg/24hrs; 24 hrs; per 24 hours millilitres","LOINC","VCntRat; RelEngRat","Clinical","unit used to measure renal excretion volume rate per body mass","l",null,"1",1,false],[false,"milliliter per kilogram per hour","mL/kg/h","(ML/KG)/HR","volume",2.7777777777777774e-13,[3,-1,-1,0,0,0,0],"(mL/kg)/h","iso1000",true,null,null,1,false,false,0,0,"mL/(kg.h); mL/kg/hr; mL per kg per hr; milliliters per kilograms per hour; millilitres","LOINC","VCntRat; RelEngRat","Clinical","unit used to measure renal excretion volume rate per body mass","l",null,"1",1,false],[false,"milliliter per kilogram per minute","mL/kg/min","(ML/KG)/MIN","volume",1.6666666666666664e-11,[3,-1,-1,0,0,0,0],"(mL/kg)/min","iso1000",true,null,null,1,false,false,0,0,"mL/(kg.min); mL/kg/dy; mL per kg per day; milliliters per kilograms per day; millilitres","LOINC","RelEngRat","Clinical","used for tests that measure activity metabolic rate compared to standard resting metabolic rate ","l",null,"1",1,false],[false,"milliliter per square meter","mL/m2","ML/M2","volume",0.000001,[1,0,0,0,0,0,0],"mL/(m<sup>2</sup>)","iso1000",true,null,null,1,false,false,0,0,"mL/m^2; mL/sq. meter; mL per m2; m^2; sq. meter; milliliters per square meter; millilitres; meter squared","LOINC","ArVol","Clinical","used for tests that relate to heart work - e.g. ventricular stroke volume; atrial volume per body surface area","l",null,"1",1,false],[false,"milliliter per millibar","mL/mbar","ML/MBAR","volume",1e-11,[4,2,-1,0,0,0,0],"mL/mbar","iso1000",true,null,null,1,false,false,0,0,"mL per mbar; milliliters per millibar; millilitres","LOINC","","Clinical","unit used to measure dynamic lung compliance","l",null,"1",1,false],[false,"milliliter per minute","mL/min","ML/MIN","volume",1.6666666666666667e-8,[3,-1,0,0,0,0,0],"mL/min","iso1000",true,null,null,1,false,false,0,0,"mL per min; milliliters; millilitres","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"milliliter per minute per square meter","mL/min/m2","(ML/MIN)/M2","volume",1.6666666666666667e-8,[1,-1,0,0,0,0,0],"(mL/min)/(m<sup>2</sup>)","iso1000",true,null,null,1,false,false,0,0,"ml/min/m^2; ml/min/sq. meter; mL per min per m2; m^2; sq. meter; milliliters per minutes per square meter; millilitres; metre; meter squared","LOINC","ArVRat","Clinical","unit used to measure volume per body surface area; oxygen consumption index","l",null,"1",1,false],[false,"milliliter per millimeter","mL/mm","ML/MM","volume",0.001,[2,0,0,0,0,0,0],"mL/mm","iso1000",true,null,null,1,false,false,0,0,"mL per mm; milliliters per millimeter; millilitres; millimetre","LOINC","Lineic Volume","Clinical","","l",null,"1",1,false],[false,"milliliter per second","mL/s","ML/S","volume",0.000001,[3,-1,0,0,0,0,0],"mL/s","iso1000",true,null,null,1,false,false,0,0,"ml/sec; mL per sec; milliliters per second; millilitres","LOINC","Vel; VelRat; VRat","Clinical","","l",null,"1",1,false],[false,"millimeter","mm","MM","length",0.001,[1,0,0,0,0,0,0],"mm",null,false,"L",null,1,false,false,0,0,"millimeters; millimetres; height; length; diameter; thickness; axis; curvature; size","LOINC","Len","Clinical","",null,null,null,null,false],[false,"millimeter per hour","mm/h","MM/HR","length",2.7777777777777776e-7,[1,-1,0,0,0,0,0],"mm/h",null,false,"L",null,1,false,false,0,0,"mm/hr; mm per hr; millimeters per hour; millimetres","LOINC","Vel","Clinical","unit to measure sedimentation rate",null,null,null,null,false],[false,"millimeter per minute","mm/min","MM/MIN","length",0.000016666666666666667,[1,-1,0,0,0,0,0],"mm/min",null,false,"L",null,1,false,false,0,0,"mm per min; millimeters per minute; millimetres","LOINC","Vel","Clinical","",null,null,null,null,false],[false,"millimeter of water","mm[H2O]","MM[H2O]","pressure",9806.65,[-1,-2,1,0,0,0,0],"mm HO<sub><r>2</r></sub>","clinical",true,null,null,1,false,false,0,0,"mmH2O; mm H2O; millimeters of water; millimetres","LOINC","Pres","Clinical","","kPa","KPAL","980665e-5",9.80665,false],[false,"millimeter of mercury","mm[Hg]","MM[HG]","pressure",133322,[-1,-2,1,0,0,0,0],"mm Hg","clinical",true,null,null,1,false,false,0,0,"mmHg; mm Hg; millimeters of mercury; millimetres","LOINC","Pres; PPres; Ratio","Clinical","1 mm[Hg] = 1 torr; unit to measure blood pressure","kPa","KPAL","133.3220",133.322,false],[false,"square millimeter","mm2","MM2","length",0.000001,[2,0,0,0,0,0,0],"mm<sup>2</sup>",null,false,"L",null,1,false,false,0,0,"mm^2; sq. mm.; sq. millimeters; millimeters squared; millimetres","LOINC","Area","Clinical","",null,null,null,null,false],[false,"millimole","mmol","MMOL","amount of substance",602213670000000000000,[0,0,0,0,0,0,0],"mmol","si",true,null,null,1,false,false,1,0,"millimoles","LOINC","Sub","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per 12 hour","mmol/(12.h)","MMOL/(12.HR)","amount of substance",13940131250000000,[0,-1,0,0,0,0,0],"mmol/h","si",true,null,null,1,false,false,1,0,"mmol/12hrs; mmol/12 hrs; mmol per 12 hrs; 12hrs; millimoles per 12 hours","LOINC","SRat","Clinical","unit for tests related to urine","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per 2 hour","mmol/(2.h)","MMOL/(2.HR)","amount of substance",83640787500000000,[0,-1,0,0,0,0,0],"mmol/h","si",true,null,null,1,false,false,1,0,"mmol/2hrs; mmol/2 hrs; mmol per 2 hrs; 2hrs; millimoles per 2 hours","LOINC","SRat","Clinical","unit for tests related to urine","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per 24 hour","mmol/(24.h)","MMOL/(24.HR)","amount of substance",6970065625000000,[0,-1,0,0,0,0,0],"mmol/h","si",true,null,null,1,false,false,1,0,"mmol/24hrs; mmol/24 hrs; mmol per 24 hrs; 24hrs; millimoles per 24 hours","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per 5 hour","mmol/(5.h)","MMOL/(5.HR)","amount of substance",33456315000000000,[0,-1,0,0,0,0,0],"mmol/h","si",true,null,null,1,false,false,1,0,"mmol/5hrs; mmol/5 hrs; mmol per 5 hrs; 5hrs; millimoles per 5 hours","LOINC","SRat","Clinical","unit for tests related to doses","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per 6 hour","mmol/(6.h)","MMOL/(6.HR)","amount of substance",27880262500000000,[0,-1,0,0,0,0,0],"mmol/h","si",true,null,null,1,false,false,1,0,"mmol/6hrs; mmol/6 hrs; mmol per 6 hrs; 6hrs; millimoles per 6 hours","LOINC","SRat","Clinical","unit for tests related to urine","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per 8 hour","mmol/(8.h)","MMOL/(8.HR)","amount of substance",20910196875000000,[0,-1,0,0,0,0,0],"mmol/h","si",true,null,null,1,false,false,1,0,"mmol/8hrs; mmol/8 hrs; mmol per 8 hrs; 8hrs; millimoles per 8 hours; shift","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per day","mmol/d","MMOL/D","amount of substance",6970065625000000,[0,-1,0,0,0,0,0],"mmol/d","si",true,null,null,1,false,false,1,0,"mmol/24hrs; mmol/24 hrs; mmol per 24 hrs; 24hrs; millimoles per 24 hours","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per deciliter","mmol/dL","MMOL/DL","amount of substance",6.022136699999999e+24,[-3,0,0,0,0,0,0],"mmol/dL","si",true,null,null,1,false,false,1,0,"mmol per dL; millimoles; decilitre","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per gram","mmol/g","MMOL/G","amount of substance",602213670000000000000,[0,0,-1,0,0,0,0],"mmol/g","si",true,null,null,1,false,false,1,0,"mmol per gram; millimoles","LOINC","SCnt","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per hour","mmol/h","MMOL/HR","amount of substance",167281575000000000,[0,-1,0,0,0,0,0],"mmol/h","si",true,null,null,1,false,false,1,0,"mmol/hr; mmol per hr; millimoles per hour","LOINC","SRat","Clinical","unit for tests related to urine","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per kilogram","mmol/kg","MMOL/KG","amount of substance",602213670000000000,[0,0,-1,0,0,0,0],"mmol/kg","si",true,null,null,1,false,false,1,0,"mmol per kg; millimoles per kilogram","LOINC","SCnt","Clinical","unit for tests related to stool","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per kilogram per 8 hour","mmol/kg/(8.h)","(MMOL/KG)/(8.HR)","amount of substance",20910196875000,[0,-1,-1,0,0,0,0],"(mmol/kg)/h","si",true,null,null,1,false,false,1,0,"mmol/(8.h.kg); mmol/kg/8hrs; mmol/kg/8 hrs; mmol per kg per 8hrs; 8 hrs; millimoles per kilograms per 8 hours; shift","LOINC","CCnt","Clinical","unit used to measure molar dose rate per patient body mass","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per kilogram per day","mmol/kg/d","(MMOL/KG)/D","amount of substance",6970065625000,[0,-1,-1,0,0,0,0],"(mmol/kg)/d","si",true,null,null,1,false,false,1,0,"mmol/kg/dy; mmol/kg/day; mmol per kg per dy; millimoles per kilograms per day","LOINC","RelSRat","Clinical","unit used to measure molar dose rate per patient body mass","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per kilogram per hour","mmol/kg/h","(MMOL/KG)/HR","amount of substance",167281575000000,[0,-1,-1,0,0,0,0],"(mmol/kg)/h","si",true,null,null,1,false,false,1,0,"mmol/kg/hr; mmol per kg per hr; millimoles per kilograms per hour","LOINC","CCnt","Clinical","unit used to measure molar dose rate per patient body mass","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per kilogram per minute","mmol/kg/min","(MMOL/KG)/MIN","amount of substance",10036894500000000,[0,-1,-1,0,0,0,0],"(mmol/kg)/min","si",true,null,null,1,false,false,1,0,"mmol/(kg.min); mmol/kg/min; mmol per kg per min; millimoles per kilograms per minute","LOINC","CCnt","Clinical","unit used to measure molar dose rate per patient body mass; note that the unit for the enzyme unit U = umol/min. mmol/kg/min = kU/kg; ","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per liter","mmol/L","MMOL/L","amount of substance",6.0221367e+23,[-3,0,0,0,0,0,0],"mmol/L","si",true,null,null,1,false,false,1,0,"mmol per L; millimoles per liter; litre","LOINC","SCnc","Clinical","unit for tests related to doses","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per square meter","mmol/m2","MMOL/M2","amount of substance",602213670000000000000,[-2,0,0,0,0,0,0],"mmol/(m<sup>2</sup>)","si",true,null,null,1,false,false,1,0,"mmol/m^2; mmol/sq. meter; mmol per m2; m^2; sq. meter; millimoles; meter squared; metre","LOINC","ArSub","Clinical","unit used to measure molar dose per patient body surface area","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per minute","mmol/min","MMOL/MIN","amount of substance",10036894500000000000,[0,-1,0,0,0,0,0],"mmol/min","si",true,null,null,1,false,false,1,0,"mmol per min; millimoles per minute","LOINC","Srat; CAct","Clinical","unit for the enzyme unit U = umol/min. mmol/min = kU","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per millimole","mmol/mmol","MMOL/MMOL","amount of substance",1,[0,0,0,0,0,0,0],"mmol/mmol","si",true,null,null,1,false,false,0,0,"mmol per mmol; millimoles per millimole","LOINC","SRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per mole","mmol/mol","MMOL/MOL","amount of substance",0.001,[0,0,0,0,0,0,0],"mmol/mol","si",true,null,null,1,false,false,0,0,"mmol per mol; millimoles per mole","LOINC","SRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"millimole per second per liter","mmol/s/L","(MMOL/S)/L","amount of substance",6.0221367e+23,[-3,-1,0,0,0,0,0],"(mmol/s)/L","si",true,null,null,1,false,false,1,0,"mmol/sec/L; mmol per s per L; per sec; millimoles per seconds per liter; litre","LOINC","CCnc ","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"mole per kilogram","mol/kg","MOL/KG","amount of substance",602213670000000000000,[0,0,-1,0,0,0,0],"mol/kg","si",true,null,null,1,false,false,1,0,"mol per kg; moles; mols","LOINC","SCnt","Clinical","unit for tests related to stool","10*23","10*23","6.0221367",6.0221367,false],[false,"mole per kilogram per second","mol/kg/s","(MOL/KG)/S","amount of substance",602213670000000000000,[0,-1,-1,0,0,0,0],"(mol/kg)/s","si",true,null,null,1,false,false,1,0,"mol/kg/sec; mol per kg per sec; moles per kilograms per second; mols","LOINC","CCnt","Clinical","unit of catalytic activity (mol/s) per mass (kg)","10*23","10*23","6.0221367",6.0221367,false],[false,"mole per liter","mol/L","MOL/L","amount of substance",6.0221366999999994e+26,[-3,0,0,0,0,0,0],"mol/L","si",true,null,null,1,false,false,1,0,"mol per L; moles per liter; litre; moles; mols","LOINC","SCnc","Clinical","unit often used in tests measuring oxygen content","10*23","10*23","6.0221367",6.0221367,false],[false,"mole per cubic meter","mol/m3","MOL/M3","amount of substance",6.0221367e+23,[-3,0,0,0,0,0,0],"mol/(m<sup>3</sup>)","si",true,null,null,1,false,false,1,0,"mol/m^3; mol/cu. m; mol per m3; m^3; cu. meter; mols; moles; meters cubed; metre; mole per kiloliter; kilolitre; mol/kL","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"mole per milliliter","mol/mL","MOL/ML","amount of substance",6.0221367e+29,[-3,0,0,0,0,0,0],"mol/mL","si",true,null,null,1,false,false,1,0,"mol per mL; moles; millilitre; mols","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"mole per mole","mol/mol","MOL/MOL","amount of substance",1,[0,0,0,0,0,0,0],"mol/mol","si",true,null,null,1,false,false,0,0,"mol per mol; moles per mol; mols","LOINC","SRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"mole per second","mol/s","MOL/S","amount of substance",6.0221367e+23,[0,-1,0,0,0,0,0],"mol/s","si",true,null,null,1,false,false,1,0,"mol per sec; moles per second; mols","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"milliosmole","mosm","MOSM","amount of substance (dissolved particles)",602213670000000000000,[0,0,0,0,0,0,0],"mosm","chemical",true,null,null,1,false,false,1,0,"milliosmoles","LOINC","Osmol","Clinical","equal to 1/1000 of an osmole","mol","MOL","1",1,false],[false,"milliosmole per kilogram","mosm/kg","MOSM/KG","amount of substance (dissolved particles)",602213670000000000,[0,0,-1,0,0,0,0],"mosm/kg","chemical",true,null,null,1,false,false,1,0,"mosm per kg; milliosmoles per kilogram","LOINC","Osmol","Clinical","","mol","MOL","1",1,false],[false,"milliosmole per liter","mosm/L","MOSM/L","amount of substance (dissolved particles)",6.0221367e+23,[-3,0,0,0,0,0,0],"mosm/L","chemical",true,null,null,1,false,false,1,0,"mosm per liter; litre; milliosmoles","LOINC","Osmol","Clinical","","mol","MOL","1",1,false],[false,"millipascal","mPa","MPAL","pressure",1,[-1,-2,1,0,0,0,0],"mPa","si",true,null,null,1,false,false,0,0,"millipascals","LOINC","Pres","Clinical","unit of pressure","N/m2","N/M2","1",1,false],[false,"millipascal second","mPa.s","MPAL.S","pressure",1,[-1,-1,1,0,0,0,0],"mPa.s","si",true,null,null,1,false,false,0,0,"mPa*s; millipoise; mP; dynamic viscosity","LOINC","Visc","Clinical","base units for millipoise, a measurement of dynamic viscosity","N/m2","N/M2","1",1,false],[false,"megasecond","Ms","MAS","time",1000000,[0,1,0,0,0,0,0],"Ms",null,false,"T",null,1,false,false,0,0,"megaseconds","LOINC","Time","Clinical","",null,null,null,null,false],[false,"millisecond","ms","MS","time",0.001,[0,1,0,0,0,0,0],"ms",null,false,"T",null,1,false,false,0,0,"milliseconds; duration","LOINC","Time","Clinical","",null,null,null,null,false],[false,"milli enzyme unit per gram","mU/g","MU/G","catalytic activity",10036894500000,[0,-1,-1,0,0,0,0],"mU/g","chemical",true,null,null,1,false,false,1,0,"mU per gm; milli enzyme units per gram; enzyme activity; enzymatic activity per mass","LOINC","CCnt","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 mU = 1 nmol/min","umol/min","UMOL/MIN","1",1,false],[false,"milli enzyme unit per liter","mU/L","MU/L","catalytic activity",10036894500000000,[-3,-1,0,0,0,0,0],"mU/L","chemical",true,null,null,1,false,false,1,0,"mU per liter; litre; milli enzyme units enzymatic activity per volume; enzyme activity","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 mU = 1 nmol/min","umol/min","UMOL/MIN","1",1,false],[false,"milli enzyme unit per milligram","mU/mg","MU/MG","catalytic activity",10036894500000000,[0,-1,-1,0,0,0,0],"mU/mg","chemical",true,null,null,1,false,false,1,0,"mU per mg; milli enzyme units per milligram","LOINC","CCnt","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 mU = 1 nmol/min","umol/min","UMOL/MIN","1",1,false],[false,"milli enzyme unit per milliliter","mU/mL","MU/ML","catalytic activity",10036894500000000000,[-3,-1,0,0,0,0,0],"mU/mL","chemical",true,null,null,1,false,false,1,0,"mU per mL; milli enzyme units per milliliter; millilitre; enzymatic activity per volume; enzyme activity","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 mU = 1 nmol/min","umol/min","UMOL/MIN","1",1,false],[false,"milli enzyme unit per milliliter per minute","mU/mL/min","(MU/ML)/MIN","catalytic activity",167281575000000000,[-3,-2,0,0,0,0,0],"(mU/mL)/min","chemical",true,null,null,1,false,false,1,0,"mU per mL per min; mU per milliliters per minute; millilitres; milli enzyme units; enzymatic activity; enzyme activity","LOINC","CCncRat","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 mU = 1 nmol/min","umol/min","UMOL/MIN","1",1,false],[false,"millivolt","mV","MV","electric potential",1,[2,-2,1,0,0,-1,0],"mV","si",true,null,null,1,false,false,0,0,"millivolts","LOINC","Elpot","Clinical","unit of electric potential (voltage)","J/C","J/C","1",1,false],[false,"Newton centimeter","N.cm","N.CM","force",10,[2,-2,1,0,0,0,0],"N.cm","si",true,null,null,1,false,false,0,0,"N*cm; Ncm; N cm; Newton*centimeters; Newton* centimetres; torque; work","LOINC","","Clinical","as a measurement of work, N.cm = 1/100 Joules;\nnote that N.m is the standard unit of measurement for torque (although dimensionally equivalent to Joule), and N.cm can also be thought of as a torqe unit","kg.m/s2","KG.M/S2","1",1,false],[false,"Newton second","N.s","N.S","force",1000,[1,-1,1,0,0,0,0],"N.s","si",true,null,null,1,false,false,0,0,"Newton*seconds; N*s; N s; Ns; impulse; imp","LOINC","","Clinical","standard unit of impulse","kg.m/s2","KG.M/S2","1",1,false],[false,"nanogram","ng","NG","mass",1e-9,[0,0,1,0,0,0,0],"ng",null,false,"M",null,1,false,false,0,0,"nanograms","LOINC","Mass","Clinical","",null,null,null,null,false],[false,"nanogram per 24 hour","ng/(24.h)","NG/(24.HR)","mass",1.1574074074074075e-14,[0,-1,1,0,0,0,0],"ng/h",null,false,"M",null,1,false,false,0,0,"ng/24hrs; ng/24 hrs; nanograms per 24 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"nanogram per 8 hour","ng/(8.h)","NG/(8.HR)","mass",3.4722222222222224e-14,[0,-1,1,0,0,0,0],"ng/h",null,false,"M",null,1,false,false,0,0,"ng/8hrs; ng/8 hrs; nanograms per 8 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"nanogram per million","ng/10*6","NG/(10*6)","mass",1e-15,[0,0,1,0,0,0,0],"ng/(10<sup>6</sup>)",null,false,"M",null,1,false,false,0,0,"ng/10^6; ng per 10*6; 10^6; nanograms","LOINC","MNum","Clinical","",null,null,null,null,false],[false,"nanogram per day","ng/d","NG/D","mass",1.1574074074074075e-14,[0,-1,1,0,0,0,0],"ng/d",null,false,"M",null,1,false,false,0,0,"ng/dy; ng per day; nanograms ","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"nanogram per deciliter","ng/dL","NG/DL","mass",0.00001,[-3,0,1,0,0,0,0],"ng/dL",null,false,"M",null,1,false,false,0,0,"ng per dL; nanograms per deciliter; decilitre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"nanogram per gram","ng/g","NG/G","mass",1e-9,[0,0,0,0,0,0,0],"ng/g",null,false,"M",null,1,false,false,0,0,"ng/gm; ng per gm; nanograms per gram","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"nanogram per hour","ng/h","NG/HR","mass",2.777777777777778e-13,[0,-1,1,0,0,0,0],"ng/h",null,false,"M",null,1,false,false,0,0,"ng/hr; ng per hr; nanograms per hour","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"nanogram per kilogram","ng/kg","NG/KG","mass",1e-12,[0,0,0,0,0,0,0],"ng/kg",null,false,"M",null,1,false,false,0,0,"ng per kg; nanograms per kilogram","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"nanogram per kilogram per 8 hour","ng/kg/(8.h)","(NG/KG)/(8.HR)","mass",3.472222222222222e-17,[0,-1,0,0,0,0,0],"(ng/kg)/h",null,false,"M",null,1,false,false,0,0,"ng/(8.h.kg); ng/kg/8hrs; ng/kg/8 hrs; ng per kg per 8hrs; 8 hrs; nanograms per kilograms per 8 hours; shift","LOINC","MRtoRat ","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"nanogram per kilogram per hour","ng/kg/h","(NG/KG)/HR","mass",2.7777777777777775e-16,[0,-1,0,0,0,0,0],"(ng/kg)/h",null,false,"M",null,1,false,false,0,0,"ng/(kg.h); ng/kg/hr; ng per kg per hr; nanograms per kilograms per hour","LOINC","MRtoRat ","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"nanogram per kilogram per minute","ng/kg/min","(NG/KG)/MIN","mass",1.6666666666666667e-14,[0,-1,0,0,0,0,0],"(ng/kg)/min",null,false,"M",null,1,false,false,0,0,"ng/(kg.min); ng per kg per min; nanograms per kilograms per minute","LOINC","MRtoRat ","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"nanogram per liter","ng/L","NG/L","mass",0.000001,[-3,0,1,0,0,0,0],"ng/L",null,false,"M",null,1,false,false,0,0,"ng per L; nanograms per liter; litre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"nanogram per square meter","ng/m2","NG/M2","mass",1e-9,[-2,0,1,0,0,0,0],"ng/(m<sup>2</sup>)",null,false,"M",null,1,false,false,0,0,"ng/m^2; ng/sq. m; ng per m2; m^2; sq. meter; nanograms; meter squared; metre","LOINC","ArMass","Clinical","unit used to measure mass dose per patient body surface area",null,null,null,null,false],[false,"nanogram per milligram","ng/mg","NG/MG","mass",0.000001,[0,0,0,0,0,0,0],"ng/mg",null,false,"M",null,1,false,false,0,0,"ng per mg; nanograms","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"nanogram per milligram per hour","ng/mg/h","(NG/MG)/HR","mass",2.7777777777777777e-10,[0,-1,0,0,0,0,0],"(ng/mg)/h",null,false,"M",null,1,false,false,0,0,"ng/mg/hr; ng per mg per hr; nanograms per milligrams per hour","LOINC","MRtoRat ","Clinical","",null,null,null,null,false],[false,"nanogram per minute","ng/min","NG/MIN","mass",1.6666666666666667e-11,[0,-1,1,0,0,0,0],"ng/min",null,false,"M",null,1,false,false,0,0,"ng per min; nanograms","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"nanogram per millliiter","ng/mL","NG/ML","mass",0.001,[-3,0,1,0,0,0,0],"ng/mL",null,false,"M",null,1,false,false,0,0,"ng per mL; nanograms; millilitre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"nanogram per milliliter per hour","ng/mL/h","(NG/ML)/HR","mass",2.7777777777777776e-7,[-3,-1,1,0,0,0,0],"(ng/mL)/h",null,false,"M",null,1,false,false,0,0,"ng/mL/hr; ng per mL per mL; nanograms per milliliter per hour; nanogram per millilitre per hour; nanograms per millilitre per hour; enzymatic activity per volume; enzyme activity per milliliters","LOINC","CCnc","Clinical","tests that measure enzymatic activity",null,null,null,null,false],[false,"nanogram per second","ng/s","NG/S","mass",1e-9,[0,-1,1,0,0,0,0],"ng/s",null,false,"M",null,1,false,false,0,0,"ng/sec; ng per sec; nanograms per second","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"nanogram per enzyme unit","ng/U","NG/U","mass",9.963241120049634e-26,[0,1,1,0,0,0,0],"ng/U",null,false,"M",null,1,false,false,-1,0,"ng per U; nanograms per enzyme unit","LOINC","CMass","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)",null,null,null,null,false],[false,"nanokatal","nkat","NKAT","catalytic activity",602213670000000,[0,-1,0,0,0,0,0],"nkat","chemical",true,null,null,1,false,false,1,0,"nanokatals","LOINC","CAct","Clinical","kat is a unit of catalytic activity with base units = mol/s. Rarely used because its units are too large to practically express catalytic activity. See enzyme unit [U] which is the standard unit for catalytic activity.","mol/s","MOL/S","1",1,false],[false,"nanoliter","nL","NL","volume",1.0000000000000002e-12,[3,0,0,0,0,0,0],"nL","iso1000",true,null,null,1,false,false,0,0,"nanoliters; nanolitres","LOINC","Vol","Clinical","","l",null,"1",1,false],[false,"nanometer","nm","NM","length",1e-9,[1,0,0,0,0,0,0],"nm",null,false,"L",null,1,false,false,0,0,"nanometers; nanometres","LOINC","Len","Clinical","",null,null,null,null,false],[false,"nanometer per second per liter","nm/s/L","(NM/S)/L","length",0.000001,[-2,-1,0,0,0,0,0],"(nm/s)/L",null,false,"L",null,1,false,false,0,0,"nm/sec/liter; nm/sec/litre; nm per s per l; nm per sec per l; nanometers per second per liter; nanometre per second per litre; nanometres per second per litre","LOINC","VelCnc","Clinical","",null,null,null,null,false],[false,"nanomole","nmol","NMOL","amount of substance",602213670000000,[0,0,0,0,0,0,0],"nmol","si",true,null,null,1,false,false,1,0,"nanomoles","LOINC","Sub","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per 24 hour","nmol/(24.h)","NMOL/(24.HR)","amount of substance",6970065625,[0,-1,0,0,0,0,0],"nmol/h","si",true,null,null,1,false,false,1,0,"nmol/24hr; nmol/24 hr; nanomoles per 24 hours; nmol/day; nanomoles per day; nmol per day; nanomole/day; nanomol/day","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per day","nmol/d","NMOL/D","amount of substance",6970065625,[0,-1,0,0,0,0,0],"nmol/d","si",true,null,null,1,false,false,1,0,"nmol/day; nanomoles per day; nmol per day; nanomole/day; nanomol/day; nmol/24hr; nmol/24 hr; nanomoles per 24 hours; ","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per deciliter","nmol/dL","NMOL/DL","amount of substance",6022136700000000000,[-3,0,0,0,0,0,0],"nmol/dL","si",true,null,null,1,false,false,1,0,"nmol per dL; nanomoles per deciliter; nanomole per decilitre; nanomoles per decilitre; nanomole/deciliter; nanomole/decilitre; nanomol/deciliter; nanomol/decilitre","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per gram","nmol/g","NMOL/G","amount of substance",602213670000000,[0,0,-1,0,0,0,0],"nmol/g","si",true,null,null,1,false,false,1,0,"nmol per gram; nanomoles per gram; nanomole/gram","LOINC","SCnt","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per hour per liter","nmol/h/L","(NMOL/HR)/L","amount of substance",167281575000000,[-3,-1,0,0,0,0,0],"(nmol/h)/L","si",true,null,null,1,false,false,1,0,"nmol/hrs/L; nmol per hrs per L; nanomoles per hours per liter; litre; enzymatic activity per volume; enzyme activities","LOINC","CCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per liter","nmol/L","NMOL/L","amount of substance",602213670000000000,[-3,0,0,0,0,0,0],"nmol/L","si",true,null,null,1,false,false,1,0,"nmol per L; nanomoles per liter; litre","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per milligram","nmol/mg","NMOL/MG","amount of substance",602213670000000000,[0,0,-1,0,0,0,0],"nmol/mg","si",true,null,null,1,false,false,1,0,"nmol per mg; nanomoles per milligram","LOINC","SCnt","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per milligram per hour","nmol/mg/h","(NMOL/MG)/HR","amount of substance",167281575000000,[0,-1,-1,0,0,0,0],"(nmol/mg)/h","si",true,null,null,1,false,false,1,0,"nmol/mg/hr; nmol per mg per hr; nanomoles per milligrams per hour","LOINC","SCntRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per milligram of protein","nmol/mg{prot}","NMOL/MG","amount of substance",602213670000000000,[0,0,-1,0,0,0,0],"nmol/mg","si",true,null,null,1,false,false,1,0,"nanomoles; nmol/mg prot; nmol per mg prot","LOINC","Ratio; CCnt","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per minute","nmol/min","NMOL/MIN","amount of substance",10036894500000,[0,-1,0,0,0,0,0],"nmol/min","si",true,null,null,1,false,false,1,0,"nmol per min; nanomoles per minute; milli enzyme units; enzyme activity per volume; enzymatic activity","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min. nmol/min = mU (milli enzyme unit)","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per minute per milliliter","nmol/min/mL","(NMOL/MIN)/ML","amount of substance",10036894500000000000,[-3,-1,0,0,0,0,0],"(nmol/min)/mL","si",true,null,null,1,false,false,1,0,"nmol per min per mL; nanomoles per minutes per milliliter; millilitre; milli enzyme units per volume; enzyme activity; enzymatic activity","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min. nmol/mL/min = mU/mL","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per milliliter","nmol/mL","NMOL/ML","amount of substance",602213670000000000000,[-3,0,0,0,0,0,0],"nmol/mL","si",true,null,null,1,false,false,1,0,"nmol per mL; nanomoles per milliliter; millilitre","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per milliliter per hour","nmol/mL/h","(NMOL/ML)/HR","amount of substance",167281575000000000,[-3,-1,0,0,0,0,0],"(nmol/mL)/h","si",true,null,null,1,false,false,1,0,"nmol/mL/hr; nmol per mL per hr; nanomoles per milliliters per hour; millilitres; milli enzyme units per volume; enzyme activity; enzymatic activity","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min.","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per milliliter per minute","nmol/mL/min","(NMOL/ML)/MIN","amount of substance",10036894500000000000,[-3,-1,0,0,0,0,0],"(nmol/mL)/min","si",true,null,null,1,false,false,1,0,"nmol per mL per min; nanomoles per milliliters per min; millilitres; milli enzyme units per volume; enzyme activity; enzymatic activity","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min. nmol/mL/min = mU/mL","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per millimole","nmol/mmol","NMOL/MMOL","amount of substance",0.000001,[0,0,0,0,0,0,0],"nmol/mmol","si",true,null,null,1,false,false,0,0,"nmol per mmol; nanomoles per millimole","LOINC","SRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per millimole of creatinine","nmol/mmol{creat}","NMOL/MMOL","amount of substance",0.000001,[0,0,0,0,0,0,0],"nmol/mmol","si",true,null,null,1,false,false,0,0,"nanomoles","LOINC","SRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per mole","nmol/mol","NMOL/MOL","amount of substance",1e-9,[0,0,0,0,0,0,0],"nmol/mol","si",true,null,null,1,false,false,0,0,"nmol per mole; nanomoles","LOINC","SRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per nanomole","nmol/nmol","NMOL/NMOL","amount of substance",1,[0,0,0,0,0,0,0],"nmol/nmol","si",true,null,null,1,false,false,0,0,"nmol per nmol; nanomoles","LOINC","SRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per second","nmol/s","NMOL/S","amount of substance",602213670000000,[0,-1,0,0,0,0,0],"nmol/s","si",true,null,null,1,false,false,1,0,"nmol/sec; nmol per sec; nanomoles per sercond; milli enzyme units; enzyme activity; enzymatic activity","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min.","10*23","10*23","6.0221367",6.0221367,false],[false,"nanomole per second per liter","nmol/s/L","(NMOL/S)/L","amount of substance",602213670000000000,[-3,-1,0,0,0,0,0],"(nmol/s)/L","si",true,null,null,1,false,false,1,0,"nmol/sec/L; nmol per s per L; nmol per sec per L; nanomoles per seconds per liter; litre; milli enzyme units per volume; enzyme activity; enzymatic activity","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min.","10*23","10*23","6.0221367",6.0221367,false],[false,"nanosecond","ns","NS","time",1e-9,[0,1,0,0,0,0,0],"ns",null,false,"T",null,1,false,false,0,0,"nanoseconds","LOINC","Time","Clinical","",null,null,null,null,false],[false,"nanoenzyme unit per milliliter","nU/mL","NU/ML","catalytic activity",10036894500000,[-3,-1,0,0,0,0,0],"nU/mL","chemical",true,null,null,1,false,false,1,0,"nU per mL; nanoenzyme units per milliliter; millilitre; enzymatic activity per volume; enzyme activity","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 fU = pmol/min","umol/min","UMOL/MIN","1",1,false],[false,"Ohm meter","Ohm.m","OHM.M","electric resistance",1000,[3,-1,1,0,0,-2,0],"Ω.m","si",true,null,null,1,false,false,0,0,"electric resistivity; meters; metres","LOINC","","Clinical","unit of electric resistivity","V/A","V/A","1",1,false],[false,"osmole per kilogram","osm/kg","OSM/KG","amount of substance (dissolved particles)",602213670000000000000,[0,0,-1,0,0,0,0],"osm/kg","chemical",true,null,null,1,false,false,1,0,"osm per kg; osmoles per kilogram; osmols","LOINC","Osmol","Clinical","","mol","MOL","1",1,false],[false,"osmole per liter","osm/L","OSM/L","amount of substance (dissolved particles)",6.0221366999999994e+26,[-3,0,0,0,0,0,0],"osm/L","chemical",true,null,null,1,false,false,1,0,"osm per L; osmoles per liter; litre; osmols","LOINC","Osmol","Clinical","","mol","MOL","1",1,false],[false,"picoampere","pA","PA","electric current",1e-12,[0,-1,0,0,0,1,0],"pA","si",true,null,null,1,false,false,0,0,"picoamperes","LOINC","","Clinical","equal to 10^-12 amperes","C/s","C/S","1",1,false],[false,"picogram","pg","PG","mass",1e-12,[0,0,1,0,0,0,0],"pg",null,false,"M",null,1,false,false,0,0,"picograms","LOINC","Mass; EntMass","Clinical","",null,null,null,null,false],[false,"picogram per deciliter","pg/dL","PG/DL","mass",9.999999999999999e-9,[-3,0,1,0,0,0,0],"pg/dL",null,false,"M",null,1,false,false,0,0,"pg per dL; picograms; decilitre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"picogram per liter","pg/L","PG/L","mass",1e-9,[-3,0,1,0,0,0,0],"pg/L",null,false,"M",null,1,false,false,0,0,"pg per L; picograms; litre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"picogram per milligram","pg/mg","PG/MG","mass",1e-9,[0,0,0,0,0,0,0],"pg/mg",null,false,"M",null,1,false,false,0,0,"pg per mg; picograms","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"picogram per milliliter","pg/mL","PG/ML","mass",0.000001,[-3,0,1,0,0,0,0],"pg/mL",null,false,"M",null,1,false,false,0,0,"pg per mL; picograms per milliliter; millilitre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"picogram per millimeter","pg/mm","PG/MM","mass",1e-9,[-1,0,1,0,0,0,0],"pg/mm",null,false,"M",null,1,false,false,0,0,"pg per mm; picogram/millimeter; picogram/millimetre; picograms per millimeter; millimetre","LOINC","Lineic Mass","Clinical","",null,null,null,null,false],[false,"picokatal","pkat","PKAT","catalytic activity",602213670000,[0,-1,0,0,0,0,0],"pkat","chemical",true,null,null,1,false,false,1,0,"pkats; picokatals","LOINC","CAct","Clinical","kat is a unit of catalytic activity with base units = mol/s. Rarely used because its units are too large to practically express catalytic activity. See enzyme unit [U] which is the standard unit for catalytic activity.","mol/s","MOL/S","1",1,false],[false,"picoliter","pL","PL","volume",1e-15,[3,0,0,0,0,0,0],"pL","iso1000",true,null,null,1,false,false,0,0,"picoliters; picolitres","LOINC","Vol","Clinical","","l",null,"1",1,false],[false,"picometer","pm","PM","length",1e-12,[1,0,0,0,0,0,0],"pm",null,false,"L",null,1,false,false,0,0,"picometers; picometres","LOINC","Len","Clinical","",null,null,null,null,false],[false,"picomole","pmol","PMOL","amount of substance",602213670000,[0,0,0,0,0,0,0],"pmol","si",true,null,null,1,false,false,1,0,"picomoles; pmols","LOINC","Sub","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"picomole per 24 hour","pmol/(24.h)","PMOL/(24.HR)","amount of substance",6970065.625,[0,-1,0,0,0,0,0],"pmol/h","si",true,null,null,1,false,false,1,0,"pmol/24hrs; pmol/24 hrs; pmol per 24 hrs; 24hrs; days; dy; picomoles per 24 hours","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"picomole per day","pmol/d","PMOL/D","amount of substance",6970065.625,[0,-1,0,0,0,0,0],"pmol/d","si",true,null,null,1,false,false,1,0,"pmol/dy; pmol per day; 24 hours; 24hrs; 24 hrs; picomoles","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"picomole per deciliter","pmol/dL","PMOL/DL","amount of substance",6022136700000000,[-3,0,0,0,0,0,0],"pmol/dL","si",true,null,null,1,false,false,1,0,"pmol per dL; picomoles per deciliter; decilitre","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"picomole per gram","pmol/g","PMOL/G","amount of substance",602213670000,[0,0,-1,0,0,0,0],"pmol/g","si",true,null,null,1,false,false,1,0,"pmol per gm; picomoles per gram; picomole/gram","LOINC","SCnt","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"picomole per hour per milliliter ","pmol/h/mL","(PMOL/HR)/ML","amount of substance",167281575000000,[-3,-1,0,0,0,0,0],"(pmol/h)/mL","si",true,null,null,1,false,false,1,0,"pmol/hrs/mL; pmol per hrs per mL; picomoles per hour per milliliter; millilitre; micro enzyme units per volume; enzymatic activity; enzyme activity","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min. ","10*23","10*23","6.0221367",6.0221367,false],[false,"picomole per liter","pmol/L","PMOL/L","amount of substance",602213670000000,[-3,0,0,0,0,0,0],"pmol/L","si",true,null,null,1,false,false,1,0,"picomole/liter; pmol per L; picomoles; litre","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"picomole per minute","pmol/min","PMOL/MIN","amount of substance",10036894500,[0,-1,0,0,0,0,0],"pmol/min","si",true,null,null,1,false,false,1,0,"picomole/minute; pmol per min; picomoles per minute; micro enzyme units; enzymatic activity; enzyme activity","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min. pmol/min = uU (micro enzyme unit)","10*23","10*23","6.0221367",6.0221367,false],[false,"picomole per milliliter","pmol/mL","PMOL/ML","amount of substance",602213670000000000,[-3,0,0,0,0,0,0],"pmol/mL","si",true,null,null,1,false,false,1,0,"picomole/milliliter; picomole/millilitre; pmol per mL; picomoles; millilitre; picomols; pmols","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"picomole per micromole","pmol/umol","PMOL/UMOL","amount of substance",0.000001,[0,0,0,0,0,0,0],"pmol/μmol","si",true,null,null,1,false,false,0,0,"pmol/mcgmol; picomole/micromole; pmol per umol; pmol per mcgmol; picomoles ","LOINC","SRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"picosecond","ps","PS","time",1e-12,[0,1,0,0,0,0,0],"ps",null,false,"T",null,1,false,false,0,0,"picoseconds; psec","LOINC","Time","Clinical","",null,null,null,null,false],[false,"picotesla","pT","PT","magnetic flux density",1e-9,[0,-1,1,0,0,-1,0],"pT","si",true,null,null,1,false,false,0,0,"picoteslas","LOINC","","Clinical","SI unit of magnetic field strength for magnetic field B","Wb/m2","WB/M2","1",1,false],[false,"enzyme unit per 12 hour","U/(12.h)","U/(12.HR)","catalytic activity",232335520833.33334,[0,-2,0,0,0,0,0],"U/h","chemical",true,null,null,1,false,false,1,0,"U/12hrs; U/ 12hrs; U per 12 hrs; 12hrs; enzyme units per 12 hours; enzyme activity; enzymatic activity per time; umol per min per 12 hours; micromoles per minute per 12 hours; umol/min/12hr","LOINC","CRat","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per 2 hour","U/(2.h)","U/(2.HR)","catalytic activity",1394013125000,[0,-2,0,0,0,0,0],"U/h","chemical",true,null,null,1,false,false,1,0,"U/2hrs; U/ 2hrs; U per 2 hrs; 2hrs; enzyme units per 2 hours; enzyme activity; enzymatic activity per time; umol per minute per 2 hours; micromoles per minute; umol/min/2hr; umol per min per 2hr","LOINC","CRat","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per 24 hour","U/(24.h)","U/(24.HR)","catalytic activity",116167760416.66667,[0,-2,0,0,0,0,0],"U/h","chemical",true,null,null,1,false,false,1,0,"U/24hrs; U/ 24hrs; U per 24 hrs; 24hrs; enzyme units per 24 hours; enzyme activity; enzymatic activity per time; micromoles per minute per 24 hours; umol/min/24hr; umol per min per 24hr","LOINC","CRat","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per 10","U/10","U/10","catalytic activity",1003689450000000,[0,-1,0,0,0,0,0],"U","chemical",true,null,null,1,false,false,1,0,"enzyme unit/10; U per 10; enzyme units per 10; enzymatic activity; enzyme activity; micromoles per minute; umol/min/10","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per 10 billion","U/10*10","U/(10*10)","catalytic activity",1003689.45,[0,-1,0,0,0,0,0],"U/(10<sup>10</sup>)","chemical",true,null,null,1,false,false,1,0,"U per 10*10; enzyme units per 10*10; U per 10 billion; enzyme units; enzymatic activity; micromoles per minute per 10 billion; umol/min/10*10","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per trillion","U/10*12","U/(10*12)","catalytic activity",10036.8945,[0,-1,0,0,0,0,0],"U/(10<sup>12</sup>)","chemical",true,null,null,1,false,false,1,0,"enzyme unit/10*12; U per 10*12; enzyme units per 10*12; enzyme units per trillion; enzymatic activity; micromoles per minute per trillion; umol/min/10*12; umol per min per 10*12","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per million","U/10*6","U/(10*6)","catalytic activity",10036894500,[0,-1,0,0,0,0,0],"U/(10<sup>6</sup>)","chemical",true,null,null,1,false,false,1,0,"enzyme unit/10*6; U per 10*6; enzyme units per 10*6; enzyme units; enzymatic activity per volume; micromoles per minute per million; umol/min/10*6; umol per min per 10*6","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per billion","U/10*9","U/(10*9)","catalytic activity",10036894.5,[0,-1,0,0,0,0,0],"U/(10<sup>9</sup>)","chemical",true,null,null,1,false,false,1,0,"enzyme unit/10*9; U per 10*9; enzyme units per 10*9; enzymatic activity per volume; micromoles per minute per billion; umol/min/10*9; umol per min per 10*9","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per day","U/d","U/D","catalytic activity",116167760416.66667,[0,-2,0,0,0,0,0],"U/d","chemical",true,null,null,1,false,false,1,0,"U/dy; enzyme units per day; enzyme units; enzyme activity; enzymatic activity per time; micromoles per minute per day; umol/min/day; umol per min per day","LOINC","CRat","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per deciliter","U/dL","U/DL","catalytic activity",100368945000000000000,[-3,-1,0,0,0,0,0],"U/dL","chemical",true,null,null,1,false,false,1,0,"U per dL; enzyme units per deciliter; decilitre; micromoles per minute per deciliter; umol/min/dL; umol per min per dL","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per gram","U/g","U/G","catalytic activity",10036894500000000,[0,-1,-1,0,0,0,0],"U/g","chemical",true,null,null,1,false,false,1,0,"U/gm; U per gm; enzyme units per gram; micromoles per minute per gram; umol/min/g; umol per min per g","LOINC","CCnt","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per hour","U/h","U/HR","catalytic activity",2788026250000,[0,-2,0,0,0,0,0],"U/h","chemical",true,null,null,1,false,false,1,0,"U/hr; U per hr; enzyme units per hour; micromoles per minute per hour; umol/min/hr; umol per min per hr","LOINC","CRat","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per liter","U/L","U/L","catalytic activity",10036894500000000000,[-3,-1,0,0,0,0,0],"U/L","chemical",true,null,null,1,false,false,1,0,"enzyme unit/liter; enzyme unit/litre; U per L; enzyme units per liter; enzyme unit per litre; micromoles per minute per liter; umol/min/L; umol per min per L","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per minute","U/min","U/MIN","catalytic activity",167281575000000,[0,-2,0,0,0,0,0],"U/min","chemical",true,null,null,1,false,false,1,0,"enzyme unit/minute; U per min; enzyme units; umol/min/min; micromoles per minute per minute; micromoles per min per min; umol","LOINC","CRat","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per milliliter","U/mL","U/ML","catalytic activity",1.00368945e+22,[-3,-1,0,0,0,0,0],"U/mL","chemical",true,null,null,1,false,false,1,0,"U per mL; enzyme units per milliliter; millilitre; micromoles per minute per milliliter; umol/min/mL; umol per min per mL","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"enzyme unit per second","U/s","U/S","catalytic activity",10036894500000000,[0,-2,0,0,0,0,0],"U/s","chemical",true,null,null,1,false,false,1,0,"U/sec; U per second; enzyme units per second; micromoles per minute per second; umol/min/sec; umol per min per sec","LOINC","CRat","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min)","umol/min","UMOL/MIN","1",1,false],[false,"micro international unit","u[IU]","U[IU]","arbitrary",0.000001,[0,0,0,0,0,0,0],"μi.U.","chemical",true,null,null,1,false,true,0,0,"uIU; u IU; microinternational units","LOINC","Arb","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"micro international unit per liter","u[IU]/L","U[IU]/L","arbitrary",0.001,[-3,0,0,0,0,0,0],"(μi.U.)/L","chemical",true,null,null,1,false,true,0,0,"uIU/L; u IU/L; uIU per L; microinternational units per liter; litre; ","LOINC","ACnc","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"micro international unit per milliliter","u[IU]/mL","U[IU]/ML","arbitrary",1,[-3,0,0,0,0,0,0],"(μi.U.)/mL","chemical",true,null,null,1,false,true,0,0,"uIU/mL; u IU/mL; uIU per mL; microinternational units per milliliter; millilitre","LOINC","ACnc","Clinical","International units (IU) are analyte and reference specimen  specific arbitrary units (held at WHO)","[iU]","[IU]","1",1,false],[false,"microequivalent","ueq","UEQ","amount of substance",602213670000000000,[0,0,0,0,0,0,0],"μeq","chemical",true,null,null,1,false,false,0,1,"microequivalents; 10^-6 equivalents; 10-6 equivalents","LOINC","Sub","Clinical","","mol","MOL","1",1,false],[false,"microequivalent per liter","ueq/L","UEQ/L","amount of substance",602213670000000000000,[-3,0,0,0,0,0,0],"μeq/L","chemical",true,null,null,1,false,false,0,1,"ueq per liter; litre; microequivalents","LOINC","MCnc","Clinical","","mol","MOL","1",1,false],[false,"microequivalent per milliliter","ueq/mL","UEQ/ML","amount of substance",6.0221367000000003e+23,[-3,0,0,0,0,0,0],"μeq/mL","chemical",true,null,null,1,false,false,0,1,"ueq per milliliter; millilitre; microequivalents","LOINC","MCnc","Clinical","","mol","MOL","1",1,false],[false,"microgram","ug","UG","mass",0.000001,[0,0,1,0,0,0,0],"μg",null,false,"M",null,1,false,false,0,0,"mcg; micrograms; 10^-6 grams; 10-6 grams","LOINC","Mass","Clinical","",null,null,null,null,false],[false,"microgram per 100 gram","ug/(100.g)","UG/(100.G)","mass",1e-8,[0,0,0,0,0,0,0],"μg/g",null,false,"M",null,1,false,false,0,0,"ug/100gm; ug/100 gm; mcg; ug per 100g; 100 gm; mcg per 100g; micrograms per 100 grams","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"microgram per 24 hour","ug/(24.h)","UG/(24.HR)","mass",1.1574074074074074e-11,[0,-1,1,0,0,0,0],"μg/h",null,false,"M",null,1,false,false,0,0,"ug/24hrs; ug/24 hrs; mcg/24hrs; ug per 24hrs; mcg per 24hrs; 24 hrs; micrograms per 24 hours","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"microgram per 8 hour","ug/(8.h)","UG/(8.HR)","mass",3.472222222222222e-11,[0,-1,1,0,0,0,0],"μg/h",null,false,"M",null,1,false,false,0,0,"ug/8hrs; ug/8 hrs; mcg/8hrs; ug per 8hrs; mcg per 8hrs; 8 hrs; micrograms per 8 hours; shift","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"microgram per square foot (international)","ug/[sft_i]","UG/[SFT_I]","mass",0.000010763910416709721,[-2,0,1,0,0,0,0],"μg",null,false,"M",null,1,false,false,0,0,"ug/sft; ug/ft2; ug/ft^2; ug/sq. ft; micrograms; sq. foot; foot squared","LOINC","ArMass","Clinical","",null,null,null,null,false],[false,"microgram per day","ug/d","UG/D","mass",1.1574074074074074e-11,[0,-1,1,0,0,0,0],"μg/d",null,false,"M",null,1,false,false,0,0,"ug/dy; mcg/dy; ug per day; mcg; micrograms per day","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"microgram per deciliter","ug/dL","UG/DL","mass",0.009999999999999998,[-3,0,1,0,0,0,0],"μg/dL",null,false,"M",null,1,false,false,0,0,"ug per dL; mcg/dl; mcg per dl; micrograms per deciliter; decilitre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"microgram per gram","ug/g","UG/G","mass",0.000001,[0,0,0,0,0,0,0],"μg/g",null,false,"M",null,1,false,false,0,0,"ug per gm; mcg/gm; mcg per g; micrograms per gram","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"microgram per hour","ug/h","UG/HR","mass",2.7777777777777777e-10,[0,-1,1,0,0,0,0],"μg/h",null,false,"M",null,1,false,false,0,0,"ug/hr; mcg/hr; mcg per hr; ug per hr; ug per hour; micrograms","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"microgram per kilogram","ug/kg","UG/KG","mass",9.999999999999999e-10,[0,0,0,0,0,0,0],"μg/kg",null,false,"M",null,1,false,false,0,0,"ug per kg; mcg/kg; mcg per kg; micrograms per kilogram","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"microgram per kilogram per 8 hour","ug/kg/(8.h)","(UG/KG)/(8.HR)","mass",3.472222222222222e-14,[0,-1,0,0,0,0,0],"(μg/kg)/h",null,false,"M",null,1,false,false,0,0,"ug/kg/8hrs; mcg/kg/8hrs; ug/kg/8 hrs; mcg/kg/8 hrs; ug per kg per 8hrs; 8 hrs; mcg per kg per 8hrs; micrograms per kilograms per 8 hours; shift","LOINC","","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"microgram per kilogram per day","ug/kg/d","(UG/KG)/D","mass",1.1574074074074072e-14,[0,-1,0,0,0,0,0],"(μg/kg)/d",null,false,"M",null,1,false,false,0,0,"ug/(kg.d); ug/kg/dy; mcg/kg/day; ug per kg per dy; 24 hours; 24hrs; mcg; kilograms; microgram per kilogram and day","LOINC","","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"microgram per kilogram per hour","ug/kg/h","(UG/KG)/HR","mass",2.7777777777777774e-13,[0,-1,0,0,0,0,0],"(μg/kg)/h",null,false,"M",null,1,false,false,0,0,"ug/(kg.h); ug/kg/hr; mcg/kg/hr; ug per kg per hr; mcg per kg per hr; kilograms","LOINC","","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"microgram per kilogram per minute","ug/kg/min","(UG/KG)/MIN","mass",1.6666666666666664e-11,[0,-1,0,0,0,0,0],"(μg/kg)/min",null,false,"M",null,1,false,false,0,0,"ug/kg/min; ug/kg/min; mcg/kg/min; ug per kg per min; mcg; micrograms per kilograms per minute ","LOINC","","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"microgram per liter","ug/L","UG/L","mass",0.001,[-3,0,1,0,0,0,0],"μg/L",null,false,"M",null,1,false,false,0,0,"mcg/L; ug per L; mcg; micrograms per liter; litre ","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"microgram per liter per 24 hour","ug/L/(24.h)","(UG/L)/(24.HR)","mass",1.1574074074074074e-8,[-3,-1,1,0,0,0,0],"(μg/L)/h",null,false,"M",null,1,false,false,0,0,"ug/L/24hrs; ug/L/24 hrs; mcg/L/24hrs; ug per L per 24hrs; 24 hrs; day; dy mcg; micrograms per liters per 24 hours; litres","LOINC","","Clinical","unit used to measure mass dose rate per patient body mass",null,null,null,null,false],[false,"microgram per square meter","ug/m2","UG/M2","mass",0.000001,[-2,0,1,0,0,0,0],"μg/(m<sup>2</sup>)",null,false,"M",null,1,false,false,0,0,"ug/m^2; ug/sq. m; mcg/m2; mcg/m^2; mcg/sq. m; ug per m2; m^2; sq. meter; mcg; micrograms per square meter; meter squared; metre","LOINC","ArMass","Clinical","unit used to measure mass dose per patient body surface area",null,null,null,null,false],[false,"microgram per cubic meter","ug/m3","UG/M3","mass",0.000001,[-3,0,1,0,0,0,0],"μg/(m<sup>3</sup>)",null,false,"M",null,1,false,false,0,0,"ug/m^3; ug/cu. m; mcg/m3; mcg/m^3; mcg/cu. m; ug per m3; ug per m^3; ug per cu. m; mcg; micrograms per cubic meter; meter cubed; metre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"microgram per milligram","ug/mg","UG/MG","mass",0.001,[0,0,0,0,0,0,0],"μg/mg",null,false,"M",null,1,false,false,0,0,"ug per mg; mcg/mg; mcg per mg; micromilligrams per milligram","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"microgram per minute","ug/min","UG/MIN","mass",1.6666666666666667e-8,[0,-1,1,0,0,0,0],"μg/min",null,false,"M",null,1,false,false,0,0,"ug per min; mcg/min; mcg per min; microminutes per minute","LOINC","MRat","Clinical","",null,null,null,null,false],[false,"microgram per milliliter","ug/mL","UG/ML","mass",1,[-3,0,1,0,0,0,0],"μg/mL",null,false,"M",null,1,false,false,0,0,"ug per mL; mcg/mL; mcg per mL; micrograms per milliliter; millilitre","LOINC","MCnc","Clinical","",null,null,null,null,false],[false,"microgram per millimole","ug/mmol","UG/MMOL","mass",1.660540186674939e-27,[0,0,1,0,0,0,0],"μg/mmol",null,false,"M",null,1,false,false,-1,0,"ug per mmol; mcg/mmol; mcg per mmol; micrograms per millimole","LOINC","Ratio","Clinical","",null,null,null,null,false],[false,"microgram per nanogram","ug/ng","UG/NG","mass",999.9999999999999,[0,0,0,0,0,0,0],"μg/ng",null,false,"M",null,1,false,false,0,0,"ug per ng; mcg/ng; mcg per ng; micrograms per nanogram","LOINC","MCnt","Clinical","",null,null,null,null,false],[false,"microkatal","ukat","UKAT","catalytic activity",602213670000000000,[0,-1,0,0,0,0,0],"μkat","chemical",true,null,null,1,false,false,1,0,"microkatals; ukats","LOINC","CAct","Clinical","kat is a unit of catalytic activity with base units = mol/s. Rarely used because its units are too large to practically express catalytic activity. See enzyme unit [U] which is the standard unit for catalytic activity.","mol/s","MOL/S","1",1,false],[false,"microliter","uL","UL","volume",1e-9,[3,0,0,0,0,0,0],"μL","iso1000",true,null,null,1,false,false,0,0,"microliters; microlitres; mcl","LOINC","Vol","Clinical","","l",null,"1",1,false],[false,"microliter per 2 hour","uL/(2.h)","UL/(2.HR)","volume",1.388888888888889e-13,[3,-1,0,0,0,0,0],"μL/h","iso1000",true,null,null,1,false,false,0,0,"uL/2hrs; uL/2 hrs; mcg/2hr; mcg per 2hr; uL per 2hr; uL per 2 hrs; microliters per 2 hours; microlitres ","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"microliter per hour","uL/h","UL/HR","volume",2.777777777777778e-13,[3,-1,0,0,0,0,0],"μL/h","iso1000",true,null,null,1,false,false,0,0,"uL/hr; mcg/hr; mcg per hr; uL per hr; microliters per hour; microlitres","LOINC","VRat","Clinical","","l",null,"1",1,false],[false,"micrometer","um","UM","length",0.000001,[1,0,0,0,0,0,0],"μm",null,false,"L",null,1,false,false,0,0,"micrometers; micrometres; μm; microns","LOINC","Len","Clinical","Unit of length that is usually used in tests related to the eye",null,null,null,null,false],[false,"microns per second","um/s","UM/S","length",0.000001,[1,-1,0,0,0,0,0],"μm/s",null,false,"L",null,1,false,false,0,0,"um/sec; micron/second; microns/second; um per sec; micrometers per second; micrometres","LOINC","Vel","Clinical","",null,null,null,null,false],[false,"micromole","umol","UMOL","amount of substance",602213670000000000,[0,0,0,0,0,0,0],"μmol","si",true,null,null,1,false,false,1,0,"micromoles; umols","LOINC","Sub","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per 2 hour","umol/(2.h)","UMOL/(2.HR)","amount of substance",83640787500000,[0,-1,0,0,0,0,0],"μmol/h","si",true,null,null,1,false,false,1,0,"umol/2hrs; umol/2 hrs; umol per 2 hrs; 2hrs; micromoles per 2 hours","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per 24 hour","umol/(24.h)","UMOL/(24.HR)","amount of substance",6970065625000,[0,-1,0,0,0,0,0],"μmol/h","si",true,null,null,1,false,false,1,0,"umol/24hrs; umol/24 hrs; umol per 24 hrs; per 24hrs; micromoles per 24 hours","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per 8 hour","umol/(8.h)","UMOL/(8.HR)","amount of substance",20910196875000,[0,-1,0,0,0,0,0],"μmol/h","si",true,null,null,1,false,false,1,0,"umol/8hr; umol/8 hr; umol per 8 hr; umol per 8hr; umols per 8hr; umol per 8 hours; micromoles per 8 hours; shift","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per day","umol/d","UMOL/D","amount of substance",6970065625000,[0,-1,0,0,0,0,0],"μmol/d","si",true,null,null,1,false,false,1,0,"umol/day; umol per day; umols per day; umol per days; micromoles per days; umol/24hr; umol/24 hr; umol per 24 hr; umol per 24hr; umols per 24hr; umol per 24 hours; micromoles per 24 hours","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per deciliter","umol/dL","UMOL/DL","amount of substance",6.0221367e+21,[-3,0,0,0,0,0,0],"μmol/dL","si",true,null,null,1,false,false,1,0,"micromole/deciliter; micromole/decilitre; umol per dL; micromoles per deciliters; micromole per decilitres","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per gram","umol/g","UMOL/G","amount of substance",602213670000000000,[0,0,-1,0,0,0,0],"μmol/g","si",true,null,null,1,false,false,1,0,"micromole/gram; umol per g; micromoles per gram","LOINC","SCnt; Ratio","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per hour","umol/h","UMOL/HR","amount of substance",167281575000000,[0,-1,0,0,0,0,0],"μmol/h","si",true,null,null,1,false,false,1,0,"umol/hr; umol per hr; umol per hour; micromoles per hours","LOINC","SRat","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per kilogram","umol/kg","UMOL/KG","amount of substance",602213670000000,[0,0,-1,0,0,0,0],"μmol/kg","si",true,null,null,1,false,false,1,0,"umol per kg; micromoles per kilogram","LOINC","SCnt","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per liter","umol/L","UMOL/L","amount of substance",602213670000000000000,[-3,0,0,0,0,0,0],"μmol/L","si",true,null,null,1,false,false,1,0,"micromole/liter; micromole/litre; umol per liter; micromoles per liter; litre","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per liter per hour","umol/L/h","(UMOL/L)/HR","amount of substance",167281575000000000,[-3,-1,0,0,0,0,0],"(μmol/L)/h","si",true,null,null,1,false,false,1,0,"umol/liter/hr; umol/litre/hr; umol per L per hr; umol per liter per hour; micromoles per liters per hour; litre","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min; umol/L/h is a derived unit of enzyme units","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per milligram","umol/mg","UMOL/MG","amount of substance",602213670000000000000,[0,0,-1,0,0,0,0],"μmol/mg","si",true,null,null,1,false,false,1,0,"micromole/milligram; umol per mg; micromoles per milligram","LOINC","SCnt","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per minute","umol/min","UMOL/MIN","amount of substance",10036894500000000,[0,-1,0,0,0,0,0],"μmol/min","si",true,null,null,1,false,false,1,0,"micromole/minute; umol per min; micromoles per minute; enzyme units","LOINC","CAct","Clinical","unit for the enzyme unit U = umol/min","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per minute per gram","umol/min/g","(UMOL/MIN)/G","amount of substance",10036894500000000,[0,-1,-1,0,0,0,0],"(μmol/min)/g","si",true,null,null,1,false,false,1,0,"umol/min/gm; umol per min per gm; micromoles per minutes per gram; U/g; enzyme units","LOINC","CCnt","Clinical","unit for the enzyme unit U = umol/min. umol/min/g = U/g","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per minute per liter","umol/min/L","(UMOL/MIN)/L","amount of substance",10036894500000000000,[-3,-1,0,0,0,0,0],"(μmol/min)/L","si",true,null,null,1,false,false,1,0,"umol/min/liter; umol/minute/liter; micromoles per minutes per liter; litre; enzyme units; U/L","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min. umol/min/L = U/L","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per milliliter","umol/mL","UMOL/ML","amount of substance",6.0221367000000003e+23,[-3,0,0,0,0,0,0],"μmol/mL","si",true,null,null,1,false,false,1,0,"umol per mL; micromoles per milliliter; millilitre","LOINC","SCnc","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per milliliter per minute","umol/mL/min","(UMOL/ML)/MIN","amount of substance",1.00368945e+22,[-3,-1,0,0,0,0,0],"(μmol/mL)/min","si",true,null,null,1,false,false,1,0,"umol per mL per min; micromoles per milliliters per minute; millilitres","LOINC","CCnc","Clinical","unit for the enzyme unit U = umol/min. umol/mL/min = U/mL","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per millimole","umol/mmol","UMOL/MMOL","amount of substance",0.001,[0,0,0,0,0,0,0],"μmol/mmol","si",true,null,null,1,false,false,0,0,"umol per mmol; micromoles per millimole","LOINC","SRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per mole","umol/mol","UMOL/MOL","amount of substance",0.000001,[0,0,0,0,0,0,0],"μmol/mol","si",true,null,null,1,false,false,0,0,"umol per mol; micromoles per mole","LOINC","SRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"micromole per micromole","umol/umol","UMOL/UMOL","amount of substance",1,[0,0,0,0,0,0,0],"μmol/μmol","si",true,null,null,1,false,false,0,0,"umol per umol; micromoles per micromole","LOINC","Srto; SFr; EntSRto","Clinical","","10*23","10*23","6.0221367",6.0221367,false],[false,"microOhm","uOhm","UOHM","electric resistance",0.001,[2,-1,1,0,0,-2,0],"μΩ","si",true,null,null,1,false,false,0,0,"microOhms; µΩ","LOINC","","Clinical","unit of electric resistance","V/A","V/A","1",1,false],[false,"microsecond","us","US","time",0.000001,[0,1,0,0,0,0,0],"μs",null,false,"T",null,1,false,false,0,0,"microseconds","LOINC","Time","Clinical","",null,null,null,null,false],[false,"micro enzyme unit per gram","uU/g","UU/G","catalytic activity",10036894500,[0,-1,-1,0,0,0,0],"μU/g","chemical",true,null,null,1,false,false,1,0,"uU per gm; micro enzyme units per gram; micro enzymatic activity per mass; enzyme activity","LOINC","CCnt","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 uU = 1pmol/min","umol/min","UMOL/MIN","1",1,false],[false,"micro enzyme unit per liter","uU/L","UU/L","catalytic activity",10036894500000,[-3,-1,0,0,0,0,0],"μU/L","chemical",true,null,null,1,false,false,1,0,"uU per L; micro enzyme units per liter; litre; enzymatic activity per volume; enzyme activity ","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 uU = 1pmol/min","umol/min","UMOL/MIN","1",1,false],[false,"micro enzyme unit per milliliter","uU/mL","UU/ML","catalytic activity",10036894500000000,[-3,-1,0,0,0,0,0],"μU/mL","chemical",true,null,null,1,false,false,1,0,"uU per mL; micro enzyme units per milliliter; millilitre; enzymatic activity per volume; enzyme activity","LOINC","CCnc","Clinical","1 U is the standard enzyme unit which equals 1 micromole substrate catalyzed per minute (1 umol/min); 1 uU = 1pmol/min","umol/min","UMOL/MIN","1",1,false],[false,"microvolt","uV","UV","electric potential",0.001,[2,-2,1,0,0,-1,0],"μV","si",true,null,null,1,false,false,0,0,"microvolts","LOINC","Elpot","Clinical","unit of electric potential (voltage)","J/C","J/C","1",1,false]]}}
 
-},{}],59:[function(require,module,exports){
+},{}],61:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -10230,7 +10558,7 @@ var Ucum = exports.Ucum = {
 };
 
 
-},{}],60:[function(require,module,exports){
+},{}],62:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -10543,7 +10871,7 @@ class Dimension {
 exports.Dimension = Dimension;
 
 
-},{"./config.js":59,"is-integer":74}],61:[function(require,module,exports){
+},{"./config.js":61,"is-integer":76}],63:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -10665,7 +10993,7 @@ function unpackArray(obj) {
 }
 
 
-},{}],62:[function(require,module,exports){
+},{}],64:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -10809,7 +11137,7 @@ class Prefix {
 exports.Prefix = Prefix;
 
 
-},{"./config.js":59}],63:[function(require,module,exports){
+},{"./config.js":61}],65:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -10939,7 +11267,7 @@ const PrefixTables = exports.PrefixTables = {
 };
 
 
-},{}],64:[function(require,module,exports){
+},{}],66:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -11174,7 +11502,7 @@ class UcumFunctions {
 var _default = exports.default = new UcumFunctions(); // one singleton instance
 
 
-},{}],65:[function(require,module,exports){
+},{}],67:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -11273,7 +11601,7 @@ function getSynonyms(theSyn) {
 } // end getSynonyms
 
 
-},{"./unitTables.js":71}],66:[function(require,module,exports){
+},{"./unitTables.js":73}],68:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -11327,7 +11655,7 @@ exports.UcumJsonDefs = UcumJsonDefs;
 var ucumJsonDefs = exports.ucumJsonDefs = new UcumJsonDefs();
 
 
-},{"../data/ucumDefs.min.json":58,"./jsonArrayPack.js":61,"./prefix.js":62,"./prefixTables.js":63,"./unit.js":69,"./unitTables.js":71}],67:[function(require,module,exports){
+},{"../data/ucumDefs.min.json":60,"./jsonArrayPack.js":63,"./prefix.js":64,"./prefixTables.js":65,"./unit.js":71,"./unitTables.js":73}],69:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -12014,7 +12342,7 @@ UcumLhcUtils.getInstance = function () {
 };
 
 
-},{"./config.js":59,"./ucumInternalUtils.js":65,"./ucumJsonDefs.js":66,"./unitString.js":70,"./unitTables.js":71}],68:[function(require,module,exports){
+},{"./config.js":61,"./ucumInternalUtils.js":67,"./ucumJsonDefs.js":68,"./unitString.js":72,"./unitTables.js":73}],70:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -12033,7 +12361,7 @@ var UcumLhcUtils = exports.UcumLhcUtils = require("./ucumLhcUtils.js").UcumLhcUt
 var UnitTables = exports.UnitTables = require("./unitTables.js").UnitTables;
 
 
-},{"./config.js":59,"./ucumLhcUtils.js":67,"./unitTables.js":71}],69:[function(require,module,exports){
+},{"./config.js":61,"./ucumLhcUtils.js":69,"./unitTables.js":73}],71:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -13091,7 +13419,7 @@ class Unit {
 exports.Unit = Unit;
 
 
-},{"./config.js":59,"./dimension.js":60,"./ucumFunctions.js":64,"./ucumInternalUtils.js":65,"./unitTables.js":71,"is-integer":74}],70:[function(require,module,exports){
+},{"./config.js":61,"./dimension.js":62,"./ucumFunctions.js":66,"./ucumInternalUtils.js":67,"./unitTables.js":73,"is-integer":76}],72:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -14600,7 +14928,7 @@ UnitString.getInstance();
 */
 
 
-},{"./config.js":59,"./prefixTables.js":63,"./ucumInternalUtils.js":65,"./unit.js":69,"./unitTables.js":71}],71:[function(require,module,exports){
+},{"./config.js":61,"./prefixTables.js":65,"./ucumInternalUtils.js":67,"./unit.js":71,"./unitTables.js":73}],73:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -15221,7 +15549,7 @@ const UnitTables = exports.UnitTables = {
 };
 
 
-},{"./config.js":59}],72:[function(require,module,exports){
+},{"./config.js":61}],74:[function(require,module,exports){
 /**
  * @license
  * MIT License
@@ -21478,14 +21806,14 @@ const UnitTables = exports.UnitTables = {
 
 }));
 
-},{}],73:[function(require,module,exports){
+},{}],75:[function(require,module,exports){
 'use strict';
 
 module.exports = Number.isFinite || function (value) {
 	return !(typeof value !== 'number' || value !== value || value === Infinity || value === -Infinity);
 };
 
-},{}],74:[function(require,module,exports){
+},{}],76:[function(require,module,exports){
 // https://github.com/paulmillr/es6-shim
 // http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger
 var isFinite = require("is-finite");
@@ -21495,7 +21823,7 @@ module.exports = Number.isInteger || function(val) {
     Math.floor(val) === val;
 };
 
-},{"is-finite":73}],75:[function(require,module,exports){
+},{"is-finite":75}],77:[function(require,module,exports){
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
diff --git a/src/cql-patient.ts b/src/cql-patient.ts
index 5ec4f2fb4..5b081ebfa 100644
--- a/src/cql-patient.ts
+++ b/src/cql-patient.ts
@@ -1,5 +1,6 @@
 import * as DT from './datatypes/datatypes';
 import { DataProvider, NamedTypeSpecifier, PatientObject, RecordObject } from './types';
+import { ELM_NAMED_TYPE_SPECIFIER } from './util/elmTypes';
 
 export class Record implements RecordObject {
   json: any;
@@ -20,13 +21,13 @@ export class Record implements RecordObject {
     return [
       {
         name: `{https://github.com/cqframework/cql-execution/simple}${this.json.recordType}`,
-        type: 'NamedTypeSpecifier'
+        type: ELM_NAMED_TYPE_SPECIFIER
       },
       {
         name: '{https://github.com/cqframework/cql-execution/simple}Record',
-        type: 'NamedTypeSpecifier'
+        type: ELM_NAMED_TYPE_SPECIFIER
       },
-      { name: '{urn:hl7-org:elm-types:r1}Any', type: 'NamedTypeSpecifier' }
+      { name: '{urn:hl7-org:elm-types:r1}Any', type: ELM_NAMED_TYPE_SPECIFIER }
     ];
   }
 
diff --git a/src/datatypes/bigint.ts b/src/datatypes/bigint.ts
new file mode 100644
index 000000000..3f379d484
--- /dev/null
+++ b/src/datatypes/bigint.ts
@@ -0,0 +1,20 @@
+// By default, BigInt throws a TypeError if you attempt to JSON.stringify it.
+// You can avoid the TypeError by defining a `toJSON()` function for BigInt.
+// We will use the same serialization approach as FHIR uses for integer64: a string.
+// See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt#use_within_json
+// See: https://hl7.org/fhir/R5/json.html#primitive
+
+declare global {
+  interface BigInt {
+    toJSON?(): unknown;
+  }
+}
+
+if (BigInt.prototype.toJSON === undefined) {
+  BigInt.prototype.toJSON = function () {
+    return this.toString();
+  };
+}
+
+// empty export forces typescript to recognize this file as a module
+export {};
diff --git a/src/datatypes/datatypes.ts b/src/datatypes/datatypes.ts
index aa00c71cd..ec689cc88 100644
--- a/src/datatypes/datatypes.ts
+++ b/src/datatypes/datatypes.ts
@@ -1,3 +1,4 @@
+export * from './bigint';
 export * from './logic';
 export * from './clinical';
 export * from './uncertainty';
diff --git a/src/datatypes/interval.ts b/src/datatypes/interval.ts
index 36ed401ca..60752040f 100644
--- a/src/datatypes/interval.ts
+++ b/src/datatypes/interval.ts
@@ -10,6 +10,15 @@ import {
   minValueForType
 } from '../util/math';
 import * as cmp from '../util/comparison';
+import {
+  ELM_INTEGER_TYPE,
+  ELM_DECIMAL_TYPE,
+  ELM_LONG_TYPE,
+  ELM_TIME_TYPE,
+  ELM_DATE_TYPE,
+  ELM_DATETIME_TYPE,
+  ELM_QUANTITY_TYPE
+} from '../util/elmTypes';
 
 export class Interval {
   constructor(
@@ -40,17 +49,17 @@ export class Interval {
     const point = this.low != null ? this.low : this.high;
     if (point != null) {
       if (typeof point === 'number') {
-        pointType = Number.isInteger(point)
-          ? '{urn:hl7-org:elm-types:r1}Integer'
-          : '{urn:hl7-org:elm-types:r1}Decimal';
+        pointType = Number.isInteger(point) ? ELM_INTEGER_TYPE : ELM_DECIMAL_TYPE;
+      } else if (typeof point === 'bigint') {
+        pointType = ELM_LONG_TYPE;
       } else if (point.isTime && point.isTime()) {
-        pointType = '{urn:hl7-org:elm-types:r1}Time';
+        pointType = ELM_TIME_TYPE;
       } else if (point.isDate) {
-        pointType = '{urn:hl7-org:elm-types:r1}Date';
+        pointType = ELM_DATE_TYPE;
       } else if (point.isDateTime) {
-        pointType = '{urn:hl7-org:elm-types:r1}DateTime';
+        pointType = ELM_DATETIME_TYPE;
       } else if (point.isQuantity) {
-        pointType = '{urn:hl7-org:elm-types:r1}Quantity';
+        pointType = ELM_QUANTITY_TYPE;
       }
     }
     if (pointType == null && this.defaultPointType != null) {
@@ -317,7 +326,7 @@ export class Interval {
         !other.highClosed &&
         !this.highClosed)
     ) {
-      if (typeof this.low === 'number') {
+      if (typeof this.low === 'number' || typeof this.low === 'bigint') {
         if (!(this.start() === other.start())) {
           return false;
         }
@@ -331,7 +340,7 @@ export class Interval {
       (this.low == null && other.low != null && this.high != null && other.high != null) ||
       (this.low == null && other.low == null && this.high != null && other.high != null)
     ) {
-      if (typeof this.high === 'number') {
+      if (typeof this.high === 'number' || typeof this.high === 'bigint') {
         if (!(this.end() === other.end())) {
           return false;
         }
@@ -366,7 +375,7 @@ export class Interval {
       return false;
     }
 
-    if (typeof this.low === 'number') {
+    if (typeof this.low === 'number' || typeof this.low === 'bigint') {
       return this.start() === other.start() && this.end() === other.end();
     } else {
       return (
@@ -521,20 +530,20 @@ export class Interval {
       if (closed.low.unit !== closed.high.unit) {
         throw new Error('Cannot calculate width of Quantity Interval with different units');
       }
-      const lowValue = closed.low.value;
-      const highValue = closed.high.value;
-      let diff = Math.abs(highValue - lowValue);
+
+      let diff = closed.high.value - closed.low.value;
       diff = Math.round(diff * Math.pow(10, 8)) / Math.pow(10, 8);
       return new Quantity(diff, closed.low.unit);
+    } else if (typeof closed.low === 'bigint') {
+      return closed.high - closed.low;
     } else {
       // TODO: Fix precision to 8 decimals in other places that return numbers
-      const diff = Math.abs(closed.high - closed.low);
+      const diff = closed.high - closed.low;
       return Math.round(diff * Math.pow(10, 8)) / Math.pow(10, 8);
     }
   }
 
   size() {
-    const pointSize = this.getPointSize();
     if (
       (this.low != null && (this.low.isDateTime || this.low.isDate)) ||
       (this.high != null && (this.high.isDateTime || this.high.isDate))
@@ -548,17 +557,21 @@ export class Interval {
       (closed.high != null && closed.high.isUncertainty)
     ) {
       return null;
-    } else if (closed.low.isQuantity) {
+    }
+
+    const pointSize = this.getPointSize();
+    if (closed.low.isQuantity) {
       if (closed.low.unit !== closed.high.unit) {
         throw new Error('Cannot calculate size of Quantity Interval with different units');
       }
-      const lowValue = closed.low.value;
-      const highValue = closed.high.value;
-      let diff = Math.abs(highValue - lowValue) + pointSize.value;
+
+      let diff = closed.high.value - closed.low.value + pointSize.value;
       diff = Math.round(diff * Math.pow(10, 8)) / Math.pow(10, 8);
       return new Quantity(diff, closed.low.unit);
+    } else if (typeof closed.low === 'bigint') {
+      return closed.high - closed.low + pointSize;
     } else {
-      const diff = Math.abs(closed.high - closed.low) + pointSize.value;
+      const diff = closed.high - closed.low + pointSize;
       return Math.round(diff * Math.pow(10, 8)) / Math.pow(10, 8);
     }
   }
@@ -577,16 +590,12 @@ export class Interval {
       if (this.high.isDateTime || this.high.isDate || this.high.isTime) {
         pointSize = new Quantity(1, this.high.getPrecision());
       } else if (this.high.isQuantity) {
-        pointSize = doSubtraction(successor(this.high), this.high);
+        pointSize = doSubtraction(this.high, predecessor(this.high));
       } else {
-        pointSize = successor(this.high) - this.high;
+        pointSize = this.high - predecessor(this.high);
       }
     } else {
-      throw new Error('Point type of intervals cannot be determined.');
-    }
-
-    if (typeof pointSize === 'number') {
-      pointSize = new Quantity(pointSize, '1');
+      throw new Error('Point type of interval cannot be determined.');
     }
 
     return pointSize;
@@ -639,7 +648,11 @@ function areDateTimes(x: any, y: any) {
 
 function areNumeric(x: any, y: any) {
   return [x, y].every(z => {
-    return typeof z === 'number' || (z != null && z.isUncertainty && typeof z.low === 'number');
+    return (
+      typeof z === 'number' ||
+      typeof z === 'bigint' ||
+      (z != null && z.isUncertainty && (typeof z.low === 'number' || typeof z.low === 'bigint'))
+    );
   });
 }
 
diff --git a/src/datatypes/quantity.ts b/src/datatypes/quantity.ts
index 6eb7038ad..c115b2a18 100644
--- a/src/datatypes/quantity.ts
+++ b/src/datatypes/quantity.ts
@@ -1,3 +1,4 @@
+import { ELM_DECIMAL_TYPE } from '../util/elmTypes';
 import { decimalAdjust, isValidDecimal, overflowsOrUnderflows } from '../util/math';
 import {
   checkUnit,
@@ -125,7 +126,7 @@ export class Quantity {
     const resultUnit = getQuotientOfUnits(unit1, unit2);
 
     // Check for invalid unit or value
-    if (resultUnit == null || overflowsOrUnderflows(resultValue)) {
+    if (resultUnit == null || overflowsOrUnderflows(resultValue, ELM_DECIMAL_TYPE)) {
       return null;
     }
     return new Quantity(decimalAdjust('round', resultValue, -8), resultUnit);
@@ -149,7 +150,7 @@ export class Quantity {
     const resultUnit = getProductOfUnits(unit1, unit2);
 
     // Check for invalid unit or value
-    if (resultUnit == null || overflowsOrUnderflows(resultValue)) {
+    if (resultUnit == null || overflowsOrUnderflows(resultValue, ELM_DECIMAL_TYPE)) {
       return null;
     }
     return new Quantity(decimalAdjust('round', resultValue, -8), resultUnit);
@@ -188,7 +189,7 @@ function doScaledAddition(a: any, b: any, scaleForB: any) {
       return null;
     }
     const sum = val1 + val2;
-    if (overflowsOrUnderflows(sum)) {
+    if (overflowsOrUnderflows(sum, ELM_DECIMAL_TYPE)) {
       return null;
     }
     return new Quantity(sum, unit1);
diff --git a/src/elm/aggregate.ts b/src/elm/aggregate.ts
index c8dfc8a7e..3ba90e09f 100644
--- a/src/elm/aggregate.ts
+++ b/src/elm/aggregate.ts
@@ -5,6 +5,8 @@ import { Context } from '../runtime/context';
 import { Exception } from '../datatypes/exception';
 import { greaterThan, lessThan } from '../util/comparison';
 import { build } from './builder';
+import { overflowsOrUnderflows } from '../util/math';
+import { ELM_DECIMAL_TYPE } from '../util/elmTypes';
 
 class AggregateExpression extends Expression {
   source: any;
@@ -53,9 +55,10 @@ export class Sum extends AggregateExpression {
     if (hasOnlyQuantities(items)) {
       const values = getValuesFromQuantities(items);
       const sum = values.reduce((x, y) => x + y);
-      return new Quantity(sum, items[0].unit);
+      return overflowsOrUnderflows(sum, ELM_DECIMAL_TYPE) ? null : new Quantity(sum, items[0].unit);
     } else {
-      return items.reduce((x: number, y: number) => x + y);
+      const sum = items.reduce((x: any, y: any) => x + y);
+      return overflowsOrUnderflows(sum, this.resultTypeName) ? null : sum;
     }
   }
 }
@@ -339,9 +342,12 @@ export class Product extends AggregateExpression {
       const values = getValuesFromQuantities(items);
       const product = values.reduce((x, y) => x * y);
       // Units are not multiplied for the geometric product
-      return new Quantity(product, items[0].unit);
+      return overflowsOrUnderflows(product, ELM_DECIMAL_TYPE)
+        ? null
+        : new Quantity(product, items[0].unit);
     } else {
-      return items.reduce((x: number, y: number) => x * y);
+      const product = items.reduce((x: any, y: any) => x * y);
+      return overflowsOrUnderflows(product, this.resultTypeName) ? null : product;
     }
   }
 }
diff --git a/src/elm/arithmetic.ts b/src/elm/arithmetic.ts
index f962e2b74..eb3796423 100644
--- a/src/elm/arithmetic.ts
+++ b/src/elm/arithmetic.ts
@@ -11,6 +11,14 @@ import { Uncertainty } from '../datatypes/uncertainty';
 import { Context } from '../runtime/context';
 import { build } from './builder';
 import { DateTime } from '../datatypes/datetime';
+import {
+  ELM_DECIMAL_TYPE,
+  ELM_DATETIME_TYPE,
+  ELM_DATE_TYPE,
+  ELM_INTEGER_TYPE,
+  ELM_LONG_TYPE,
+  ELM_TIME_TYPE
+} from '../util/elmTypes';
 
 export class Add extends Expression {
   constructor(json: any) {
@@ -48,7 +56,7 @@ export class Add extends Expression {
       }
     });
 
-    if (MathUtil.overflowsOrUnderflows(sum)) {
+    if (MathUtil.overflowsOrUnderflows(sum, this.resultTypeName)) {
       return null;
     }
     return sum;
@@ -86,7 +94,7 @@ export class Subtract extends Expression {
       }
     });
 
-    if (MathUtil.overflowsOrUnderflows(difference)) {
+    if (MathUtil.overflowsOrUnderflows(difference, this.resultTypeName)) {
       return null;
     }
     return difference;
@@ -124,7 +132,7 @@ export class Multiply extends Expression {
       }
     });
 
-    if (MathUtil.overflowsOrUnderflows(product)) {
+    if (MathUtil.overflowsOrUnderflows(product, this.resultTypeName)) {
       return null;
     }
     return product;
@@ -164,7 +172,7 @@ export class Divide extends Expression {
 
     // Note, anything divided by 0 is Infinity in Javascript, which will be
     // considered as overflow by this check.
-    if (MathUtil.overflowsOrUnderflows(quotient)) {
+    if (MathUtil.overflowsOrUnderflows(quotient, this.resultTypeName)) {
       return null;
     }
     return quotient;
@@ -182,10 +190,21 @@ export class TruncatedDivide extends Expression {
       return null;
     }
 
-    const quotient = args.reduce((x: number, y: number) => x / y);
-    const truncatedQuotient = quotient >= 0 ? Math.floor(quotient) : Math.ceil(quotient);
+    let truncatedQuotient: number | bigint;
+    if (typeof args[0] === 'bigint') {
+      // bigint division always truncates
+      try {
+        truncatedQuotient = args.reduce((x: bigint, y: bigint) => x / y);
+      } catch {
+        // bigint divide by 0 throws an error
+        return null;
+      }
+    } else {
+      const quotient = args.reduce((x: number, y: number) => x / y);
+      truncatedQuotient = quotient >= 0 ? Math.floor(quotient) : Math.ceil(quotient);
+    }
 
-    if (MathUtil.overflowsOrUnderflows(truncatedQuotient)) {
+    if (MathUtil.overflowsOrUnderflows(truncatedQuotient, this.resultTypeName)) {
       return null;
     }
     return truncatedQuotient;
@@ -203,9 +222,15 @@ export class Modulo extends Expression {
       return null;
     }
 
-    const modulo = args.reduce((x: number, y: number) => x % y);
+    let modulo: number | bigint;
+    try {
+      modulo = args.reduce((x: any, y: any) => x % y);
+    } catch {
+      // modulo divide by zero results in null according to specification
+      return null;
+    }
 
-    return MathUtil.decimalOrNull(modulo);
+    return MathUtil.decimalLongOrNull(modulo);
   }
 }
 
@@ -264,8 +289,16 @@ export class Abs extends Expression {
       return null;
     } else if (arg.isQuantity) {
       return new Quantity(Math.abs(arg.value), arg.unit);
+    } else if (typeof arg === 'bigint') {
+      const absoluteValue = arg < 0n ? -arg : arg;
+      return MathUtil.overflowsOrUnderflows(absoluteValue, this.resultTypeName)
+        ? null
+        : absoluteValue;
     } else {
-      return Math.abs(arg);
+      const absoluteValue = Math.abs(arg);
+      return MathUtil.overflowsOrUnderflows(absoluteValue, this.resultTypeName)
+        ? null
+        : absoluteValue;
     }
   }
 }
@@ -281,8 +314,16 @@ export class Negate extends Expression {
       return null;
     } else if (arg.isQuantity) {
       return new Quantity(arg.value * -1, arg.unit);
+    } else if (typeof arg === 'bigint') {
+      const negatedValue = arg * -1n;
+      return MathUtil.overflowsOrUnderflows(negatedValue, this.resultTypeName)
+        ? null
+        : negatedValue;
     } else {
-      return arg * -1;
+      const negatedValue = arg * -1;
+      return MathUtil.overflowsOrUnderflows(negatedValue, this.resultTypeName)
+        ? null
+        : negatedValue;
     }
   }
 }
@@ -336,7 +377,7 @@ export class Exp extends Expression {
 
     const power = Math.exp(arg);
 
-    if (MathUtil.overflowsOrUnderflows(power)) {
+    if (MathUtil.overflowsOrUnderflows(power, this.resultTypeName)) {
       return null;
     }
     return power;
@@ -371,22 +412,48 @@ export class Power extends Expression {
       return null;
     }
 
-    const power = args.reduce((x: number, y: number) => Math.pow(x, y));
+    const power = args.reduce((x: any, y: any) => doPower(x, y));
 
-    if (MathUtil.overflowsOrUnderflows(power)) {
+    // Note: The resultTypeName may be wrong if the exponent is a negative number. Math.overflowsOrUnderflows
+    // already accounts for this possibility by only considering it an integer if Number.isInteger(value).
+    // E.g., CQL-to-ELM says 10^-1 is an Integer result type, but the correct result is a 0.1 (a Decimal)
+    if (MathUtil.overflowsOrUnderflows(power, this.resultTypeName)) {
       return null;
     }
     return power;
   }
 }
 
+function doPower(x: any, y: any) {
+  if (typeof x === 'bigint' && typeof y === 'bigint' && y < 0n) {
+    // x ** y does not support negative exponents for bigint, so downgrade to number if possible, otherwise return null
+    if (
+      x < BigInt(Number.MIN_SAFE_INTEGER) ||
+      x > BigInt(Number.MAX_SAFE_INTEGER) ||
+      y < BigInt(Number.MIN_SAFE_INTEGER)
+    ) {
+      // can't safely convert to number so just return null
+      return null;
+    }
+    return Number(x) ** Number(y);
+  }
+
+  try {
+    return x ** y;
+  } catch {
+    // will throw if BigInt goes out of range
+    return null;
+  }
+}
+
 export class MinValue extends Expression {
   static readonly MIN_VALUES = {
-    '{urn:hl7-org:elm-types:r1}Integer': MathUtil.MIN_INT_VALUE,
-    '{urn:hl7-org:elm-types:r1}Decimal': MathUtil.MIN_FLOAT_VALUE,
-    '{urn:hl7-org:elm-types:r1}DateTime': MathUtil.MIN_DATETIME_VALUE,
-    '{urn:hl7-org:elm-types:r1}Date': MathUtil.MIN_DATE_VALUE,
-    '{urn:hl7-org:elm-types:r1}Time': MathUtil.MIN_TIME_VALUE
+    [ELM_INTEGER_TYPE]: MathUtil.MIN_INT_VALUE,
+    [ELM_LONG_TYPE]: MathUtil.MIN_LONG_VALUE,
+    [ELM_DECIMAL_TYPE]: MathUtil.MIN_FLOAT_VALUE,
+    [ELM_DATETIME_TYPE]: MathUtil.MIN_DATETIME_VALUE,
+    [ELM_DATE_TYPE]: MathUtil.MIN_DATE_VALUE,
+    [ELM_TIME_TYPE]: MathUtil.MIN_TIME_VALUE
   };
 
   valueType: keyof typeof MinValue.MIN_VALUES;
@@ -398,7 +465,7 @@ export class MinValue extends Expression {
 
   async exec(ctx: Context) {
     if (MinValue.MIN_VALUES[this.valueType]) {
-      if (this.valueType === '{urn:hl7-org:elm-types:r1}DateTime') {
+      if (this.valueType === ELM_DATETIME_TYPE) {
         const minDateTime = (MinValue.MIN_VALUES[this.valueType] as DateTime).copy();
         minDateTime.timezoneOffset = ctx.getTimezoneOffset();
         return minDateTime;
@@ -413,11 +480,12 @@ export class MinValue extends Expression {
 
 export class MaxValue extends Expression {
   static readonly MAX_VALUES = {
-    '{urn:hl7-org:elm-types:r1}Integer': MathUtil.MAX_INT_VALUE,
-    '{urn:hl7-org:elm-types:r1}Decimal': MathUtil.MAX_FLOAT_VALUE,
-    '{urn:hl7-org:elm-types:r1}DateTime': MathUtil.MAX_DATETIME_VALUE,
-    '{urn:hl7-org:elm-types:r1}Date': MathUtil.MAX_DATE_VALUE,
-    '{urn:hl7-org:elm-types:r1}Time': MathUtil.MAX_TIME_VALUE
+    [ELM_INTEGER_TYPE]: MathUtil.MAX_INT_VALUE,
+    [ELM_LONG_TYPE]: MathUtil.MAX_LONG_VALUE,
+    [ELM_DECIMAL_TYPE]: MathUtil.MAX_FLOAT_VALUE,
+    [ELM_DATETIME_TYPE]: MathUtil.MAX_DATETIME_VALUE,
+    [ELM_DATE_TYPE]: MathUtil.MAX_DATE_VALUE,
+    [ELM_TIME_TYPE]: MathUtil.MAX_TIME_VALUE
   };
 
   valueType: keyof typeof MaxValue.MAX_VALUES;
@@ -429,7 +497,7 @@ export class MaxValue extends Expression {
 
   async exec(ctx: Context) {
     if (MaxValue.MAX_VALUES[this.valueType] != null) {
-      if (this.valueType === '{urn:hl7-org:elm-types:r1}DateTime') {
+      if (this.valueType === ELM_DATETIME_TYPE) {
         const maxDateTime = (MaxValue.MAX_VALUES[this.valueType] as DateTime).copy();
         maxDateTime.timezoneOffset = ctx.getTimezoneOffset();
         return maxDateTime;
@@ -457,14 +525,14 @@ export class Successor extends Expression {
     try {
       // MathUtil.successor throws on overflow, and the exception is used in
       // the logic for evaluating `meets`, so it can't be changed to just return null
-      successor = MathUtil.successor(arg);
+      successor = MathUtil.successor(arg, this.resultTypeName);
     } catch (e) {
       if (e instanceof MathUtil.OverFlowException) {
         return null;
       }
     }
 
-    if (MathUtil.overflowsOrUnderflows(successor)) {
+    if (MathUtil.overflowsOrUnderflows(successor, this.resultTypeName)) {
       return null;
     }
     return successor;
@@ -486,14 +554,14 @@ export class Predecessor extends Expression {
     try {
       // MathUtil.predecessor throws on underflow, and the exception is used in
       // the logic for evaluating `meets`, so it can't be changed to just return null
-      predecessor = MathUtil.predecessor(arg);
+      predecessor = MathUtil.predecessor(arg, this.resultTypeName);
     } catch (e) {
       if (e instanceof MathUtil.OverFlowException) {
         return null;
       }
     }
 
-    if (MathUtil.overflowsOrUnderflows(predecessor)) {
+    if (MathUtil.overflowsOrUnderflows(predecessor, this.resultTypeName)) {
       return null;
     }
     return predecessor;
diff --git a/src/elm/datetime.ts b/src/elm/datetime.ts
index 0a4df0600..5432ea15c 100644
--- a/src/elm/datetime.ts
+++ b/src/elm/datetime.ts
@@ -4,6 +4,7 @@ import { build } from './builder';
 import { Literal } from './literal';
 import * as DT from '../datatypes/datatypes';
 import { Context } from '../runtime/context';
+import { ELM_INTEGER_TYPE } from '../util/elmTypes';
 
 export class DateTime extends Expression {
   json: any;
@@ -35,7 +36,7 @@ export class DateTime extends Expression {
         this[property] = Literal.from({
           type: 'Literal',
           value: ctx.getTimezoneOffset(),
-          valueType: '{urn:hl7-org:elm-types:r1}Integer'
+          valueType: ELM_INTEGER_TYPE
         });
       }
     }
diff --git a/src/elm/expression.ts b/src/elm/expression.ts
index 601dcd86a..cf14b99d8 100644
--- a/src/elm/expression.ts
+++ b/src/elm/expression.ts
@@ -9,6 +9,7 @@ export class Expression {
   locator?: string;
   arg?: Expression;
   args?: Expression[];
+  resultTypeName?: string;
 
   constructor(json: any) {
     if (json.operand != null) {
@@ -27,6 +28,10 @@ export class Expression {
     if (json.locator != null) {
       this.locator = json.locator;
     }
+
+    if (json.resultTypeName != null) {
+      this.resultTypeName = json.resultTypeName;
+    }
   }
 
   async execute(ctx: Context) {
diff --git a/src/elm/instance.ts b/src/elm/instance.ts
index 0668711aa..07fd9c369 100644
--- a/src/elm/instance.ts
+++ b/src/elm/instance.ts
@@ -3,6 +3,7 @@ import { Quantity } from '../datatypes/quantity';
 import { Code, Concept } from '../datatypes/datatypes';
 import { Context } from '../runtime/context';
 import { build } from './builder';
+import { ELM_QUANTITY_TYPE, ELM_CONCEPT_TYPE } from '../util/elmTypes';
 
 class Element {
   name: string;
@@ -33,11 +34,11 @@ export class Instance extends Expression {
       obj[el.name] = await el.exec(ctx);
     }
     switch (this.classType) {
-      case '{urn:hl7-org:elm-types:r1}Quantity':
+      case ELM_QUANTITY_TYPE:
         return new Quantity(obj.value, obj.unit);
       case '{urn:hl7-org:elm-types:r1}Code':
         return new Code(obj.code, obj.system, obj.version, obj.display);
-      case '{urn:hl7-org:elm-types:r1}Concept':
+      case ELM_CONCEPT_TYPE:
         return new Concept(obj.codes, obj.display);
       default:
         return obj;
diff --git a/src/elm/interval.ts b/src/elm/interval.ts
index 72ed2a4cf..189357fec 100644
--- a/src/elm/interval.ts
+++ b/src/elm/interval.ts
@@ -5,6 +5,7 @@ import { convertUnit, compareUnits, convertToCQLDateUnit } from '../util/units';
 import * as dtivl from '../datatypes/interval';
 import { Context } from '../runtime/context';
 import { build } from './builder';
+import { ELM_NAMED_TYPE_SPECIFIER } from '../util/elmTypes';
 
 export class Interval extends Expression {
   lowClosed: boolean;
@@ -44,11 +45,11 @@ export class Interval extends Expression {
     let defaultPointType;
     if (lowValue == null && highValue == null) {
       // try to get the default point type from a cast
-      if (this.low.asTypeSpecifier && this.low.asTypeSpecifier.type === 'NamedTypeSpecifier') {
+      if (this.low.asTypeSpecifier && this.low.asTypeSpecifier.type === ELM_NAMED_TYPE_SPECIFIER) {
         defaultPointType = this.low.asTypeSpecifier.name;
       } else if (
         this.high.asTypeSpecifier &&
-        this.high.asTypeSpecifier.type === 'NamedTypeSpecifier'
+        this.high.asTypeSpecifier.type === ELM_NAMED_TYPE_SPECIFIER
       ) {
         defaultPointType = this.high.asTypeSpecifier.name;
       }
@@ -320,7 +321,7 @@ export class Ends extends Expression {
 }
 
 function intervalListType(intervals: any) {
-  // Returns one of null, 'time', 'date', 'datetime', 'quantity', 'integer', 'decimal' or 'mismatch'
+  // Returns one of null, 'time', 'date', 'datetime', 'quantity', 'long', 'integer', 'decimal' or 'mismatch'
   let type = null;
 
   for (const itvl of intervals) {
@@ -375,6 +376,14 @@ function intervalListType(intervals: any) {
       } else {
         return 'mismatch';
       }
+    } else if (typeof low === 'bigint' && typeof high === 'bigint') {
+      if (type == null) {
+        type = 'long';
+      } else if (type === 'long') {
+        continue;
+      } else {
+        return 'mismatch';
+      }
     } else if (Number.isInteger(low) && Number.isInteger(high)) {
       if (type == null) {
         type = 'integer';
@@ -433,7 +442,7 @@ export class Expand extends Expression {
     } else if (['quantity'].includes(type)) {
       expandFunction = this.expandQuantityInterval;
       defaultPer = (interval: any) => new Quantity(1, interval.low.unit);
-    } else if (['integer', 'decimal'].includes(type)) {
+    } else if (['long', 'integer', 'decimal'].includes(type)) {
       expandFunction = this.expandNumericInterval;
       defaultPer = (_interval: any) => new Quantity(1, '1');
     } else {
@@ -588,10 +597,42 @@ export class Expand extends Expression {
     // Integers should have 0 Decimal places
     const perIsDecimal = perValue.toString().includes('.');
     const decimalPrecision = perIsDecimal ? 8 : 0;
+    const hasLongBoundaries = typeof low === 'bigint' || typeof high === 'bigint';
 
     low = lowClosed ? low : successor(low);
     high = highClosed ? high : predecessor(high);
 
+    if (hasLongBoundaries && !perIsDecimal) {
+      const longLow = low as bigint;
+      const longHigh = high as bigint;
+
+      if (longLow > longHigh) {
+        return [];
+      }
+      if (longLow == null || longHigh == null) {
+        return [];
+      }
+
+      const perBigInt = BigInt(perValue);
+      if (perBigInt > longHigh - longLow + 1n) {
+        return [];
+      }
+
+      let current_low = longLow;
+      let current_high = current_low + perBigInt - 1n;
+      const results = [];
+      while (current_high <= longHigh) {
+        results.push(new dtivl.Interval(current_low, current_high, true, true));
+        current_low += perBigInt;
+        current_high = current_low + perBigInt - 1n;
+      }
+
+      return results;
+    } else if (hasLongBoundaries) {
+      low = Number(low);
+      high = Number(high);
+    }
+
     // If the interval boundaries are more precise than the per quantity, the
     // more precise values will be truncated to the precision specified by the
     // per quantity.
@@ -668,7 +709,8 @@ function collapseIntervals(intervals: any, perWidth: any) {
     // of the intervals involved will be used (i.e. the interval that has a
     // width equal to the result of the successor function for the point type).
     if (perWidth == null) {
-      perWidth = intervalsClone[0].getPointSize();
+      const pointSize = intervalsClone[0].getPointSize();
+      perWidth = pointSize.isQuantity ? pointSize : new Quantity(Number(pointSize), '1');
     }
 
     // sort intervalsClone by start
@@ -747,7 +789,16 @@ function collapseIntervals(intervals: any, perWidth: any) {
           a = b;
         }
       } else {
-        if (b.low - a.high <= perWidth.value) {
+        const distance = b.low - a.high;
+        const comparablePerWidth =
+          typeof distance === 'bigint' && Number.isInteger(perWidth.value)
+            ? BigInt(perWidth.value)
+            : perWidth.value;
+        const withinPerWidth =
+          typeof distance === 'bigint' && typeof comparablePerWidth !== 'bigint'
+            ? Number(distance) <= comparablePerWidth
+            : distance <= comparablePerWidth;
+        if (withinPerWidth) {
           if (b.high > a.high || b.high == null) {
             a.high = b.high;
           }
diff --git a/src/elm/literal.ts b/src/elm/literal.ts
index e49bdc87f..40d17b393 100644
--- a/src/elm/literal.ts
+++ b/src/elm/literal.ts
@@ -1,4 +1,11 @@
 import { Context } from '../runtime/context';
+import {
+  ELM_BOOLEAN_TYPE,
+  ELM_INTEGER_TYPE,
+  ELM_LONG_TYPE,
+  ELM_DECIMAL_TYPE,
+  ELM_STRING_TYPE
+} from '../util/elmTypes';
 import { Expression } from './expression';
 
 export class Literal extends Expression {
@@ -7,13 +14,15 @@ export class Literal extends Expression {
 
   static from(json: any) {
     switch (json.valueType) {
-      case '{urn:hl7-org:elm-types:r1}Boolean':
+      case ELM_BOOLEAN_TYPE:
         return new BooleanLiteral(json);
-      case '{urn:hl7-org:elm-types:r1}Integer':
+      case ELM_INTEGER_TYPE:
         return new IntegerLiteral(json);
-      case '{urn:hl7-org:elm-types:r1}Decimal':
+      case ELM_LONG_TYPE:
+        return new LongLiteral(json);
+      case ELM_DECIMAL_TYPE:
         return new DecimalLiteral(json);
-      case '{urn:hl7-org:elm-types:r1}String':
+      case ELM_STRING_TYPE:
         return new StringLiteral(json);
       default:
         return new Literal(json);
@@ -67,6 +76,23 @@ export class IntegerLiteral extends Literal {
   }
 }
 
+export class LongLiteral extends Literal {
+  constructor(json: any) {
+    super(json);
+    this.value = BigInt(this.value);
+  }
+
+  // Define a simple getter to allow type-checking of this class without instanceof
+  // and in a way that survives minification (as opposed to checking constructor.name)
+  get isLongLiteral() {
+    return true;
+  }
+
+  async exec(_ctx: Context) {
+    return this.value;
+  }
+}
+
 export class DecimalLiteral extends Literal {
   constructor(json: any) {
     super(json);
diff --git a/src/elm/overloaded.ts b/src/elm/overloaded.ts
index d876f0430..319f4cd9c 100644
--- a/src/elm/overloaded.ts
+++ b/src/elm/overloaded.ts
@@ -9,6 +9,7 @@ import * as LIST from './list';
 import * as IVL from './interval';
 import { Context } from '../runtime/context';
 import { CQLValueSet } from '../datatypes/clinical';
+import { ELM_LIST_TYPE_SPECIFIER } from '../util/elmTypes';
 
 export class Equal extends Expression {
   constructor(json: any) {
@@ -93,7 +94,7 @@ export class Union extends Expression {
 
   listTypeArgs() {
     return this.args?.some((arg: any) => {
-      return arg.asTypeSpecifier != null && arg.asTypeSpecifier.type === 'ListTypeSpecifier';
+      return arg.asTypeSpecifier != null && arg.asTypeSpecifier.type === ELM_LIST_TYPE_SPECIFIER;
     });
   }
 }
@@ -277,7 +278,7 @@ export class Length extends Expression {
     const arg = await this.execArgs(ctx);
     if (arg != null) {
       return arg.length;
-    } else if ((this.arg as any).asTypeSpecifier.type === 'ListTypeSpecifier') {
+    } else if ((this.arg as any).asTypeSpecifier.type === ELM_LIST_TYPE_SPECIFIER) {
       return 0;
     } else {
       return null;
diff --git a/src/elm/reusable.ts b/src/elm/reusable.ts
index 93845e3f7..2880de728 100644
--- a/src/elm/reusable.ts
+++ b/src/elm/reusable.ts
@@ -2,6 +2,7 @@ import { Context } from '../runtime/context';
 import { Expression } from './expression';
 import { build } from './builder';
 import { Parameter } from '../types/runtime.types';
+import { ELM_NAMED_TYPE_SPECIFIER } from '../util/elmTypes';
 
 export class ExpressionDef extends Expression {
   name: string;
@@ -92,7 +93,7 @@ export class FunctionRef extends Expression {
               // convert it to a NamedTypedSpecifier
               operandTypeSpecifier = {
                 name: f.parameters[i].operandType,
-                type: 'NamedTypeSpecifier'
+                type: ELM_NAMED_TYPE_SPECIFIER
               };
             }
             match = ctx.matchesTypeSpecifier(args[i], operandTypeSpecifier);
diff --git a/src/elm/type.ts b/src/elm/type.ts
index e7a2822a7..59361e7d1 100644
--- a/src/elm/type.ts
+++ b/src/elm/type.ts
@@ -4,10 +4,27 @@ import { Expression, UnimplementedExpression } from './expression';
 import { DateTime, Date } from '../datatypes/datetime';
 import { Concept } from '../datatypes/clinical';
 import { Quantity, parseQuantity } from '../datatypes/quantity';
-import { isValidDecimal, isValidInteger, limitDecimalPrecision } from '../util/math';
+import { isValidDecimal, isValidInteger, isValidLong, limitDecimalPrecision } from '../util/math';
 import { normalizeMillisecondsField } from '../util/util';
 import { Ratio } from '../datatypes/ratio';
 import { Uncertainty } from '../datatypes/uncertainty';
+import {
+  ELM_NAMED_TYPE_SPECIFIER,
+  ELM_BOOLEAN_TYPE,
+  ELM_CONCEPT_TYPE,
+  ELM_DECIMAL_TYPE,
+  ELM_INTEGER_TYPE,
+  ELM_LONG_TYPE,
+  ELM_STRING_TYPE,
+  ELM_QUANTITY_TYPE,
+  ELM_DATETIME_TYPE,
+  ELM_DATE_TYPE,
+  ELM_TIME_TYPE,
+  ELM_LIST_TYPE_SPECIFIER,
+  ELM_TUPLE_TYPE_SPECIFIER,
+  ELM_INTERVAL_TYPE_SPECIFIER,
+  ELM_CHOICE_TYPE_SPECIFIER
+} from '../util/elmTypes';
 
 // TODO: Casting and Conversion needs unit tests!
 
@@ -23,7 +40,7 @@ export class As extends Expression {
       // convert it to a NamedTypedSpecifier
       this.asTypeSpecifier = {
         name: json.asType,
-        type: 'NamedTypeSpecifier'
+        type: ELM_NAMED_TYPE_SPECIFIER
       };
     }
     this.strict = json.strict != null ? json.strict : false;
@@ -147,8 +164,22 @@ export class ToInteger extends Expression {
 
   async exec(ctx: Context) {
     const arg = await this.execArgs(ctx);
-    if (typeof arg === 'string') {
-      const integer = parseInt(arg);
+    if (typeof arg === 'number') {
+      if (isValidInteger(arg)) {
+        return arg;
+      }
+    } else if (typeof arg === 'bigint') {
+      const integer = Number(arg);
+      if (isValidInteger(integer)) {
+        return integer;
+      }
+    } else if (typeof arg === 'string') {
+      // check for blank string because Number('') and Number(' ') evaluate to 0.
+      if (arg.trim().length === 0) {
+        return null;
+      }
+      // note: invalid strings will result in NaN and fail isValidInteger
+      const integer = Number(arg);
       if (isValidInteger(integer)) {
         return integer;
       }
@@ -159,6 +190,42 @@ export class ToInteger extends Expression {
   }
 }
 
+export class ToLong extends Expression {
+  constructor(json: any) {
+    super(json);
+  }
+
+  async exec(ctx: Context) {
+    const arg = await this.execArgs(ctx);
+    if (typeof arg === 'bigint') {
+      if (isValidLong(arg)) {
+        return arg;
+      }
+    } else if (typeof arg === 'number') {
+      try {
+        const long = BigInt(arg);
+        if (isValidLong(long)) {
+          return long;
+        }
+      } catch {
+        return null;
+      }
+    } else if (typeof arg === 'string') {
+      // check string format because BigInt throws for invalid strings
+      if (!/^[+-]?\d+$/.test(arg)) {
+        return null;
+      }
+      const long = BigInt(arg);
+      if (isValidLong(long)) {
+        return long;
+      }
+    } else if (typeof arg === 'boolean') {
+      return arg ? 1n : 0n;
+    }
+    return null;
+  }
+}
+
 export class ToQuantity extends Expression {
   constructor(json: any) {
     super(json);
@@ -173,6 +240,8 @@ export class ToQuantity extends Expression {
       return null;
     } else if (typeof val === 'number') {
       return new Quantity(val, '1');
+    } else if (typeof val === 'bigint') {
+      return new Quantity(Number(val), '1');
     } else if (val.isRatio) {
       // numerator and denominator are guaranteed non-null
       return val.numerator.dividedBy(val.denominator);
@@ -301,23 +370,25 @@ export class Convert extends Expression {
 
   async exec(ctx: Context) {
     switch (this.toType) {
-      case '{urn:hl7-org:elm-types:r1}Boolean':
+      case ELM_BOOLEAN_TYPE:
         return new ToBoolean({ type: 'ToBoolean', operand: this.operand }).execute(ctx);
-      case '{urn:hl7-org:elm-types:r1}Concept':
+      case ELM_CONCEPT_TYPE:
         return new ToConcept({ type: 'ToConcept', operand: this.operand }).execute(ctx);
-      case '{urn:hl7-org:elm-types:r1}Decimal':
+      case ELM_DECIMAL_TYPE:
         return new ToDecimal({ type: 'ToDecimal', operand: this.operand }).execute(ctx);
-      case '{urn:hl7-org:elm-types:r1}Integer':
+      case ELM_INTEGER_TYPE:
         return new ToInteger({ type: 'ToInteger', operand: this.operand }).execute(ctx);
-      case '{urn:hl7-org:elm-types:r1}String':
+      case ELM_LONG_TYPE:
+        return new ToLong({ type: 'ToLong', operand: this.operand }).execute(ctx);
+      case ELM_STRING_TYPE:
         return new ToString({ type: 'ToString', operand: this.operand }).execute(ctx);
-      case '{urn:hl7-org:elm-types:r1}Quantity':
+      case ELM_QUANTITY_TYPE:
         return new ToQuantity({ type: 'ToQuantity', operand: this.operand }).execute(ctx);
-      case '{urn:hl7-org:elm-types:r1}DateTime':
+      case ELM_DATETIME_TYPE:
         return new ToDateTime({ type: 'ToDateTime', operand: this.operand }).execute(ctx);
-      case '{urn:hl7-org:elm-types:r1}Date':
+      case ELM_DATE_TYPE:
         return new ToDate({ type: 'ToDate', operand: this.operand }).execute(ctx);
-      case '{urn:hl7-org:elm-types:r1}Time':
+      case ELM_TIME_TYPE:
         return new ToTime({ type: 'ToTime', operand: this.operand }).execute(ctx);
       default:
         return this.execArgs(ctx);
@@ -415,6 +486,24 @@ export class ConvertsToInteger extends Expression {
   }
 }
 
+export class ConvertsToLong extends Expression {
+  operand: any;
+
+  constructor(json: any) {
+    super(json);
+    this.operand = json.operand;
+  }
+
+  async exec(ctx: Context) {
+    const operatorValue = await this.execArgs(ctx);
+    if (operatorValue === null) {
+      return null;
+    } else {
+      return canConvertToType(ToLong, this.operand, ctx);
+    }
+  }
+}
+
 export class ConvertsToQuantity extends Expression {
   operand: any;
 
@@ -551,7 +640,7 @@ export class Is extends Expression {
       // Convert it to a NamedTypeSpecifier
       this.isTypeSpecifier = {
         name: json.isType,
-        type: 'NamedTypeSpecifier'
+        type: ELM_NAMED_TYPE_SPECIFIER
       };
     }
   }
@@ -571,15 +660,15 @@ export class Is extends Expression {
 
 function isSystemType(spec: any): any {
   switch (spec.type) {
-    case 'NamedTypeSpecifier':
+    case ELM_NAMED_TYPE_SPECIFIER:
       return spec.name.startsWith('{urn:hl7-org:elm-types:r1}');
-    case 'ListTypeSpecifier':
+    case ELM_LIST_TYPE_SPECIFIER:
       return isSystemType(spec.elementType);
-    case 'TupleTypeSpecifier':
+    case ELM_TUPLE_TYPE_SPECIFIER:
       return spec.element.every((e: any) => isSystemType(e.elementType));
-    case 'IntervalTypeSpecifier':
+    case ELM_INTERVAL_TYPE_SPECIFIER:
       return isSystemType(spec.pointType);
-    case 'ChoiceTypeSpecifier':
+    case ELM_CHOICE_TYPE_SPECIFIER:
       return spec.choice.every((c: any) => isSystemType(c));
     default:
       return false;
@@ -593,17 +682,17 @@ function specifierToString(spec: any): any {
     return '';
   }
   switch (spec.type) {
-    case 'NamedTypeSpecifier':
+    case ELM_NAMED_TYPE_SPECIFIER:
       return spec.name;
-    case 'ListTypeSpecifier':
+    case ELM_LIST_TYPE_SPECIFIER:
       return `List<${specifierToString(spec.elementType)}>`;
-    case 'TupleTypeSpecifier':
+    case ELM_TUPLE_TYPE_SPECIFIER:
       return `Tuple<${spec.element
         .map((e: any) => `${e.name} ${specifierToString(e.elementType)}`)
         .join(', ')}>`;
-    case 'IntervalTypeSpecifier':
+    case ELM_INTERVAL_TYPE_SPECIFIER:
       return `Interval<${specifierToString(spec.pointType)}>`;
-    case 'ChoiceTypeSpecifier':
+    case ELM_CHOICE_TYPE_SPECIFIER:
       return `Choice<${spec.choice.map((c: any) => specifierToString(c)).join(', ')}>`;
     default:
       return JSON.stringify(spec);
@@ -618,42 +707,44 @@ function guessSpecifierType(val: any): any {
   if (typeHierarchy && typeHierarchy.length > 0) {
     return typeHierarchy[0];
   } else if (typeof val === 'boolean') {
-    return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Boolean' };
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: ELM_BOOLEAN_TYPE };
   } else if (typeof val === 'number' && Math.floor(val) === val) {
     // it could still be a decimal, but we have to just take our best guess!
-    return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Integer' };
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: ELM_INTEGER_TYPE };
   } else if (typeof val === 'number') {
-    return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Decimal' };
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: ELM_DECIMAL_TYPE };
+  } else if (typeof val === 'bigint') {
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: ELM_LONG_TYPE };
   } else if (typeof val === 'string') {
-    return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}String' };
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: ELM_STRING_TYPE };
   } else if (val.isConcept) {
-    return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Concept' };
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: ELM_CONCEPT_TYPE };
   } else if (val.isCode) {
-    return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Code' };
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: '{urn:hl7-org:elm-types:r1}Code' };
   } else if (val.isDate) {
-    return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Date' };
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: ELM_DATE_TYPE };
   } else if (val.isTime && val.isTime()) {
-    return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}Time' };
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: ELM_TIME_TYPE };
   } else if (val.isDateTime) {
-    return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}DateTime' };
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: ELM_DATETIME_TYPE };
   } else if (val.isQuantity) {
-    return { type: 'NamedTypeSpecifier', name: '{urn:hl7-org:elm-types:r1}DateTime' };
+    return { type: ELM_NAMED_TYPE_SPECIFIER, name: ELM_DATETIME_TYPE };
   } else if (Array.isArray(val)) {
     // Get unique types from the array (by converting to string and putting in a Set)
     const typesAsStrings = Array.from(new Set(val.map(v => JSON.stringify(guessSpecifierType(v)))));
     const types = typesAsStrings.map(ts => (/^{/.test(ts) ? JSON.parse(ts) : ts));
     return {
-      type: 'ListTypeSpecifier',
-      elementType: types.length == 1 ? types[0] : { type: 'ChoiceTypeSpecifier', choice: types }
+      type: ELM_LIST_TYPE_SPECIFIER,
+      elementType: types.length == 1 ? types[0] : { type: ELM_CHOICE_TYPE_SPECIFIER, choice: types }
     };
   } else if (val.isInterval) {
     return {
-      type: 'IntervalTypeSpecifier',
+      type: ELM_INTERVAL_TYPE_SPECIFIER,
       pointType: val.pointType
     };
   } else if (typeof val === 'object' && Object.keys(val).length > 0) {
     return {
-      type: 'TupleTypeSpecifier',
+      type: ELM_TUPLE_TYPE_SPECIFIER,
       element: Object.keys(val).map(k => ({ name: k, elementType: guessSpecifierType(val[k]) }))
     };
   }
diff --git a/src/runtime/context.ts b/src/runtime/context.ts
index fff16b6bb..e28e5ad68 100644
--- a/src/runtime/context.ts
+++ b/src/runtime/context.ts
@@ -3,6 +3,23 @@ import { Exception } from '../datatypes/exception';
 import { Library } from '../elm/library';
 import { PatientObject, RetrieveDetails, TerminologyProvider } from '../types';
 import { Parameter } from '../types/runtime.types';
+import {
+  ELM_NAMED_TYPE_SPECIFIER,
+  ELM_LIST_TYPE_SPECIFIER,
+  ELM_TUPLE_TYPE_SPECIFIER,
+  ELM_INTERVAL_TYPE_SPECIFIER,
+  ELM_CHOICE_TYPE_SPECIFIER,
+  ELM_BOOLEAN_TYPE,
+  ELM_DECIMAL_TYPE,
+  ELM_INTEGER_TYPE,
+  ELM_LONG_TYPE,
+  ELM_STRING_TYPE,
+  ELM_CONCEPT_TYPE,
+  ELM_DATETIME_TYPE,
+  ELM_DATE_TYPE,
+  ELM_QUANTITY_TYPE,
+  ELM_TIME_TYPE
+} from '../util/elmTypes';
 import { typeIsArray } from '../util/util';
 import { MessageListener, NullMessageListener } from './messageListeners';
 
@@ -263,15 +280,15 @@ export class Context {
 
   matchesTypeSpecifier(val: any, spec: any) {
     switch (spec.type) {
-      case 'NamedTypeSpecifier':
+      case ELM_NAMED_TYPE_SPECIFIER:
         return this.matchesNamedTypeSpecifier(val, spec);
-      case 'ListTypeSpecifier':
+      case ELM_LIST_TYPE_SPECIFIER:
         return this.matchesListTypeSpecifier(val, spec);
-      case 'TupleTypeSpecifier':
+      case ELM_TUPLE_TYPE_SPECIFIER:
         return this.matchesTupleTypeSpecifier(val, spec);
-      case 'IntervalTypeSpecifier':
+      case ELM_INTERVAL_TYPE_SPECIFIER:
         return this.matchesIntervalTypeSpecifier(val, spec);
-      case 'ChoiceTypeSpecifier':
+      case ELM_CHOICE_TYPE_SPECIFIER:
         return this.matchesChoiceTypeSpecifier(val, spec);
       default:
         return true; // default to true when we don't know
@@ -321,25 +338,27 @@ export class Context {
       return true;
     }
     switch (spec.name) {
-      case '{urn:hl7-org:elm-types:r1}Boolean':
+      case ELM_BOOLEAN_TYPE:
         return typeof val === 'boolean';
-      case '{urn:hl7-org:elm-types:r1}Decimal':
+      case ELM_DECIMAL_TYPE:
         return typeof val === 'number';
-      case '{urn:hl7-org:elm-types:r1}Integer':
+      case ELM_INTEGER_TYPE:
         return typeof val === 'number' && Math.floor(val) === val;
-      case '{urn:hl7-org:elm-types:r1}String':
+      case ELM_LONG_TYPE:
+        return typeof val === 'bigint';
+      case ELM_STRING_TYPE:
         return typeof val === 'string';
-      case '{urn:hl7-org:elm-types:r1}Concept':
+      case ELM_CONCEPT_TYPE:
         return val && val.isConcept;
       case '{urn:hl7-org:elm-types:r1}Code':
         return val && val.isCode;
-      case '{urn:hl7-org:elm-types:r1}DateTime':
+      case ELM_DATETIME_TYPE:
         return val && val.isDateTime;
-      case '{urn:hl7-org:elm-types:r1}Date':
+      case ELM_DATE_TYPE:
         return val && val.isDate;
-      case '{urn:hl7-org:elm-types:r1}Quantity':
+      case ELM_QUANTITY_TYPE:
         return val && val.isQuantity;
-      case '{urn:hl7-org:elm-types:r1}Time':
+      case ELM_TIME_TYPE:
         return val && val.isTime && val.isTime();
       default:
         // Use the data model's implementation of _is, if it is available
@@ -372,6 +391,8 @@ export class Context {
       return typeof val === 'number';
     } else if (inst.isIntegerLiteral) {
       return typeof val === 'number' && Math.floor(val) === val;
+    } else if (inst.isLongLiteral) {
+      return typeof val === 'bigint';
     } else if (inst.isStringLiteral) {
       return typeof val === 'string';
     } else if (inst.isCode) {
diff --git a/src/types/type-specifiers.interfaces.ts b/src/types/type-specifiers.interfaces.ts
index 47a58195a..7d8fea307 100644
--- a/src/types/type-specifiers.interfaces.ts
+++ b/src/types/type-specifiers.interfaces.ts
@@ -1,3 +1,11 @@
+import {
+  ELM_NAMED_TYPE_SPECIFIER,
+  ELM_LIST_TYPE_SPECIFIER,
+  ELM_TUPLE_TYPE_SPECIFIER,
+  ELM_INTERVAL_TYPE_SPECIFIER,
+  ELM_CHOICE_TYPE_SPECIFIER
+} from '../util/elmTypes';
+
 // Types derived from http://cql.hl7.org/04-logicalspecification.html#typespecifier
 
 /*
@@ -19,17 +27,17 @@ export interface TypeSpecifier {
 }
 
 export interface NamedTypeSpecifier extends TypeSpecifier {
-  type: 'NamedTypeSpecifier';
+  type: typeof ELM_NAMED_TYPE_SPECIFIER;
   name: string;
 }
 
 export interface IntervalTypeSpecifier extends TypeSpecifier {
-  type: 'IntervalTypeSpecifier';
+  type: typeof ELM_INTERVAL_TYPE_SPECIFIER;
   pointType: AnyTypeSpecifier;
 }
 
 export interface ListTypeSpecifier extends TypeSpecifier {
-  type: 'ListTypeSpecifier';
+  type: typeof ELM_LIST_TYPE_SPECIFIER;
   elementType: AnyTypeSpecifier;
 }
 
@@ -40,11 +48,11 @@ export interface TupleElementDefinition {
 }
 
 export interface TupleTypeSpecifier extends TypeSpecifier {
-  type: 'TupleTypeSpecifier';
+  type: typeof ELM_TUPLE_TYPE_SPECIFIER;
   element?: TupleElementDefinition[];
 }
 
 export interface ChoiceTypeSpecifier extends TypeSpecifier {
-  type: 'ChoiceTypeSpecifier';
+  type: typeof ELM_CHOICE_TYPE_SPECIFIER;
   choice?: AnyTypeSpecifier[];
 }
diff --git a/src/util/comparison.ts b/src/util/comparison.ts
index de9ba3149..ea2454bff 100644
--- a/src/util/comparison.ts
+++ b/src/util/comparison.ts
@@ -4,6 +4,10 @@ function areNumbers(a: any, b: any) {
   return typeof a === 'number' && typeof b === 'number';
 }
 
+function areBigInts(a: any, b: any) {
+  return typeof a === 'bigint' && typeof b === 'bigint';
+}
+
 function areStrings(a: any, b: any) {
   return typeof a === 'string' && typeof b === 'string';
 }
@@ -21,7 +25,7 @@ function isUncertainty(x: any) {
 }
 
 export function lessThan(a: any, b: any, precision?: any) {
-  if (areNumbers(a, b) || areStrings(a, b)) {
+  if (areNumbers(a, b) || areBigInts(a, b) || areStrings(a, b)) {
     return a < b;
   } else if (areDateTimesOrQuantities(a, b)) {
     return a.before(b, precision);
@@ -35,7 +39,7 @@ export function lessThan(a: any, b: any, precision?: any) {
 }
 
 export function lessThanOrEquals(a: any, b: any, precision?: any) {
-  if (areNumbers(a, b) || areStrings(a, b)) {
+  if (areNumbers(a, b) || areBigInts(a, b) || areStrings(a, b)) {
     return a <= b;
   } else if (areDateTimesOrQuantities(a, b)) {
     return a.sameOrBefore(b, precision);
@@ -49,7 +53,7 @@ export function lessThanOrEquals(a: any, b: any, precision?: any) {
 }
 
 export function greaterThan(a: any, b: any, precision?: any) {
-  if (areNumbers(a, b) || areStrings(a, b)) {
+  if (areNumbers(a, b) || areBigInts(a, b) || areStrings(a, b)) {
     return a > b;
   } else if (areDateTimesOrQuantities(a, b)) {
     return a.after(b, precision);
@@ -63,7 +67,7 @@ export function greaterThan(a: any, b: any, precision?: any) {
 }
 
 export function greaterThanOrEquals(a: any, b: any, precision?: any) {
-  if (areNumbers(a, b) || areStrings(a, b)) {
+  if (areNumbers(a, b) || areBigInts(a, b) || areStrings(a, b)) {
     return a >= b;
   } else if (areDateTimesOrQuantities(a, b)) {
     return a.sameOrAfter(b, precision);
@@ -219,6 +223,7 @@ export function equals(a: any, b: any) {
   if (
     (typeof a === typeof b && typeof a === 'string') ||
     typeof a === 'number' ||
+    typeof a === 'bigint' ||
     typeof a === 'boolean'
   ) {
     return a === b;
diff --git a/src/util/elmTypes.ts b/src/util/elmTypes.ts
new file mode 100644
index 000000000..d5bc34070
--- /dev/null
+++ b/src/util/elmTypes.ts
@@ -0,0 +1,18 @@
+// Simple Types
+export const ELM_BOOLEAN_TYPE = '{urn:hl7-org:elm-types:r1}Boolean';
+export const ELM_CONCEPT_TYPE = '{urn:hl7-org:elm-types:r1}Concept';
+export const ELM_DATE_TYPE = '{urn:hl7-org:elm-types:r1}Date';
+export const ELM_DATETIME_TYPE = '{urn:hl7-org:elm-types:r1}DateTime';
+export const ELM_DECIMAL_TYPE = '{urn:hl7-org:elm-types:r1}Decimal';
+export const ELM_INTEGER_TYPE = '{urn:hl7-org:elm-types:r1}Integer';
+export const ELM_LONG_TYPE = '{urn:hl7-org:elm-types:r1}Long';
+export const ELM_QUANTITY_TYPE = '{urn:hl7-org:elm-types:r1}Quantity';
+export const ELM_STRING_TYPE = '{urn:hl7-org:elm-types:r1}String';
+export const ELM_TIME_TYPE = '{urn:hl7-org:elm-types:r1}Time';
+
+// Type Specifiers
+export const ELM_NAMED_TYPE_SPECIFIER = 'NamedTypeSpecifier';
+export const ELM_LIST_TYPE_SPECIFIER = 'ListTypeSpecifier';
+export const ELM_TUPLE_TYPE_SPECIFIER = 'TupleTypeSpecifier';
+export const ELM_INTERVAL_TYPE_SPECIFIER = 'IntervalTypeSpecifier';
+export const ELM_CHOICE_TYPE_SPECIFIER = 'ChoiceTypeSpecifier';
diff --git a/src/util/math.ts b/src/util/math.ts
index 5ecb9b84e..6c106458c 100644
--- a/src/util/math.ts
+++ b/src/util/math.ts
@@ -9,9 +9,20 @@ import {
   MAX_TIME_VALUE as dtMaxTimeValue
 } from '../datatypes/datetime';
 import { Uncertainty } from '../datatypes/uncertainty';
+import {
+  ELM_INTEGER_TYPE,
+  ELM_DECIMAL_TYPE,
+  ELM_LONG_TYPE,
+  ELM_DATETIME_TYPE,
+  ELM_DATE_TYPE,
+  ELM_TIME_TYPE,
+  ELM_QUANTITY_TYPE
+} from './elmTypes';
 
-export const MAX_INT_VALUE = Math.pow(2, 31) - 1;
-export const MIN_INT_VALUE = Math.pow(-2, 31);
+export const MAX_INT_VALUE = Math.pow(2, 31) - 1; // 2147483647
+export const MIN_INT_VALUE = Math.pow(-2, 31); // -2147483648
+export const MAX_LONG_VALUE = 9223372036854775807n;
+export const MIN_LONG_VALUE = -9223372036854775808n;
 export const MAX_FLOAT_VALUE = 99999999999999999999.99999999;
 export const MIN_FLOAT_VALUE = -99999999999999999999.99999999;
 export const MIN_FLOAT_PRECISION_VALUE = Math.pow(10, -8);
@@ -22,7 +33,7 @@ export const MAX_DATE_VALUE = dtMaxDateValue;
 export const MIN_TIME_VALUE = dtMinTimeValue;
 export const MAX_TIME_VALUE = dtMaxTimeValue;
 
-export function overflowsOrUnderflows(value: any): boolean {
+export function overflowsOrUnderflows(value: any, type?: string): boolean {
   if (value == null) {
     return false;
   }
@@ -51,22 +62,30 @@ export function overflowsOrUnderflows(value: any): boolean {
     if (value.before(MIN_DATE_VALUE)) {
       return true;
     }
-  } else if (Number.isInteger(value)) {
-    if (!isValidInteger(value)) {
+  } else if (typeof value === 'bigint') {
+    if (!isValidLong(value)) {
       return true;
     }
-  } else if (value.isUncertainty) {
-    return overflowsOrUnderflows(value.low) || overflowsOrUnderflows(value.high);
-  } else {
-    if (!isValidDecimal(value)) {
+  } else if (typeof value === 'number') {
+    // Only consider it an integer if it looks like an integer (even if the type says it's an integer).
+    // We need to do this because the CQL-to-ELM Translator's implementation of Power may incorrectly tag
+    // a result as an Integer when it really is a decimal (e.g., when the exponent is a negative number).
+    const isInteger = Number.isInteger(value) && (type === ELM_INTEGER_TYPE || type == null);
+    if (isInteger) {
+      if (!isValidInteger(value)) {
+        return true;
+      }
+    } else if (!isValidDecimal(value)) {
       return true;
     }
+  } else if (value.isUncertainty) {
+    return overflowsOrUnderflows(value.low, type) || overflowsOrUnderflows(value.high, type);
   }
   return false;
 }
 
 export function isValidInteger(integer: any) {
-  if (isNaN(integer)) {
+  if (!Number.isInteger(integer)) {
     return false;
   }
   if (integer > MAX_INT_VALUE) {
@@ -78,10 +97,26 @@ export function isValidInteger(integer: any) {
   return true;
 }
 
+export function isValidLong(long: any) {
+  if (typeof long !== 'bigint') {
+    return false;
+  }
+  if (long > MAX_LONG_VALUE) {
+    return false;
+  }
+  if (long < MIN_LONG_VALUE) {
+    return false;
+  }
+  return true;
+}
+
 export function isValidDecimal(decimal: any) {
   if (isNaN(decimal)) {
     return false;
   }
+  if (typeof decimal !== 'number') {
+    return false;
+  }
   if (decimal > MAX_FLOAT_VALUE) {
     return false;
   }
@@ -110,9 +145,10 @@ export function limitDecimalPrecision(decimal: any) {
 
 export class OverFlowException extends Exception {}
 
-export function successor(val: any): any {
+export function successor(val: any, type?: string): any {
   if (typeof val === 'number') {
-    if (Number.isInteger(val)) {
+    const isInteger = type === ELM_INTEGER_TYPE || (type == null && Number.isInteger(val));
+    if (isInteger) {
       if (val >= MAX_INT_VALUE) {
         throw new OverFlowException();
       } else {
@@ -125,6 +161,12 @@ export function successor(val: any): any {
         return val + MIN_FLOAT_PRECISION_VALUE;
       }
     }
+  } else if (typeof val === 'bigint') {
+    if (val >= MAX_LONG_VALUE) {
+      throw new OverFlowException();
+    } else {
+      return val + 1n;
+    }
   } else if (val && val.isTime && val.isTime()) {
     if (val.sameAs(MAX_TIME_VALUE)) {
       throw new OverFlowException();
@@ -147,7 +189,7 @@ export function successor(val: any): any {
     // For uncertainties, if the high is the max val, don't increment it
     const high = (() => {
       try {
-        return successor(val.high);
+        return successor(val.high, type);
       } catch {
         return val.high;
       }
@@ -155,16 +197,17 @@ export function successor(val: any): any {
     return new Uncertainty(successor(val.low), high);
   } else if (val && val.isQuantity) {
     const succ = val.clone();
-    succ.value = successor(val.value);
+    succ.value = successor(val.value, ELM_DECIMAL_TYPE);
     return succ;
   } else if (val == null) {
     return null;
   }
 }
 
-export function predecessor(val: any): any {
+export function predecessor(val: any, type?: string): any {
   if (typeof val === 'number') {
-    if (Number.isInteger(val)) {
+    const isInteger = type === ELM_INTEGER_TYPE || (type == null && Number.isInteger(val));
+    if (isInteger) {
       if (val <= MIN_INT_VALUE) {
         throw new OverFlowException();
       } else {
@@ -177,6 +220,12 @@ export function predecessor(val: any): any {
         return val - MIN_FLOAT_PRECISION_VALUE;
       }
     }
+  } else if (typeof val === 'bigint') {
+    if (val <= MIN_LONG_VALUE) {
+      throw new OverFlowException();
+    } else {
+      return val - 1n;
+    }
   } else if (val && val.isTime && val.isTime()) {
     if (val.sameAs(MIN_TIME_VALUE)) {
       throw new OverFlowException();
@@ -199,7 +248,7 @@ export function predecessor(val: any): any {
     // For uncertainties, if the low is the min val, don't decrement it
     const low = ((): any => {
       try {
-        return predecessor(val.low);
+        return predecessor(val.low, type);
       } catch {
         return val.low;
       }
@@ -207,7 +256,7 @@ export function predecessor(val: any): any {
     return new Uncertainty(low, predecessor(val.high));
   } else if (val && val.isQuantity) {
     const pred = val.clone();
-    pred.value = predecessor(val.value);
+    pred.value = predecessor(val.value, ELM_DECIMAL_TYPE);
     return pred;
   } else if (val == null) {
     return null;
@@ -221,6 +270,8 @@ export function maxValueForInstance(val: any) {
     } else {
       return MAX_FLOAT_VALUE;
     }
+  } else if (typeof val === 'bigint') {
+    return MAX_LONG_VALUE;
   } else if (val && val.isTime && val.isTime()) {
     return MAX_TIME_VALUE?.copy();
   } else if (val && val.isDateTime) {
@@ -238,23 +289,25 @@ export function maxValueForInstance(val: any) {
 
 export function maxValueForType(type: string, quantityInstance?: Quantity) {
   switch (type) {
-    case '{urn:hl7-org:elm-types:r1}Integer':
+    case ELM_INTEGER_TYPE:
       return MAX_INT_VALUE;
-    case '{urn:hl7-org:elm-types:r1}Decimal':
+    case ELM_LONG_TYPE:
+      return MAX_LONG_VALUE;
+    case ELM_DECIMAL_TYPE:
       return MAX_FLOAT_VALUE;
-    case '{urn:hl7-org:elm-types:r1}DateTime':
+    case ELM_DATETIME_TYPE:
       return MAX_DATETIME_VALUE?.copy();
-    case '{urn:hl7-org:elm-types:r1}Date':
+    case ELM_DATE_TYPE:
       return MAX_DATE_VALUE?.copy();
-    case '{urn:hl7-org:elm-types:r1}Time':
+    case ELM_TIME_TYPE:
       return MAX_TIME_VALUE?.copy();
-    case '{urn:hl7-org:elm-types:r1}Quantity': {
+    case ELM_QUANTITY_TYPE: {
       if (quantityInstance == null) {
         // can't infer a quantity unit type from nothing]
         return null;
       }
       const maxQty = quantityInstance.clone();
-      maxQty.value = maxValueForInstance(maxQty.value);
+      maxQty.value = MAX_FLOAT_VALUE;
       return maxQty;
     }
   }
@@ -268,6 +321,8 @@ export function minValueForInstance(val: any) {
     } else {
       return MIN_FLOAT_VALUE;
     }
+  } else if (typeof val === 'bigint') {
+    return MIN_LONG_VALUE;
   } else if (val && val.isTime && val.isTime()) {
     return MIN_TIME_VALUE?.copy();
   } else if (val && val.isDateTime) {
@@ -285,23 +340,25 @@ export function minValueForInstance(val: any) {
 
 export function minValueForType(type: string, quantityInstance?: Quantity) {
   switch (type) {
-    case '{urn:hl7-org:elm-types:r1}Integer':
+    case ELM_INTEGER_TYPE:
       return MIN_INT_VALUE;
-    case '{urn:hl7-org:elm-types:r1}Decimal':
+    case ELM_LONG_TYPE:
+      return MIN_LONG_VALUE;
+    case ELM_DECIMAL_TYPE:
       return MIN_FLOAT_VALUE;
-    case '{urn:hl7-org:elm-types:r1}DateTime':
+    case ELM_DATETIME_TYPE:
       return MIN_DATETIME_VALUE?.copy();
-    case '{urn:hl7-org:elm-types:r1}Date':
+    case ELM_DATE_TYPE:
       return MIN_DATE_VALUE?.copy();
-    case '{urn:hl7-org:elm-types:r1}Time':
+    case ELM_TIME_TYPE:
       return MIN_TIME_VALUE?.copy();
-    case '{urn:hl7-org:elm-types:r1}Quantity': {
+    case ELM_QUANTITY_TYPE: {
       if (quantityInstance == null) {
         // can't infer a quantity unit type from nothing]
         return null;
       }
       const minQty = quantityInstance.clone();
-      minQty.value = minValueForInstance(minQty.value);
+      minQty.value = MIN_FLOAT_VALUE;
       return minQty;
     }
   }
@@ -334,3 +391,10 @@ export function decimalAdjust(type: MathFn, value: any, exp: any) {
 export function decimalOrNull(value: any) {
   return isValidDecimal(value) ? value : null;
 }
+
+export function decimalLongOrNull(value: any) {
+  return (typeof value === 'number' && isValidDecimal(value)) ||
+    (typeof value === 'bigint' && isValidLong(value))
+    ? value
+    : null;
+}
diff --git a/test/datatypes/bigint-test.ts b/test/datatypes/bigint-test.ts
new file mode 100644
index 000000000..c570dee3b
--- /dev/null
+++ b/test/datatypes/bigint-test.ts
@@ -0,0 +1,8 @@
+import '../../src/datatypes/bigint';
+
+describe('BigInt', () => {
+  it('should serialize bigint values to a string', () => {
+    const big = { big: 1234567890123456789n };
+    JSON.stringify(big).should.eql('{"big":"1234567890123456789"}');
+  });
+});
diff --git a/test/datatypes/interval-data.ts b/test/datatypes/interval-data.ts
index c9bbd0d27..15bac1833 100644
--- a/test/datatypes/interval-data.ts
+++ b/test/datatypes/interval-data.ts
@@ -228,5 +228,53 @@ export default () => {
       y: new TestInterval(0, 100)
     }
   };
+  data['zeroToHundredLong'] = new TestInterval(0n, 100n);
+  data['zeroToFortyLong'] = new TestInterval(0n, 40n);
+  data['fortyToSixtyLong'] = new TestInterval(40n, 60n);
+  data['sixtyToHundredLong'] = new TestInterval(60n, 100n);
+  data['lIvl'] = {
+    sameAs: {
+      //    |----------X----------|
+      //    |----------Y----------|
+      x: new TestInterval(0n, 100n),
+      y: new TestInterval(0n, 100n)
+    },
+    before: {
+      //    |----------X----------|
+      //                                   |----------Y----------|
+      x: new TestInterval(0n, 40n),
+      y: new TestInterval(60n, 100n)
+    },
+    meets: {
+      //    |----------X----------|
+      //                           |-----------Y----------|
+      x: new TestInterval(0n, 50n),
+      y: new TestInterval(51n, 100n)
+    },
+    overlaps: {
+      //    |----------X----------|
+      //                  |----------Y----------|
+      x: new TestInterval(0n, 60n),
+      y: new TestInterval(40n, 100n)
+    },
+    begins: {
+      //    |-----X-----|
+      //    |----------Y----------|
+      x: new TestInterval(0n, 60n),
+      y: new TestInterval(0n, 100n)
+    },
+    during: {
+      //         |-----X-----|
+      //    |----------Y----------|
+      x: new TestInterval(30n, 70n),
+      y: new TestInterval(0n, 100n)
+    },
+    ends: {
+      //              |-----X-----|
+      //    |----------Y----------|
+      x: new TestInterval(40n, 100n),
+      y: new TestInterval(0n, 100n)
+    }
+  };
   return data;
 };
diff --git a/test/datatypes/interval-test.ts b/test/datatypes/interval-test.ts
index 9394d3491..b6b6f1418 100644
--- a/test/datatypes/interval-test.ts
+++ b/test/datatypes/interval-test.ts
@@ -25,6 +25,14 @@ describe('Interval', () => {
     i.highClosed.should.be.false();
   });
 
+  it('should properly set all properties when constructed as long interval', () => {
+    const i = new Interval(12n, 36n, true, false);
+    i.low.should.equal(12n);
+    i.high.should.equal(36n);
+    i.lowClosed.should.be.true();
+    i.highClosed.should.be.false();
+  });
+
   it('should default lowClosed/highClosed to true', () => {
     const i = new Interval(DateTime.parse('2012-01-01'), DateTime.parse('2013-01-01'));
     i.low.should.eql(DateTime.parse('2012-01-01'));
@@ -34,3472 +42,5166 @@ describe('Interval', () => {
   });
 });
 
-describe('DateTimeInterval.contains', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate dates before it', () => {
-    d.all2012.closed.contains(d.bef2012.full).should.be.false();
-  });
-
-  it('should properly calculate the left boundary date', () => {
-    d.all2012.closed.contains(d.beg2012.full).should.be.true();
-    d.all2012.open.contains(d.beg2012.full).should.be.false();
-  });
-
-  it('should properly calculate dates in the middle of it', () => {
-    d.all2012.closed.contains(d.mid2012.full).should.be.true();
-  });
-
-  it('should properly calculate the right boundary date', () => {
-    d.all2012.closed.contains(d.end2012.full).should.be.true();
-    d.all2012.open.contains(d.end2012.full).should.be.false();
-  });
-
-  it('should properly calculate dates after it', () => {
-    d.all2012.closed.contains(d.aft2012.full).should.be.false();
-  });
-
-  it('should properly handle null endpoints', () => {
-    const date = DateTime.parse('2012-01-01T00:00:00.0');
-    const early = DateTime.parse('0001-01-01T00:00:00.0');
-    const late = DateTime.parse('2999-01-01T00:00:00.0');
-    new Interval(null, date).contains(early).should.be.true();
-    new Interval(null, date).contains(late).should.be.false();
-    new Interval(null, date, false, true).contains(date).should.be.true();
-    should(new Interval(null, date, false, true).contains(early)).be.null();
-    new Interval(null, date, false, true).contains(late).should.be.false();
-    new Interval(date, null).contains(late).should.be.true();
-    new Interval(date, null).contains(early).should.be.false();
-    new Interval(date, null, true, false).contains(date).should.be.true();
-    should(new Interval(date, null, true, false).contains(late)).be.null();
-    new Interval(date, null, true, false).contains(early).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    d.all2012.closed.contains(d.bef2012.toMonth).should.be.false();
-    should.not.exist(d.all2012.closed.contains(d.beg2012.toMonth));
-    d.all2012.closed.contains(d.mid2012.toMonth).should.be.true();
-    should.not.exist(d.all2012.closed.contains(d.end2012.toMonth));
-    d.all2012.closed.contains(d.aft2012.toMonth).should.be.false();
-
-    d.all2012.toMonth.contains(d.bef2012.toMonth).should.be.false();
-    d.all2012.toMonth.contains(d.beg2012.toMonth).should.be.true();
-    d.all2012.toMonth.contains(d.mid2012.toMonth).should.be.true();
-    d.all2012.toMonth.contains(d.end2012.toMonth).should.be.true();
-    d.all2012.toMonth.contains(d.aft2012.toMonth).should.be.false();
-
-    d.all2012.toMonth.contains(d.bef2012.full).should.be.false();
-    should.not.exist(d.all2012.toMonth.contains(d.beg2012.full));
-    d.all2012.toMonth.contains(d.mid2012.full).should.be.true();
-    should.not.exist(d.all2012.toMonth.contains(d.end2012.full));
-    d.all2012.toMonth.contains(d.aft2012.full).should.be.false();
-
-    should.not.exist(d.all2012.closed.contains(d.mid2012.toYear));
-  });
-
-  it('should return null when checking if interval contains null point', () => {
-    const date = DateTime.parse('2012-01-01T00:00:00.0');
-    should(new Interval(date, null, true, false).contains(null)).be.null();
-  });
-
-  it('should throw when the argument is an interval', () => {
-    should(() => d.all2012.closed.contains(d.all2012.open)).throw(Error);
-  });
-});
-
-describe('DateTimeInterval.includes', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.includes(y.closed).should.be.true();
-    x.closed.includes(y.open).should.be.true();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.true();
-    y.closed.includes(x.closed).should.be.true();
-    y.closed.includes(x.open).should.be.true();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.true();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.false();
-    y.closed.includes(x.open).should.be.false();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.false();
-    y.closed.includes(x.open).should.be.false();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.false();
-    y.closed.includes(x.open).should.be.false();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.true();
-    y.closed.includes(x.open).should.be.true();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.true();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.true();
-    y.closed.includes(x.open).should.be.true();
-    y.open.includes(x.closed).should.be.true();
-    y.open.includes(x.open).should.be.true();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.true();
-    y.closed.includes(x.open).should.be.true();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.true();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.sameAs));
-    should.not.exist(x.closed.includes(y.toMinute));
-    should.not.exist(x.toHour.includes(y.toMinute));
-
-    [x, y] = Array.from(xy(d.dIvl.before));
-    x.toMonth.includes(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.includes(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    x.toMonth.includes(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.includes(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toMonth.includes(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.includes(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    x.toMinute.includes(y.toMinute).should.be.false();
-    should.not.exist(x.toYear.includes(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    x.toMonth.includes(y.toMonth).should.be.false();
-    y.toMonth.includes(x.toMonth).should.be.true();
-    should.not.exist(x.toYear.includes(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    x.toMinute.includes(y.toMinute).should.be.false();
-    should.not.exist(x.toYear.includes(y.closed));
-  });
-
-  it('should include a point date', () => {
-    d.all2012.closed.includes(d.mid2012.full).should.be.true();
-  });
-});
-
-describe('DateTimeInterval.includedIn', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.includedIn(y.closed).should.be.true();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.true();
-    x.open.includedIn(y.open).should.be.true();
-
-    y.closed.includedIn(x.closed).should.be.true();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.true();
-    y.open.includedIn(x.open).should.be.true();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    x.closed.includedIn(y.closed).should.be.false();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.false();
-    x.open.includedIn(y.open).should.be.false();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    x.closed.includedIn(y.closed).should.be.false();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.false();
-    x.open.includedIn(y.open).should.be.false();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.closed.includedIn(y.closed).should.be.false();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.false();
-    x.open.includedIn(y.open).should.be.false();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.includedIn(y.closed).should.be.true();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.true();
-    x.open.includedIn(y.open).should.be.true();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.includedIn(y.closed).should.be.true();
-    x.closed.includedIn(y.open).should.be.true();
-    x.open.includedIn(y.closed).should.be.true();
-    x.open.includedIn(y.open).should.be.true();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.includedIn(y.closed).should.be.true();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.true();
-    x.open.includedIn(y.open).should.be.true();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.sameAs));
-    should.not.exist(x.closed.includedIn(y.toMinute));
-    should.not.exist(x.toHour.includedIn(y.toMinute));
-
-    [x, y] = Array.from(xy(d.dIvl.before));
-    x.toMonth.includedIn(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.includedIn(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    x.toMonth.includedIn(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.includedIn(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toMonth.includedIn(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.includedIn(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    x.toMinute.includedIn(y.toMinute).should.be.true();
-    should.not.exist(x.toYear.includedIn(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    x.toMonth.includedIn(y.toMonth).should.be.true();
-    y.toMonth.includedIn(x.toMonth).should.be.false();
-    should.not.exist(x.toYear.includedIn(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    x.toMinute.includedIn(y.toMinute).should.be.true();
-    should.not.exist(x.toYear.includedIn(y.closed));
-  });
-
-  it('should include a point date', () => {
-    d.all2012.closed.includedIn(d.mid2012.full).should.be.true();
-  });
-});
-
-describe('DateTimeInterval.overlaps(DateTimeInterval)', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.overlaps(y.closed).should.be.true();
-    x.closed.overlaps(y.open).should.be.true();
-    x.open.overlaps(y.closed).should.be.true();
-    x.open.overlaps(y.open).should.be.true();
-    y.closed.overlaps(x.closed).should.be.true();
-    y.closed.overlaps(x.open).should.be.true();
-    y.open.overlaps(x.closed).should.be.true();
-    y.open.overlaps(x.open).should.be.true();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    x.closed.overlaps(y.closed).should.be.false();
-    x.closed.overlaps(y.open).should.be.false();
-    x.open.overlaps(y.closed).should.be.false();
-    x.open.overlaps(y.open).should.be.false();
-    y.closed.overlaps(x.closed).should.be.false();
-    y.closed.overlaps(x.open).should.be.false();
-    y.open.overlaps(x.closed).should.be.false();
-    y.open.overlaps(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    x.closed.overlaps(y.closed).should.be.false();
-    x.closed.overlaps(y.open).should.be.false();
-    x.open.overlaps(y.closed).should.be.false();
-    x.open.overlaps(y.open).should.be.false();
-    y.closed.overlaps(x.closed).should.be.false();
-    y.closed.overlaps(x.open).should.be.false();
-    y.open.overlaps(x.closed).should.be.false();
-    y.open.overlaps(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.closed.overlaps(y.closed).should.be.true();
-    x.closed.overlaps(y.open).should.be.true();
-    x.open.overlaps(y.closed).should.be.true();
-    x.open.overlaps(y.open).should.be.true();
-    y.closed.overlaps(x.closed).should.be.true();
-    y.closed.overlaps(x.open).should.be.true();
-    y.open.overlaps(x.closed).should.be.true();
-    y.open.overlaps(x.open).should.be.true();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.overlaps(y.closed).should.be.true();
-    x.closed.overlaps(y.open).should.be.true();
-    x.open.overlaps(y.closed).should.be.true();
-    x.open.overlaps(y.open).should.be.true();
-    y.closed.overlaps(x.closed).should.be.true();
-    y.closed.overlaps(x.open).should.be.true();
-    y.open.overlaps(x.closed).should.be.true();
-    y.open.overlaps(x.open).should.be.true();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.overlaps(y.closed).should.be.true();
-    x.closed.overlaps(y.open).should.be.true();
-    x.open.overlaps(y.closed).should.be.true();
-    x.open.overlaps(y.open).should.be.true();
-    y.closed.overlaps(x.closed).should.be.true();
-    y.closed.overlaps(x.open).should.be.true();
-    y.open.overlaps(x.closed).should.be.true();
-    y.open.overlaps(x.open).should.be.true();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.overlaps(y.closed).should.be.true();
-    x.closed.overlaps(y.open).should.be.true();
-    x.open.overlaps(y.closed).should.be.true();
-    x.open.overlaps(y.open).should.be.true();
-    y.closed.overlaps(x.closed).should.be.true();
-    y.closed.overlaps(x.open).should.be.true();
-    y.open.overlaps(x.closed).should.be.true();
-    y.open.overlaps(x.open).should.be.true();
-  });
-
-  it('should properly handle boundless and unknown intervals', () => {
-    boundlessInterval().overlaps(boundlessInterval()).should.be.true();
-    boundlessInterval().overlaps(d.all2012.closed).should.be.true();
-    d.all2012.closed.overlaps(boundlessInterval()).should.be.true();
-    should(boundlessInterval().overlaps(unknownInterval())).be.null();
-    should(unknownInterval().overlaps(boundlessInterval())).be.null();
-    should(unknownInterval().overlaps(d.all2012.closed)).be.null();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.overlaps(y.toMinute).should.be.true();
-    x.toHour.overlaps(y.toMinute).should.be.true();
-
-    [x, y] = Array.from(xy(d.dIvl.before));
-    x.toMonth.overlaps(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.overlaps(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    x.toMonth.overlaps(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.overlaps(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toMonth.overlaps(y.toMonth).should.be.true();
-    should.not.exist(x.toYear.overlaps(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    x.toMinute.overlaps(y.toMinute).should.be.true();
-    should.not.exist(x.toYear.overlaps(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    x.toMonth.overlaps(y.toMonth).should.be.true();
-    y.toMonth.overlaps(x.toMonth).should.be.true();
-    should.not.exist(x.toYear.overlaps(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    x.toMinute.overlaps(y.toMinute).should.be.true();
-    should.not.exist(x.toYear.overlaps(y.closed));
-  });
-});
-
-describe('DateTimeInterval.overlaps(DateTime)', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate dates before it', () => {
-    d.all2012.closed.overlaps(d.bef2012.full).should.be.false();
-  });
-
-  it('should properly calculate the left boundary date', () => {
-    d.all2012.closed.overlaps(d.beg2012.full).should.be.true();
-    d.all2012.open.overlaps(d.beg2012.full).should.be.false();
-  });
-
-  it('should properly calculate dates in the middle of it', () => {
-    d.all2012.closed.overlaps(d.mid2012.full).should.be.true();
-  });
-
-  it('should properly calculate the right boundary date', () => {
-    d.all2012.closed.overlaps(d.end2012.full).should.be.true();
-    d.all2012.open.overlaps(d.end2012.full).should.be.false();
-  });
-
-  it('should properly calculate dates after it', () => {
-    d.all2012.closed.overlaps(d.aft2012.full).should.be.false();
-  });
-
-  it('should properly handle boundless and unknown intervals', () => {
-    boundlessInterval().overlaps(d.mid2012.full).should.be.true();
-    should(boundlessInterval().overlaps(null)).be.null();
-    should(unknownInterval().overlaps(d.mid2012.full)).be.null();
-  });
-
-  it('should properly handle imprecision', () => {
-    d.all2012.closed.overlaps(d.bef2012.toMonth).should.be.false();
-    should.not.exist(d.all2012.closed.overlaps(d.beg2012.toMonth));
-    d.all2012.closed.overlaps(d.mid2012.toMonth).should.be.true();
-    should.not.exist(d.all2012.closed.overlaps(d.end2012.toMonth));
-    d.all2012.closed.overlaps(d.aft2012.toMonth).should.be.false();
-
-    d.all2012.toMonth.overlaps(d.bef2012.toMonth).should.be.false();
-    d.all2012.toMonth.overlaps(d.beg2012.toMonth).should.be.true();
-    d.all2012.toMonth.overlaps(d.mid2012.toMonth).should.be.true();
-    d.all2012.toMonth.overlaps(d.end2012.toMonth).should.be.true();
-    d.all2012.toMonth.overlaps(d.aft2012.toMonth).should.be.false();
-
-    d.all2012.toMonth.overlaps(d.bef2012.full).should.be.false();
-    should.not.exist(d.all2012.toMonth.overlaps(d.beg2012.full));
-    d.all2012.toMonth.overlaps(d.mid2012.full).should.be.true();
-    should.not.exist(d.all2012.toMonth.overlaps(d.end2012.full));
-    d.all2012.toMonth.overlaps(d.aft2012.full).should.be.false();
-
-    should.not.exist(d.all2012.closed.overlaps(d.mid2012.toYear));
-  });
-});
-
-describe('DateTimeInterval.overlapsBefore', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly handle boundless intervals', () => {
-    boundlessInterval().overlapsBefore(d.mid2012.full).should.be.true();
-    d.all2012.closed.overlapsBefore(boundlessInterval()).should.be.false();
-    should(boundlessInterval().overlapsBefore(unknownInterval())).be.null();
-    should(unknownInterval().overlapsBefore(boundlessInterval())).be.null();
-  });
-});
-
-describe('DateTimeInterval.overlapsAfter', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly handle boundless intervals', () => {
-    boundlessInterval().overlapsAfter(d.mid2012.full).should.be.true();
-    d.all2012.closed.overlapsAfter(boundlessInterval()).should.be.false();
-    should(boundlessInterval().overlapsAfter(unknownInterval())).be.null();
-    should(unknownInterval().overlapsAfter(boundlessInterval())).be.null();
-  });
-});
-
-describe('DateTimeInterval.equals', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.equals(y.closed).should.be.true();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.true();
-    y.closed.equals(x.closed).should.be.true();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.true();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate open vs. closed intervals', () => {
-    const lowEdge2012 = DateTime.parse('2012-01-01T00:00:00.0+00');
-    const lowEdge2012Succ = DateTime.parse('2012-01-01T00:00:00.001+00');
-    const highEdge2012 = DateTime.parse('2012-12-31T23:59:59.999+00');
-    const highEdge2012Pred = DateTime.parse('2012-12-31T23:59:59.998+00');
-    const cc = new Interval(lowEdge2012, highEdge2012, true, true);
-    const oc = new Interval(lowEdge2012, highEdge2012, false, true);
-    const co = new Interval(lowEdge2012, highEdge2012, true, false);
-    const oo = new Interval(lowEdge2012, highEdge2012, false, false);
-    const cci = new Interval(lowEdge2012Succ, highEdge2012Pred, true, true);
-    const oci = new Interval(lowEdge2012Succ, highEdge2012Pred, false, true);
-    const coi = new Interval(lowEdge2012Succ, highEdge2012Pred, true, false);
-    const ooi = new Interval(lowEdge2012Succ, highEdge2012Pred, false, false);
-
-    oo.equals(oo).should.be.true();
-    oo.equals(cc).should.be.false();
-    oo.equals(cci).should.be.true();
-    oo.equals(oci).should.be.false();
-    oo.equals(coi).should.be.false();
-    oo.equals(ooi).should.be.false();
-    cci.equals(cci).should.be.true();
-    cci.equals(oo).should.be.true();
-    cci.equals(co).should.be.false();
-    cci.equals(oc).should.be.false();
-    cci.equals(cc).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.sameAs));
-    should(x.closed.equals(y.toMinute)).be.null();
-    should(x.toHour.equals(y.toMinute)).be.null();
-
-    [x, y] = Array.from(xy(d.dIvl.before));
-    x.toMonth.equals(y.toMonth).should.be.false();
-    should(x.toYear.equals(y.closed)).be.null();
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    x.toMonth.equals(y.toMonth).should.be.false();
-    should(x.toYear.equals(y.closed)).be.null();
-
-    [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toMonth.equals(y.toMonth).should.be.false();
-    should(x.toYear.equals(y.closed)).be.null();
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    x.toMinute.equals(y.toMinute).should.be.false();
-    should(x.toYear.equals(y.closed)).be.null();
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    x.toMonth.equals(y.toMonth).should.be.false();
-    y.toMonth.equals(x.toMonth).should.be.false();
-    should(x.toYear.equals(y.closed)).be.null();
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    x.toMinute.equals(y.toMinute).should.be.false();
-    should(x.toYear.equals(y.closed)).be.null();
-  });
-
-  it('should be false for equality with points', () => {
-    const point = DateTime.parse('2012-01-01T00:00:00.0+00');
-    const ivl = new Interval(point, point, true, true);
-
-    ivl.equals(point).should.be.false();
-  });
-});
-
-describe('DateTimeInterval.union', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs unions', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.union(y.closed).equals(x.closed).should.be.true();
-    x.closed.union(y.open).equals(x.closed).should.be.true();
-    x.open.union(y.closed).equals(x.closed).should.be.true();
-    x.open.union(y.open).equals(x.open).should.be.true();
-    y.closed.union(x.closed).equals(y.closed).should.be.true();
-    y.closed.union(x.open).equals(y.closed).should.be.true();
-    y.open.union(x.closed).equals(y.closed).should.be.true();
-    y.open.union(x.open).equals(y.open).should.be.true();
-  });
-
-  it('should properly calculate before/after unions', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    should(x.closed.union(y.closed)).be.null();
-    should(x.closed.union(y.open)).be.null();
-    should(x.open.union(y.closed)).be.null();
-    should(x.open.union(y.open)).be.null();
-    should(y.closed.union(x.closed)).be.null();
-    should(y.closed.union(x.open)).be.null();
-    should(y.open.union(x.closed)).be.null();
-    should(y.open.union(x.open)).be.null();
-  });
-
-  it('should properly calculate meets unions', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    const z = d.all2012;
-    x.closed.union(y.closed).equals(z.closed).should.be.true();
-    should(x.closed.union(y.open)).be.null();
-    should(x.open.union(y.closed)).be.null();
-    should(x.open.union(y.open)).be.null();
-    y.closed.union(x.closed).equals(z.closed).should.be.true();
-    should(y.closed.union(x.open)).be.null();
-    should(y.open.union(x.closed)).be.null();
-    should(y.open.union(x.open)).be.null();
-  });
-
-  it('should properly calculate left/right overlapping unions', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    const z = d.all2012;
-    x.closed.union(y.closed).equals(z.closed).should.be.true();
-    x.closed.union(y.open).equals(z.closedOpen).should.be.true();
-    x.open.union(y.closed).equals(z.openClosed).should.be.true();
-    x.open.union(y.open).equals(z.open).should.be.true();
-    y.closed.union(x.closed).equals(z.closed).should.be.true();
-    y.closed.union(x.open).equals(z.openClosed).should.be.true();
-    y.open.union(x.closed).equals(z.closedOpen).should.be.true();
-    y.open.union(x.open).equals(z.open).should.be.true();
-  });
-
-  it('should properly calculate begins/begun by unions', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.union(y.closed).equals(y.closed).should.be.true();
-    x.closed.union(y.open).equals(y.closedOpen).should.be.true();
-    x.open.union(y.closed).equals(y.closed).should.be.true();
-    x.open.union(y.open).equals(y.open).should.be.true();
-    y.closed.union(x.closed).equals(y.closed).should.be.true();
-    y.closed.union(x.open).equals(y.closed).should.be.true();
-    y.open.union(x.closed).equals(y.closedOpen).should.be.true();
-    y.open.union(x.open).equals(y.open).should.be.true();
-  });
-
-  it('should properly calculate includes/included by unions', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.union(y.closed).equals(y.closed).should.be.true();
-    x.closed.union(y.open).equals(y.open).should.be.true();
-    x.open.union(y.closed).equals(y.closed).should.be.true();
-    x.open.union(y.open).equals(y.open).should.be.true();
-    y.closed.union(x.closed).equals(y.closed).should.be.true();
-    y.closed.union(x.open).equals(y.closed).should.be.true();
-    y.open.union(x.closed).equals(y.open).should.be.true();
-    y.open.union(x.open).equals(y.open).should.be.true();
-  });
-
-  it('should properly calculate ends/ended by unions', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.union(y.closed).equals(y.closed).should.be.true();
-    x.closed.union(y.open).equals(y.openClosed).should.be.true();
-    x.open.union(y.closed).equals(y.closed).should.be.true();
-    x.open.union(y.open).equals(y.open).should.be.true();
-    y.closed.union(x.closed).equals(y.closed).should.be.true();
-    y.closed.union(x.open).equals(y.closed).should.be.true();
-    y.open.union(x.closed).equals(y.openClosed).should.be.true();
-    y.open.union(x.open).equals(y.open).should.be.true();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.sameAs));
-
-    // first, check that the DateTime precision methods are correct.
-    // TODO: move these into DateTime tests
-    x.closed.low.isMorePrecise(x.toMinute.low).should.be.true();
-    x.closed.low.isLessPrecise(x.toMinute.low).should.be.false();
-    x.closed.low.isSamePrecision(x.toMinute.low).should.be.false();
-    x.toMinute.low.isMorePrecise(x.closed.low).should.be.false();
-    x.toMinute.low.isLessPrecise(x.closed.low).should.be.true();
-    x.toMinute.low.isSamePrecision(x.closed.low).should.be.false();
-
-    // The union of (A U B) should be the same as (B U A)
-    // check sameAs
-    let i = x.toMinute.union(y.closed);
-    x.toMinute.low.sameAs(i.low, DateTime.Unit.MINUTE).should.be.true();
-    x.toMinute.high.sameAs(i.high, DateTime.Unit.MINUTE).should.be.true();
-
-    let j = y.closed.union(x.toMinute);
-    y.closed.low.sameAs(j.low, DateTime.Unit.MINUTE).should.be.true();
-    y.closed.high.sameAs(j.high, DateTime.Unit.MINUTE).should.be.true();
-
-    i.low.sameAs(j.low, DateTime.Unit.MINUTE).should.be.true();
-    i.high.sameAs(j.high, DateTime.Unit.MINUTE).should.be.true();
-
-    // check resulting precision
-    i.low.isMorePrecise(j.low).should.be.false();
-    i.low.isLessPrecise(j.low).should.be.false();
-    i.low.isSamePrecision(j.low).should.be.true();
-    i.high.isMorePrecise(j.high).should.be.false();
-    i.high.isLessPrecise(j.high).should.be.false();
-    i.high.isSamePrecision(j.high).should.be.true();
-
-    [x, y] = Array.from(xy(d.dIvl.before));
-    i = x.toYear.union(y.toYear);
-    should(i).not.be.null();
-    i.low.equals(y.toYear.low);
-    i.high.equals(y.toYear.high);
-    j = y.toYear.union(x.toYear);
-    should(j).not.be.null();
-    j.equals(i).should.be.true();
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    i = x.toMonth.union(y.toMonth);
-    should(i).not.be.null();
-    i.low.equals(x.toMonth.low);
-    i.high.equals(y.toMonth.high);
-
-    [x, y] = Array.from(xy(d.dIvl.overlaps));
-    i = x.toMonth.union(y.toMonth);
-    j = y.toMonth.union(x.toMonth);
-
-    x.toMonth.low.sameAs(i.low, DateTime.Unit.MONTH).should.be.true();
-    y.toMonth.high.sameAs(i.high, DateTime.Unit.MONTH).should.be.true();
-    x.toMonth.low.sameAs(j.low, DateTime.Unit.MONTH).should.be.true();
-    y.toMonth.high.sameAs(j.high, DateTime.Unit.MONTH).should.be.true();
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    i = x.toMonth.union(y.toMonth);
-    j = y.toMonth.union(x.toMonth);
-
-    x.toMonth.low.sameAs(i.low, DateTime.Unit.MONTH).should.be.true();
-    y.toMonth.high.sameAs(i.high, DateTime.Unit.MONTH).should.be.true();
-    x.toMonth.low.sameAs(j.low, DateTime.Unit.MONTH).should.be.true();
-    y.toMonth.high.sameAs(j.high, DateTime.Unit.MONTH).should.be.true();
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    i = x.toMonth.union(y.toMonth);
-    j = y.toMonth.union(x.toMonth);
-
-    y.toMonth.low.sameAs(i.low, DateTime.Unit.MONTH).should.be.true();
-    y.toMonth.high.sameAs(i.high, DateTime.Unit.MONTH).should.be.true();
-    y.toMonth.low.sameAs(j.low, DateTime.Unit.MONTH).should.be.true();
-    y.toMonth.high.sameAs(j.high, DateTime.Unit.MONTH).should.be.true();
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    i = x.toMonth.union(y.toMonth);
-    j = y.toMonth.union(x.toMonth);
-
-    y.toMonth.low.sameAs(i.low, DateTime.Unit.MONTH).should.be.true();
-    x.toMonth.high.sameAs(i.high, DateTime.Unit.MONTH).should.be.true();
-    y.toMonth.low.sameAs(j.low, DateTime.Unit.MONTH).should.be.true();
-    x.toMonth.high.sameAs(j.high, DateTime.Unit.MONTH).should.be.true();
-  });
-
-  it('should throw when the argument is a point', () => {
-    should(() => d.all2012.closed.union(d.mid2012.closed)).throw(Error);
-  });
-});
-
-describe('DateTimeInterval.intersect', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intersect', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.intersect(y.closed).equals(x.closed).should.be.true();
-    x.closed.intersect(y.open).equals(y.open).should.be.true();
-    x.open.intersect(y.closed).equals(x.open).should.be.true();
-    x.open.intersect(y.open).equals(x.open).should.be.true();
-    y.closed.intersect(x.closed).equals(y.closed).should.be.true();
-    y.closed.intersect(x.open).equals(x.open).should.be.true();
-    y.open.intersect(x.closed).equals(y.open).should.be.true();
-    y.open.intersect(x.open).equals(y.open).should.be.true();
-  });
-
-  it('should properly calculate before/after intersect', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    should.not.exist(x.closed.intersect(y.closed));
-    should.not.exist(x.closed.intersect(y.open));
-    should.not.exist(x.open.intersect(y.closed));
-    should.not.exist(x.open.intersect(y.open));
-    should.not.exist(y.closed.intersect(x.closed));
-    should.not.exist(y.closed.intersect(x.open));
-    should.not.exist(y.open.intersect(x.closed));
-    should.not.exist(y.open.intersect(x.open));
-  });
-
-  it('should properly calculate meets intersect', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    should.not.exist(x.closed.intersect(y.closed));
-    should.not.exist(x.closed.intersect(y.open));
-    should.not.exist(x.open.intersect(y.closed));
-    should.not.exist(x.open.intersect(y.open));
-    should.not.exist(y.closed.intersect(x.closed));
-    should.not.exist(y.closed.intersect(x.open));
-    should.not.exist(y.open.intersect(x.closed));
-    should.not.exist(y.open.intersect(x.open));
-  });
-
-  it('should properly calculate left/right overlapping intersect', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    const a = d.julysept;
-    x.closed.intersect(y.closed).equals(a.closed).should.be.true();
-    x.closed.intersect(y.open).equals(a.openClosed).should.be.true();
-    x.open.intersect(y.closed).equals(a.closedOpen).should.be.true();
-    x.open.intersect(y.open).equals(a.open).should.be.true();
-    y.closed.intersect(x.closed).equals(a.closed).should.be.true();
-    y.closed.intersect(x.open).equals(a.closedOpen).should.be.true();
-    y.open.intersect(x.closed).equals(a.openClosed).should.be.true();
-    y.open.intersect(x.open).equals(a.open).should.be.true();
-  });
-
-  it('should properly calculate begins/begun by intersect', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.intersect(y.closed).equals(x.closed).should.be.true();
-    x.closed.intersect(y.open).equals(x.openClosed).should.be.true();
-    x.open.intersect(y.closed).equals(x.open).should.be.true();
-    x.open.intersect(y.open).equals(x.open).should.be.true();
-    y.closed.intersect(x.closed).equals(x.closed).should.be.true();
-    y.closed.intersect(x.open).equals(x.open).should.be.true();
-    y.open.intersect(x.closed).equals(x.openClosed).should.be.true();
-    y.open.intersect(x.open).equals(x.open).should.be.true();
-  });
-
-  it('should properly calculate includes/included by intersect', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.intersect(y.closed).equals(x.closed).should.be.true();
-    x.closed.intersect(y.open).equals(x.closed).should.be.true();
-    x.open.intersect(y.closed).equals(x.open).should.be.true();
-    x.open.intersect(y.open).equals(x.open).should.be.true();
-    y.closed.intersect(x.closed).equals(x.closed).should.be.true();
-    y.closed.intersect(x.open).equals(x.open).should.be.true();
-    y.open.intersect(x.closed).equals(x.closed).should.be.true();
-    y.open.intersect(x.open).equals(x.open).should.be.true();
-  });
-
-  it('should properly calculate ends/ended by intersect', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.intersect(y.closed).equals(x.closed).should.be.true();
-    x.closed.intersect(y.open).equals(x.closedOpen).should.be.true();
-    x.open.intersect(y.closed).equals(x.open).should.be.true();
-    x.open.intersect(y.open).equals(x.open).should.be.true();
-    y.closed.intersect(x.closed).equals(x.closed).should.be.true();
-    y.closed.intersect(x.open).equals(x.open).should.be.true();
-    y.open.intersect(x.closed).equals(x.closedOpen).should.be.true();
-    y.open.intersect(x.open).equals(x.open).should.be.true();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toDay.intersect(y.toDay).low.should.eql(y.toDay.low);
-    x.toDay.intersect(y.toDay).high.should.eql(x.toDay.high);
-    y.toDay.intersect(x.toDay).low.should.eql(y.toDay.low);
-    y.toDay.intersect(x.toDay).high.should.eql(x.toDay.high);
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    should.not.exist(x.toDay.intersect(y.toDay));
-    should.not.exist(y.toDay.intersect(x.toDay));
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    x.toDay.intersect(y.toDay).low.should.eql(x.toDay.low);
-    x.toDay.intersect(y.toDay).high.should.eql(x.toDay.high);
-    y.toDay.intersect(x.toDay).low.should.eql(x.toDay.low);
-    y.toDay.intersect(x.toDay).high.should.eql(x.toDay.high);
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    x.toDay.intersect(y.toDay).low.should.eql(x.toDay.low);
-    x.toDay.intersect(y.toDay).high.should.eql(x.toDay.high);
-    y.toDay.intersect(x.toDay).low.should.eql(x.toDay.low);
-    y.toDay.intersect(x.toDay).high.should.eql(x.toDay.high);
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    x.toDay.intersect(y.toDay).low.should.eql(x.toDay.low);
-    x.toDay.intersect(y.toDay).high.should.eql(x.toDay.high);
-    y.toDay.intersect(x.toDay).low.should.eql(x.toDay.low);
-    y.toDay.intersect(x.toDay).high.should.eql(x.toDay.high);
-  });
-
-  it('should throw when the argument is a point', () => {
-    should(() => d.all2012.intersect(DateTime.parse('2012-07-01T00:00:00.0'))).throw(Error);
-  });
-});
-
-describe('DateTimeInterval.except', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs except', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    should.not.exist(x.closed.except(y.closed));
-    should.not.exist(x.closed.except(y.open));
-    should.not.exist(x.open.except(y.closed));
-    should.not.exist(x.open.except(y.open));
-    should.not.exist(y.closed.except(x.closed));
-    should.not.exist(y.closed.except(x.open));
-    should.not.exist(y.open.except(x.closed));
-    should.not.exist(y.open.except(x.open));
-  });
-
-  it('should properly calculate before/after except', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    x.closed.except(y.closed).should.eql(x.closed);
-    x.closed.except(y.open).should.eql(x.closed);
-    x.open.except(y.closed).should.eql(x.open);
-    x.open.except(y.open).should.eql(x.open);
-    y.closed.except(x.closed).should.eql(y.closed);
-    y.closed.except(x.open).should.eql(y.closed);
-    y.open.except(x.closed).should.eql(y.open);
-    y.open.except(x.open).should.eql(y.open);
-  });
-
-  it('should properly calculate meets except', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    x.closed.except(y.closed).should.eql(x.closed);
-    x.closed.except(y.open).should.eql(x.closed);
-    x.open.except(y.closed).should.eql(x.open);
-    x.open.except(y.open).should.eql(x.open);
-    y.closed.except(x.closed).should.eql(y.closed);
-    y.closed.except(x.open).should.eql(y.closed);
-    y.open.except(x.closed).should.eql(y.open);
-    y.open.except(x.open).should.eql(y.open);
-  });
-
-  it('should properly calculate left/right overlapping except', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    const a = d.janjune;
-    const b = d.septdec;
-    x.closed.except(y.closed).equals(a.closedOpen).should.be.true();
-    x.closed.except(y.open).equals(a.closed).should.be.true();
-    x.open.except(y.closed).equals(a.open).should.be.true();
-    x.open.except(y.open).equals(a.openClosed).should.be.true();
-    y.closed.except(x.closed).equals(b.openClosed).should.be.true();
-    y.closed.except(x.open).equals(b.closed).should.be.true();
-    y.open.except(x.closed).equals(b.open).should.be.true();
-    y.open.except(x.open).equals(b.closedOpen).should.be.true();
-  });
-
-  it('should properly calculate begins/begun by except', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    const b = d.julydec;
-    should.not.exist(x.closed.except(y.closed));
-    x.closed.except(y.open).should.eql(new Interval(x.closed.low, x.closed.low));
-    should.not.exist(x.open.except(y.open));
-    y.closed.except(x.closed).equals(b.openClosed).should.be.true();
-    should.not.exist(y.closed.except(x.open));
-    y.open.except(x.closed).equals(b.open).should.be.true();
-    y.open.except(x.open).equals(b.closedOpen).should.be.true();
-  });
-
-  it('should properly calculate includes/included by except', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    should.not.exist(x.closed.except(y.closed));
-    should.not.exist(x.closed.except(y.open));
-    should.not.exist(x.open.except(y.closed));
-    should.not.exist(x.open.except(y.open));
-    should.not.exist(y.closed.except(x.closed));
-    should.not.exist(y.closed.except(x.open));
-    should.not.exist(y.open.except(x.closed));
-    should.not.exist(y.open.except(x.open));
-  });
-
-  it('should properly calculate ends/ended by except', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    const b = d.janjuly;
-    should.not.exist(x.closed.except(y.closed));
-    x.closed.except(y.open).should.eql(new Interval(x.closed.high, x.closed.high));
-    should.not.exist(x.open.except(y.closed));
-    should.not.exist(x.open.except(y.open));
-    y.closed.except(x.closed).equals(b.closedOpen).should.be.true();
-    should.not.exist(y.closed.except(x.open));
-    y.open.except(x.closed).equals(b.open).should.be.true();
-    y.open.except(x.open).equals(b.openClosed).should.be.true();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toDay.except(y.toDay).low.should.eql(x.toDay.low);
-    x.toDay.except(y.toDay).high.should.eql(y.toDay.low);
-    y.toDay.except(x.toDay).low.should.eql(x.toDay.high);
-    y.toDay.except(x.toDay).high.should.eql(y.toDay.high);
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    // [a,b].except([b,c]) (where b is uncertain) should result in [a,b) but spec says we don't know if they overlap
-    x.toDay.except(y.toDay).should.eql(x.toDay);
-    // [b,c].except([a,b]) (where b is uncertain) should result in (b,c] but spec says we don't know if they overlap
-    y.toDay.except(x.toDay).should.eql(y.toDay);
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    should.not.exist(x.toDay.except(y.toDay));
-    should.not.exist(y.toDay.except(x.toDay));
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    should.not.exist(x.toDay.except(y.toDay));
-    should.not.exist(x.toDay.except(y.toDay));
-    // x: ['2012-07-01', '2012-12-31']
-    // y: ['2012-01-01', '2012-12-31']
-    y.toDay.except(x.toDay).should.eql(new Interval(y.toDay.low, x.toDay.low, true, false));
-    should.not.exist(y.toDay.except(x.toMinute));
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    should.not.exist(x.toDay.except(y.toDay));
-    should.not.exist(x.toDay.except(y.toDay));
-    // x: ['2012-01-01', '2012-07-01']
-    // y: ['2012-01-01', '2012-12-31']
-    y.toDay.except(x.toDay).should.eql(new Interval(x.toDay.high, y.toDay.high, false, true));
-    should.not.exist(y.toDay.except(x.toMinute));
-  });
-
-  it('should throw when the argument is a point', () => {
-    should(() => d.all2012.closed.except(DateTime.parse('2012-07-01T00:00:00.0'))).throw(Error);
+describe('DateTimeInterval', () => {
+  describe('contains', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate dates before it', () => {
+      d.all2012.closed.contains(d.bef2012.full).should.be.false();
+    });
+
+    it('should properly calculate the left boundary date', () => {
+      d.all2012.closed.contains(d.beg2012.full).should.be.true();
+      d.all2012.open.contains(d.beg2012.full).should.be.false();
+    });
+
+    it('should properly calculate dates in the middle of it', () => {
+      d.all2012.closed.contains(d.mid2012.full).should.be.true();
+    });
+
+    it('should properly calculate the right boundary date', () => {
+      d.all2012.closed.contains(d.end2012.full).should.be.true();
+      d.all2012.open.contains(d.end2012.full).should.be.false();
+    });
+
+    it('should properly calculate dates after it', () => {
+      d.all2012.closed.contains(d.aft2012.full).should.be.false();
+    });
+
+    it('should properly handle null endpoints', () => {
+      const date = DateTime.parse('2012-01-01T00:00:00.0');
+      const early = DateTime.parse('0001-01-01T00:00:00.0');
+      const late = DateTime.parse('2999-01-01T00:00:00.0');
+      new Interval(null, date).contains(early).should.be.true();
+      new Interval(null, date).contains(late).should.be.false();
+      new Interval(null, date, false, true).contains(date).should.be.true();
+      should(new Interval(null, date, false, true).contains(early)).be.null();
+      new Interval(null, date, false, true).contains(late).should.be.false();
+      new Interval(date, null).contains(late).should.be.true();
+      new Interval(date, null).contains(early).should.be.false();
+      new Interval(date, null, true, false).contains(date).should.be.true();
+      should(new Interval(date, null, true, false).contains(late)).be.null();
+      new Interval(date, null, true, false).contains(early).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      d.all2012.closed.contains(d.bef2012.toMonth).should.be.false();
+      should.not.exist(d.all2012.closed.contains(d.beg2012.toMonth));
+      d.all2012.closed.contains(d.mid2012.toMonth).should.be.true();
+      should.not.exist(d.all2012.closed.contains(d.end2012.toMonth));
+      d.all2012.closed.contains(d.aft2012.toMonth).should.be.false();
+
+      d.all2012.toMonth.contains(d.bef2012.toMonth).should.be.false();
+      d.all2012.toMonth.contains(d.beg2012.toMonth).should.be.true();
+      d.all2012.toMonth.contains(d.mid2012.toMonth).should.be.true();
+      d.all2012.toMonth.contains(d.end2012.toMonth).should.be.true();
+      d.all2012.toMonth.contains(d.aft2012.toMonth).should.be.false();
+
+      d.all2012.toMonth.contains(d.bef2012.full).should.be.false();
+      should.not.exist(d.all2012.toMonth.contains(d.beg2012.full));
+      d.all2012.toMonth.contains(d.mid2012.full).should.be.true();
+      should.not.exist(d.all2012.toMonth.contains(d.end2012.full));
+      d.all2012.toMonth.contains(d.aft2012.full).should.be.false();
+
+      should.not.exist(d.all2012.closed.contains(d.mid2012.toYear));
+    });
+
+    it('should return null when checking if interval contains null point', () => {
+      const date = DateTime.parse('2012-01-01T00:00:00.0');
+      should(new Interval(date, null, true, false).contains(null)).be.null();
+    });
+
+    it('should throw when the argument is an interval', () => {
+      should(() => d.all2012.closed.contains(d.all2012.open)).throw(Error);
+    });
+  });
+
+  describe('includes', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.includes(y.closed).should.be.true();
+      x.closed.includes(y.open).should.be.true();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.true();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.false();
+      y.closed.includes(x.open).should.be.false();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.false();
+      y.closed.includes(x.open).should.be.false();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.false();
+      y.closed.includes(x.open).should.be.false();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.true();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.sameAs));
+      should.not.exist(x.closed.includes(y.toMinute));
+      should.not.exist(x.toHour.includes(y.toMinute));
+
+      [x, y] = Array.from(xy(d.dIvl.before));
+      x.toMonth.includes(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.includes(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      x.toMonth.includes(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.includes(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toMonth.includes(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.includes(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      x.toMinute.includes(y.toMinute).should.be.false();
+      should.not.exist(x.toYear.includes(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      x.toMonth.includes(y.toMonth).should.be.false();
+      y.toMonth.includes(x.toMonth).should.be.true();
+      should.not.exist(x.toYear.includes(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      x.toMinute.includes(y.toMinute).should.be.false();
+      should.not.exist(x.toYear.includes(y.closed));
+    });
+
+    it('should include a point date', () => {
+      d.all2012.closed.includes(d.mid2012.full).should.be.true();
+    });
+  });
+
+  describe('includedIn', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+
+      y.closed.includedIn(x.closed).should.be.true();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.true();
+      y.open.includedIn(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      x.closed.includedIn(y.closed).should.be.false();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.false();
+      x.open.includedIn(y.open).should.be.false();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      x.closed.includedIn(y.closed).should.be.false();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.false();
+      x.open.includedIn(y.open).should.be.false();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.closed.includedIn(y.closed).should.be.false();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.false();
+      x.open.includedIn(y.open).should.be.false();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.true();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.sameAs));
+      should.not.exist(x.closed.includedIn(y.toMinute));
+      should.not.exist(x.toHour.includedIn(y.toMinute));
+
+      [x, y] = Array.from(xy(d.dIvl.before));
+      x.toMonth.includedIn(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.includedIn(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      x.toMonth.includedIn(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.includedIn(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toMonth.includedIn(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.includedIn(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      x.toMinute.includedIn(y.toMinute).should.be.true();
+      should.not.exist(x.toYear.includedIn(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      x.toMonth.includedIn(y.toMonth).should.be.true();
+      y.toMonth.includedIn(x.toMonth).should.be.false();
+      should.not.exist(x.toYear.includedIn(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      x.toMinute.includedIn(y.toMinute).should.be.true();
+      should.not.exist(x.toYear.includedIn(y.closed));
+    });
+
+    it('should include a point date', () => {
+      d.all2012.closed.includedIn(d.mid2012.full).should.be.true();
+    });
+  });
+
+  describe('overlaps(DateTimeInterval)', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      x.closed.overlaps(y.closed).should.be.false();
+      x.closed.overlaps(y.open).should.be.false();
+      x.open.overlaps(y.closed).should.be.false();
+      x.open.overlaps(y.open).should.be.false();
+      y.closed.overlaps(x.closed).should.be.false();
+      y.closed.overlaps(x.open).should.be.false();
+      y.open.overlaps(x.closed).should.be.false();
+      y.open.overlaps(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      x.closed.overlaps(y.closed).should.be.false();
+      x.closed.overlaps(y.open).should.be.false();
+      x.open.overlaps(y.closed).should.be.false();
+      x.open.overlaps(y.open).should.be.false();
+      y.closed.overlaps(x.closed).should.be.false();
+      y.closed.overlaps(x.open).should.be.false();
+      y.open.overlaps(x.closed).should.be.false();
+      y.open.overlaps(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly handle boundless and unknown intervals', () => {
+      boundlessInterval().overlaps(boundlessInterval()).should.be.true();
+      boundlessInterval().overlaps(d.all2012.closed).should.be.true();
+      d.all2012.closed.overlaps(boundlessInterval()).should.be.true();
+      should(boundlessInterval().overlaps(unknownInterval())).be.null();
+      should(unknownInterval().overlaps(boundlessInterval())).be.null();
+      should(unknownInterval().overlaps(d.all2012.closed)).be.null();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.overlaps(y.toMinute).should.be.true();
+      x.toHour.overlaps(y.toMinute).should.be.true();
+
+      [x, y] = Array.from(xy(d.dIvl.before));
+      x.toMonth.overlaps(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.overlaps(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      x.toMonth.overlaps(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.overlaps(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toMonth.overlaps(y.toMonth).should.be.true();
+      should.not.exist(x.toYear.overlaps(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      x.toMinute.overlaps(y.toMinute).should.be.true();
+      should.not.exist(x.toYear.overlaps(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      x.toMonth.overlaps(y.toMonth).should.be.true();
+      y.toMonth.overlaps(x.toMonth).should.be.true();
+      should.not.exist(x.toYear.overlaps(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      x.toMinute.overlaps(y.toMinute).should.be.true();
+      should.not.exist(x.toYear.overlaps(y.closed));
+    });
+  });
+
+  describe('overlaps(DateTime)', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate dates before it', () => {
+      d.all2012.closed.overlaps(d.bef2012.full).should.be.false();
+    });
+
+    it('should properly calculate the left boundary date', () => {
+      d.all2012.closed.overlaps(d.beg2012.full).should.be.true();
+      d.all2012.open.overlaps(d.beg2012.full).should.be.false();
+    });
+
+    it('should properly calculate dates in the middle of it', () => {
+      d.all2012.closed.overlaps(d.mid2012.full).should.be.true();
+    });
+
+    it('should properly calculate the right boundary date', () => {
+      d.all2012.closed.overlaps(d.end2012.full).should.be.true();
+      d.all2012.open.overlaps(d.end2012.full).should.be.false();
+    });
+
+    it('should properly calculate dates after it', () => {
+      d.all2012.closed.overlaps(d.aft2012.full).should.be.false();
+    });
+
+    it('should properly handle boundless and unknown intervals', () => {
+      boundlessInterval().overlaps(d.mid2012.full).should.be.true();
+      should(boundlessInterval().overlaps(null)).be.null();
+      should(unknownInterval().overlaps(d.mid2012.full)).be.null();
+    });
+
+    it('should properly handle imprecision', () => {
+      d.all2012.closed.overlaps(d.bef2012.toMonth).should.be.false();
+      should.not.exist(d.all2012.closed.overlaps(d.beg2012.toMonth));
+      d.all2012.closed.overlaps(d.mid2012.toMonth).should.be.true();
+      should.not.exist(d.all2012.closed.overlaps(d.end2012.toMonth));
+      d.all2012.closed.overlaps(d.aft2012.toMonth).should.be.false();
+
+      d.all2012.toMonth.overlaps(d.bef2012.toMonth).should.be.false();
+      d.all2012.toMonth.overlaps(d.beg2012.toMonth).should.be.true();
+      d.all2012.toMonth.overlaps(d.mid2012.toMonth).should.be.true();
+      d.all2012.toMonth.overlaps(d.end2012.toMonth).should.be.true();
+      d.all2012.toMonth.overlaps(d.aft2012.toMonth).should.be.false();
+
+      d.all2012.toMonth.overlaps(d.bef2012.full).should.be.false();
+      should.not.exist(d.all2012.toMonth.overlaps(d.beg2012.full));
+      d.all2012.toMonth.overlaps(d.mid2012.full).should.be.true();
+      should.not.exist(d.all2012.toMonth.overlaps(d.end2012.full));
+      d.all2012.toMonth.overlaps(d.aft2012.full).should.be.false();
+
+      should.not.exist(d.all2012.closed.overlaps(d.mid2012.toYear));
+    });
+  });
+
+  describe('overlapsBefore', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly handle boundless intervals', () => {
+      boundlessInterval().overlapsBefore(d.mid2012.full).should.be.true();
+      d.all2012.closed.overlapsBefore(boundlessInterval()).should.be.false();
+      should(boundlessInterval().overlapsBefore(unknownInterval())).be.null();
+      should(unknownInterval().overlapsBefore(boundlessInterval())).be.null();
+    });
+  });
+
+  describe('overlapsAfter', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly handle boundless intervals', () => {
+      boundlessInterval().overlapsAfter(d.mid2012.full).should.be.true();
+      d.all2012.closed.overlapsAfter(boundlessInterval()).should.be.false();
+      should(boundlessInterval().overlapsAfter(unknownInterval())).be.null();
+      should(unknownInterval().overlapsAfter(boundlessInterval())).be.null();
+    });
+  });
+
+  describe('equals', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.equals(y.closed).should.be.true();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.true();
+      y.closed.equals(x.closed).should.be.true();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate open vs. closed intervals', () => {
+      const lowEdge2012 = DateTime.parse('2012-01-01T00:00:00.0+00');
+      const lowEdge2012Succ = DateTime.parse('2012-01-01T00:00:00.001+00');
+      const highEdge2012 = DateTime.parse('2012-12-31T23:59:59.999+00');
+      const highEdge2012Pred = DateTime.parse('2012-12-31T23:59:59.998+00');
+      const cc = new Interval(lowEdge2012, highEdge2012, true, true);
+      const oc = new Interval(lowEdge2012, highEdge2012, false, true);
+      const co = new Interval(lowEdge2012, highEdge2012, true, false);
+      const oo = new Interval(lowEdge2012, highEdge2012, false, false);
+      const cci = new Interval(lowEdge2012Succ, highEdge2012Pred, true, true);
+      const oci = new Interval(lowEdge2012Succ, highEdge2012Pred, false, true);
+      const coi = new Interval(lowEdge2012Succ, highEdge2012Pred, true, false);
+      const ooi = new Interval(lowEdge2012Succ, highEdge2012Pred, false, false);
+
+      oo.equals(oo).should.be.true();
+      oo.equals(cc).should.be.false();
+      oo.equals(cci).should.be.true();
+      oo.equals(oci).should.be.false();
+      oo.equals(coi).should.be.false();
+      oo.equals(ooi).should.be.false();
+      cci.equals(cci).should.be.true();
+      cci.equals(oo).should.be.true();
+      cci.equals(co).should.be.false();
+      cci.equals(oc).should.be.false();
+      cci.equals(cc).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.sameAs));
+      should(x.closed.equals(y.toMinute)).be.null();
+      should(x.toHour.equals(y.toMinute)).be.null();
+
+      [x, y] = Array.from(xy(d.dIvl.before));
+      x.toMonth.equals(y.toMonth).should.be.false();
+      should(x.toYear.equals(y.closed)).be.null();
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      x.toMonth.equals(y.toMonth).should.be.false();
+      should(x.toYear.equals(y.closed)).be.null();
+
+      [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toMonth.equals(y.toMonth).should.be.false();
+      should(x.toYear.equals(y.closed)).be.null();
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      x.toMinute.equals(y.toMinute).should.be.false();
+      should(x.toYear.equals(y.closed)).be.null();
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      x.toMonth.equals(y.toMonth).should.be.false();
+      y.toMonth.equals(x.toMonth).should.be.false();
+      should(x.toYear.equals(y.closed)).be.null();
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      x.toMinute.equals(y.toMinute).should.be.false();
+      should(x.toYear.equals(y.closed)).be.null();
+    });
+
+    it('should be false for equality with points', () => {
+      const point = DateTime.parse('2012-01-01T00:00:00.0+00');
+      const ivl = new Interval(point, point, true, true);
+
+      ivl.equals(point).should.be.false();
+    });
+  });
+
+  describe('union', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs unions', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.union(y.closed).equals(x.closed).should.be.true();
+      x.closed.union(y.open).equals(x.closed).should.be.true();
+      x.open.union(y.closed).equals(x.closed).should.be.true();
+      x.open.union(y.open).equals(x.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.closed).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate before/after unions', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      should(x.closed.union(y.closed)).be.null();
+      should(x.closed.union(y.open)).be.null();
+      should(x.open.union(y.closed)).be.null();
+      should(x.open.union(y.open)).be.null();
+      should(y.closed.union(x.closed)).be.null();
+      should(y.closed.union(x.open)).be.null();
+      should(y.open.union(x.closed)).be.null();
+      should(y.open.union(x.open)).be.null();
+    });
+
+    it('should properly calculate meets unions', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      const z = d.all2012;
+      x.closed.union(y.closed).equals(z.closed).should.be.true();
+      should(x.closed.union(y.open)).be.null();
+      should(x.open.union(y.closed)).be.null();
+      should(x.open.union(y.open)).be.null();
+      y.closed.union(x.closed).equals(z.closed).should.be.true();
+      should(y.closed.union(x.open)).be.null();
+      should(y.open.union(x.closed)).be.null();
+      should(y.open.union(x.open)).be.null();
+    });
+
+    it('should properly calculate left/right overlapping unions', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      const z = d.all2012;
+      x.closed.union(y.closed).equals(z.closed).should.be.true();
+      x.closed.union(y.open).equals(z.closedOpen).should.be.true();
+      x.open.union(y.closed).equals(z.openClosed).should.be.true();
+      x.open.union(y.open).equals(z.open).should.be.true();
+      y.closed.union(x.closed).equals(z.closed).should.be.true();
+      y.closed.union(x.open).equals(z.openClosed).should.be.true();
+      y.open.union(x.closed).equals(z.closedOpen).should.be.true();
+      y.open.union(x.open).equals(z.open).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by unions', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.union(y.closed).equals(y.closed).should.be.true();
+      x.closed.union(y.open).equals(y.closedOpen).should.be.true();
+      x.open.union(y.closed).equals(y.closed).should.be.true();
+      x.open.union(y.open).equals(y.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.closedOpen).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by unions', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.union(y.closed).equals(y.closed).should.be.true();
+      x.closed.union(y.open).equals(y.open).should.be.true();
+      x.open.union(y.closed).equals(y.closed).should.be.true();
+      x.open.union(y.open).equals(y.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.open).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by unions', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.union(y.closed).equals(y.closed).should.be.true();
+      x.closed.union(y.open).equals(y.openClosed).should.be.true();
+      x.open.union(y.closed).equals(y.closed).should.be.true();
+      x.open.union(y.open).equals(y.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.openClosed).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.sameAs));
+
+      // first, check that the DateTime precision methods are correct.
+      // TODO: move these into DateTime tests
+      x.closed.low.isMorePrecise(x.toMinute.low).should.be.true();
+      x.closed.low.isLessPrecise(x.toMinute.low).should.be.false();
+      x.closed.low.isSamePrecision(x.toMinute.low).should.be.false();
+      x.toMinute.low.isMorePrecise(x.closed.low).should.be.false();
+      x.toMinute.low.isLessPrecise(x.closed.low).should.be.true();
+      x.toMinute.low.isSamePrecision(x.closed.low).should.be.false();
+
+      // The union of (A U B) should be the same as (B U A)
+      // check sameAs
+      let i = x.toMinute.union(y.closed);
+      x.toMinute.low.sameAs(i.low, DateTime.Unit.MINUTE).should.be.true();
+      x.toMinute.high.sameAs(i.high, DateTime.Unit.MINUTE).should.be.true();
+
+      let j = y.closed.union(x.toMinute);
+      y.closed.low.sameAs(j.low, DateTime.Unit.MINUTE).should.be.true();
+      y.closed.high.sameAs(j.high, DateTime.Unit.MINUTE).should.be.true();
+
+      i.low.sameAs(j.low, DateTime.Unit.MINUTE).should.be.true();
+      i.high.sameAs(j.high, DateTime.Unit.MINUTE).should.be.true();
+
+      // check resulting precision
+      i.low.isMorePrecise(j.low).should.be.false();
+      i.low.isLessPrecise(j.low).should.be.false();
+      i.low.isSamePrecision(j.low).should.be.true();
+      i.high.isMorePrecise(j.high).should.be.false();
+      i.high.isLessPrecise(j.high).should.be.false();
+      i.high.isSamePrecision(j.high).should.be.true();
+
+      [x, y] = Array.from(xy(d.dIvl.before));
+      i = x.toYear.union(y.toYear);
+      should(i).not.be.null();
+      i.low.equals(y.toYear.low);
+      i.high.equals(y.toYear.high);
+      j = y.toYear.union(x.toYear);
+      should(j).not.be.null();
+      j.equals(i).should.be.true();
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      i = x.toMonth.union(y.toMonth);
+      should(i).not.be.null();
+      i.low.equals(x.toMonth.low);
+      i.high.equals(y.toMonth.high);
+
+      [x, y] = Array.from(xy(d.dIvl.overlaps));
+      i = x.toMonth.union(y.toMonth);
+      j = y.toMonth.union(x.toMonth);
+
+      x.toMonth.low.sameAs(i.low, DateTime.Unit.MONTH).should.be.true();
+      y.toMonth.high.sameAs(i.high, DateTime.Unit.MONTH).should.be.true();
+      x.toMonth.low.sameAs(j.low, DateTime.Unit.MONTH).should.be.true();
+      y.toMonth.high.sameAs(j.high, DateTime.Unit.MONTH).should.be.true();
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      i = x.toMonth.union(y.toMonth);
+      j = y.toMonth.union(x.toMonth);
+
+      x.toMonth.low.sameAs(i.low, DateTime.Unit.MONTH).should.be.true();
+      y.toMonth.high.sameAs(i.high, DateTime.Unit.MONTH).should.be.true();
+      x.toMonth.low.sameAs(j.low, DateTime.Unit.MONTH).should.be.true();
+      y.toMonth.high.sameAs(j.high, DateTime.Unit.MONTH).should.be.true();
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      i = x.toMonth.union(y.toMonth);
+      j = y.toMonth.union(x.toMonth);
+
+      y.toMonth.low.sameAs(i.low, DateTime.Unit.MONTH).should.be.true();
+      y.toMonth.high.sameAs(i.high, DateTime.Unit.MONTH).should.be.true();
+      y.toMonth.low.sameAs(j.low, DateTime.Unit.MONTH).should.be.true();
+      y.toMonth.high.sameAs(j.high, DateTime.Unit.MONTH).should.be.true();
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      i = x.toMonth.union(y.toMonth);
+      j = y.toMonth.union(x.toMonth);
+
+      y.toMonth.low.sameAs(i.low, DateTime.Unit.MONTH).should.be.true();
+      x.toMonth.high.sameAs(i.high, DateTime.Unit.MONTH).should.be.true();
+      y.toMonth.low.sameAs(j.low, DateTime.Unit.MONTH).should.be.true();
+      x.toMonth.high.sameAs(j.high, DateTime.Unit.MONTH).should.be.true();
+    });
+
+    it('should throw when the argument is a point', () => {
+      should(() => d.all2012.closed.union(d.mid2012.closed)).throw(Error);
+    });
+  });
+
+  describe('intersect', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intersect', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(y.open).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(y.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(y.open).should.be.true();
+      y.open.intersect(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intersect', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      should.not.exist(x.closed.intersect(y.closed));
+      should.not.exist(x.closed.intersect(y.open));
+      should.not.exist(x.open.intersect(y.closed));
+      should.not.exist(x.open.intersect(y.open));
+      should.not.exist(y.closed.intersect(x.closed));
+      should.not.exist(y.closed.intersect(x.open));
+      should.not.exist(y.open.intersect(x.closed));
+      should.not.exist(y.open.intersect(x.open));
+    });
+
+    it('should properly calculate meets intersect', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      should.not.exist(x.closed.intersect(y.closed));
+      should.not.exist(x.closed.intersect(y.open));
+      should.not.exist(x.open.intersect(y.closed));
+      should.not.exist(x.open.intersect(y.open));
+      should.not.exist(y.closed.intersect(x.closed));
+      should.not.exist(y.closed.intersect(x.open));
+      should.not.exist(y.open.intersect(x.closed));
+      should.not.exist(y.open.intersect(x.open));
+    });
+
+    it('should properly calculate left/right overlapping intersect', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      const a = d.julysept;
+      x.closed.intersect(y.closed).equals(a.closed).should.be.true();
+      x.closed.intersect(y.open).equals(a.openClosed).should.be.true();
+      x.open.intersect(y.closed).equals(a.closedOpen).should.be.true();
+      x.open.intersect(y.open).equals(a.open).should.be.true();
+      y.closed.intersect(x.closed).equals(a.closed).should.be.true();
+      y.closed.intersect(x.open).equals(a.closedOpen).should.be.true();
+      y.open.intersect(x.closed).equals(a.openClosed).should.be.true();
+      y.open.intersect(x.open).equals(a.open).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by intersect', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(x.openClosed).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(x.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(x.openClosed).should.be.true();
+      y.open.intersect(x.open).equals(x.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by intersect', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(x.closed).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(x.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(x.closed).should.be.true();
+      y.open.intersect(x.open).equals(x.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by intersect', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(x.closedOpen).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(x.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(x.closedOpen).should.be.true();
+      y.open.intersect(x.open).equals(x.open).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toDay.intersect(y.toDay).low.should.eql(y.toDay.low);
+      x.toDay.intersect(y.toDay).high.should.eql(x.toDay.high);
+      y.toDay.intersect(x.toDay).low.should.eql(y.toDay.low);
+      y.toDay.intersect(x.toDay).high.should.eql(x.toDay.high);
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      should.not.exist(x.toDay.intersect(y.toDay));
+      should.not.exist(y.toDay.intersect(x.toDay));
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      x.toDay.intersect(y.toDay).low.should.eql(x.toDay.low);
+      x.toDay.intersect(y.toDay).high.should.eql(x.toDay.high);
+      y.toDay.intersect(x.toDay).low.should.eql(x.toDay.low);
+      y.toDay.intersect(x.toDay).high.should.eql(x.toDay.high);
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      x.toDay.intersect(y.toDay).low.should.eql(x.toDay.low);
+      x.toDay.intersect(y.toDay).high.should.eql(x.toDay.high);
+      y.toDay.intersect(x.toDay).low.should.eql(x.toDay.low);
+      y.toDay.intersect(x.toDay).high.should.eql(x.toDay.high);
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      x.toDay.intersect(y.toDay).low.should.eql(x.toDay.low);
+      x.toDay.intersect(y.toDay).high.should.eql(x.toDay.high);
+      y.toDay.intersect(x.toDay).low.should.eql(x.toDay.low);
+      y.toDay.intersect(x.toDay).high.should.eql(x.toDay.high);
+    });
+
+    it('should throw when the argument is a point', () => {
+      should(() => d.all2012.intersect(DateTime.parse('2012-07-01T00:00:00.0'))).throw(Error);
+    });
+  });
+
+  describe('except', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs except', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      should.not.exist(x.closed.except(y.closed));
+      should.not.exist(x.closed.except(y.open));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      should.not.exist(y.closed.except(x.closed));
+      should.not.exist(y.closed.except(x.open));
+      should.not.exist(y.open.except(x.closed));
+      should.not.exist(y.open.except(x.open));
+    });
+
+    it('should properly calculate before/after except', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      x.closed.except(y.closed).should.eql(x.closed);
+      x.closed.except(y.open).should.eql(x.closed);
+      x.open.except(y.closed).should.eql(x.open);
+      x.open.except(y.open).should.eql(x.open);
+      y.closed.except(x.closed).should.eql(y.closed);
+      y.closed.except(x.open).should.eql(y.closed);
+      y.open.except(x.closed).should.eql(y.open);
+      y.open.except(x.open).should.eql(y.open);
+    });
+
+    it('should properly calculate meets except', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      x.closed.except(y.closed).should.eql(x.closed);
+      x.closed.except(y.open).should.eql(x.closed);
+      x.open.except(y.closed).should.eql(x.open);
+      x.open.except(y.open).should.eql(x.open);
+      y.closed.except(x.closed).should.eql(y.closed);
+      y.closed.except(x.open).should.eql(y.closed);
+      y.open.except(x.closed).should.eql(y.open);
+      y.open.except(x.open).should.eql(y.open);
+    });
+
+    it('should properly calculate left/right overlapping except', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      const a = d.janjune;
+      const b = d.septdec;
+      x.closed.except(y.closed).equals(a.closedOpen).should.be.true();
+      x.closed.except(y.open).equals(a.closed).should.be.true();
+      x.open.except(y.closed).equals(a.open).should.be.true();
+      x.open.except(y.open).equals(a.openClosed).should.be.true();
+      y.closed.except(x.closed).equals(b.openClosed).should.be.true();
+      y.closed.except(x.open).equals(b.closed).should.be.true();
+      y.open.except(x.closed).equals(b.open).should.be.true();
+      y.open.except(x.open).equals(b.closedOpen).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by except', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      const b = d.julydec;
+      should.not.exist(x.closed.except(y.closed));
+      x.closed.except(y.open).should.eql(new Interval(x.closed.low, x.closed.low));
+      should.not.exist(x.open.except(y.open));
+      y.closed.except(x.closed).equals(b.openClosed).should.be.true();
+      should.not.exist(y.closed.except(x.open));
+      y.open.except(x.closed).equals(b.open).should.be.true();
+      y.open.except(x.open).equals(b.closedOpen).should.be.true();
+    });
+
+    it('should properly calculate includes/included by except', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      should.not.exist(x.closed.except(y.closed));
+      should.not.exist(x.closed.except(y.open));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      should.not.exist(y.closed.except(x.closed));
+      should.not.exist(y.closed.except(x.open));
+      should.not.exist(y.open.except(x.closed));
+      should.not.exist(y.open.except(x.open));
+    });
+
+    it('should properly calculate ends/ended by except', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      const b = d.janjuly;
+      should.not.exist(x.closed.except(y.closed));
+      x.closed.except(y.open).should.eql(new Interval(x.closed.high, x.closed.high));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      y.closed.except(x.closed).equals(b.closedOpen).should.be.true();
+      should.not.exist(y.closed.except(x.open));
+      y.open.except(x.closed).equals(b.open).should.be.true();
+      y.open.except(x.open).equals(b.openClosed).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toDay.except(y.toDay).low.should.eql(x.toDay.low);
+      x.toDay.except(y.toDay).high.should.eql(y.toDay.low);
+      y.toDay.except(x.toDay).low.should.eql(x.toDay.high);
+      y.toDay.except(x.toDay).high.should.eql(y.toDay.high);
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      // [a,b].except([b,c]) (where b is uncertain) should result in [a,b) but spec says we don't know if they overlap
+      x.toDay.except(y.toDay).should.eql(x.toDay);
+      // [b,c].except([a,b]) (where b is uncertain) should result in (b,c] but spec says we don't know if they overlap
+      y.toDay.except(x.toDay).should.eql(y.toDay);
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      should.not.exist(x.toDay.except(y.toDay));
+      should.not.exist(y.toDay.except(x.toDay));
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      should.not.exist(x.toDay.except(y.toDay));
+      should.not.exist(x.toDay.except(y.toDay));
+      // x: ['2012-07-01', '2012-12-31']
+      // y: ['2012-01-01', '2012-12-31']
+      y.toDay.except(x.toDay).should.eql(new Interval(y.toDay.low, x.toDay.low, true, false));
+      should.not.exist(y.toDay.except(x.toMinute));
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      should.not.exist(x.toDay.except(y.toDay));
+      should.not.exist(x.toDay.except(y.toDay));
+      // x: ['2012-01-01', '2012-07-01']
+      // y: ['2012-01-01', '2012-12-31']
+      y.toDay.except(x.toDay).should.eql(new Interval(x.toDay.high, y.toDay.high, false, true));
+      should.not.exist(y.toDay.except(x.toMinute));
+    });
+
+    it('should throw when the argument is a point', () => {
+      should(() => d.all2012.closed.except(DateTime.parse('2012-07-01T00:00:00.0'))).throw(Error);
+    });
+  });
+
+  describe('after', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.true();
+      y.closed.after(x.open).should.be.true();
+      y.open.after(x.closed).should.be.true();
+      y.open.after(x.open).should.be.true();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.true();
+      y.closed.after(x.open).should.be.true();
+      y.open.after(x.closed).should.be.true();
+      y.open.after(x.open).should.be.true();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.after(y.toMinute).should.be.false();
+      x.toHour.after(y.toMinute).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.before));
+      x.toMonth.after(y.toMonth).should.be.false();
+      x.toMonth.after(y.toDay).should.be.false();
+      should.not.exist(x.toYear.after(y.closed));
+      should.not.exist(y.toYear.after(x.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      x.toMonth.after(y.toMonth).should.be.false();
+      y.toDay.after(x.toMonth).should.be.true();
+      should.not.exist(x.toYear.after(y.closed));
+      should.not.exist(y.toYear.after(x.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toMonth.after(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.after(y.closed));
+      should.not.exist(y.toYear.after(x.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      x.toMinute.after(y.toMinute).should.be.false();
+      x.toMinute.after(y.toDay).should.be.false();
+      should.not.exist(x.toYear.after(y.closed));
+      should.not.exist(y.toYear.after(x.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      x.toMonth.after(y.toMonth).should.be.false();
+      y.toMonth.after(x.toMonth).should.be.false();
+      x.toDay.after(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.after(y.closed));
+      should.not.exist(y.toYear.after(x.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      x.toMinute.after(y.toMinute).should.be.false();
+      x.toMinute.after(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.after(y.closed));
+      should.not.exist(x.toYear.after(x.closed));
+    });
+  });
+
+  describe('before', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      x.closed.before(y.closed).should.be.true();
+      x.closed.before(y.open).should.be.true();
+      x.open.before(y.closed).should.be.true();
+      x.open.before(y.open).should.be.true();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      x.closed.before(y.closed).should.be.true();
+      x.closed.before(y.open).should.be.true();
+      x.open.before(y.closed).should.be.true();
+      x.open.before(y.open).should.be.true();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.before(y.toMinute).should.be.false();
+      x.toHour.before(y.toMinute).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.before));
+      x.toMonth.before(y.toMonth).should.be.true();
+      x.toMonth.before(y.toDay).should.be.true();
+      should.not.exist(y.toYear.before(x.closed));
+      should.not.exist(x.toYear.before(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      x.toMonth.before(y.toMonth).should.be.true();
+      x.toDay.before(y.toMonth).should.be.true();
+      should.not.exist(y.toYear.before(x.closed));
+      should.not.exist(x.toYear.before(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toMonth.before(y.toMonth).should.be.false();
+      x.toMonth.before(y.toMinute).should.be.false();
+      should.not.exist(y.toYear.before(x.closed));
+      should.not.exist(x.toYear.before(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      x.toMinute.before(y.toMinute).should.be.false();
+      should.not.exist(y.toYear.before(x.closed));
+      should.not.exist(x.toYear.before(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      x.toMonth.before(y.toMonth).should.be.false();
+      y.toMonth.before(x.toMonth).should.be.false();
+      y.toMonth.before(x.toDay).should.be.false();
+      should.not.exist(y.toYear.before(x.closed));
+      should.not.exist(x.toYear.before(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      x.toMinute.before(y.toMinute).should.be.false();
+      should.not.exist(y.toYear.before(x.closed));
+      should.not.exist(x.toYear.before(y.closed));
+    });
+  });
+
+  // TODO Add tests that pass in precision parameters
+  describe('meets', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      x.closed.meets(y.closed).should.be.true();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.true();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.meets(y.toMinute).should.be.false();
+      x.toHour.meets(y.toMinute).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.before));
+      x.toMonth.meets(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.meets(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      x.toMonth.meets(y.toMonth).should.be.true();
+      should.not.exist(x.toYear.meets(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toMonth.meets(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.meets(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      x.toMinute.meets(y.toMinute).should.be.false();
+      x.toYear.meets(y.closed).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      x.toMonth.meets(y.toMonth).should.be.false();
+      y.toMonth.meets(x.toMonth).should.be.false();
+      x.toYear.meets(y.closed).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      x.toMinute.meets(y.toMinute).should.be.false();
+      x.toYear.meets(y.closed).should.be.false();
+    });
+  });
+
+  // TODO Add tests that pass in precision parameter
+  describe('meetsAfter', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.true();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.meetsAfter(y.toMinute).should.be.false();
+      x.toHour.meetsAfter(y.toMinute).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.before));
+      x.toMonth.meetsAfter(y.toMonth).should.be.false();
+      x.toYear.meetsAfter(y.closed).should.be.false();
+      should.not.exist(y.toYear.meetsAfter(x.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      x.toMonth.meetsAfter(y.toMonth).should.be.false();
+      y.toMonth.meetsAfter(x.toMonth).should.be.true();
+      should.not.exist(y.toDay.meetsAfter(x.toMonth));
+      x.toYear.meetsAfter(y.closed).should.be.false();
+      should.not.exist(y.toYear.meetsAfter(x.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toMonth.meetsAfter(y.toMonth).should.be.false();
+      x.toYear.meetsAfter(y.closed).should.be.false();
+      should.not.exist(y.toYear.meetsAfter(x.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      x.toMinute.meetsAfter(y.toMinute).should.be.false();
+      x.toYear.meetsAfter(y.closed).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      x.toMonth.meetsAfter(y.toMonth).should.be.false();
+      y.toMonth.meetsAfter(x.toMonth).should.be.false();
+      x.toYear.meetsAfter(y.closed).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      x.toMinute.meetsAfter(y.toMinute).should.be.false();
+      x.toYear.meetsAfter(y.closed).should.be.false();
+    });
+  });
+
+  // TODO Add tests that pass in precision parameter
+  describe('meetsBefore', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.before));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.meets));
+      x.closed.meetsBefore(y.closed).should.be.true();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.begins));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.during));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.dIvl.ends));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      let [x, y] = Array.from(xy(d.dIvl.sameAs));
+      x.closed.meetsBefore(y.toMinute).should.be.false();
+      x.toHour.meetsBefore(y.toMinute).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.before));
+      x.toMonth.meetsBefore(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.meetsBefore(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.meets));
+      x.toMonth.meetsBefore(y.toMonth).should.be.true();
+      should.not.exist(x.toMonth.meetsBefore(y.toDay));
+      should.not.exist(x.toYear.meetsBefore(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.overlaps));
+      x.toMonth.meetsBefore(y.toMonth).should.be.false();
+      should.not.exist(x.toYear.meetsBefore(y.closed));
+
+      [x, y] = Array.from(xy(d.dIvl.begins));
+      x.toMinute.meetsBefore(y.toMinute).should.be.false();
+      x.toYear.meetsBefore(y.closed).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.during));
+      x.toMonth.meetsBefore(y.toMonth).should.be.false();
+      y.toMonth.meetsBefore(x.toMonth).should.be.false();
+      x.toYear.meetsBefore(y.closed).should.be.false();
+
+      [x, y] = Array.from(xy(d.dIvl.ends));
+      x.toMinute.meetsBefore(y.toMinute).should.be.false();
+      x.toYear.meetsBefore(y.closed).should.be.false();
+    });
   });
 });
 
-describe('DateTimeInterval.after', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.false();
-    y.closed.after(x.open).should.be.false();
-    y.open.after(x.closed).should.be.false();
-    y.open.after(x.open).should.be.false();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.true();
-    y.closed.after(x.open).should.be.true();
-    y.open.after(x.closed).should.be.true();
-    y.open.after(x.open).should.be.true();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.true();
-    y.closed.after(x.open).should.be.true();
-    y.open.after(x.closed).should.be.true();
-    y.open.after(x.open).should.be.true();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.false();
-    y.closed.after(x.open).should.be.false();
-    y.open.after(x.closed).should.be.false();
-    y.open.after(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.false();
-    y.closed.after(x.open).should.be.false();
-    y.open.after(x.closed).should.be.false();
-    y.open.after(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.false();
-    y.closed.after(x.open).should.be.false();
-    y.open.after(x.closed).should.be.false();
-    y.open.after(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.false();
-    y.closed.after(x.open).should.be.false();
-    y.open.after(x.closed).should.be.false();
-    y.open.after(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.after(y.toMinute).should.be.false();
-    x.toHour.after(y.toMinute).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.before));
-    x.toMonth.after(y.toMonth).should.be.false();
-    x.toMonth.after(y.toDay).should.be.false();
-    should.not.exist(x.toYear.after(y.closed));
-    should.not.exist(y.toYear.after(x.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    x.toMonth.after(y.toMonth).should.be.false();
-    y.toDay.after(x.toMonth).should.be.true();
-    should.not.exist(x.toYear.after(y.closed));
-    should.not.exist(y.toYear.after(x.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toMonth.after(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.after(y.closed));
-    should.not.exist(y.toYear.after(x.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    x.toMinute.after(y.toMinute).should.be.false();
-    x.toMinute.after(y.toDay).should.be.false();
-    should.not.exist(x.toYear.after(y.closed));
-    should.not.exist(y.toYear.after(x.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    x.toMonth.after(y.toMonth).should.be.false();
-    y.toMonth.after(x.toMonth).should.be.false();
-    x.toDay.after(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.after(y.closed));
-    should.not.exist(y.toYear.after(x.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    x.toMinute.after(y.toMinute).should.be.false();
-    x.toMinute.after(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.after(y.closed));
-    should.not.exist(x.toYear.after(x.closed));
+describe('IntegerInterval', () => {
+  describe('contains', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate integers less than it', () => {
+      d.zeroToHundred.closed.contains(-5).should.be.false();
+    });
+
+    it('should properly calculate the left boundary integer', () => {
+      d.zeroToHundred.closed.contains(0).should.be.true();
+      d.zeroToHundred.open.contains(0).should.be.false();
+    });
+
+    it('should properly calculate integers in the middle of it', () => {
+      d.zeroToHundred.closed.contains(50).should.be.true();
+    });
+
+    it('should properly calculate the right boundary integer', () => {
+      d.zeroToHundred.closed.contains(100).should.be.true();
+      d.zeroToHundred.open.contains(100).should.be.false();
+    });
+
+    it('should properly calculate integers greater than it', () => {
+      d.zeroToHundred.closed.contains(105).should.be.false();
+    });
+
+    it('should properly handle null endpoints', () => {
+      new Interval(null, 0).contains(-123456789).should.be.true();
+      new Interval(null, 0).contains(1).should.be.false();
+      new Interval(null, 0, false, true).contains(0).should.be.true();
+      should(new Interval(null, 0, false, true).contains(-123456789)).be.null();
+      new Interval(null, 0, false, true).contains(1).should.be.false();
+      new Interval(0, null).contains(123456789).should.be.true();
+      new Interval(0, null).contains(-1).should.be.false();
+      new Interval(0, null, true, false).contains(0).should.be.true();
+      should(new Interval(0, null, true, false).contains(123456789)).be.null();
+      new Interval(0, null, true, false).contains(-1).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      d.zeroToHundred.closed.contains(new Uncertainty(-20, -10)).should.be.false();
+      should.not.exist(d.zeroToHundred.closed.contains(new Uncertainty(-20, 20)));
+      d.zeroToHundred.closed.contains(new Uncertainty(0, 100)).should.be.true();
+      should.not.exist(d.zeroToHundred.closed.contains(new Uncertainty(80, 120)));
+      d.zeroToHundred.closed.contains(new Uncertainty(120, 140)).should.be.false();
+      should.not.exist(d.zeroToHundred.closed.contains(new Uncertainty(-20, 120)));
+
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      uIvl.contains(0).should.be.false();
+      should.not.exist(uIvl.contains(5));
+      should.not.exist(uIvl.contains(6));
+      uIvl.contains(10).should.be.true();
+      uIvl.contains(12).should.be.true();
+      uIvl.contains(15).should.be.true();
+      should.not.exist(uIvl.contains(16));
+      should.not.exist(uIvl.contains(20));
+      uIvl.contains(25).should.be.false();
+
+      uIvl.contains(new Uncertainty(0, 4)).should.be.false();
+      should.not.exist(uIvl.contains(new Uncertainty(0, 5)));
+      should.not.exist(uIvl.contains(new Uncertainty(5, 10)));
+      uIvl.contains(new Uncertainty(10, 15)).should.be.true();
+      should.not.exist(uIvl.contains(new Uncertainty(15, 20)));
+      should.not.exist(uIvl.contains(new Uncertainty(20, 25)));
+      uIvl.contains(new Uncertainty(25, 30)).should.be.false();
+    });
+
+    it('should throw when the argument is an interval', () => {
+      should(() => d.zeroToHundred.closed.contains(new Interval(5, 10))).throw(Error);
+    });
+  });
+
+  describe('includes', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.includes(y.closed).should.be.true();
+      x.closed.includes(y.open).should.be.true();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.true();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.false();
+      y.closed.includes(x.open).should.be.false();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.false();
+      y.closed.includes(x.open).should.be.false();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.false();
+      y.closed.includes(x.open).should.be.false();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.true();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      let ivl = new Interval(0, 100);
+      ivl.includes(uIvl).should.be.true();
+      uIvl.includes(ivl).should.be.false();
+
+      ivl = new Interval(-100, 0);
+      ivl.includes(uIvl).should.be.false();
+      uIvl.includes(ivl).should.be.false();
+
+      ivl = new Interval(10, 15);
+      should.not.exist(ivl.includes(uIvl));
+      uIvl.includes(ivl).should.be.true();
+
+      ivl = new Interval(5, 20);
+      ivl.includes(uIvl).should.be.true();
+      should.not.exist(uIvl.includes(ivl));
+
+      should.not.exist(uIvl.includes(uIvl));
+    });
+
+    it('should include a point Integer', () => {
+      d.zeroToHundred.closed.includes(50).should.be.true();
+    });
+  });
+
+  describe('includedIn', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+
+      y.closed.includedIn(x.closed).should.be.true();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.true();
+      y.open.includedIn(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      x.closed.includedIn(y.closed).should.be.false();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.false();
+      x.open.includedIn(y.open).should.be.false();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      x.closed.includedIn(y.closed).should.be.false();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.false();
+      x.open.includedIn(y.open).should.be.false();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      x.closed.includedIn(y.closed).should.be.false();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.false();
+      x.open.includedIn(y.open).should.be.false();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.true();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      let ivl = new Interval(0, 100);
+      ivl.includedIn(uIvl).should.be.false();
+      uIvl.includedIn(ivl).should.be.true();
+
+      ivl = new Interval(-100, 0);
+      ivl.includedIn(uIvl).should.be.false();
+      uIvl.includedIn(ivl).should.be.false();
+
+      ivl = new Interval(10, 15);
+      ivl.includedIn(uIvl).should.be.true();
+      should.not.exist(uIvl.includedIn(ivl));
+
+      ivl = new Interval(5, 20);
+      should.not.exist(ivl.includedIn(uIvl));
+      uIvl.includedIn(ivl).should.be.true();
+
+      should.not.exist(uIvl.includedIn(uIvl));
+    });
+
+    it('should include a point integer', () => {
+      d.zeroToHundred.closed.includedIn(50).should.be.true();
+      d.zeroToHundred.closed.includedIn(500).should.be.false();
+    });
+  });
+
+  describe('overlaps(IntegerInterval)', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      x.closed.overlaps(y.closed).should.be.false();
+      x.closed.overlaps(y.open).should.be.false();
+      x.open.overlaps(y.closed).should.be.false();
+      x.open.overlaps(y.open).should.be.false();
+      y.closed.overlaps(x.closed).should.be.false();
+      y.closed.overlaps(x.open).should.be.false();
+      y.open.overlaps(x.closed).should.be.false();
+      y.open.overlaps(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      x.closed.overlaps(y.closed).should.be.false();
+      x.closed.overlaps(y.open).should.be.false();
+      x.open.overlaps(y.closed).should.be.false();
+      x.open.overlaps(y.open).should.be.false();
+      y.closed.overlaps(x.closed).should.be.false();
+      y.closed.overlaps(x.open).should.be.false();
+      y.open.overlaps(x.closed).should.be.false();
+      y.open.overlaps(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly handle boundless and unknown intervals', () => {
+      boundlessInterval().overlaps(boundlessInterval()).should.be.true();
+      boundlessInterval().overlaps(d.zeroToHundred.closed).should.be.true();
+      d.zeroToHundred.closed.overlaps(boundlessInterval()).should.be.true();
+      should(boundlessInterval().overlaps(unknownInterval())).be.null();
+      should(unknownInterval().overlaps(boundlessInterval())).be.null();
+      should(unknownInterval().overlaps(d.zeroToHundred.closed)).be.null();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      let ivl = new Interval(0, 100);
+      ivl.overlaps(uIvl).should.be.true();
+      uIvl.overlaps(ivl).should.be.true();
+
+      ivl = new Interval(-100, 0);
+      ivl.overlaps(uIvl).should.be.false();
+      uIvl.overlaps(ivl).should.be.false();
+
+      ivl = new Interval(10, 15);
+      ivl.overlaps(uIvl).should.be.true();
+      uIvl.overlaps(ivl).should.be.true();
+
+      ivl = new Interval(5, 20);
+      ivl.overlaps(uIvl).should.be.true();
+      uIvl.overlaps(ivl).should.be.true();
+
+      uIvl.overlaps(uIvl).should.be.true();
+    });
+  });
+
+  describe('overlaps(Integer)', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate integers less than it', () => {
+      d.zeroToHundred.closed.overlaps(-5).should.be.false();
+    });
+
+    it('should properly calculate the left boundary integer', () => {
+      d.zeroToHundred.closed.overlaps(0).should.be.true();
+      d.zeroToHundred.open.overlaps(0).should.be.false();
+    });
+
+    it('should properly calculate integers in the middle of it', () => {
+      d.zeroToHundred.closed.overlaps(50).should.be.true();
+    });
+
+    it('should properly calculate the right boundary integer', () => {
+      d.zeroToHundred.closed.overlaps(100).should.be.true();
+      d.zeroToHundred.open.overlaps(100).should.be.false();
+    });
+
+    it('should properly calculate integers greater than it', () => {
+      d.zeroToHundred.closed.overlaps(105).should.be.false();
+    });
+
+    it('should properly handle boundless and unknown intervals', () => {
+      boundlessInterval().overlaps(5).should.be.true();
+      should(boundlessInterval().overlaps(null)).be.null();
+      should(unknownInterval().overlaps(5)).be.null();
+    });
+
+    it('should properly handle imprecision', () => {
+      d.zeroToHundred.closed.overlaps(new Uncertainty(-20, -10)).should.be.false();
+      should.not.exist(d.zeroToHundred.closed.overlaps(new Uncertainty(-20, 20)));
+      d.zeroToHundred.closed.overlaps(new Uncertainty(0, 100)).should.be.true();
+      should.not.exist(d.zeroToHundred.closed.overlaps(new Uncertainty(80, 120)));
+      d.zeroToHundred.closed.overlaps(new Uncertainty(120, 140)).should.be.false();
+      should.not.exist(d.zeroToHundred.closed.overlaps(new Uncertainty(-20, 120)));
+
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      uIvl.overlaps(0).should.be.false();
+      should.not.exist(uIvl.overlaps(5));
+      should.not.exist(uIvl.overlaps(6));
+      uIvl.overlaps(10).should.be.true();
+      uIvl.overlaps(12).should.be.true();
+      uIvl.overlaps(15).should.be.true();
+      should.not.exist(uIvl.overlaps(16));
+      should.not.exist(uIvl.overlaps(20));
+      uIvl.overlaps(25).should.be.false();
+
+      uIvl.overlaps(new Uncertainty(0, 4)).should.be.false();
+      should.not.exist(uIvl.overlaps(new Uncertainty(0, 5)));
+      should.not.exist(uIvl.overlaps(new Uncertainty(5, 10)));
+      uIvl.overlaps(new Uncertainty(10, 15)).should.be.true();
+      should.not.exist(uIvl.overlaps(new Uncertainty(15, 20)));
+      should.not.exist(uIvl.overlaps(new Uncertainty(20, 25)));
+      uIvl.overlaps(new Uncertainty(25, 30)).should.be.false();
+    });
+  });
+
+  describe('overlapsBefore', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly handle boundless intervals', () => {
+      boundlessInterval().overlapsBefore(d.zeroToHundred.closed).should.be.true();
+      boundlessInterval().overlapsBefore(5).should.be.true();
+      d.zeroToHundred.closed.overlapsBefore(boundlessInterval()).should.be.false();
+      should(boundlessInterval().overlapsBefore(unknownInterval())).be.null();
+      should(unknownInterval().overlapsBefore(boundlessInterval())).be.null();
+    });
+  });
+
+  describe('overlapsAfter', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly handle boundless intervals', () => {
+      boundlessInterval().overlapsAfter(d.zeroToHundred.closed).should.be.true();
+      boundlessInterval().overlapsAfter(5).should.be.true();
+      d.zeroToHundred.closed.overlapsAfter(boundlessInterval()).should.be.false();
+      should(boundlessInterval().overlapsAfter(unknownInterval())).be.null();
+      should(unknownInterval().overlapsAfter(boundlessInterval())).be.null();
+    });
+  });
+
+  describe('equals', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.equals(y.closed).should.be.true();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.true();
+      y.closed.equals(x.closed).should.be.true();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate open vs. closed intervals', () => {
+      const c2c5 = new Interval(2, 5, true, true);
+      const o2c5 = new Interval(2, 5, false, true);
+      const c2o5 = new Interval(2, 5, true, false);
+      const o2o5 = new Interval(2, 5, false, false);
+      const c1c6 = new Interval(1, 6, true, true);
+      const o1c6 = new Interval(1, 6, false, true);
+      const c1o6 = new Interval(1, 6, true, false);
+      const o1o6 = new Interval(1, 6, false, false);
+
+      c2c5.equals(o2o5).should.be.false();
+      c2c5.equals(c1c6).should.be.false();
+      c2c5.equals(o1c6).should.be.false();
+      c2c5.equals(c1o6).should.be.false();
+      c2c5.equals(o1o6).should.be.true();
+      o1o6.equals(c1c6).should.be.false();
+      o1o6.equals(c2c5).should.be.true();
+      o1o6.equals(o2c5).should.be.false();
+      o1o6.equals(c2o5).should.be.false();
+      o1o6.equals(o2o5).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      let ivl = new Interval(0, 100);
+      ivl.equals(uIvl).should.be.false();
+      uIvl.equals(ivl).should.be.false();
+
+      ivl = new Interval(-100, 0);
+      ivl.equals(uIvl).should.be.false();
+      uIvl.equals(ivl).should.be.false();
+
+      ivl = new Interval(10, 15);
+      should(ivl.equals(uIvl)).be.null();
+      should(uIvl.equals(ivl)).be.null();
+
+      ivl = new Interval(5, 20);
+      should(ivl.equals(uIvl)).be.null();
+      should(uIvl.equals(ivl)).be.null();
+
+      should(uIvl.equals(uIvl)).be.null();
+    });
+
+    it('should be false for equality with points', () => {
+      const point = 3;
+      const ivl = new Interval(point, point, true, true);
+
+      ivl.equals(point).should.be.false();
+    });
+  });
+
+  describe('union', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs unions', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.union(y.closed).equals(x.closed).should.be.true();
+      x.closed.union(y.open).equals(x.closed).should.be.true();
+      x.open.union(y.closed).equals(x.closed).should.be.true();
+      x.open.union(y.open).equals(x.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.closed).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate before/after unions', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      should(x.closed.union(y.closed)).be.null();
+      should(x.closed.union(y.open)).be.null();
+      should(x.open.union(y.closed)).be.null();
+      should(x.open.union(y.open)).be.null();
+      should(y.closed.union(x.closed)).be.null();
+      should(y.closed.union(x.open)).be.null();
+      should(y.open.union(x.closed)).be.null();
+      should(y.open.union(x.open)).be.null();
+    });
+
+    it('should properly calculate meets unions', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      const z = d.zeroToHundred;
+      x.closed.union(y.closed).equals(z.closed).should.be.true();
+      should(x.closed.union(y.open)).be.null();
+      should(x.open.union(y.closed)).be.null();
+      should(x.open.union(y.open)).be.null();
+      y.closed.union(x.closed).equals(z.closed).should.be.true();
+      should(y.closed.union(x.open)).be.null();
+      should(y.open.union(x.closed)).be.null();
+      should(y.open.union(x.open)).be.null();
+    });
+
+    it('should properly calculate left/right overlapping unions', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      const z = d.zeroToHundred;
+      x.closed.union(y.closed).equals(z.closed).should.be.true();
+      x.closed.union(y.open).equals(z.closedOpen).should.be.true();
+      x.open.union(y.closed).equals(z.openClosed).should.be.true();
+      x.open.union(y.open).equals(z.open).should.be.true();
+      y.closed.union(x.closed).equals(z.closed).should.be.true();
+      y.closed.union(x.open).equals(z.openClosed).should.be.true();
+      y.open.union(x.closed).equals(z.closedOpen).should.be.true();
+      y.open.union(x.open).equals(z.open).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by unions', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.union(y.closed).equals(y.closed).should.be.true();
+      x.closed.union(y.open).equals(y.closedOpen).should.be.true();
+      x.open.union(y.closed).equals(y.closed).should.be.true();
+      x.open.union(y.open).equals(y.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.closedOpen).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by unions', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.union(y.closed).equals(y.closed).should.be.true();
+      x.closed.union(y.open).equals(y.open).should.be.true();
+      x.open.union(y.closed).equals(y.closed).should.be.true();
+      x.open.union(y.open).equals(y.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.open).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by unions', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.union(y.closed).equals(y.closed).should.be.true();
+      x.closed.union(y.open).equals(y.openClosed).should.be.true();
+      x.open.union(y.closed).equals(y.closed).should.be.true();
+      x.open.union(y.open).equals(y.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.openClosed).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      let ivl = new Interval(0, 100);
+      ivl.union(uIvl).equals(ivl).should.be.true();
+      uIvl.union(ivl).equals(ivl).should.be.true();
+
+      ivl = new Interval(-100, 0);
+      should(ivl.union(uIvl)).be.null();
+      should(uIvl.union(ivl)).be.null();
+
+      ivl = new Interval(8, 17);
+      let i = ivl.union(uIvl);
+      i.low.low.should.equal(5);
+      i.low.high.should.equal(8);
+      i.high.low.should.equal(17);
+      i.high.high.should.equal(20);
+
+      i = uIvl.union(ivl);
+      i.low.low.should.equal(5);
+      i.low.high.should.equal(8);
+      i.high.low.should.equal(17);
+      i.high.high.should.equal(20);
+
+      ivl = new Interval(10, 15);
+      i = ivl.union(uIvl);
+      i.should.eql(uIvl);
+
+      i = uIvl.union(ivl);
+      i.should.eql(uIvl);
+
+      ivl = new Interval(15, 20);
+      i = ivl.union(uIvl);
+      i.low.should.eql(uIvl.low);
+      i.high.should.eql(ivl.high);
+      i = uIvl.union(ivl);
+      i.low.should.eql(uIvl.low);
+      i.high.should.eql(ivl.high);
+
+      ivl = new Interval(20, 30);
+      should.not.exist(ivl.union(uIvl));
+
+      ivl = new Interval(5, 20);
+      ivl.union(uIvl).equals(ivl).should.be.true();
+      uIvl.union(ivl).equals(ivl).should.be.true();
+    });
+
+    it('should throw when the argument is a point', () => {
+      should(() => d.zeroToHundred.union(300)).throw(Error);
+    });
+  });
+
+  describe('intersect', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intersect', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(y.open).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(y.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(y.open).should.be.true();
+      y.open.intersect(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intersect', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      should.not.exist(x.closed.intersect(y.closed));
+      should.not.exist(x.closed.intersect(y.open));
+      should.not.exist(x.open.intersect(y.closed));
+      should.not.exist(x.open.intersect(y.open));
+      should.not.exist(y.closed.intersect(x.closed));
+      should.not.exist(y.closed.intersect(x.open));
+      should.not.exist(y.open.intersect(x.closed));
+      should.not.exist(y.open.intersect(x.open));
+    });
+
+    it('should properly calculate meets intersect', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      should.not.exist(x.closed.intersect(y.closed));
+      should.not.exist(x.closed.intersect(y.open));
+      should.not.exist(x.open.intersect(y.closed));
+      should.not.exist(x.open.intersect(y.open));
+      should.not.exist(y.closed.intersect(x.closed));
+      should.not.exist(y.closed.intersect(x.open));
+      should.not.exist(y.open.intersect(x.closed));
+      should.not.exist(y.open.intersect(x.open));
+    });
+
+    it('should properly calculate left/right overlapping intersect', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      const a = d.fortyToSixty;
+      x.closed.intersect(y.closed).equals(a.closed).should.be.true();
+      x.closed.intersect(y.open).equals(a.openClosed).should.be.true();
+      x.open.intersect(y.closed).equals(a.closedOpen).should.be.true();
+      x.open.intersect(y.open).equals(a.open).should.be.true();
+      y.closed.intersect(x.closed).equals(a.closed).should.be.true();
+      y.closed.intersect(x.open).equals(a.closedOpen).should.be.true();
+      y.open.intersect(x.closed).equals(a.openClosed).should.be.true();
+      y.open.intersect(x.open).equals(a.open).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by intersect', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(x.openClosed).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(x.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(x.openClosed).should.be.true();
+      y.open.intersect(x.open).equals(x.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by intersect', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(x.closed).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(x.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(x.closed).should.be.true();
+      y.open.intersect(x.open).equals(x.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by intersect', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(x.closedOpen).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(x.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(x.closedOpen).should.be.true();
+      y.open.intersect(x.open).equals(x.open).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      const a = 0;
+      const b = new Uncertainty(10, 20);
+      const c = 50;
+      const d = new Uncertainty(80, 90);
+      const e = 100;
+
+      let x = new Interval(b, e);
+      let y = new Interval(a, c);
+      x.intersect(y).should.eql(new Interval(b, c));
+      y.intersect(x).should.eql(new Interval(b, c));
+
+      x = new Interval(a, b);
+      y = new Interval(b, d);
+      // x.intersect(y) should result in [b,b] but spec says we don't know if they overlap
+      should.not.exist(x.intersect(y));
+      // y.intersect(x) should result in [b,b] but spec says we don't know if they overlap
+      should.not.exist(y.intersect(x));
+
+      x = new Interval(a, e);
+      y = new Interval(b, d);
+      x.intersect(y).should.eql(y);
+      y.intersect(x).should.eql(y);
+
+      x = new Interval(a, d);
+      y = new Interval(b, e);
+      x.intersect(y).should.eql(new Interval(b, d));
+      y.intersect(x).should.eql(new Interval(b, d));
+
+      x = new Interval(a, b);
+      y = new Interval(d, e);
+      should.not.exist(x.intersect(y));
+      should.not.exist(y.intersect(x));
+
+      x = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+      y = new Interval(8, 17);
+      x.intersect(y).should.eql(new Interval(new Uncertainty(8, 10), new Uncertainty(15, 17)));
+      y.intersect(x).should.eql(new Interval(new Uncertainty(8, 10), new Uncertainty(15, 17)));
+    });
+
+    it('should throw when the argument is a point', () => {
+      should(() => d.zeroToHundred.intersect(50)).throw(Error);
+    });
+  });
+
+  describe('except', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs except', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      should.not.exist(x.closed.except(y.closed));
+      should.not.exist(x.closed.except(y.open));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      should.not.exist(y.closed.except(x.closed));
+      should.not.exist(y.closed.except(x.open));
+      should.not.exist(y.open.except(x.closed));
+      should.not.exist(y.open.except(x.open));
+    });
+
+    it('should properly calculate before/after except', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      x.closed.except(y.closed).should.eql(x.closed);
+      x.closed.except(y.open).should.eql(x.closed);
+      x.open.except(y.closed).should.eql(x.open);
+      x.open.except(y.open).should.eql(x.open);
+      y.closed.except(x.closed).should.eql(y.closed);
+      y.closed.except(x.open).should.eql(y.closed);
+      y.open.except(x.closed).should.eql(y.open);
+      y.open.except(x.open).should.eql(y.open);
+    });
+
+    it('should properly calculate meets except', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      x.closed.except(y.closed).should.eql(x.closed);
+      x.closed.except(y.open).should.eql(x.closed);
+      x.open.except(y.closed).should.eql(x.open);
+      x.open.except(y.open).should.eql(x.open);
+      y.closed.except(x.closed).should.eql(y.closed);
+      y.closed.except(x.open).should.eql(y.closed);
+      y.open.except(x.closed).should.eql(y.open);
+      y.open.except(x.open).should.eql(y.open);
+    });
+
+    it('should properly calculate left/right overlapping except', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      const a = d.zeroToForty;
+      const b = d.sixtyToHundred;
+      x.closed.except(y.closed).equals(a.closedOpen).should.be.true();
+      x.closed.except(y.open).equals(a.closed).should.be.true();
+      x.open.except(y.closed).equals(a.open).should.be.true();
+      x.open.except(y.open).equals(a.openClosed).should.be.true();
+      y.closed.except(x.closed).equals(b.openClosed).should.be.true();
+      y.closed.except(x.open).equals(b.closed).should.be.true();
+      y.open.except(x.closed).equals(b.open).should.be.true();
+      y.open.except(x.open).equals(b.closedOpen).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by except', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      const b = d.sixtyToHundred;
+      should.not.exist(x.closed.except(y.closed));
+      x.closed.except(y.open).should.eql(new Interval(x.closed.low, x.closed.low));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      y.closed.except(x.closed).equals(b.openClosed).should.be.true();
+      should.not.exist(y.closed.except(x.open));
+      y.open.except(x.closed).equals(b.open).should.be.true();
+      y.open.except(x.open).equals(b.closedOpen).should.be.true();
+    });
+
+    it('should properly calculate includes/included by except', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      should.not.exist(x.closed.except(y.closed));
+      should.not.exist(x.closed.except(y.open));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      should.not.exist(y.closed.except(x.closed));
+      should.not.exist(y.closed.except(x.open));
+      should.not.exist(y.open.except(x.closed));
+      should.not.exist(y.open.except(x.open));
+    });
+
+    it('should properly calculate ends/ended by except', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      const b = d.zeroToForty;
+      should.not.exist(x.closed.except(y.closed));
+      x.closed.except(y.open).should.eql(new Interval(x.closed.high, x.closed.high));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      y.closed.except(x.closed).equals(b.closedOpen).should.be.true();
+      should.not.exist(y.closed.except(x.open));
+      y.open.except(x.closed).equals(b.open).should.be.true();
+      y.open.except(x.open).equals(b.openClosed).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      const a = 0;
+      const b = new Uncertainty(10, 20);
+      const c = 50;
+      const d = new Uncertainty(80, 90);
+      const e = 100;
+
+      let x = new Interval(b, e); //([10,20] , 100)
+      let y = new Interval(a, c); //(   0    ,  50)
+      x.except(y).should.eql(new Interval(c, e, false, true));
+      y.except(x).should.eql(new Interval(a, b, true, false));
+
+      x = new Interval(a, b);
+      y = new Interval(b, d);
+      // x.except(y) should result in [a,b) but spec says we don't know if they overlap
+      should.not.exist(x.except(y));
+      // y.except(x) should result in (b,d] but spec says we don't know if they overlap
+      should.not.exist(y.except(x));
+
+      x = new Interval(a, e);
+      y = new Interval(b, d);
+      should.not.exist(x.except(y));
+      should.not.exist(y.except(x));
+
+      x = new Interval(a, d);
+      y = new Interval(b, e);
+      x.except(y).should.eql(new Interval(a, b, true, false));
+      y.except(x).should.eql(new Interval(d, e, false, true));
+
+      x = new Interval(a, b);
+      y = new Interval(d, e);
+      x.except(y).should.eql(x);
+      y.except(x).should.eql(y);
+    });
+
+    it('should throw when the argument is a point', () => {
+      should(() => d.zeroToHundred.except(100)).throw(Error);
+    });
+  });
+
+  describe('after', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.true();
+      y.closed.after(x.open).should.be.true();
+      y.open.after(x.closed).should.be.true();
+      y.open.after(x.open).should.be.true();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.true();
+      y.closed.after(x.open).should.be.true();
+      y.open.after(x.closed).should.be.true();
+      y.open.after(x.open).should.be.true();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      let ivl = new Interval(0, 100);
+      ivl.after(uIvl).should.be.false();
+      uIvl.after(ivl).should.be.false();
+
+      ivl = new Interval(-100, 0);
+      ivl.after(uIvl).should.be.false();
+      uIvl.after(ivl).should.be.true();
+
+      ivl = new Interval(10, 15);
+      ivl.after(uIvl).should.be.false();
+      uIvl.after(ivl).should.be.false();
+
+      ivl = new Interval(15, 20);
+      ivl.after(uIvl).should.be.false();
+      uIvl.after(ivl).should.be.false();
+
+      ivl = new Interval(20, 30);
+      should.not.exist(ivl.after(uIvl));
+      uIvl.after(ivl).should.be.false();
+
+      ivl = new Interval(5, 20);
+      ivl.after(uIvl).should.be.false();
+      uIvl.after(ivl).should.be.false();
+
+      uIvl.after(uIvl).should.be.false();
+    });
+  });
+
+  describe('before', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      x.closed.before(y.closed).should.be.true();
+      x.closed.before(y.open).should.be.true();
+      x.open.before(y.closed).should.be.true();
+      x.open.before(y.open).should.be.true();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      x.closed.before(y.closed).should.be.true();
+      x.closed.before(y.open).should.be.true();
+      x.open.before(y.closed).should.be.true();
+      x.open.before(y.open).should.be.true();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      let ivl = new Interval(0, 100);
+      ivl.before(uIvl).should.be.false();
+      uIvl.before(ivl).should.be.false();
+
+      ivl = new Interval(-100, 0);
+      ivl.before(uIvl).should.be.true();
+      uIvl.before(ivl).should.be.false();
+
+      ivl = new Interval(10, 15);
+      ivl.before(uIvl).should.be.false();
+      uIvl.before(ivl).should.be.false();
+
+      ivl = new Interval(15, 20);
+      ivl.before(uIvl).should.be.false();
+      uIvl.before(ivl).should.be.false();
+
+      ivl = new Interval(20, 30);
+      should.not.exist(uIvl.before(ivl));
+      ivl.before(uIvl).should.be.false();
+
+      ivl = new Interval(5, 20);
+      ivl.before(uIvl).should.be.false();
+      uIvl.before(ivl).should.be.false();
+
+      uIvl.before(uIvl).should.be.false();
+    });
+  });
+
+  describe('meets', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      x.closed.meets(y.closed).should.be.true();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.true();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      let ivl = new Interval(0, 3);
+      ivl.meets(uIvl).should.be.false();
+      uIvl.meets(ivl).should.be.false();
+
+      ivl = new Interval(0, 10);
+      ivl.meets(uIvl).should.be.false();
+      uIvl.meets(ivl).should.be.false();
+
+      ivl = new Interval(15, 40);
+      ivl.meets(uIvl).should.be.false();
+      uIvl.meets(ivl).should.be.false();
+
+      ivl = new Interval(22, 40);
+      ivl.meets(uIvl).should.be.false();
+      uIvl.meets(ivl).should.be.false();
+
+      ivl = new Interval(0, 4);
+      should.not.exist(ivl.meets(uIvl));
+      should.not.exist(uIvl.meets(ivl));
+
+      ivl = new Interval(21, 40);
+      should.not.exist(ivl.meets(uIvl));
+      should.not.exist(uIvl.meets(ivl));
+
+      uIvl.meets(uIvl).should.be.false();
+    });
+  });
+
+  describe('meetsAfter', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.true();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      let ivl = new Interval(0, 3);
+      ivl.meetsAfter(uIvl).should.be.false();
+      uIvl.meetsAfter(ivl).should.be.false();
+
+      ivl = new Interval(0, 10);
+      ivl.meetsAfter(uIvl).should.be.false();
+      uIvl.meetsAfter(ivl).should.be.false();
+
+      ivl = new Interval(15, 40);
+      ivl.meetsAfter(uIvl).should.be.false();
+      uIvl.meetsAfter(ivl).should.be.false();
+
+      ivl = new Interval(22, 40);
+      ivl.meetsAfter(uIvl).should.be.false();
+      uIvl.meetsAfter(ivl).should.be.false();
+
+      ivl = new Interval(0, 4);
+      ivl.meetsAfter(uIvl).should.be.false();
+      should.not.exist(uIvl.meetsAfter(ivl));
+
+      ivl = new Interval(21, 40);
+      should.not.exist(ivl.meetsAfter(uIvl));
+      uIvl.meetsAfter(ivl).should.be.false();
+
+      uIvl.meetsAfter(uIvl).should.be.false();
+    });
+  });
+
+  describe('meetsBefore', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.sameAs));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.before));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.meets));
+      x.closed.meetsBefore(y.closed).should.be.true();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.overlaps));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.begins));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.during));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.iIvl.ends));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
+
+      let ivl = new Interval(0, 3);
+      ivl.meetsBefore(uIvl).should.be.false();
+      uIvl.meetsBefore(ivl).should.be.false();
+
+      ivl = new Interval(0, 10);
+      ivl.meetsBefore(uIvl).should.be.false();
+      uIvl.meetsBefore(ivl).should.be.false();
+
+      ivl = new Interval(15, 40);
+      ivl.meetsBefore(uIvl).should.be.false();
+      uIvl.meetsBefore(ivl).should.be.false();
+
+      ivl = new Interval(22, 40);
+      ivl.meetsBefore(uIvl).should.be.false();
+      uIvl.meetsBefore(ivl).should.be.false();
+
+      ivl = new Interval(0, 4);
+      should.not.exist(ivl.meetsBefore(uIvl));
+      uIvl.meetsBefore(ivl).should.be.false();
+
+      ivl = new Interval(21, 40);
+      ivl.meetsBefore(uIvl).should.be.false();
+      should.not.exist(uIvl.meetsBefore(ivl));
+
+      uIvl.meetsBefore(uIvl).should.be.false();
+    });
   });
 });
 
-describe('DateTimeInterval.before', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.before(y.closed).should.be.false();
-    x.closed.before(y.open).should.be.false();
-    x.open.before(y.closed).should.be.false();
-    x.open.before(y.open).should.be.false();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    x.closed.before(y.closed).should.be.true();
-    x.closed.before(y.open).should.be.true();
-    x.open.before(y.closed).should.be.true();
-    x.open.before(y.open).should.be.true();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    x.closed.before(y.closed).should.be.true();
-    x.closed.before(y.open).should.be.true();
-    x.open.before(y.closed).should.be.true();
-    x.open.before(y.open).should.be.true();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.closed.before(y.closed).should.be.false();
-    x.closed.before(y.open).should.be.false();
-    x.open.before(y.closed).should.be.false();
-    x.open.before(y.open).should.be.false();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.before(y.closed).should.be.false();
-    x.closed.before(y.open).should.be.false();
-    x.open.before(y.closed).should.be.false();
-    x.open.before(y.open).should.be.false();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.before(y.closed).should.be.false();
-    x.closed.before(y.open).should.be.false();
-    x.open.before(y.closed).should.be.false();
-    x.open.before(y.open).should.be.false();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.before(y.closed).should.be.false();
-    x.closed.before(y.open).should.be.false();
-    x.open.before(y.closed).should.be.false();
-    x.open.before(y.open).should.be.false();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.before(y.toMinute).should.be.false();
-    x.toHour.before(y.toMinute).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.before));
-    x.toMonth.before(y.toMonth).should.be.true();
-    x.toMonth.before(y.toDay).should.be.true();
-    should.not.exist(y.toYear.before(x.closed));
-    should.not.exist(x.toYear.before(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    x.toMonth.before(y.toMonth).should.be.true();
-    x.toDay.before(y.toMonth).should.be.true();
-    should.not.exist(y.toYear.before(x.closed));
-    should.not.exist(x.toYear.before(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toMonth.before(y.toMonth).should.be.false();
-    x.toMonth.before(y.toMinute).should.be.false();
-    should.not.exist(y.toYear.before(x.closed));
-    should.not.exist(x.toYear.before(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    x.toMinute.before(y.toMinute).should.be.false();
-    should.not.exist(y.toYear.before(x.closed));
-    should.not.exist(x.toYear.before(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    x.toMonth.before(y.toMonth).should.be.false();
-    y.toMonth.before(x.toMonth).should.be.false();
-    y.toMonth.before(x.toDay).should.be.false();
-    should.not.exist(y.toYear.before(x.closed));
-    should.not.exist(x.toYear.before(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    x.toMinute.before(y.toMinute).should.be.false();
-    should.not.exist(y.toYear.before(x.closed));
-    should.not.exist(x.toYear.before(y.closed));
-  });
-});
-
-// TODO Add tests that pass in precision parameters
-describe('DateTimeInterval.meets', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    x.closed.meets(y.closed).should.be.true();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.true();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.meets(y.toMinute).should.be.false();
-    x.toHour.meets(y.toMinute).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.before));
-    x.toMonth.meets(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.meets(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    x.toMonth.meets(y.toMonth).should.be.true();
-    should.not.exist(x.toYear.meets(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toMonth.meets(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.meets(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    x.toMinute.meets(y.toMinute).should.be.false();
-    x.toYear.meets(y.closed).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    x.toMonth.meets(y.toMonth).should.be.false();
-    y.toMonth.meets(x.toMonth).should.be.false();
-    x.toYear.meets(y.closed).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    x.toMinute.meets(y.toMinute).should.be.false();
-    x.toYear.meets(y.closed).should.be.false();
-  });
-});
-
-// TODO Add tests that pass in precision parameter
-describe('DateTimeInterval.meetsAfter', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.true();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.meetsAfter(y.toMinute).should.be.false();
-    x.toHour.meetsAfter(y.toMinute).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.before));
-    x.toMonth.meetsAfter(y.toMonth).should.be.false();
-    x.toYear.meetsAfter(y.closed).should.be.false();
-    should.not.exist(y.toYear.meetsAfter(x.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    x.toMonth.meetsAfter(y.toMonth).should.be.false();
-    y.toMonth.meetsAfter(x.toMonth).should.be.true();
-    should.not.exist(y.toDay.meetsAfter(x.toMonth));
-    x.toYear.meetsAfter(y.closed).should.be.false();
-    should.not.exist(y.toYear.meetsAfter(x.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toMonth.meetsAfter(y.toMonth).should.be.false();
-    x.toYear.meetsAfter(y.closed).should.be.false();
-    should.not.exist(y.toYear.meetsAfter(x.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    x.toMinute.meetsAfter(y.toMinute).should.be.false();
-    x.toYear.meetsAfter(y.closed).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    x.toMonth.meetsAfter(y.toMonth).should.be.false();
-    y.toMonth.meetsAfter(x.toMonth).should.be.false();
-    x.toYear.meetsAfter(y.closed).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    x.toMinute.meetsAfter(y.toMinute).should.be.false();
-    x.toYear.meetsAfter(y.closed).should.be.false();
-  });
-});
-
-// TODO Add tests that pass in precision parameter
-describe('DateTimeInterval.meetsBefore', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.before));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.meets));
-    x.closed.meetsBefore(y.closed).should.be.true();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.begins));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.during));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.dIvl.ends));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    let [x, y] = Array.from(xy(d.dIvl.sameAs));
-    x.closed.meetsBefore(y.toMinute).should.be.false();
-    x.toHour.meetsBefore(y.toMinute).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.before));
-    x.toMonth.meetsBefore(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.meetsBefore(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.meets));
-    x.toMonth.meetsBefore(y.toMonth).should.be.true();
-    should.not.exist(x.toMonth.meetsBefore(y.toDay));
-    should.not.exist(x.toYear.meetsBefore(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.overlaps));
-    x.toMonth.meetsBefore(y.toMonth).should.be.false();
-    should.not.exist(x.toYear.meetsBefore(y.closed));
-
-    [x, y] = Array.from(xy(d.dIvl.begins));
-    x.toMinute.meetsBefore(y.toMinute).should.be.false();
-    x.toYear.meetsBefore(y.closed).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.during));
-    x.toMonth.meetsBefore(y.toMonth).should.be.false();
-    y.toMonth.meetsBefore(x.toMonth).should.be.false();
-    x.toYear.meetsBefore(y.closed).should.be.false();
-
-    [x, y] = Array.from(xy(d.dIvl.ends));
-    x.toMinute.meetsBefore(y.toMinute).should.be.false();
-    x.toYear.meetsBefore(y.closed).should.be.false();
-  });
-});
-
-describe('IntegerInterval.contains', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate integers less than it', () => {
-    d.zeroToHundred.closed.contains(-5).should.be.false();
-  });
-
-  it('should properly calculate the left boundary integer', () => {
-    d.zeroToHundred.closed.contains(0).should.be.true();
-    d.zeroToHundred.open.contains(0).should.be.false();
-  });
-
-  it('should properly calculate integers in the middle of it', () => {
-    d.zeroToHundred.closed.contains(50).should.be.true();
-  });
-
-  it('should properly calculate the right boundary integer', () => {
-    d.zeroToHundred.closed.contains(100).should.be.true();
-    d.zeroToHundred.open.contains(100).should.be.false();
-  });
-
-  it('should properly calculate integers greater than it', () => {
-    d.zeroToHundred.closed.contains(105).should.be.false();
-  });
-
-  it('should properly handle null endpoints', () => {
-    new Interval(null, 0).contains(-123456789).should.be.true();
-    new Interval(null, 0).contains(1).should.be.false();
-    new Interval(null, 0, false, true).contains(0).should.be.true();
-    should(new Interval(null, 0, false, true).contains(-123456789)).be.null();
-    new Interval(null, 0, false, true).contains(1).should.be.false();
-    new Interval(0, null).contains(123456789).should.be.true();
-    new Interval(0, null).contains(-1).should.be.false();
-    new Interval(0, null, true, false).contains(0).should.be.true();
-    should(new Interval(0, null, true, false).contains(123456789)).be.null();
-    new Interval(0, null, true, false).contains(-1).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    d.zeroToHundred.closed.contains(new Uncertainty(-20, -10)).should.be.false();
-    should.not.exist(d.zeroToHundred.closed.contains(new Uncertainty(-20, 20)));
-    d.zeroToHundred.closed.contains(new Uncertainty(0, 100)).should.be.true();
-    should.not.exist(d.zeroToHundred.closed.contains(new Uncertainty(80, 120)));
-    d.zeroToHundred.closed.contains(new Uncertainty(120, 140)).should.be.false();
-    should.not.exist(d.zeroToHundred.closed.contains(new Uncertainty(-20, 120)));
-
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    uIvl.contains(0).should.be.false();
-    should.not.exist(uIvl.contains(5));
-    should.not.exist(uIvl.contains(6));
-    uIvl.contains(10).should.be.true();
-    uIvl.contains(12).should.be.true();
-    uIvl.contains(15).should.be.true();
-    should.not.exist(uIvl.contains(16));
-    should.not.exist(uIvl.contains(20));
-    uIvl.contains(25).should.be.false();
-
-    uIvl.contains(new Uncertainty(0, 4)).should.be.false();
-    should.not.exist(uIvl.contains(new Uncertainty(0, 5)));
-    should.not.exist(uIvl.contains(new Uncertainty(5, 10)));
-    uIvl.contains(new Uncertainty(10, 15)).should.be.true();
-    should.not.exist(uIvl.contains(new Uncertainty(15, 20)));
-    should.not.exist(uIvl.contains(new Uncertainty(20, 25)));
-    uIvl.contains(new Uncertainty(25, 30)).should.be.false();
-  });
-
-  it('should throw when the argument is an interval', () => {
-    should(() => d.zeroToHundred.closed.contains(new Interval(5, 10))).throw(Error);
-  });
-});
-
-describe('IntegerInterval.includes', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.includes(y.closed).should.be.true();
-    x.closed.includes(y.open).should.be.true();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.true();
-    y.closed.includes(x.closed).should.be.true();
-    y.closed.includes(x.open).should.be.true();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.true();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.false();
-    y.closed.includes(x.open).should.be.false();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.false();
-    y.closed.includes(x.open).should.be.false();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.false();
-    y.closed.includes(x.open).should.be.false();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.true();
-    y.closed.includes(x.open).should.be.true();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.true();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.true();
-    y.closed.includes(x.open).should.be.true();
-    y.open.includes(x.closed).should.be.true();
-    y.open.includes(x.open).should.be.true();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.includes(y.closed).should.be.false();
-    x.closed.includes(y.open).should.be.false();
-    x.open.includes(y.closed).should.be.false();
-    x.open.includes(y.open).should.be.false();
-    y.closed.includes(x.closed).should.be.true();
-    y.closed.includes(x.open).should.be.true();
-    y.open.includes(x.closed).should.be.false();
-    y.open.includes(x.open).should.be.true();
-  });
-
-  it('should properly handle imprecision', () => {
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    let ivl = new Interval(0, 100);
-    ivl.includes(uIvl).should.be.true();
-    uIvl.includes(ivl).should.be.false();
-
-    ivl = new Interval(-100, 0);
-    ivl.includes(uIvl).should.be.false();
-    uIvl.includes(ivl).should.be.false();
-
-    ivl = new Interval(10, 15);
-    should.not.exist(ivl.includes(uIvl));
-    uIvl.includes(ivl).should.be.true();
-
-    ivl = new Interval(5, 20);
-    ivl.includes(uIvl).should.be.true();
-    should.not.exist(uIvl.includes(ivl));
-
-    should.not.exist(uIvl.includes(uIvl));
-  });
-
-  it('should include a point Integer', () => {
-    d.zeroToHundred.closed.includes(50).should.be.true();
-  });
-});
-
-describe('IntegerInterval.includedIn', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.includedIn(y.closed).should.be.true();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.true();
-    x.open.includedIn(y.open).should.be.true();
-
-    y.closed.includedIn(x.closed).should.be.true();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.true();
-    y.open.includedIn(x.open).should.be.true();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    x.closed.includedIn(y.closed).should.be.false();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.false();
-    x.open.includedIn(y.open).should.be.false();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    x.closed.includedIn(y.closed).should.be.false();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.false();
-    x.open.includedIn(y.open).should.be.false();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    x.closed.includedIn(y.closed).should.be.false();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.false();
-    x.open.includedIn(y.open).should.be.false();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.includedIn(y.closed).should.be.true();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.true();
-    x.open.includedIn(y.open).should.be.true();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.includedIn(y.closed).should.be.true();
-    x.closed.includedIn(y.open).should.be.true();
-    x.open.includedIn(y.closed).should.be.true();
-    x.open.includedIn(y.open).should.be.true();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.includedIn(y.closed).should.be.true();
-    x.closed.includedIn(y.open).should.be.false();
-    x.open.includedIn(y.closed).should.be.true();
-    x.open.includedIn(y.open).should.be.true();
-    y.closed.includedIn(x.closed).should.be.false();
-    y.closed.includedIn(x.open).should.be.false();
-    y.open.includedIn(x.closed).should.be.false();
-    y.open.includedIn(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    let ivl = new Interval(0, 100);
-    ivl.includedIn(uIvl).should.be.false();
-    uIvl.includedIn(ivl).should.be.true();
-
-    ivl = new Interval(-100, 0);
-    ivl.includedIn(uIvl).should.be.false();
-    uIvl.includedIn(ivl).should.be.false();
-
-    ivl = new Interval(10, 15);
-    ivl.includedIn(uIvl).should.be.true();
-    should.not.exist(uIvl.includedIn(ivl));
-
-    ivl = new Interval(5, 20);
-    should.not.exist(ivl.includedIn(uIvl));
-    uIvl.includedIn(ivl).should.be.true();
-
-    should.not.exist(uIvl.includedIn(uIvl));
-  });
-
-  it('should include a point integer', () => {
-    d.zeroToHundred.closed.includedIn(50).should.be.true();
-    d.zeroToHundred.closed.includedIn(500).should.be.false();
-  });
-});
-
-describe('IntegerInterval.overlaps(IntegerInterval)', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.overlaps(y.closed).should.be.true();
-    x.closed.overlaps(y.open).should.be.true();
-    x.open.overlaps(y.closed).should.be.true();
-    x.open.overlaps(y.open).should.be.true();
-    y.closed.overlaps(x.closed).should.be.true();
-    y.closed.overlaps(x.open).should.be.true();
-    y.open.overlaps(x.closed).should.be.true();
-    y.open.overlaps(x.open).should.be.true();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    x.closed.overlaps(y.closed).should.be.false();
-    x.closed.overlaps(y.open).should.be.false();
-    x.open.overlaps(y.closed).should.be.false();
-    x.open.overlaps(y.open).should.be.false();
-    y.closed.overlaps(x.closed).should.be.false();
-    y.closed.overlaps(x.open).should.be.false();
-    y.open.overlaps(x.closed).should.be.false();
-    y.open.overlaps(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    x.closed.overlaps(y.closed).should.be.false();
-    x.closed.overlaps(y.open).should.be.false();
-    x.open.overlaps(y.closed).should.be.false();
-    x.open.overlaps(y.open).should.be.false();
-    y.closed.overlaps(x.closed).should.be.false();
-    y.closed.overlaps(x.open).should.be.false();
-    y.open.overlaps(x.closed).should.be.false();
-    y.open.overlaps(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    x.closed.overlaps(y.closed).should.be.true();
-    x.closed.overlaps(y.open).should.be.true();
-    x.open.overlaps(y.closed).should.be.true();
-    x.open.overlaps(y.open).should.be.true();
-    y.closed.overlaps(x.closed).should.be.true();
-    y.closed.overlaps(x.open).should.be.true();
-    y.open.overlaps(x.closed).should.be.true();
-    y.open.overlaps(x.open).should.be.true();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.overlaps(y.closed).should.be.true();
-    x.closed.overlaps(y.open).should.be.true();
-    x.open.overlaps(y.closed).should.be.true();
-    x.open.overlaps(y.open).should.be.true();
-    y.closed.overlaps(x.closed).should.be.true();
-    y.closed.overlaps(x.open).should.be.true();
-    y.open.overlaps(x.closed).should.be.true();
-    y.open.overlaps(x.open).should.be.true();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.overlaps(y.closed).should.be.true();
-    x.closed.overlaps(y.open).should.be.true();
-    x.open.overlaps(y.closed).should.be.true();
-    x.open.overlaps(y.open).should.be.true();
-    y.closed.overlaps(x.closed).should.be.true();
-    y.closed.overlaps(x.open).should.be.true();
-    y.open.overlaps(x.closed).should.be.true();
-    y.open.overlaps(x.open).should.be.true();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.overlaps(y.closed).should.be.true();
-    x.closed.overlaps(y.open).should.be.true();
-    x.open.overlaps(y.closed).should.be.true();
-    x.open.overlaps(y.open).should.be.true();
-    y.closed.overlaps(x.closed).should.be.true();
-    y.closed.overlaps(x.open).should.be.true();
-    y.open.overlaps(x.closed).should.be.true();
-    y.open.overlaps(x.open).should.be.true();
-  });
-
-  it('should properly handle boundless and unknown intervals', () => {
-    boundlessInterval().overlaps(boundlessInterval()).should.be.true();
-    boundlessInterval().overlaps(d.zeroToHundred.closed).should.be.true();
-    d.zeroToHundred.closed.overlaps(boundlessInterval()).should.be.true();
-    should(boundlessInterval().overlaps(unknownInterval())).be.null();
-    should(unknownInterval().overlaps(boundlessInterval())).be.null();
-    should(unknownInterval().overlaps(d.zeroToHundred.closed)).be.null();
-  });
-
-  it('should properly handle imprecision', () => {
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    let ivl = new Interval(0, 100);
-    ivl.overlaps(uIvl).should.be.true();
-    uIvl.overlaps(ivl).should.be.true();
-
-    ivl = new Interval(-100, 0);
-    ivl.overlaps(uIvl).should.be.false();
-    uIvl.overlaps(ivl).should.be.false();
-
-    ivl = new Interval(10, 15);
-    ivl.overlaps(uIvl).should.be.true();
-    uIvl.overlaps(ivl).should.be.true();
-
-    ivl = new Interval(5, 20);
-    ivl.overlaps(uIvl).should.be.true();
-    uIvl.overlaps(ivl).should.be.true();
-
-    uIvl.overlaps(uIvl).should.be.true();
-  });
-});
-
-describe('IntegerInterval.overlaps(Integer)', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate integers less than it', () => {
-    d.zeroToHundred.closed.overlaps(-5).should.be.false();
-  });
-
-  it('should properly calculate the left boundary integer', () => {
-    d.zeroToHundred.closed.overlaps(0).should.be.true();
-    d.zeroToHundred.open.overlaps(0).should.be.false();
-  });
-
-  it('should properly calculate integers in the middle of it', () => {
-    d.zeroToHundred.closed.overlaps(50).should.be.true();
-  });
-
-  it('should properly calculate the right boundary integer', () => {
-    d.zeroToHundred.closed.overlaps(100).should.be.true();
-    d.zeroToHundred.open.overlaps(100).should.be.false();
-  });
-
-  it('should properly calculate integers greater than it', () => {
-    d.zeroToHundred.closed.overlaps(105).should.be.false();
-  });
-
-  it('should properly handle boundless and unknown intervals', () => {
-    boundlessInterval().overlaps(5).should.be.true();
-    should(boundlessInterval().overlaps(null)).be.null();
-    should(unknownInterval().overlaps(5)).be.null();
-  });
-
-  it('should properly handle imprecision', () => {
-    d.zeroToHundred.closed.overlaps(new Uncertainty(-20, -10)).should.be.false();
-    should.not.exist(d.zeroToHundred.closed.overlaps(new Uncertainty(-20, 20)));
-    d.zeroToHundred.closed.overlaps(new Uncertainty(0, 100)).should.be.true();
-    should.not.exist(d.zeroToHundred.closed.overlaps(new Uncertainty(80, 120)));
-    d.zeroToHundred.closed.overlaps(new Uncertainty(120, 140)).should.be.false();
-    should.not.exist(d.zeroToHundred.closed.overlaps(new Uncertainty(-20, 120)));
-
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    uIvl.overlaps(0).should.be.false();
-    should.not.exist(uIvl.overlaps(5));
-    should.not.exist(uIvl.overlaps(6));
-    uIvl.overlaps(10).should.be.true();
-    uIvl.overlaps(12).should.be.true();
-    uIvl.overlaps(15).should.be.true();
-    should.not.exist(uIvl.overlaps(16));
-    should.not.exist(uIvl.overlaps(20));
-    uIvl.overlaps(25).should.be.false();
-
-    uIvl.overlaps(new Uncertainty(0, 4)).should.be.false();
-    should.not.exist(uIvl.overlaps(new Uncertainty(0, 5)));
-    should.not.exist(uIvl.overlaps(new Uncertainty(5, 10)));
-    uIvl.overlaps(new Uncertainty(10, 15)).should.be.true();
-    should.not.exist(uIvl.overlaps(new Uncertainty(15, 20)));
-    should.not.exist(uIvl.overlaps(new Uncertainty(20, 25)));
-    uIvl.overlaps(new Uncertainty(25, 30)).should.be.false();
-  });
-});
-
-describe('IntegerInterval.overlapsBefore', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly handle boundless intervals', () => {
-    boundlessInterval().overlapsBefore(d.zeroToHundred.closed).should.be.true();
-    boundlessInterval().overlapsBefore(5).should.be.true();
-    d.zeroToHundred.closed.overlapsBefore(boundlessInterval()).should.be.false();
-    should(boundlessInterval().overlapsBefore(unknownInterval())).be.null();
-    should(unknownInterval().overlapsBefore(boundlessInterval)).be.null();
-  });
-});
-
-describe('IntegerInterval.overlapsAfter', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly handle boundless intervals', () => {
-    boundlessInterval().overlapsAfter(d.zeroToHundred.closed).should.be.true();
-    boundlessInterval().overlapsAfter(5).should.be.true();
-    d.zeroToHundred.closed.overlapsAfter(boundlessInterval()).should.be.false();
-    should(boundlessInterval().overlapsAfter(unknownInterval())).be.null();
-    should(unknownInterval().overlapsAfter(boundlessInterval)).be.null();
-  });
-});
-
-describe('IntegerInterval.equals', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.equals(y.closed).should.be.true();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.true();
-    y.closed.equals(x.closed).should.be.true();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.true();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.equals(y.closed).should.be.false();
-    x.closed.equals(y.open).should.be.false();
-    x.open.equals(y.closed).should.be.false();
-    x.open.equals(y.open).should.be.false();
-    y.closed.equals(x.closed).should.be.false();
-    y.closed.equals(x.open).should.be.false();
-    y.open.equals(x.closed).should.be.false();
-    y.open.equals(x.open).should.be.false();
-  });
-
-  it('should properly calculate open vs. closed intervals', () => {
-    const c2c5 = new Interval(2, 5, true, true);
-    const o2c5 = new Interval(2, 5, false, true);
-    const c2o5 = new Interval(2, 5, true, false);
-    const o2o5 = new Interval(2, 5, false, false);
-    const c1c6 = new Interval(1, 6, true, true);
-    const o1c6 = new Interval(1, 6, false, true);
-    const c1o6 = new Interval(1, 6, true, false);
-    const o1o6 = new Interval(1, 6, false, false);
-
-    c2c5.equals(o2o5).should.be.false();
-    c2c5.equals(c1c6).should.be.false();
-    c2c5.equals(o1c6).should.be.false();
-    c2c5.equals(c1o6).should.be.false();
-    c2c5.equals(o1o6).should.be.true();
-    o1o6.equals(c1c6).should.be.false();
-    o1o6.equals(c2c5).should.be.true();
-    o1o6.equals(o2c5).should.be.false();
-    o1o6.equals(c2o5).should.be.false();
-    o1o6.equals(o2o5).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    let ivl = new Interval(0, 100);
-    ivl.equals(uIvl).should.be.false();
-    uIvl.equals(ivl).should.be.false();
-
-    ivl = new Interval(-100, 0);
-    ivl.equals(uIvl).should.be.false();
-    uIvl.equals(ivl).should.be.false();
-
-    ivl = new Interval(10, 15);
-    should(ivl.equals(uIvl)).be.null();
-    should(uIvl.equals(ivl)).be.null();
-
-    ivl = new Interval(5, 20);
-    should(ivl.equals(uIvl)).be.null();
-    should(uIvl.equals(ivl)).be.null();
-
-    should(uIvl.equals(uIvl)).be.null();
-  });
-
-  it('should be false for equality with points', () => {
-    const point = 3;
-    const ivl = new Interval(point, point, true, true);
-
-    ivl.equals(point).should.be.false();
-  });
-});
-
-describe('IntegerInterval.union', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs unions', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.union(y.closed).equals(x.closed).should.be.true();
-    x.closed.union(y.open).equals(x.closed).should.be.true();
-    x.open.union(y.closed).equals(x.closed).should.be.true();
-    x.open.union(y.open).equals(x.open).should.be.true();
-    y.closed.union(x.closed).equals(y.closed).should.be.true();
-    y.closed.union(x.open).equals(y.closed).should.be.true();
-    y.open.union(x.closed).equals(y.closed).should.be.true();
-    y.open.union(x.open).equals(y.open).should.be.true();
-  });
-
-  it('should properly calculate before/after unions', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    should(x.closed.union(y.closed)).be.null();
-    should(x.closed.union(y.open)).be.null();
-    should(x.open.union(y.closed)).be.null();
-    should(x.open.union(y.open)).be.null();
-    should(y.closed.union(x.closed)).be.null();
-    should(y.closed.union(x.open)).be.null();
-    should(y.open.union(x.closed)).be.null();
-    should(y.open.union(x.open)).be.null();
-  });
-
-  it('should properly calculate meets unions', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    const z = d.zeroToHundred;
-    x.closed.union(y.closed).equals(z.closed).should.be.true();
-    should(x.closed.union(y.open)).be.null();
-    should(x.open.union(y.closed)).be.null();
-    should(x.open.union(y.open)).be.null();
-    y.closed.union(x.closed).equals(z.closed).should.be.true();
-    should(y.closed.union(x.open)).be.null();
-    should(y.open.union(x.closed)).be.null();
-    should(y.open.union(x.open)).be.null();
-  });
-
-  it('should properly calculate left/right overlapping unions', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    const z = d.zeroToHundred;
-    x.closed.union(y.closed).equals(z.closed).should.be.true();
-    x.closed.union(y.open).equals(z.closedOpen).should.be.true();
-    x.open.union(y.closed).equals(z.openClosed).should.be.true();
-    x.open.union(y.open).equals(z.open).should.be.true();
-    y.closed.union(x.closed).equals(z.closed).should.be.true();
-    y.closed.union(x.open).equals(z.openClosed).should.be.true();
-    y.open.union(x.closed).equals(z.closedOpen).should.be.true();
-    y.open.union(x.open).equals(z.open).should.be.true();
-  });
-
-  it('should properly calculate begins/begun by unions', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.union(y.closed).equals(y.closed).should.be.true();
-    x.closed.union(y.open).equals(y.closedOpen).should.be.true();
-    x.open.union(y.closed).equals(y.closed).should.be.true();
-    x.open.union(y.open).equals(y.open).should.be.true();
-    y.closed.union(x.closed).equals(y.closed).should.be.true();
-    y.closed.union(x.open).equals(y.closed).should.be.true();
-    y.open.union(x.closed).equals(y.closedOpen).should.be.true();
-    y.open.union(x.open).equals(y.open).should.be.true();
-  });
-
-  it('should properly calculate includes/included by unions', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.union(y.closed).equals(y.closed).should.be.true();
-    x.closed.union(y.open).equals(y.open).should.be.true();
-    x.open.union(y.closed).equals(y.closed).should.be.true();
-    x.open.union(y.open).equals(y.open).should.be.true();
-    y.closed.union(x.closed).equals(y.closed).should.be.true();
-    y.closed.union(x.open).equals(y.closed).should.be.true();
-    y.open.union(x.closed).equals(y.open).should.be.true();
-    y.open.union(x.open).equals(y.open).should.be.true();
-  });
-
-  it('should properly calculate ends/ended by unions', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.union(y.closed).equals(y.closed).should.be.true();
-    x.closed.union(y.open).equals(y.openClosed).should.be.true();
-    x.open.union(y.closed).equals(y.closed).should.be.true();
-    x.open.union(y.open).equals(y.open).should.be.true();
-    y.closed.union(x.closed).equals(y.closed).should.be.true();
-    y.closed.union(x.open).equals(y.closed).should.be.true();
-    y.open.union(x.closed).equals(y.openClosed).should.be.true();
-    y.open.union(x.open).equals(y.open).should.be.true();
-  });
-
-  it('should properly handle imprecision', () => {
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    let ivl = new Interval(0, 100);
-    ivl.union(uIvl).equals(ivl).should.be.true();
-    uIvl.union(ivl).equals(ivl).should.be.true();
-
-    ivl = new Interval(-100, 0);
-    should(ivl.union(uIvl)).be.null();
-    should(uIvl.union(ivl)).be.null();
-
-    ivl = new Interval(8, 17);
-    let i = ivl.union(uIvl);
-    i.low.low.should.equal(5);
-    i.low.high.should.equal(8);
-    i.high.low.should.equal(17);
-    i.high.high.should.equal(20);
-
-    i = uIvl.union(ivl);
-    i.low.low.should.equal(5);
-    i.low.high.should.equal(8);
-    i.high.low.should.equal(17);
-    i.high.high.should.equal(20);
-
-    ivl = new Interval(10, 15);
-    i = ivl.union(uIvl);
-    i.should.eql(uIvl);
-
-    i = uIvl.union(ivl);
-    i.should.eql(uIvl);
-
-    ivl = new Interval(15, 20);
-    i = ivl.union(uIvl);
-    i.low.should.eql(uIvl.low);
-    i.high.should.eql(ivl.high);
-    i = uIvl.union(ivl);
-    i.low.should.eql(uIvl.low);
-    i.high.should.eql(ivl.high);
-
-    ivl = new Interval(20, 30);
-    should.not.exist(ivl.union(uIvl));
-
-    ivl = new Interval(5, 20);
-    ivl.union(uIvl).equals(ivl).should.be.true();
-    uIvl.union(ivl).equals(ivl).should.be.true();
-  });
-
-  it('should throw when the argument is a point', () => {
-    should(() => d.zeroToHundred.union(300)).throw(Error);
-  });
-});
-
-describe('IntegerInterval.intersect', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intersect', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.intersect(y.closed).equals(x.closed).should.be.true();
-    x.closed.intersect(y.open).equals(y.open).should.be.true();
-    x.open.intersect(y.closed).equals(x.open).should.be.true();
-    x.open.intersect(y.open).equals(x.open).should.be.true();
-    y.closed.intersect(x.closed).equals(y.closed).should.be.true();
-    y.closed.intersect(x.open).equals(x.open).should.be.true();
-    y.open.intersect(x.closed).equals(y.open).should.be.true();
-    y.open.intersect(x.open).equals(y.open).should.be.true();
-  });
-
-  it('should properly calculate before/after intersect', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    should.not.exist(x.closed.intersect(y.closed));
-    should.not.exist(x.closed.intersect(y.open));
-    should.not.exist(x.open.intersect(y.closed));
-    should.not.exist(x.open.intersect(y.open));
-    should.not.exist(y.closed.intersect(x.closed));
-    should.not.exist(y.closed.intersect(x.open));
-    should.not.exist(y.open.intersect(x.closed));
-    should.not.exist(y.open.intersect(x.open));
-  });
-
-  it('should properly calculate meets intersect', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    should.not.exist(x.closed.intersect(y.closed));
-    should.not.exist(x.closed.intersect(y.open));
-    should.not.exist(x.open.intersect(y.closed));
-    should.not.exist(x.open.intersect(y.open));
-    should.not.exist(y.closed.intersect(x.closed));
-    should.not.exist(y.closed.intersect(x.open));
-    should.not.exist(y.open.intersect(x.closed));
-    should.not.exist(y.open.intersect(x.open));
-  });
-
-  it('should properly calculate left/right overlapping intersect', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    const a = d.fortyToSixty;
-    x.closed.intersect(y.closed).equals(a.closed).should.be.true();
-    x.closed.intersect(y.open).equals(a.openClosed).should.be.true();
-    x.open.intersect(y.closed).equals(a.closedOpen).should.be.true();
-    x.open.intersect(y.open).equals(a.open).should.be.true();
-    y.closed.intersect(x.closed).equals(a.closed).should.be.true();
-    y.closed.intersect(x.open).equals(a.closedOpen).should.be.true();
-    y.open.intersect(x.closed).equals(a.openClosed).should.be.true();
-    y.open.intersect(x.open).equals(a.open).should.be.true();
-  });
-
-  it('should properly calculate begins/begun by intersect', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.intersect(y.closed).equals(x.closed).should.be.true();
-    x.closed.intersect(y.open).equals(x.openClosed).should.be.true();
-    x.open.intersect(y.closed).equals(x.open).should.be.true();
-    x.open.intersect(y.open).equals(x.open).should.be.true();
-    y.closed.intersect(x.closed).equals(x.closed).should.be.true();
-    y.closed.intersect(x.open).equals(x.open).should.be.true();
-    y.open.intersect(x.closed).equals(x.openClosed).should.be.true();
-    y.open.intersect(x.open).equals(x.open).should.be.true();
-  });
-
-  it('should properly calculate includes/included by intersect', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.intersect(y.closed).equals(x.closed).should.be.true();
-    x.closed.intersect(y.open).equals(x.closed).should.be.true();
-    x.open.intersect(y.closed).equals(x.open).should.be.true();
-    x.open.intersect(y.open).equals(x.open).should.be.true();
-    y.closed.intersect(x.closed).equals(x.closed).should.be.true();
-    y.closed.intersect(x.open).equals(x.open).should.be.true();
-    y.open.intersect(x.closed).equals(x.closed).should.be.true();
-    y.open.intersect(x.open).equals(x.open).should.be.true();
-  });
-
-  it('should properly calculate ends/ended by intersect', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.intersect(y.closed).equals(x.closed).should.be.true();
-    x.closed.intersect(y.open).equals(x.closedOpen).should.be.true();
-    x.open.intersect(y.closed).equals(x.open).should.be.true();
-    x.open.intersect(y.open).equals(x.open).should.be.true();
-    y.closed.intersect(x.closed).equals(x.closed).should.be.true();
-    y.closed.intersect(x.open).equals(x.open).should.be.true();
-    y.open.intersect(x.closed).equals(x.closedOpen).should.be.true();
-    y.open.intersect(x.open).equals(x.open).should.be.true();
-  });
-
-  it('should properly handle imprecision', () => {
-    const a = 0;
-    const b = new Uncertainty(10, 20);
-    const c = 50;
-    const d = new Uncertainty(80, 90);
-    const e = 100;
-
-    let x = new Interval(b, e);
-    let y = new Interval(a, c);
-    x.intersect(y).should.eql(new Interval(b, c));
-    y.intersect(x).should.eql(new Interval(b, c));
-
-    x = new Interval(a, b);
-    y = new Interval(b, d);
-    // x.intersect(y) should result in [b,b] but spec says we don't know if they overlap
-    should.not.exist(x.intersect(y));
-    // y.intersect(x) should result in [b,b] but spec says we don't know if they overlap
-    should.not.exist(y.intersect(x));
-
-    x = new Interval(a, e);
-    y = new Interval(b, d);
-    x.intersect(y).should.eql(y);
-    y.intersect(x).should.eql(y);
-
-    x = new Interval(a, d);
-    y = new Interval(b, e);
-    x.intersect(y).should.eql(new Interval(b, d));
-    y.intersect(x).should.eql(new Interval(b, d));
-
-    x = new Interval(a, b);
-    y = new Interval(d, e);
-    should.not.exist(x.intersect(y));
-    should.not.exist(y.intersect(x));
-
-    x = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-    y = new Interval(8, 17);
-    x.intersect(y).should.eql(new Interval(new Uncertainty(8, 10), new Uncertainty(15, 17)));
-    y.intersect(x).should.eql(new Interval(new Uncertainty(8, 10), new Uncertainty(15, 17)));
-  });
-
-  it('should throw when the argument is a point', () => {
-    should(() => d.zeroToHundred.intersect(50)).throw(Error);
-  });
-});
-
-describe('IntegerInterval.except', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs except', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    should.not.exist(x.closed.except(y.closed));
-    should.not.exist(x.closed.except(y.open));
-    should.not.exist(x.open.except(y.closed));
-    should.not.exist(x.open.except(y.open));
-    should.not.exist(y.closed.except(x.closed));
-    should.not.exist(y.closed.except(x.open));
-    should.not.exist(y.open.except(x.closed));
-    should.not.exist(y.open.except(x.open));
-  });
-
-  it('should properly calculate before/after except', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    x.closed.except(y.closed).should.eql(x.closed);
-    x.closed.except(y.open).should.eql(x.closed);
-    x.open.except(y.closed).should.eql(x.open);
-    x.open.except(y.open).should.eql(x.open);
-    y.closed.except(x.closed).should.eql(y.closed);
-    y.closed.except(x.open).should.eql(y.closed);
-    y.open.except(x.closed).should.eql(y.open);
-    y.open.except(x.open).should.eql(y.open);
-  });
-
-  it('should properly calculate meets except', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    x.closed.except(y.closed).should.eql(x.closed);
-    x.closed.except(y.open).should.eql(x.closed);
-    x.open.except(y.closed).should.eql(x.open);
-    x.open.except(y.open).should.eql(x.open);
-    y.closed.except(x.closed).should.eql(y.closed);
-    y.closed.except(x.open).should.eql(y.closed);
-    y.open.except(x.closed).should.eql(y.open);
-    y.open.except(x.open).should.eql(y.open);
-  });
-
-  it('should properly calculate left/right overlapping except', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    const a = d.zeroToForty;
-    const b = d.sixtyToHundred;
-    x.closed.except(y.closed).equals(a.closedOpen).should.be.true();
-    x.closed.except(y.open).equals(a.closed).should.be.true();
-    x.open.except(y.closed).equals(a.open).should.be.true();
-    x.open.except(y.open).equals(a.openClosed).should.be.true();
-    y.closed.except(x.closed).equals(b.openClosed).should.be.true();
-    y.closed.except(x.open).equals(b.closed).should.be.true();
-    y.open.except(x.closed).equals(b.open).should.be.true();
-    y.open.except(x.open).equals(b.closedOpen).should.be.true();
-  });
-
-  it('should properly calculate begins/begun by except', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    const b = d.sixtyToHundred;
-    should.not.exist(x.closed.except(y.closed));
-    x.closed.except(y.open).should.eql(new Interval(x.closed.low, x.closed.low));
-    should.not.exist(x.open.except(y.closed));
-    should.not.exist(x.open.except(y.open));
-    y.closed.except(x.closed).equals(b.openClosed).should.be.true();
-    should.not.exist(y.closed.except(x.open));
-    y.open.except(x.closed).equals(b.open).should.be.true();
-    y.open.except(x.open).equals(b.closedOpen).should.be.true();
-  });
-
-  it('should properly calculate includes/included by except', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    should.not.exist(x.closed.except(y.closed));
-    should.not.exist(x.closed.except(y.open));
-    should.not.exist(x.open.except(y.closed));
-    should.not.exist(x.open.except(y.open));
-    should.not.exist(y.closed.except(x.closed));
-    should.not.exist(y.closed.except(x.open));
-    should.not.exist(y.open.except(x.closed));
-    should.not.exist(y.open.except(x.open));
-  });
-
-  it('should properly calculate ends/ended by except', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    const b = d.zeroToForty;
-    should.not.exist(x.closed.except(y.closed));
-    x.closed.except(y.open).should.eql(new Interval(x.closed.high, x.closed.high));
-    should.not.exist(x.open.except(y.closed));
-    should.not.exist(x.open.except(y.open));
-    y.closed.except(x.closed).equals(b.closedOpen).should.be.true();
-    should.not.exist(y.closed.except(x.open));
-    y.open.except(x.closed).equals(b.open).should.be.true();
-    y.open.except(x.open).equals(b.openClosed).should.be.true();
-  });
-
-  it('should properly handle imprecision', () => {
-    const a = 0;
-    const b = new Uncertainty(10, 20);
-    const c = 50;
-    const d = new Uncertainty(80, 90);
-    const e = 100;
-
-    let x = new Interval(b, e); //([10,20] , 100)
-    let y = new Interval(a, c); //(   0    ,  50)
-    x.except(y).should.eql(new Interval(c, e, false, true));
-    y.except(x).should.eql(new Interval(a, b, true, false));
-
-    x = new Interval(a, b);
-    y = new Interval(b, d);
-    // x.except(y) should result in [a,b) but spec says we don't know if they overlap
-    should.not.exist(x.except(y));
-    // y.except(x) should result in (b,d] but spec says we don't know if they overlap
-    should.not.exist(y.except(x));
-
-    x = new Interval(a, e);
-    y = new Interval(b, d);
-    should.not.exist(x.except(y));
-    should.not.exist(y.except(x));
-
-    x = new Interval(a, d);
-    y = new Interval(b, e);
-    x.except(y).should.eql(new Interval(a, b, true, false));
-    y.except(x).should.eql(new Interval(d, e, false, true));
-
-    x = new Interval(a, b);
-    y = new Interval(d, e);
-    x.except(y).should.eql(x);
-    y.except(x).should.eql(y);
-  });
-
-  it('should throw when the argument is a point', () => {
-    should(() => d.zeroToHundred.except(100)).throw(Error);
-  });
-});
-
-describe('IntegerInterval.after', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.false();
-    y.closed.after(x.open).should.be.false();
-    y.open.after(x.closed).should.be.false();
-    y.open.after(x.open).should.be.false();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.true();
-    y.closed.after(x.open).should.be.true();
-    y.open.after(x.closed).should.be.true();
-    y.open.after(x.open).should.be.true();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.true();
-    y.closed.after(x.open).should.be.true();
-    y.open.after(x.closed).should.be.true();
-    y.open.after(x.open).should.be.true();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.false();
-    y.closed.after(x.open).should.be.false();
-    y.open.after(x.closed).should.be.false();
-    y.open.after(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.false();
-    y.closed.after(x.open).should.be.false();
-    y.open.after(x.closed).should.be.false();
-    y.open.after(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.false();
-    y.closed.after(x.open).should.be.false();
-    y.open.after(x.closed).should.be.false();
-    y.open.after(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.after(y.closed).should.be.false();
-    x.closed.after(y.open).should.be.false();
-    x.open.after(y.closed).should.be.false();
-    x.open.after(y.open).should.be.false();
-    y.closed.after(x.closed).should.be.false();
-    y.closed.after(x.open).should.be.false();
-    y.open.after(x.closed).should.be.false();
-    y.open.after(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    let ivl = new Interval(0, 100);
-    ivl.after(uIvl).should.be.false();
-    uIvl.after(ivl).should.be.false();
-
-    ivl = new Interval(-100, 0);
-    ivl.after(uIvl).should.be.false();
-    uIvl.after(ivl).should.be.true();
-
-    ivl = new Interval(10, 15);
-    ivl.after(uIvl).should.be.false();
-    uIvl.after(ivl).should.be.false();
-
-    ivl = new Interval(15, 20);
-    ivl.after(uIvl).should.be.false();
-    uIvl.after(ivl).should.be.false();
-
-    ivl = new Interval(20, 30);
-    should.not.exist(ivl.after(uIvl));
-    uIvl.after(ivl).should.be.false();
-
-    ivl = new Interval(5, 20);
-    ivl.after(uIvl).should.be.false();
-    uIvl.after(ivl).should.be.false();
-
-    uIvl.after(uIvl).should.be.false();
-  });
-});
-
-describe('IntegerInterval.before', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.before(y.closed).should.be.false();
-    x.closed.before(y.open).should.be.false();
-    x.open.before(y.closed).should.be.false();
-    x.open.before(y.open).should.be.false();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    x.closed.before(y.closed).should.be.true();
-    x.closed.before(y.open).should.be.true();
-    x.open.before(y.closed).should.be.true();
-    x.open.before(y.open).should.be.true();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    x.closed.before(y.closed).should.be.true();
-    x.closed.before(y.open).should.be.true();
-    x.open.before(y.closed).should.be.true();
-    x.open.before(y.open).should.be.true();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    x.closed.before(y.closed).should.be.false();
-    x.closed.before(y.open).should.be.false();
-    x.open.before(y.closed).should.be.false();
-    x.open.before(y.open).should.be.false();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.before(y.closed).should.be.false();
-    x.closed.before(y.open).should.be.false();
-    x.open.before(y.closed).should.be.false();
-    x.open.before(y.open).should.be.false();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.before(y.closed).should.be.false();
-    x.closed.before(y.open).should.be.false();
-    x.open.before(y.closed).should.be.false();
-    x.open.before(y.open).should.be.false();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.before(y.closed).should.be.false();
-    x.closed.before(y.open).should.be.false();
-    x.open.before(y.closed).should.be.false();
-    x.open.before(y.open).should.be.false();
-    y.closed.before(x.closed).should.be.false();
-    y.closed.before(x.open).should.be.false();
-    y.open.before(x.closed).should.be.false();
-    y.open.before(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    let ivl = new Interval(0, 100);
-    ivl.before(uIvl).should.be.false();
-    uIvl.before(ivl).should.be.false();
-
-    ivl = new Interval(-100, 0);
-    ivl.before(uIvl).should.be.true();
-    uIvl.before(ivl).should.be.false();
-
-    ivl = new Interval(10, 15);
-    ivl.before(uIvl).should.be.false();
-    uIvl.before(ivl).should.be.false();
-
-    ivl = new Interval(15, 20);
-    ivl.before(uIvl).should.be.false();
-    uIvl.before(ivl).should.be.false();
-
-    ivl = new Interval(20, 30);
-    should.not.exist(uIvl.before(ivl));
-    ivl.before(uIvl).should.be.false();
-
-    ivl = new Interval(5, 20);
-    ivl.before(uIvl).should.be.false();
-    uIvl.before(ivl).should.be.false();
-
-    uIvl.before(uIvl).should.be.false();
-  });
-});
-
-describe('IntegerInterval.meets', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    x.closed.meets(y.closed).should.be.true();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.true();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.meets(y.closed).should.be.false();
-    x.closed.meets(y.open).should.be.false();
-    x.open.meets(y.closed).should.be.false();
-    x.open.meets(y.open).should.be.false();
-    y.closed.meets(x.closed).should.be.false();
-    y.closed.meets(x.open).should.be.false();
-    y.open.meets(x.closed).should.be.false();
-    y.open.meets(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    let ivl = new Interval(0, 3);
-    ivl.meets(uIvl).should.be.false();
-    uIvl.meets(ivl).should.be.false();
-
-    ivl = new Interval(0, 10);
-    ivl.meets(uIvl).should.be.false();
-    uIvl.meets(ivl).should.be.false();
-
-    ivl = new Interval(15, 40);
-    ivl.meets(uIvl).should.be.false();
-    uIvl.meets(ivl).should.be.false();
-
-    ivl = new Interval(22, 40);
-    ivl.meets(uIvl).should.be.false();
-    uIvl.meets(ivl).should.be.false();
-
-    ivl = new Interval(0, 4);
-    should.not.exist(ivl.meets(uIvl));
-    should.not.exist(uIvl.meets(ivl));
-
-    ivl = new Interval(21, 40);
-    should.not.exist(ivl.meets(uIvl));
-    should.not.exist(uIvl.meets(ivl));
-
-    uIvl.meets(uIvl).should.be.false();
-  });
-});
-
-describe('IntegerInterval.meetsAfter', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.true();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.meetsAfter(y.closed).should.be.false();
-    x.closed.meetsAfter(y.open).should.be.false();
-    x.open.meetsAfter(y.closed).should.be.false();
-    x.open.meetsAfter(y.open).should.be.false();
-    y.closed.meetsAfter(x.closed).should.be.false();
-    y.closed.meetsAfter(x.open).should.be.false();
-    y.open.meetsAfter(x.closed).should.be.false();
-    y.open.meetsAfter(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    let ivl = new Interval(0, 3);
-    ivl.meetsAfter(uIvl).should.be.false();
-    uIvl.meetsAfter(ivl).should.be.false();
-
-    ivl = new Interval(0, 10);
-    ivl.meetsAfter(uIvl).should.be.false();
-    uIvl.meetsAfter(ivl).should.be.false();
-
-    ivl = new Interval(15, 40);
-    ivl.meetsAfter(uIvl).should.be.false();
-    uIvl.meetsAfter(ivl).should.be.false();
-
-    ivl = new Interval(22, 40);
-    ivl.meetsAfter(uIvl).should.be.false();
-    uIvl.meetsAfter(ivl).should.be.false();
-
-    ivl = new Interval(0, 4);
-    ivl.meetsAfter(uIvl).should.be.false();
-    should.not.exist(uIvl.meetsAfter(ivl));
-
-    ivl = new Interval(21, 40);
-    should.not.exist(ivl.meetsAfter(uIvl));
-    uIvl.meetsAfter(ivl).should.be.false();
-
-    uIvl.meetsAfter(uIvl).should.be.false();
-  });
-});
-
-describe('IntegerInterval.meetsBefore', () => {
-  let d: any;
-  beforeEach(() => {
-    d = data();
-  });
-
-  it('should properly calculate sameAs intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.sameAs));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate before/after intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.before));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate meets intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.meets));
-    x.closed.meetsBefore(y.closed).should.be.true();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate left/right overlapping intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.overlaps));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate begins/begun by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.begins));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate includes/included by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.during));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly calculate ends/ended by intervals', () => {
-    const [x, y] = Array.from(xy(d.iIvl.ends));
-    x.closed.meetsBefore(y.closed).should.be.false();
-    x.closed.meetsBefore(y.open).should.be.false();
-    x.open.meetsBefore(y.closed).should.be.false();
-    x.open.meetsBefore(y.open).should.be.false();
-    y.closed.meetsBefore(x.closed).should.be.false();
-    y.closed.meetsBefore(x.open).should.be.false();
-    y.open.meetsBefore(x.closed).should.be.false();
-    y.open.meetsBefore(x.open).should.be.false();
-  });
-
-  it('should properly handle imprecision', () => {
-    const uIvl = new Interval(new Uncertainty(5, 10), new Uncertainty(15, 20));
-
-    let ivl = new Interval(0, 3);
-    ivl.meetsBefore(uIvl).should.be.false();
-    uIvl.meetsBefore(ivl).should.be.false();
-
-    ivl = new Interval(0, 10);
-    ivl.meetsBefore(uIvl).should.be.false();
-    uIvl.meetsBefore(ivl).should.be.false();
-
-    ivl = new Interval(15, 40);
-    ivl.meetsBefore(uIvl).should.be.false();
-    uIvl.meetsBefore(ivl).should.be.false();
-
-    ivl = new Interval(22, 40);
-    ivl.meetsBefore(uIvl).should.be.false();
-    uIvl.meetsBefore(ivl).should.be.false();
-
-    ivl = new Interval(0, 4);
-    should.not.exist(ivl.meetsBefore(uIvl));
-    uIvl.meetsBefore(ivl).should.be.false();
-
-    ivl = new Interval(21, 40);
-    ivl.meetsBefore(uIvl).should.be.false();
-    should.not.exist(uIvl.meetsBefore(ivl));
-
-    uIvl.meetsBefore(uIvl).should.be.false();
+describe('LongInterval', () => {
+  describe('contains', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate longs less than it', () => {
+      d.zeroToHundredLong.closed.contains(-5n).should.be.false();
+    });
+
+    it('should properly calculate the left boundary long', () => {
+      d.zeroToHundredLong.closed.contains(0n).should.be.true();
+      d.zeroToHundredLong.open.contains(0n).should.be.false();
+    });
+
+    it('should properly calculate longs in the middle of it', () => {
+      d.zeroToHundredLong.closed.contains(50n).should.be.true();
+    });
+
+    it('should properly calculate the right boundary long', () => {
+      d.zeroToHundredLong.closed.contains(100n).should.be.true();
+      d.zeroToHundredLong.open.contains(100n).should.be.false();
+    });
+
+    it('should properly calculate longs greater than it', () => {
+      d.zeroToHundredLong.closed.contains(105n).should.be.false();
+    });
+
+    it('should properly handle null endpoints', () => {
+      new Interval(null, 0n).contains(-123456789n).should.be.true();
+      new Interval(null, 0n).contains(1n).should.be.false();
+      new Interval(null, 0n, false, true).contains(0n).should.be.true();
+      should(new Interval(null, 0n, false, true).contains(-123456789n)).be.null();
+      new Interval(null, 0n, false, true).contains(1n).should.be.false();
+      new Interval(0n, null).contains(123456789n).should.be.true();
+      new Interval(0n, null).contains(-1n).should.be.false();
+      new Interval(0n, null, true, false).contains(0n).should.be.true();
+      should(new Interval(0n, null, true, false).contains(123456789n)).be.null();
+      new Interval(0n, null, true, false).contains(-1n).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      d.zeroToHundredLong.closed.contains(new Uncertainty(-20n, -10n)).should.be.false();
+      should.not.exist(d.zeroToHundredLong.closed.contains(new Uncertainty(-20n, 20n)));
+      d.zeroToHundredLong.closed.contains(new Uncertainty(0n, 100n)).should.be.true();
+      should.not.exist(d.zeroToHundredLong.closed.contains(new Uncertainty(80n, 120n)));
+      d.zeroToHundredLong.closed.contains(new Uncertainty(120n, 140n)).should.be.false();
+      should.not.exist(d.zeroToHundredLong.closed.contains(new Uncertainty(-20n, 120n)));
+
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      uIvl.contains(0n).should.be.false();
+      should.not.exist(uIvl.contains(5n));
+      should.not.exist(uIvl.contains(6n));
+      uIvl.contains(10n).should.be.true();
+      uIvl.contains(12n).should.be.true();
+      uIvl.contains(15n).should.be.true();
+      should.not.exist(uIvl.contains(16n));
+      should.not.exist(uIvl.contains(20n));
+      uIvl.contains(25n).should.be.false();
+
+      uIvl.contains(new Uncertainty(0n, 4n)).should.be.false();
+      should.not.exist(uIvl.contains(new Uncertainty(0n, 5n)));
+      should.not.exist(uIvl.contains(new Uncertainty(5n, 10n)));
+      uIvl.contains(new Uncertainty(10n, 15n)).should.be.true();
+      should.not.exist(uIvl.contains(new Uncertainty(15n, 20n)));
+      should.not.exist(uIvl.contains(new Uncertainty(20n, 25n)));
+      uIvl.contains(new Uncertainty(25n, 30n)).should.be.false();
+    });
+
+    it('should throw when the argument is an interval', () => {
+      should(() => d.zeroToHundredLong.closed.contains(new Interval(5n, 10n))).throw(Error);
+    });
+  });
+
+  describe('includes', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.includes(y.closed).should.be.true();
+      x.closed.includes(y.open).should.be.true();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.true();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.false();
+      y.closed.includes(x.open).should.be.false();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.false();
+      y.closed.includes(x.open).should.be.false();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.false();
+      y.closed.includes(x.open).should.be.false();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.true();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.includes(y.closed).should.be.false();
+      x.closed.includes(y.open).should.be.false();
+      x.open.includes(y.closed).should.be.false();
+      x.open.includes(y.open).should.be.false();
+      y.closed.includes(x.closed).should.be.true();
+      y.closed.includes(x.open).should.be.true();
+      y.open.includes(x.closed).should.be.false();
+      y.open.includes(x.open).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      let ivl = new Interval(0n, 100n);
+      ivl.includes(uIvl).should.be.true();
+      uIvl.includes(ivl).should.be.false();
+
+      ivl = new Interval(-100n, 0n);
+      ivl.includes(uIvl).should.be.false();
+      uIvl.includes(ivl).should.be.false();
+
+      ivl = new Interval(10n, 15n);
+      should.not.exist(ivl.includes(uIvl));
+      uIvl.includes(ivl).should.be.true();
+
+      ivl = new Interval(5n, 20n);
+      ivl.includes(uIvl).should.be.true();
+      should.not.exist(uIvl.includes(ivl));
+
+      should.not.exist(uIvl.includes(uIvl));
+    });
+
+    it('should include a point Long', () => {
+      d.zeroToHundredLong.closed.includes(50n).should.be.true();
+    });
+  });
+
+  describe('includedIn', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+
+      y.closed.includedIn(x.closed).should.be.true();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.true();
+      y.open.includedIn(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      x.closed.includedIn(y.closed).should.be.false();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.false();
+      x.open.includedIn(y.open).should.be.false();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      x.closed.includedIn(y.closed).should.be.false();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.false();
+      x.open.includedIn(y.open).should.be.false();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      x.closed.includedIn(y.closed).should.be.false();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.false();
+      x.open.includedIn(y.open).should.be.false();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.true();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.includedIn(y.closed).should.be.true();
+      x.closed.includedIn(y.open).should.be.false();
+      x.open.includedIn(y.closed).should.be.true();
+      x.open.includedIn(y.open).should.be.true();
+      y.closed.includedIn(x.closed).should.be.false();
+      y.closed.includedIn(x.open).should.be.false();
+      y.open.includedIn(x.closed).should.be.false();
+      y.open.includedIn(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      let ivl = new Interval(0n, 100n);
+      ivl.includedIn(uIvl).should.be.false();
+      uIvl.includedIn(ivl).should.be.true();
+
+      ivl = new Interval(-100n, 0n);
+      ivl.includedIn(uIvl).should.be.false();
+      uIvl.includedIn(ivl).should.be.false();
+
+      ivl = new Interval(10n, 15n);
+      ivl.includedIn(uIvl).should.be.true();
+      should.not.exist(uIvl.includedIn(ivl));
+
+      ivl = new Interval(5n, 20n);
+      should.not.exist(ivl.includedIn(uIvl));
+      uIvl.includedIn(ivl).should.be.true();
+
+      should.not.exist(uIvl.includedIn(uIvl));
+    });
+
+    it('should include a point long', () => {
+      d.zeroToHundredLong.closed.includedIn(50n).should.be.true();
+      d.zeroToHundredLong.closed.includedIn(500n).should.be.false();
+    });
+  });
+
+  describe('overlaps(LongInterval)', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      x.closed.overlaps(y.closed).should.be.false();
+      x.closed.overlaps(y.open).should.be.false();
+      x.open.overlaps(y.closed).should.be.false();
+      x.open.overlaps(y.open).should.be.false();
+      y.closed.overlaps(x.closed).should.be.false();
+      y.closed.overlaps(x.open).should.be.false();
+      y.open.overlaps(x.closed).should.be.false();
+      y.open.overlaps(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      x.closed.overlaps(y.closed).should.be.false();
+      x.closed.overlaps(y.open).should.be.false();
+      x.open.overlaps(y.closed).should.be.false();
+      x.open.overlaps(y.open).should.be.false();
+      y.closed.overlaps(x.closed).should.be.false();
+      y.closed.overlaps(x.open).should.be.false();
+      y.open.overlaps(x.closed).should.be.false();
+      y.open.overlaps(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.overlaps(y.closed).should.be.true();
+      x.closed.overlaps(y.open).should.be.true();
+      x.open.overlaps(y.closed).should.be.true();
+      x.open.overlaps(y.open).should.be.true();
+      y.closed.overlaps(x.closed).should.be.true();
+      y.closed.overlaps(x.open).should.be.true();
+      y.open.overlaps(x.closed).should.be.true();
+      y.open.overlaps(x.open).should.be.true();
+    });
+
+    it('should properly handle boundless and unknown intervals', () => {
+      boundlessInterval().overlaps(boundlessInterval()).should.be.true();
+      boundlessInterval().overlaps(d.zeroToHundredLong.closed).should.be.true();
+      d.zeroToHundredLong.closed.overlaps(boundlessInterval()).should.be.true();
+      should(boundlessInterval().overlaps(unknownInterval())).be.null();
+      should(unknownInterval().overlaps(boundlessInterval())).be.null();
+      should(unknownInterval().overlaps(d.zeroToHundredLong.closed)).be.null();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      let ivl = new Interval(0n, 100n);
+      ivl.overlaps(uIvl).should.be.true();
+      uIvl.overlaps(ivl).should.be.true();
+
+      ivl = new Interval(-100n, 0n);
+      ivl.overlaps(uIvl).should.be.false();
+      uIvl.overlaps(ivl).should.be.false();
+
+      ivl = new Interval(10n, 15n);
+      ivl.overlaps(uIvl).should.be.true();
+      uIvl.overlaps(ivl).should.be.true();
+
+      ivl = new Interval(5n, 20n);
+      ivl.overlaps(uIvl).should.be.true();
+      uIvl.overlaps(ivl).should.be.true();
+
+      uIvl.overlaps(uIvl).should.be.true();
+    });
+  });
+
+  describe('overlaps(Long)', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate longs less than it', () => {
+      d.zeroToHundredLong.closed.overlaps(-5n).should.be.false();
+    });
+
+    it('should properly calculate the left boundary long', () => {
+      d.zeroToHundredLong.closed.overlaps(0n).should.be.true();
+      d.zeroToHundredLong.open.overlaps(0n).should.be.false();
+    });
+
+    it('should properly calculate longs in the middle of it', () => {
+      d.zeroToHundredLong.closed.overlaps(50n).should.be.true();
+    });
+
+    it('should properly calculate the right boundary long', () => {
+      d.zeroToHundredLong.closed.overlaps(100n).should.be.true();
+      d.zeroToHundredLong.open.overlaps(100n).should.be.false();
+    });
+
+    it('should properly calculate longs greater than it', () => {
+      d.zeroToHundredLong.closed.overlaps(105n).should.be.false();
+    });
+
+    it('should properly handle boundless and unknown intervals', () => {
+      boundlessInterval().overlaps(5n).should.be.true();
+      should(boundlessInterval().overlaps(null)).be.null();
+      should(unknownInterval().overlaps(5n)).be.null();
+    });
+
+    it('should properly handle imprecision', () => {
+      d.zeroToHundredLong.closed.overlaps(new Uncertainty(-20n, -10n)).should.be.false();
+      should.not.exist(d.zeroToHundredLong.closed.overlaps(new Uncertainty(-20n, 20n)));
+      d.zeroToHundredLong.closed.overlaps(new Uncertainty(0n, 100n)).should.be.true();
+      should.not.exist(d.zeroToHundredLong.closed.overlaps(new Uncertainty(80n, 120n)));
+      d.zeroToHundredLong.closed.overlaps(new Uncertainty(120n, 140n)).should.be.false();
+      should.not.exist(d.zeroToHundredLong.closed.overlaps(new Uncertainty(-20n, 120n)));
+
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      uIvl.overlaps(0n).should.be.false();
+      should.not.exist(uIvl.overlaps(5n));
+      should.not.exist(uIvl.overlaps(6n));
+      uIvl.overlaps(10n).should.be.true();
+      uIvl.overlaps(12n).should.be.true();
+      uIvl.overlaps(15n).should.be.true();
+      should.not.exist(uIvl.overlaps(16n));
+      should.not.exist(uIvl.overlaps(20n));
+      uIvl.overlaps(25n).should.be.false();
+
+      uIvl.overlaps(new Uncertainty(0n, 4n)).should.be.false();
+      should.not.exist(uIvl.overlaps(new Uncertainty(0n, 5n)));
+      should.not.exist(uIvl.overlaps(new Uncertainty(5n, 10n)));
+      uIvl.overlaps(new Uncertainty(10n, 15n)).should.be.true();
+      should.not.exist(uIvl.overlaps(new Uncertainty(15n, 20n)));
+      should.not.exist(uIvl.overlaps(new Uncertainty(20n, 25n)));
+      uIvl.overlaps(new Uncertainty(25n, 30n)).should.be.false();
+    });
+  });
+
+  describe('overlapsBefore', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly handle boundless intervals', () => {
+      boundlessInterval().overlapsBefore(d.zeroToHundredLong.closed).should.be.true();
+      boundlessInterval().overlapsBefore(5n).should.be.true();
+      d.zeroToHundredLong.closed.overlapsBefore(boundlessInterval()).should.be.false();
+      should(boundlessInterval().overlapsBefore(unknownInterval())).be.null();
+      should(unknownInterval().overlapsBefore(boundlessInterval())).be.null();
+    });
+  });
+
+  describe('overlapsAfter', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly handle boundless intervals', () => {
+      boundlessInterval().overlapsAfter(d.zeroToHundredLong.closed).should.be.true();
+      boundlessInterval().overlapsAfter(5n).should.be.true();
+      d.zeroToHundredLong.closed.overlapsAfter(boundlessInterval()).should.be.false();
+      should(boundlessInterval().overlapsAfter(unknownInterval())).be.null();
+      should(unknownInterval().overlapsAfter(boundlessInterval())).be.null();
+    });
+  });
+
+  describe('equals', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.equals(y.closed).should.be.true();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.true();
+      y.closed.equals(x.closed).should.be.true();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.equals(y.closed).should.be.false();
+      x.closed.equals(y.open).should.be.false();
+      x.open.equals(y.closed).should.be.false();
+      x.open.equals(y.open).should.be.false();
+      y.closed.equals(x.closed).should.be.false();
+      y.closed.equals(x.open).should.be.false();
+      y.open.equals(x.closed).should.be.false();
+      y.open.equals(x.open).should.be.false();
+    });
+
+    it('should properly calculate open vs. closed intervals', () => {
+      const c2c5 = new Interval(2n, 5n, true, true);
+      const o2c5 = new Interval(2n, 5n, false, true);
+      const c2o5 = new Interval(2n, 5n, true, false);
+      const o2o5 = new Interval(2n, 5n, false, false);
+      const c1c6 = new Interval(1n, 6n, true, true);
+      const o1c6 = new Interval(1n, 6n, false, true);
+      const c1o6 = new Interval(1n, 6n, true, false);
+      const o1o6 = new Interval(1n, 6n, false, false);
+
+      c2c5.equals(o2o5).should.be.false();
+      c2c5.equals(c1c6).should.be.false();
+      c2c5.equals(o1c6).should.be.false();
+      c2c5.equals(c1o6).should.be.false();
+      c2c5.equals(o1o6).should.be.true();
+      o1o6.equals(c1c6).should.be.false();
+      o1o6.equals(c2c5).should.be.true();
+      o1o6.equals(o2c5).should.be.false();
+      o1o6.equals(c2o5).should.be.false();
+      o1o6.equals(o2o5).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      let ivl = new Interval(0n, 100n);
+      ivl.equals(uIvl).should.be.false();
+      uIvl.equals(ivl).should.be.false();
+
+      ivl = new Interval(-100n, 0n);
+      ivl.equals(uIvl).should.be.false();
+      uIvl.equals(ivl).should.be.false();
+
+      ivl = new Interval(10n, 15n);
+      should(ivl.equals(uIvl)).be.null();
+      should(uIvl.equals(ivl)).be.null();
+
+      ivl = new Interval(5n, 20n);
+      should(ivl.equals(uIvl)).be.null();
+      should(uIvl.equals(ivl)).be.null();
+
+      should(uIvl.equals(uIvl)).be.null();
+    });
+
+    it('should be false for equality with points', () => {
+      const point = 3n;
+      const ivl = new Interval(point, point, true, true);
+
+      ivl.equals(point).should.be.false();
+    });
+  });
+
+  describe('union', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs unions', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.union(y.closed).equals(x.closed).should.be.true();
+      x.closed.union(y.open).equals(x.closed).should.be.true();
+      x.open.union(y.closed).equals(x.closed).should.be.true();
+      x.open.union(y.open).equals(x.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.closed).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate before/after unions', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      should(x.closed.union(y.closed)).be.null();
+      should(x.closed.union(y.open)).be.null();
+      should(x.open.union(y.closed)).be.null();
+      should(x.open.union(y.open)).be.null();
+      should(y.closed.union(x.closed)).be.null();
+      should(y.closed.union(x.open)).be.null();
+      should(y.open.union(x.closed)).be.null();
+      should(y.open.union(x.open)).be.null();
+    });
+
+    it('should properly calculate meets unions', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      const z = d.zeroToHundredLong;
+      x.closed.union(y.closed).equals(z.closed).should.be.true();
+      should(x.closed.union(y.open)).be.null();
+      should(x.open.union(y.closed)).be.null();
+      should(x.open.union(y.open)).be.null();
+      y.closed.union(x.closed).equals(z.closed).should.be.true();
+      should(y.closed.union(x.open)).be.null();
+      should(y.open.union(x.closed)).be.null();
+      should(y.open.union(x.open)).be.null();
+    });
+
+    it('should properly calculate left/right overlapping unions', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      const z = d.zeroToHundredLong;
+      x.closed.union(y.closed).equals(z.closed).should.be.true();
+      x.closed.union(y.open).equals(z.closedOpen).should.be.true();
+      x.open.union(y.closed).equals(z.openClosed).should.be.true();
+      x.open.union(y.open).equals(z.open).should.be.true();
+      y.closed.union(x.closed).equals(z.closed).should.be.true();
+      y.closed.union(x.open).equals(z.openClosed).should.be.true();
+      y.open.union(x.closed).equals(z.closedOpen).should.be.true();
+      y.open.union(x.open).equals(z.open).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by unions', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.union(y.closed).equals(y.closed).should.be.true();
+      x.closed.union(y.open).equals(y.closedOpen).should.be.true();
+      x.open.union(y.closed).equals(y.closed).should.be.true();
+      x.open.union(y.open).equals(y.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.closedOpen).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by unions', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.union(y.closed).equals(y.closed).should.be.true();
+      x.closed.union(y.open).equals(y.open).should.be.true();
+      x.open.union(y.closed).equals(y.closed).should.be.true();
+      x.open.union(y.open).equals(y.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.open).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by unions', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.union(y.closed).equals(y.closed).should.be.true();
+      x.closed.union(y.open).equals(y.openClosed).should.be.true();
+      x.open.union(y.closed).equals(y.closed).should.be.true();
+      x.open.union(y.open).equals(y.open).should.be.true();
+      y.closed.union(x.closed).equals(y.closed).should.be.true();
+      y.closed.union(x.open).equals(y.closed).should.be.true();
+      y.open.union(x.closed).equals(y.openClosed).should.be.true();
+      y.open.union(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      let ivl = new Interval(0n, 100n);
+      ivl.union(uIvl).equals(ivl).should.be.true();
+      uIvl.union(ivl).equals(ivl).should.be.true();
+
+      ivl = new Interval(-100n, 0n);
+      should(ivl.union(uIvl)).be.null();
+      should(uIvl.union(ivl)).be.null();
+
+      ivl = new Interval(8n, 17n);
+      let i = ivl.union(uIvl);
+      i.low.low.should.equal(5n);
+      i.low.high.should.equal(8n);
+      i.high.low.should.equal(17n);
+      i.high.high.should.equal(20n);
+
+      i = uIvl.union(ivl);
+      i.low.low.should.equal(5n);
+      i.low.high.should.equal(8n);
+      i.high.low.should.equal(17n);
+      i.high.high.should.equal(20n);
+
+      ivl = new Interval(10n, 15n);
+      i = ivl.union(uIvl);
+      i.should.eql(uIvl);
+
+      i = uIvl.union(ivl);
+      i.should.eql(uIvl);
+
+      ivl = new Interval(15n, 20n);
+      i = ivl.union(uIvl);
+      i.low.should.eql(uIvl.low);
+      i.high.should.eql(ivl.high);
+      i = uIvl.union(ivl);
+      i.low.should.eql(uIvl.low);
+      i.high.should.eql(ivl.high);
+
+      ivl = new Interval(20n, 30n);
+      should.not.exist(ivl.union(uIvl));
+
+      ivl = new Interval(5n, 20n);
+      ivl.union(uIvl).equals(ivl).should.be.true();
+      uIvl.union(ivl).equals(ivl).should.be.true();
+    });
+
+    it('should throw when the argument is a point', () => {
+      should(() => d.zeroToHundredLong.union(300n)).throw(Error);
+    });
+  });
+
+  describe('intersect', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intersect', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(y.open).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(y.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(y.open).should.be.true();
+      y.open.intersect(x.open).equals(y.open).should.be.true();
+    });
+
+    it('should properly calculate before/after intersect', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      should.not.exist(x.closed.intersect(y.closed));
+      should.not.exist(x.closed.intersect(y.open));
+      should.not.exist(x.open.intersect(y.closed));
+      should.not.exist(x.open.intersect(y.open));
+      should.not.exist(y.closed.intersect(x.closed));
+      should.not.exist(y.closed.intersect(x.open));
+      should.not.exist(y.open.intersect(x.closed));
+      should.not.exist(y.open.intersect(x.open));
+    });
+
+    it('should properly calculate meets intersect', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      should.not.exist(x.closed.intersect(y.closed));
+      should.not.exist(x.closed.intersect(y.open));
+      should.not.exist(x.open.intersect(y.closed));
+      should.not.exist(x.open.intersect(y.open));
+      should.not.exist(y.closed.intersect(x.closed));
+      should.not.exist(y.closed.intersect(x.open));
+      should.not.exist(y.open.intersect(x.closed));
+      should.not.exist(y.open.intersect(x.open));
+    });
+
+    it('should properly calculate left/right overlapping intersect', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      const a = d.fortyToSixtyLong;
+      x.closed.intersect(y.closed).equals(a.closed).should.be.true();
+      x.closed.intersect(y.open).equals(a.openClosed).should.be.true();
+      x.open.intersect(y.closed).equals(a.closedOpen).should.be.true();
+      x.open.intersect(y.open).equals(a.open).should.be.true();
+      y.closed.intersect(x.closed).equals(a.closed).should.be.true();
+      y.closed.intersect(x.open).equals(a.closedOpen).should.be.true();
+      y.open.intersect(x.closed).equals(a.openClosed).should.be.true();
+      y.open.intersect(x.open).equals(a.open).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by intersect', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(x.openClosed).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(x.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(x.openClosed).should.be.true();
+      y.open.intersect(x.open).equals(x.open).should.be.true();
+    });
+
+    it('should properly calculate includes/included by intersect', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(x.closed).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(x.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(x.closed).should.be.true();
+      y.open.intersect(x.open).equals(x.open).should.be.true();
+    });
+
+    it('should properly calculate ends/ended by intersect', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.intersect(y.closed).equals(x.closed).should.be.true();
+      x.closed.intersect(y.open).equals(x.closedOpen).should.be.true();
+      x.open.intersect(y.closed).equals(x.open).should.be.true();
+      x.open.intersect(y.open).equals(x.open).should.be.true();
+      y.closed.intersect(x.closed).equals(x.closed).should.be.true();
+      y.closed.intersect(x.open).equals(x.open).should.be.true();
+      y.open.intersect(x.closed).equals(x.closedOpen).should.be.true();
+      y.open.intersect(x.open).equals(x.open).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      const a = 0n;
+      const b = new Uncertainty(10n, 20n);
+      const c = 50n;
+      const d = new Uncertainty(80n, 90n);
+      const e = 100n;
+
+      let x = new Interval(b, e);
+      let y = new Interval(a, c);
+      x.intersect(y).should.eql(new Interval(b, c));
+      y.intersect(x).should.eql(new Interval(b, c));
+
+      x = new Interval(a, b);
+      y = new Interval(b, d);
+      // x.intersect(y) should result in [b,b] but spec says we don't know if they overlap
+      should.not.exist(x.intersect(y));
+      // y.intersect(x) should result in [b,b] but spec says we don't know if they overlap
+      should.not.exist(y.intersect(x));
+
+      x = new Interval(a, e);
+      y = new Interval(b, d);
+      x.intersect(y).should.eql(y);
+      y.intersect(x).should.eql(y);
+
+      x = new Interval(a, d);
+      y = new Interval(b, e);
+      x.intersect(y).should.eql(new Interval(b, d));
+      y.intersect(x).should.eql(new Interval(b, d));
+
+      x = new Interval(a, b);
+      y = new Interval(d, e);
+      should.not.exist(x.intersect(y));
+      should.not.exist(y.intersect(x));
+
+      x = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+      y = new Interval(8n, 17n);
+      x.intersect(y).should.eql(new Interval(new Uncertainty(8n, 10n), new Uncertainty(15n, 17n)));
+      y.intersect(x).should.eql(new Interval(new Uncertainty(8n, 10n), new Uncertainty(15n, 17n)));
+    });
+
+    it('should throw when the argument is a point', () => {
+      should(() => d.zeroToHundredLong.intersect(50n)).throw(Error);
+    });
+  });
+
+  describe('except', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs except', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      should.not.exist(x.closed.except(y.closed));
+      should.not.exist(x.closed.except(y.open));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      should.not.exist(y.closed.except(x.closed));
+      should.not.exist(y.closed.except(x.open));
+      should.not.exist(y.open.except(x.closed));
+      should.not.exist(y.open.except(x.open));
+    });
+
+    it('should properly calculate before/after except', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      x.closed.except(y.closed).should.eql(x.closed);
+      x.closed.except(y.open).should.eql(x.closed);
+      x.open.except(y.closed).should.eql(x.open);
+      x.open.except(y.open).should.eql(x.open);
+      y.closed.except(x.closed).should.eql(y.closed);
+      y.closed.except(x.open).should.eql(y.closed);
+      y.open.except(x.closed).should.eql(y.open);
+      y.open.except(x.open).should.eql(y.open);
+    });
+
+    it('should properly calculate meets except', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      x.closed.except(y.closed).should.eql(x.closed);
+      x.closed.except(y.open).should.eql(x.closed);
+      x.open.except(y.closed).should.eql(x.open);
+      x.open.except(y.open).should.eql(x.open);
+      y.closed.except(x.closed).should.eql(y.closed);
+      y.closed.except(x.open).should.eql(y.closed);
+      y.open.except(x.closed).should.eql(y.open);
+      y.open.except(x.open).should.eql(y.open);
+    });
+
+    it('should properly calculate left/right overlapping except', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      const a = d.zeroToFortyLong;
+      const b = d.sixtyToHundredLong;
+      x.closed.except(y.closed).equals(a.closedOpen).should.be.true();
+      x.closed.except(y.open).equals(a.closed).should.be.true();
+      x.open.except(y.closed).equals(a.open).should.be.true();
+      x.open.except(y.open).equals(a.openClosed).should.be.true();
+      y.closed.except(x.closed).equals(b.openClosed).should.be.true();
+      y.closed.except(x.open).equals(b.closed).should.be.true();
+      y.open.except(x.closed).equals(b.open).should.be.true();
+      y.open.except(x.open).equals(b.closedOpen).should.be.true();
+    });
+
+    it('should properly calculate begins/begun by except', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      const b = d.sixtyToHundredLong;
+      should.not.exist(x.closed.except(y.closed));
+      x.closed.except(y.open).should.eql(new Interval(x.closed.low, x.closed.low));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      y.closed.except(x.closed).equals(b.openClosed).should.be.true();
+      should.not.exist(y.closed.except(x.open));
+      y.open.except(x.closed).equals(b.open).should.be.true();
+      y.open.except(x.open).equals(b.closedOpen).should.be.true();
+    });
+
+    it('should properly calculate includes/included by except', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      should.not.exist(x.closed.except(y.closed));
+      should.not.exist(x.closed.except(y.open));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      should.not.exist(y.closed.except(x.closed));
+      should.not.exist(y.closed.except(x.open));
+      should.not.exist(y.open.except(x.closed));
+      should.not.exist(y.open.except(x.open));
+    });
+
+    it('should properly calculate ends/ended by except', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      const b = d.zeroToFortyLong;
+      should.not.exist(x.closed.except(y.closed));
+      x.closed.except(y.open).should.eql(new Interval(x.closed.high, x.closed.high));
+      should.not.exist(x.open.except(y.closed));
+      should.not.exist(x.open.except(y.open));
+      y.closed.except(x.closed).equals(b.closedOpen).should.be.true();
+      should.not.exist(y.closed.except(x.open));
+      y.open.except(x.closed).equals(b.open).should.be.true();
+      y.open.except(x.open).equals(b.openClosed).should.be.true();
+    });
+
+    it('should properly handle imprecision', () => {
+      const a = 0n;
+      const b = new Uncertainty(10n, 20n);
+      const c = 50n;
+      const d = new Uncertainty(80n, 90n);
+      const e = 100n;
+
+      let x = new Interval(b, e); //([10n,20n] , 100n)
+      let y = new Interval(a, c); //(   0n    ,  50n)
+      x.except(y).should.eql(new Interval(c, e, false, true));
+      y.except(x).should.eql(new Interval(a, b, true, false));
+
+      x = new Interval(a, b);
+      y = new Interval(b, d);
+      // x.except(y) should result in [a,b) but spec says we don't know if they overlap
+      should.not.exist(x.except(y));
+      // y.except(x) should result in (b,d] but spec says we don't know if they overlap
+      should.not.exist(y.except(x));
+
+      x = new Interval(a, e);
+      y = new Interval(b, d);
+      should.not.exist(x.except(y));
+      should.not.exist(y.except(x));
+
+      x = new Interval(a, d);
+      y = new Interval(b, e);
+      x.except(y).should.eql(new Interval(a, b, true, false));
+      y.except(x).should.eql(new Interval(d, e, false, true));
+
+      x = new Interval(a, b);
+      y = new Interval(d, e);
+      x.except(y).should.eql(x);
+      y.except(x).should.eql(y);
+    });
+
+    it('should throw when the argument is a point', () => {
+      should(() => d.zeroToHundredLong.except(100n)).throw(Error);
+    });
+  });
+
+  describe('after', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.true();
+      y.closed.after(x.open).should.be.true();
+      y.open.after(x.closed).should.be.true();
+      y.open.after(x.open).should.be.true();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.true();
+      y.closed.after(x.open).should.be.true();
+      y.open.after(x.closed).should.be.true();
+      y.open.after(x.open).should.be.true();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.after(y.closed).should.be.false();
+      x.closed.after(y.open).should.be.false();
+      x.open.after(y.closed).should.be.false();
+      x.open.after(y.open).should.be.false();
+      y.closed.after(x.closed).should.be.false();
+      y.closed.after(x.open).should.be.false();
+      y.open.after(x.closed).should.be.false();
+      y.open.after(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      let ivl = new Interval(0n, 100n);
+      ivl.after(uIvl).should.be.false();
+      uIvl.after(ivl).should.be.false();
+
+      ivl = new Interval(-100n, 0n);
+      ivl.after(uIvl).should.be.false();
+      uIvl.after(ivl).should.be.true();
+
+      ivl = new Interval(10n, 15n);
+      ivl.after(uIvl).should.be.false();
+      uIvl.after(ivl).should.be.false();
+
+      ivl = new Interval(15n, 20n);
+      ivl.after(uIvl).should.be.false();
+      uIvl.after(ivl).should.be.false();
+
+      ivl = new Interval(20n, 30n);
+      should.not.exist(ivl.after(uIvl));
+      uIvl.after(ivl).should.be.false();
+
+      ivl = new Interval(5n, 20n);
+      ivl.after(uIvl).should.be.false();
+      uIvl.after(ivl).should.be.false();
+
+      uIvl.after(uIvl).should.be.false();
+    });
+  });
+
+  describe('before', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      x.closed.before(y.closed).should.be.true();
+      x.closed.before(y.open).should.be.true();
+      x.open.before(y.closed).should.be.true();
+      x.open.before(y.open).should.be.true();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      x.closed.before(y.closed).should.be.true();
+      x.closed.before(y.open).should.be.true();
+      x.open.before(y.closed).should.be.true();
+      x.open.before(y.open).should.be.true();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.before(y.closed).should.be.false();
+      x.closed.before(y.open).should.be.false();
+      x.open.before(y.closed).should.be.false();
+      x.open.before(y.open).should.be.false();
+      y.closed.before(x.closed).should.be.false();
+      y.closed.before(x.open).should.be.false();
+      y.open.before(x.closed).should.be.false();
+      y.open.before(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      let ivl = new Interval(0n, 100n);
+      ivl.before(uIvl).should.be.false();
+      uIvl.before(ivl).should.be.false();
+
+      ivl = new Interval(-100n, 0n);
+      ivl.before(uIvl).should.be.true();
+      uIvl.before(ivl).should.be.false();
+
+      ivl = new Interval(10n, 15n);
+      ivl.before(uIvl).should.be.false();
+      uIvl.before(ivl).should.be.false();
+
+      ivl = new Interval(15n, 20n);
+      ivl.before(uIvl).should.be.false();
+      uIvl.before(ivl).should.be.false();
+
+      ivl = new Interval(20n, 30n);
+      should.not.exist(uIvl.before(ivl));
+      ivl.before(uIvl).should.be.false();
+
+      ivl = new Interval(5n, 20n);
+      ivl.before(uIvl).should.be.false();
+      uIvl.before(ivl).should.be.false();
+
+      uIvl.before(uIvl).should.be.false();
+    });
+  });
+
+  describe('meets', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      x.closed.meets(y.closed).should.be.true();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.true();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.meets(y.closed).should.be.false();
+      x.closed.meets(y.open).should.be.false();
+      x.open.meets(y.closed).should.be.false();
+      x.open.meets(y.open).should.be.false();
+      y.closed.meets(x.closed).should.be.false();
+      y.closed.meets(x.open).should.be.false();
+      y.open.meets(x.closed).should.be.false();
+      y.open.meets(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      let ivl = new Interval(0n, 3n);
+      ivl.meets(uIvl).should.be.false();
+      uIvl.meets(ivl).should.be.false();
+
+      ivl = new Interval(0n, 10n);
+      ivl.meets(uIvl).should.be.false();
+      uIvl.meets(ivl).should.be.false();
+
+      ivl = new Interval(15n, 40n);
+      ivl.meets(uIvl).should.be.false();
+      uIvl.meets(ivl).should.be.false();
+
+      ivl = new Interval(22n, 40n);
+      ivl.meets(uIvl).should.be.false();
+      uIvl.meets(ivl).should.be.false();
+
+      ivl = new Interval(0n, 4n);
+      should.not.exist(ivl.meets(uIvl));
+      should.not.exist(uIvl.meets(ivl));
+
+      ivl = new Interval(21n, 40n);
+      should.not.exist(ivl.meets(uIvl));
+      should.not.exist(uIvl.meets(ivl));
+
+      uIvl.meets(uIvl).should.be.false();
+    });
+  });
+
+  describe('meetsAfter', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.true();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.meetsAfter(y.closed).should.be.false();
+      x.closed.meetsAfter(y.open).should.be.false();
+      x.open.meetsAfter(y.closed).should.be.false();
+      x.open.meetsAfter(y.open).should.be.false();
+      y.closed.meetsAfter(x.closed).should.be.false();
+      y.closed.meetsAfter(x.open).should.be.false();
+      y.open.meetsAfter(x.closed).should.be.false();
+      y.open.meetsAfter(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      let ivl = new Interval(0n, 3n);
+      ivl.meetsAfter(uIvl).should.be.false();
+      uIvl.meetsAfter(ivl).should.be.false();
+
+      ivl = new Interval(0n, 10n);
+      ivl.meetsAfter(uIvl).should.be.false();
+      uIvl.meetsAfter(ivl).should.be.false();
+
+      ivl = new Interval(15n, 40n);
+      ivl.meetsAfter(uIvl).should.be.false();
+      uIvl.meetsAfter(ivl).should.be.false();
+
+      ivl = new Interval(22n, 40n);
+      ivl.meetsAfter(uIvl).should.be.false();
+      uIvl.meetsAfter(ivl).should.be.false();
+
+      ivl = new Interval(0n, 4n);
+      ivl.meetsAfter(uIvl).should.be.false();
+      should.not.exist(uIvl.meetsAfter(ivl));
+
+      ivl = new Interval(21n, 40n);
+      should.not.exist(ivl.meetsAfter(uIvl));
+      uIvl.meetsAfter(ivl).should.be.false();
+
+      uIvl.meetsAfter(uIvl).should.be.false();
+    });
+  });
+
+  describe('meetsBefore', () => {
+    let d: any;
+    beforeEach(() => {
+      d = data();
+    });
+
+    it('should properly calculate sameAs intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.sameAs));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate before/after intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.before));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate meets intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.meets));
+      x.closed.meetsBefore(y.closed).should.be.true();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate left/right overlapping intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.overlaps));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate begins/begun by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.begins));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate includes/included by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.during));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly calculate ends/ended by intervals', () => {
+      const [x, y] = Array.from(xy(d.lIvl.ends));
+      x.closed.meetsBefore(y.closed).should.be.false();
+      x.closed.meetsBefore(y.open).should.be.false();
+      x.open.meetsBefore(y.closed).should.be.false();
+      x.open.meetsBefore(y.open).should.be.false();
+      y.closed.meetsBefore(x.closed).should.be.false();
+      y.closed.meetsBefore(x.open).should.be.false();
+      y.open.meetsBefore(x.closed).should.be.false();
+      y.open.meetsBefore(x.open).should.be.false();
+    });
+
+    it('should properly handle imprecision', () => {
+      const uIvl = new Interval(new Uncertainty(5n, 10n), new Uncertainty(15n, 20n));
+
+      let ivl = new Interval(0n, 3n);
+      ivl.meetsBefore(uIvl).should.be.false();
+      uIvl.meetsBefore(ivl).should.be.false();
+
+      ivl = new Interval(0n, 10n);
+      ivl.meetsBefore(uIvl).should.be.false();
+      uIvl.meetsBefore(ivl).should.be.false();
+
+      ivl = new Interval(15n, 40n);
+      ivl.meetsBefore(uIvl).should.be.false();
+      uIvl.meetsBefore(ivl).should.be.false();
+
+      ivl = new Interval(22n, 40n);
+      ivl.meetsBefore(uIvl).should.be.false();
+      uIvl.meetsBefore(ivl).should.be.false();
+
+      ivl = new Interval(0n, 4n);
+      should.not.exist(ivl.meetsBefore(uIvl));
+      uIvl.meetsBefore(ivl).should.be.false();
+
+      ivl = new Interval(21n, 40n);
+      ivl.meetsBefore(uIvl).should.be.false();
+      should.not.exist(uIvl.meetsBefore(ivl));
+
+      uIvl.meetsBefore(uIvl).should.be.false();
+    });
   });
 });
 
diff --git a/test/elm/aggregate/aggregate-test.ts b/test/elm/aggregate/aggregate-test.ts
index 59fa212db..9fa028950 100644
--- a/test/elm/aggregate/aggregate-test.ts
+++ b/test/elm/aggregate/aggregate-test.ts
@@ -31,8 +31,93 @@ describe('Sum', () => {
     setup(this, data);
   });
 
-  it('should be able to sum lists without nulls', async function () {
-    (await this.not_null.exec(this.ctx)).should.equal(15);
+  it('should be able to sum lists with integers', async function () {
+    (await this.integers.exec(this.ctx)).should.equal(15);
+  });
+
+  it('should be able to sum integers up to max integer value', async function () {
+    (await this.integers_at_max_value.exec(this.ctx)).should.equal(2147483647);
+  });
+
+  it('should return null when overflowing the max integer value', async function () {
+    should(await this.integers_above_max_value.exec(this.ctx)).be.null();
+  });
+
+  it('should be able to sum integers down to min integer value', async function () {
+    (await this.integers_at_min_value.exec(this.ctx)).should.equal(-2147483648);
+  });
+
+  it('should return null when underflowing the min integer value', async function () {
+    should(await this.integers_below_min_value.exec(this.ctx)).be.null();
+  });
+
+  it('should be able to sum lists with longs', async function () {
+    (await this.longs.exec(this.ctx)).should.equal(15n);
+  });
+
+  it('should be able to sum longs up to max long value', async function () {
+    (await this.longs_at_max_value.exec(this.ctx)).should.equal(9223372036854775807n);
+  });
+
+  it('should return null when overflowing the max long value', async function () {
+    should(await this.longs_above_max_value.exec(this.ctx)).be.null();
+  });
+
+  it('should be able to sum longs down to min long value', async function () {
+    (await this.longs_at_min_value.exec(this.ctx)).should.equal(-9223372036854775808n);
+  });
+
+  it('should return null when underflowing the min long value', async function () {
+    should(await this.longs_below_min_value.exec(this.ctx)).be.null();
+  });
+
+  it('should be able to sum lists with decimals', async function () {
+    (await this.decimals.exec(this.ctx)).should.equal(16.5);
+  });
+
+  it('should be able to sum decimals up to max decimal value', async function () {
+    (await this.decimals_at_max_value.exec(this.ctx)).should.equal(99999999999999999999.99999999);
+  });
+
+  it('should return null when overflowing the max decimal value', async function () {
+    should(await this.decimals_above_max_value.exec(this.ctx)).be.null();
+  });
+
+  it('should be able to sum decimals down to min decimal value', async function () {
+    (await this.decimals_at_min_value.exec(this.ctx)).should.equal(-99999999999999999999.99999999);
+  });
+
+  it('should return null when underflowing the min decimal value', async function () {
+    should(await this.decimals_below_min_value.exec(this.ctx)).be.null();
+  });
+
+  it('should be able to sum lists with quantities', async function () {
+    const q = await this.quantities.exec(this.ctx);
+    validateQuantity(q, 15, 'ml');
+  });
+
+  it('should be able to sum quantities up to max decimal value', async function () {
+    validateQuantity(
+      await this.quantities_at_max_value.exec(this.ctx),
+      99999999999999999999.99999999,
+      'ml'
+    );
+  });
+
+  it('should return null when overflowing the max quantity value', async function () {
+    should(await this.quantities_above_max_value.exec(this.ctx)).be.null();
+  });
+
+  it('should be able to sum quantities down to min decimal value', async function () {
+    validateQuantity(
+      await this.quantities_at_min_value.exec(this.ctx),
+      -99999999999999999999.99999999,
+      'ml'
+    );
+  });
+
+  it('should return null when underflowing the min quantity value', async function () {
+    should(await this.quantities_below_min_value.exec(this.ctx)).be.null();
   });
 
   it('should be able to sum lists with nulls', async function () {
@@ -43,11 +128,6 @@ describe('Sum', () => {
     should(await this.empty.exec(this.ctx)).be.null();
   });
 
-  it('should be able to sum quantity lists without nulls', async function () {
-    const q = await this.not_null_q.exec(this.ctx);
-    validateQuantity(q, 15, 'ml');
-  });
-
   it('should be able to sum  quantity lists with nulls', async function () {
     validateQuantity(await this.has_null_q.exec(this.ctx), 3, 'ml');
   });
@@ -98,6 +178,10 @@ describe('Min', () => {
     (await this.integerMin.exec(this.ctx)).should.equal(2);
   });
 
+  it('list of Longs', async function () {
+    (await this.longMin.exec(this.ctx)).should.equal(2n);
+  });
+
   it('list of Decimals', async function () {
     (await this.decimalMin.exec(this.ctx)).should.equal(-5);
   });
@@ -171,6 +255,10 @@ describe('Max', () => {
     (await this.integerMax.exec(this.ctx)).should.equal(8);
   });
 
+  it('list of Longs', async function () {
+    (await this.longMax.exec(this.ctx)).should.equal(8n);
+  });
+
   it('list of Decimals', async function () {
     (await this.decimalMax.exec(this.ctx)).should.equal(5.1);
   });
@@ -322,6 +410,9 @@ describe('Mode', () => {
   it('should be able to find mode of lists without nulls', async function () {
     (await this.not_null.exec(this.ctx)).should.equal(2);
   });
+  it('should be able to find mode of list of longs', async function () {
+    (await this.longs.exec(this.ctx)).should.equal(2n);
+  });
   it('should be able to find Mode lists with nulls', async function () {
     (await this.has_null.exec(this.ctx)).should.equal(2);
   });
@@ -430,16 +521,68 @@ describe('Product', () => {
     setup(this, data);
   });
 
+  it('should return a integer product', async function () {
+    (await this.integer_product.exec(this.ctx)).should.equal(100);
+  });
+
+  it('should return integer product up to max integer value', async function () {
+    (await this.integers_at_max_value_product.exec(this.ctx)).should.equal(2147483647);
+  });
+
+  it('should return null when integer product overflows max integer value', async function () {
+    should(await this.integers_above_max_value_product.exec(this.ctx)).be.null();
+  });
+
+  it('should return integer product down to min integer value', async function () {
+    (await this.integers_at_min_value_product.exec(this.ctx)).should.equal(-2147483648);
+  });
+
+  it('should return null when integer product underflows min integer value', async function () {
+    should(await this.integers_below_min_value_product.exec(this.ctx)).be.null();
+  });
+
+  it('should return a long product', async function () {
+    (await this.long_product.exec(this.ctx)).should.equal(100n);
+  });
+
+  it('should return long product up to max long value', async function () {
+    (await this.longs_at_max_value_product.exec(this.ctx)).should.equal(9223372036854775807n);
+  });
+
+  it('should return null when long product overflows max long value', async function () {
+    should(await this.longs_above_max_value_product.exec(this.ctx)).be.null();
+  });
+
+  it('should return long product down to min long value', async function () {
+    (await this.longs_at_min_value_product.exec(this.ctx)).should.equal(-9223372036854775808n);
+  });
+
+  it('should return null when long product underflows min long value', async function () {
+    should(await this.longs_below_min_value_product.exec(this.ctx)).be.null();
+  });
+
   it('should return a decimal product', async function () {
     (await this.decimal_product.exec(this.ctx)).should.equal(24.0);
   });
 
-  it('should return a integer product', async function () {
-    (await this.integer_product.exec(this.ctx)).should.equal(100);
+  it('should return decimal product up to max decimal value', async function () {
+    (await this.decimals_at_max_value_product.exec(this.ctx)).should.equal(
+      99999999999999999999.99999999
+    );
   });
 
-  it('should return 0', async function () {
-    (await this.zero_product.exec(this.ctx)).should.equal(0);
+  it('should return null when decimal product overflows max decimal value', async function () {
+    should(await this.decimals_above_max_value_product.exec(this.ctx)).be.null();
+  });
+
+  it('should return decimal product down to min decimal value', async function () {
+    (await this.decimals_at_min_value_product.exec(this.ctx)).should.equal(
+      -99999999999999999999.99999999
+    );
+  });
+
+  it('should return null when decimal product underflows min decimal value', async function () {
+    should(await this.decimals_below_min_value_product.exec(this.ctx)).be.null();
   });
 
   it('should return product of non-null items', async function () {
@@ -450,11 +593,39 @@ describe('Product', () => {
     validateQuantity(await this.quantity_product.exec(this.ctx), 24, 'g');
   });
 
+  it('should return quantity product up to max decimal value', async function () {
+    validateQuantity(
+      await this.quantities_at_max_value_product.exec(this.ctx),
+      99999999999999999999.99999999,
+      'g'
+    );
+  });
+
+  it('should return null when quantity product overflows max decimal value', async function () {
+    should(await this.quantities_above_max_value_product.exec(this.ctx)).be.null();
+  });
+
+  it('should return quantity product down to min decimal value', async function () {
+    validateQuantity(
+      await this.quantities_at_min_value_product.exec(this.ctx),
+      -99999999999999999999.99999999,
+      'g'
+    );
+  });
+
+  it('should return null when quantity product underflows min decimal value', async function () {
+    should(await this.quantities_below_min_value_product.exec(this.ctx)).be.null();
+  });
+
   it('should return a 0 quantity product', async function () {
     const q = await this.quantity_zero_product.exec(this.ctx);
     validateQuantity(q, 0, 'g');
   });
 
+  it('should return 0', async function () {
+    (await this.zero_product.exec(this.ctx)).should.equal(0);
+  });
+
   it('should return null when null list is passed in', async function () {
     should(await this.product_null.exec(this.ctx)).be.null();
   });
diff --git a/test/elm/aggregate/data.cql b/test/elm/aggregate/data.cql
index 137949d5e..40968e0b3 100644
--- a/test/elm/aggregate/data.cql
+++ b/test/elm/aggregate/data.cql
@@ -5,9 +5,27 @@ define empty: Count({})
 define is_null: Count(null as List<Integer>)
 
 // @Test: Sum
-define not_null: Sum({1,2,3,4,5})
+define integers: Sum({1,2,3,4,5})
+define integers_at_max_value: Sum({1,2,2147483644}) // 2147483647
+define integers_above_max_value: Sum({1,2,2147483645}) // 2147483648
+define integers_at_min_value: Sum({-1,-2,-2147483645}) // -2147483648
+define integers_below_min_value: Sum({-1,-2,-2147483646}) //-2147483649
+define longs: Sum({1L,2L,3L,4L,5L})
+define longs_at_max_value: Sum({1L,2L,9223372036854775804L}) // 9223372036854775807
+define longs_above_max_value: Sum({1L,2L,9223372036854775805L}) // 9223372036854775808
+define longs_at_min_value: Sum({-1L,-2L,-9223372036854775805L}) // -9223372036854775808
+define longs_below_min_value: Sum({-1L,-2L,-9223372036854775806L}) //-9223372036854775809
+define decimals: Sum({1.1,2.2,3.3,4.4,5.5})
+define decimals_at_max_value: Sum({99999999999999999999.99999999})
+define decimals_above_max_value: Sum({99999999999999999999.99999999, 99999999999999999999.99999999})
+define decimals_at_min_value: Sum({-99999999999999999999.99999999})
+define decimals_below_min_value: Sum({-99999999999999999999.99999999, -99999999999999999999.99999999})
+define quantities: Sum({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
+define quantities_at_max_value: Sum({99999999999999999999.99999999 'ml'})
+define quantities_above_max_value: Sum({99999999999999999999.99999999 'ml', 99999999999999999999.99999999 'ml'})
+define quantities_at_min_value: Sum({-99999999999999999999.99999999 'ml'})
+define quantities_below_min_value: Sum({-99999999999999999999.99999999 'ml', -99999999999999999999.99999999 'ml'})
 define has_null: Sum({1,null,null,null,2})
-define not_null_q: Sum({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
 define has_null_q: Sum({1 'ml',null,null,null,2 'ml'})
 define unmatched_units_q: Min({1 'ml',2 'm',3 'ml',4 'ml',5 'ml',0 'ml'})
 define empty: Sum(List<Integer>{})
@@ -24,6 +42,7 @@ define has_null_q: Min({1 'ml',null,-1 'ml',null,2 'ml'})
 define q_diff_units: Min({1 'ml',2 'dl',3 'l',4 'l',5 'l',0 'ml'})
 define NumbersAndQuantities: Min({1 ,2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
 define IntegerMin: Min({ 2, 4, 8, 6 })
+define LongMin: Min({ 4L, 2L, 8L, 6L })
 define DecimalMin: Min({ 5.0, 4.9, 5.1, -5.0 })
 define DateMin: Min({ @2012-12-31, @2013-01-01, @2012-01-01 })
 define DateTimeMin: Min({ DateTime(2012, 9, 9), DateTime(2012, 9, 5) })
@@ -45,6 +64,7 @@ define IncompatibleUnitsNull: Max({1 'mg/d', 0.002 '/d'})
 define empty: Max(List<Integer>{})
 
 define IntegerMax: Max({ 2, 4, 8, 6 })
+define LongMax: Max({ 2L, 4L, 8L, 6L })
 define DecimalMax: Max({ 5.0, 4.9, 5.1, -5.0 })
 define DateMax: Max({ @2012-12-31, @2013-01-01, @2012-01-01 })
 define DateTimeMax: Max({ DateTime(2012, 2, 3), DateTime(2012, 9, 5) })
@@ -82,6 +102,7 @@ define IncompatibleUnitsNull: Median({1 'mg/d', 0.002 '/d'})
 
 // @Test: Mode
 define not_null: Mode({1,2,2,2,3,4,5})
+define longs: Mode({1L,2L,2L,2L,3L,4L,5L})
 define has_null: Mode({1,null,null,2,2})
 define empty: Mode({})
 
@@ -119,11 +140,28 @@ define NumbersAndQuantities: PopulationStdDev({1 ,2 ,3 ,4 'ml',5 })
 define IncompatibleUnitsNull: PopulationStdDev({1 'mg/d', 0.002 '/d'})
 
 // @Test: Product
-define decimal_product: Product({1.0, 2.0, 3.0, 4.0})
 define integer_product: Product({5, 4, 5})
-define zero_product: Product({0, 5, 10})
+define integers_at_max_value_product: Product({1, 2147483647}) // 2147483647
+define integers_above_max_value_product: Product({2, 1073741824}) // 2147483648
+define integers_at_min_value_product: Product({-1, 2, 1073741824}) // -2147483648
+define integers_below_min_value_product: Product({-2, 1073741825}) // -2147483650
+define long_product: Product({5L, 4L, 5L})
+define longs_at_max_value_product: Product({1L, 9223372036854775807L}) // 9223372036854775807
+define longs_above_max_value_product: Product({2L, 4611686018427387904L}) // 9223372036854775808
+define longs_at_min_value_product: Product({-1L, 2L, 4611686018427387904L}) // -9223372036854775808
+define longs_below_min_value_product: Product({-1L, 3L, 3074457345618258603L}) // -9223372036854775809
+define decimal_product: Product({1.0, 2.0, 3.0, 4.0})
+define decimals_at_max_value_product: Product({99999999999999999999.99999999, 1.0})
+define decimals_above_max_value_product: Product({99999999999999999999.99999999, 2.0})
+define decimals_at_min_value_product: Product({-99999999999999999999.99999999, 1.0})
+define decimals_below_min_value_product: Product({-99999999999999999999.99999999, 2.0})
 define quantity_product: Product({1.0 'g', 2.0 'g', 3.0 'g', 4.0 'g'})
+define quantities_at_max_value_product: Product({99999999999999999999.99999999 'g', 1.0 'g'})
+define quantities_above_max_value_product: Product({99999999999999999999.99999999 'g', 2.0 'g'})
+define quantities_at_min_value_product: Product({-99999999999999999999.99999999 'g', 1.0 'g'})
+define quantities_below_min_value_product: Product({-99999999999999999999.99999999 'g', 2.0 'g'})
 define quantity_zero_product: Product({1.0 'g', 2.0 'g', 0 'g'})
+define zero_product: Product({0, 5, 10})
 define product_with_null: Product({5, 4, null})
 define product_of_nulls: Product({null as Integer, null, null})
 define product_null: Product(null as List<Decimal>)
diff --git a/test/elm/aggregate/data.js b/test/elm/aggregate/data.js
index f2d6c8e4c..58aa6c375 100644
--- a/test/elm/aggregate/data.js
+++ b/test/elm/aggregate/data.js
@@ -483,9 +483,27 @@ module.exports['Count'] = {
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define not_null: Sum({1,2,3,4,5})
+define integers: Sum({1,2,3,4,5})
+define integers_at_max_value: Sum({1,2,2147483644}) // 2147483647
+define integers_above_max_value: Sum({1,2,2147483645}) // 2147483648
+define integers_at_min_value: Sum({-1,-2,-2147483645}) // -2147483648
+define integers_below_min_value: Sum({-1,-2,-2147483646}) //-2147483649
+define longs: Sum({1L,2L,3L,4L,5L})
+define longs_at_max_value: Sum({1L,2L,9223372036854775804L}) // 9223372036854775807
+define longs_above_max_value: Sum({1L,2L,9223372036854775805L}) // 9223372036854775808
+define longs_at_min_value: Sum({-1L,-2L,-9223372036854775805L}) // -9223372036854775808
+define longs_below_min_value: Sum({-1L,-2L,-9223372036854775806L}) //-9223372036854775809
+define decimals: Sum({1.1,2.2,3.3,4.4,5.5})
+define decimals_at_max_value: Sum({99999999999999999999.99999999})
+define decimals_above_max_value: Sum({99999999999999999999.99999999, 99999999999999999999.99999999})
+define decimals_at_min_value: Sum({-99999999999999999999.99999999})
+define decimals_below_min_value: Sum({-99999999999999999999.99999999, -99999999999999999999.99999999})
+define quantities: Sum({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
+define quantities_at_max_value: Sum({99999999999999999999.99999999 'ml'})
+define quantities_above_max_value: Sum({99999999999999999999.99999999 'ml', 99999999999999999999.99999999 'ml'})
+define quantities_at_min_value: Sum({-99999999999999999999.99999999 'ml'})
+define quantities_below_min_value: Sum({-99999999999999999999.99999999 'ml', -99999999999999999999.99999999 'ml'})
 define has_null: Sum({1,null,null,null,2})
-define not_null_q: Sum({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
 define has_null_q: Sum({1 'ml',null,null,null,2 'ml'})
 define unmatched_units_q: Min({1 'ml',2 'm',3 'ml',4 'ml',5 'ml',0 'ml'})
 define empty: Sum(List<Integer>{})
@@ -506,7 +524,7 @@ module.exports['Sum'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "366",
+        "r" : "682",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -581,7 +599,7 @@ module.exports['Sum'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "not_null",
+        "name" : "integers",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -590,7 +608,7 @@ module.exports['Sum'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "not_null", ": " ]
+              "value" : [ "", "define ", "integers", ": " ]
             }, {
               "r" : "227",
               "s" : [ {
@@ -679,7 +697,7 @@ module.exports['Sum'] = {
       }, {
         "localId" : "232",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "has_null",
+        "name" : "integers_at_max_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -688,16 +706,16 @@ module.exports['Sum'] = {
           "s" : {
             "r" : "232",
             "s" : [ {
-              "value" : [ "", "define ", "has_null", ": " ]
+              "value" : [ "", "define ", "integers_at_max_value", ": " ]
             }, {
-              "r" : "248",
+              "r" : "243",
               "s" : [ {
                 "value" : [ "Sum", "(" ]
               }, {
                 "r" : "233",
                 "s" : [ {
                   "r" : "234",
-                  "value" : [ "{", "1", ",", "null", ",", "null", ",", "null", ",", "2", "}" ]
+                  "value" : [ "{", "1", ",", "2", ",", "2147483644", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -707,16 +725,16 @@ module.exports['Sum'] = {
         } ],
         "expression" : {
           "type" : "Sum",
-          "localId" : "248",
+          "localId" : "243",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "249",
+            "localId" : "244",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "250",
+              "localId" : "245",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
@@ -727,11 +745,11 @@ module.exports['Sum'] = {
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "242",
+              "localId" : "237",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "243",
+                "localId" : "238",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -743,108 +761,45 @@ module.exports['Sum'] = {
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
-            }, {
-              "type" : "As",
-              "localId" : "239",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "235",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "As",
-              "localId" : "240",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "236",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "As",
-              "localId" : "241",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "237",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }, {
               "type" : "Literal",
-              "localId" : "238",
+              "localId" : "235",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2147483644",
+              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "253",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "not_null_q",
+        "localId" : "248",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "integers_above_max_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "253",
+            "r" : "248",
             "s" : [ {
-              "value" : [ "", "define ", "not_null_q", ": " ]
+              "value" : [ "// 2147483647\n", "define ", "integers_above_max_value", ": " ]
             }, {
-              "r" : "266",
+              "r" : "259",
               "s" : [ {
                 "value" : [ "Sum", "(" ]
               }, {
-                "r" : "254",
+                "r" : "249",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "255",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "256",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "257",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "258",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "259",
-                  "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "250",
+                  "value" : [ "{", "1", ",", "2", ",", "2147483645", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -854,106 +809,101 @@ module.exports['Sum'] = {
         } ],
         "expression" : {
           "type" : "Sum",
-          "localId" : "266",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "259",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "267",
+            "localId" : "260",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "268",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "254",
+            "localId" : "249",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "260",
+              "localId" : "253",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "261",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "254",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "255",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "256",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "257",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "250",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "258",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "251",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "259",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2147483645",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "271",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "has_null_q",
+        "localId" : "264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "integers_at_min_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "271",
+            "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "has_null_q", ": " ]
+              "value" : [ "// 2147483648\n", "define ", "integers_at_min_value", ": " ]
             }, {
-              "r" : "287",
+              "r" : "281",
               "s" : [ {
                 "value" : [ "Sum", "(" ]
               }, {
-                "r" : "272",
+                "r" : "265",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "273",
+                  "r" : "266",
                   "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
+                    "r" : "267",
+                    "value" : [ "-", "1" ]
                   } ]
                 }, {
-                  "r" : "274",
-                  "value" : [ ",", "null", ",", "null", ",", "null", "," ]
+                  "value" : [ "," ]
                 }, {
-                  "r" : "277",
+                  "r" : "269",
                   "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
+                    "r" : "270",
+                    "value" : [ "-", "2" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "272",
+                  "s" : [ {
+                    "r" : "273",
+                    "value" : [ "-", "2147483645" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -966,148 +916,137 @@ module.exports['Sum'] = {
         } ],
         "expression" : {
           "type" : "Sum",
-          "localId" : "287",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "281",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "288",
+            "localId" : "282",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "289",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "283",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "272",
+            "localId" : "265",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "281",
+              "localId" : "275",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "282",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "276",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "273",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "As",
-              "localId" : "278",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "Negate",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "268",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
               "operand" : {
-                "type" : "Null",
-                "localId" : "274",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "type" : "Literal",
+                "localId" : "267",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
               }
             }, {
-              "type" : "As",
-              "localId" : "279",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "Negate",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "271",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
               "operand" : {
-                "type" : "Null",
-                "localId" : "275",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "type" : "Literal",
+                "localId" : "270",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               }
             }, {
-              "type" : "As",
-              "localId" : "280",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "Negate",
+              "localId" : "272",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "274",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
               "operand" : {
-                "type" : "Null",
-                "localId" : "276",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "type" : "Literal",
+                "localId" : "273",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2147483645",
                 "annotation" : [ ]
               }
-            }, {
-              "type" : "Quantity",
-              "localId" : "277",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "292",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "unmatched_units_q",
+        "localId" : "286",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "integers_below_min_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "292",
+            "r" : "286",
             "s" : [ {
-              "value" : [ "", "define ", "unmatched_units_q", ": " ]
+              "value" : [ "// -2147483648\n", "define ", "integers_below_min_value", ": " ]
             }, {
-              "r" : "306",
+              "r" : "303",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "293",
+                "r" : "287",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "294",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "295",
-                  "s" : [ {
-                    "value" : [ "2 ", "'m'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "296",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "297",
+                  "r" : "288",
                   "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
+                    "r" : "289",
+                    "value" : [ "-", "1" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "298",
+                  "r" : "291",
                   "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
+                    "r" : "292",
+                    "value" : [ "-", "2" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "299",
+                  "r" : "294",
                   "s" : [ {
-                    "value" : [ "0 ", "'ml'" ]
+                    "r" : "295",
+                    "value" : [ "-", "2147483646" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -1119,109 +1058,118 @@ module.exports['Sum'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "306",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Sum",
+          "localId" : "303",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "307",
+            "localId" : "304",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "308",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "305",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "293",
+            "localId" : "287",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "300",
+              "localId" : "297",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "301",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "298",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "294",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "295",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "m",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "290",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "289",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "298",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "293",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "292",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "299",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "294",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "296",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "295",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2147483646",
+                "annotation" : [ ]
+              }
             } ]
           }
         }
       }, {
-        "localId" : "311",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "empty",
+        "localId" : "308",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longs",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "311",
+            "r" : "308",
             "s" : [ {
-              "value" : [ "", "define ", "empty", ": " ]
+              "value" : [ "//-2147483649\n", "define ", "longs", ": " ]
             }, {
               "r" : "321",
               "s" : [ {
                 "value" : [ "Sum", "(" ]
               }, {
-                "r" : "313",
+                "r" : "309",
                 "s" : [ {
-                  "value" : [ "List<" ]
-                }, {
-                  "r" : "312",
-                  "s" : [ {
-                    "value" : [ "Integer" ]
-                  } ]
-                }, {
-                  "value" : [ ">{}" ]
+                  "r" : "310",
+                  "value" : [ "{", "1L", ",", "2L", ",", "3L", ",", "4L", ",", "5L", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -1232,7 +1180,7 @@ module.exports['Sum'] = {
         "expression" : {
           "type" : "Sum",
           "localId" : "321",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
@@ -1241,13 +1189,13 @@ module.exports['Sum'] = {
             "elementType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "323",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "313",
+            "localId" : "309",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
@@ -1256,17 +1204,52 @@ module.exports['Sum'] = {
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "316",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
-            "element" : [ ]
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "310",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "312",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "313",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "314",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
           }
         }
       }, {
         "localId" : "326",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "q_diff_units",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longs_at_max_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1275,50 +1258,16 @@ module.exports['Sum'] = {
           "s" : {
             "r" : "326",
             "s" : [ {
-              "value" : [ "", "define ", "q_diff_units", ": " ]
+              "value" : [ "", "define ", "longs_at_max_value", ": " ]
             }, {
-              "r" : "339",
+              "r" : "337",
               "s" : [ {
                 "value" : [ "Sum", "(" ]
               }, {
                 "r" : "327",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
                   "r" : "328",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "329",
-                  "s" : [ {
-                    "value" : [ "0.002 ", "'l'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "330",
-                  "s" : [ {
-                    "value" : [ "0.03 ", "'dl'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "331",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "332",
-                  "s" : [ {
-                    "value" : [ "0.005 ", "'l'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "value" : [ "{", "1L", ",", "2L", ",", "9223372036854775804L", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -1328,17 +1277,17 @@ module.exports['Sum'] = {
         } ],
         "expression" : {
           "type" : "Sum",
-          "localId" : "339",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "337",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "340",
+            "localId" : "338",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "341",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "339",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -1348,107 +1297,165 @@ module.exports['Sum'] = {
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "333",
+              "localId" : "331",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "334",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "332",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "328",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "329",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "l",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "330",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.03,
-              "unit" : "dl",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "9223372036854775804",
               "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "342",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longs_above_max_value",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "342",
+            "s" : [ {
+              "value" : [ "// 9223372036854775807\n", "define ", "longs_above_max_value", ": " ]
             }, {
-              "type" : "Quantity",
-              "localId" : "331",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "r" : "353",
+              "s" : [ {
+                "value" : [ "Sum", "(" ]
+              }, {
+                "r" : "343",
+                "s" : [ {
+                  "r" : "344",
+                  "value" : [ "{", "1L", ",", "2L", ",", "9223372036854775805L", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Sum",
+          "localId" : "353",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "354",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "355",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "343",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "347",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "348",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "344",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "332",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.005,
-              "unit" : "l",
+              "type" : "Literal",
+              "localId" : "345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "9223372036854775805",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "344",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "NumbersAndQuantities",
+        "localId" : "358",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longs_at_min_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "344",
+            "r" : "358",
             "s" : [ {
-              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+              "value" : [ "// 9223372036854775808\n", "define ", "longs_at_min_value", ": " ]
             }, {
-              "r" : "361",
+              "r" : "375",
               "s" : [ {
                 "value" : [ "Sum", "(" ]
               }, {
-                "r" : "345",
+                "r" : "359",
                 "s" : [ {
-                  "r" : "346",
-                  "value" : [ "{", "1", " ," ]
-                }, {
-                  "r" : "347",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "348",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "349",
+                  "r" : "360",
                   "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
+                    "r" : "361",
+                    "value" : [ "-", "1L" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "350",
+                  "r" : "363",
                   "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
+                    "r" : "364",
+                    "value" : [ "-", "2L" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "351",
+                  "r" : "366",
                   "s" : [ {
-                    "value" : [ "0 ", "'ml'" ]
+                    "r" : "367",
+                    "value" : [ "-", "9223372036854775805L" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -1461,123 +1468,137 @@ module.exports['Sum'] = {
         } ],
         "expression" : {
           "type" : "Sum",
-          "localId" : "361",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "375",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "362",
+            "localId" : "376",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "363",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "377",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "345",
+            "localId" : "359",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "355",
+              "localId" : "369",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "356",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "370",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "ToQuantity",
-              "localId" : "353",
+              "type" : "Negate",
+              "localId" : "360",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "354",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "362",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "346",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "361",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "1",
                 "annotation" : [ ]
               }
             }, {
-              "type" : "Quantity",
-              "localId" : "347",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "348",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "349",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "350",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "363",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "365",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "364",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "351",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "367",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "9223372036854775805",
+                "annotation" : [ ]
+              }
             } ]
           }
         }
       }, {
-        "localId" : "366",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "IncompatibleUnitsNull",
+        "localId" : "380",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longs_below_min_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "366",
+            "r" : "380",
             "s" : [ {
-              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+              "value" : [ "// -9223372036854775808\n", "define ", "longs_below_min_value", ": " ]
             }, {
-              "r" : "376",
+              "r" : "397",
               "s" : [ {
                 "value" : [ "Sum", "(" ]
               }, {
-                "r" : "367",
+                "r" : "381",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "368",
+                  "r" : "382",
                   "s" : [ {
-                    "value" : [ "1 ", "'mg/d'" ]
+                    "r" : "383",
+                    "value" : [ "-", "1L" ]
                   } ]
                 }, {
-                  "value" : [ ", " ]
+                  "value" : [ "," ]
                 }, {
-                  "r" : "369",
+                  "r" : "385",
                   "s" : [ {
-                    "value" : [ "0.002 ", "'/d'" ]
+                    "r" : "386",
+                    "value" : [ "-", "2L" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "388",
+                  "s" : [ {
+                    "r" : "389",
+                    "value" : [ "-", "9223372036854775806L" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -1590,185 +1611,117 @@ module.exports['Sum'] = {
         } ],
         "expression" : {
           "type" : "Sum",
-          "localId" : "376",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "397",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "377",
+            "localId" : "398",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "378",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "399",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "367",
+            "localId" : "381",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "370",
+              "localId" : "391",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "371",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "392",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "368",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg/d",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "384",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "383",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "369",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "/d",
-              "annotation" : [ ]
-            } ]
-          }
-        }
-      } ]
-    }
-  }
-}
-
-/* Min
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define not_null: Min({1,2,3,4,5,0})
-define has_null: Min({1,null,-1,null,2})
-define empty: Min(List<Integer>{})
-define not_null_q: Min({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
-define has_null_q: Min({1 'ml',null,-1 'ml',null,2 'ml'})
-define q_diff_units: Min({1 'ml',2 'dl',3 'l',4 'l',5 'l',0 'ml'})
-define NumbersAndQuantities: Min({1 ,2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
-define IntegerMin: Min({ 2, 4, 8, 6 })
-define DecimalMin: Min({ 5.0, 4.9, 5.1, -5.0 })
-define DateMin: Min({ @2012-12-31, @2013-01-01, @2012-01-01 })
-define DateTimeMin: Min({ DateTime(2012, 9, 9), DateTime(2012, 9, 5) })
-define TimeMin: Min({ Time(12, 30, 4), Time(12, 30, 3), Time(12, 30, 5)})
-define StringMin: Min({'def', 'abc', 'jkl', 'ghi'})
-define MinIsNull: Min({ null as Quantity, null as Quantity, null as Quantity })
-define MinIsAlsoNull: Min(null as List<Decimal>)
-define IncompatibleUnitsNull: Min({1 'mg/d', 0.002 '/d'})
-*/
-
-module.exports['Min'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "563",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
+              "type" : "Negate",
+              "localId" : "385",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "387",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "386",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             }, {
-              "value" : [ " version '1.0.0'" ]
+              "type" : "Negate",
+              "localId" : "388",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "390",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "389",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "9223372036854775806",
+                "annotation" : [ ]
+              }
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "not_null",
+        "localId" : "402",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimals",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "402",
             "s" : [ {
-              "value" : [ "", "define ", "not_null", ": " ]
+              "value" : [ "//-9223372036854775809\n", "define ", "decimals", ": " ]
             }, {
-              "r" : "228",
+              "r" : "415",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "215",
+                "r" : "403",
                 "s" : [ {
-                  "r" : "216",
-                  "value" : [ "{", "1", ",", "2", ",", "3", ",", "4", ",", "5", ",", "0", "}" ]
+                  "r" : "404",
+                  "value" : [ "{", "1.1", ",", "2.2", ",", "3.3", ",", "4.4", ",", "5.5", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -1777,112 +1730,96 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "228",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Sum",
+          "localId" : "415",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "229",
+            "localId" : "416",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "230",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "417",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "215",
+            "localId" : "403",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "222",
+              "localId" : "409",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "223",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "410",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "localId" : "404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "localId" : "405",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "219",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "localId" : "406",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "localId" : "407",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "408",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "5.5",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "233",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "has_null",
+        "localId" : "420",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimals_at_max_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "233",
+            "r" : "420",
             "s" : [ {
-              "value" : [ "", "define ", "has_null", ": " ]
+              "value" : [ "", "define ", "decimals_at_max_value", ": " ]
             }, {
-              "r" : "250",
+              "r" : "429",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "234",
+                "r" : "421",
                 "s" : [ {
-                  "r" : "235",
-                  "value" : [ "{", "1", ",", "null", "," ]
-                }, {
-                  "r" : "237",
-                  "s" : [ {
-                    "r" : "238",
-                    "value" : [ "-", "1" ]
-                  } ]
-                }, {
-                  "r" : "240",
-                  "value" : [ ",", "null", ",", "2", "}" ]
+                  "r" : "422",
+                  "value" : [ "{", "99999999999999999999.99999999", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -1891,124 +1828,249 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "250",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Sum",
+          "localId" : "429",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "251",
+            "localId" : "430",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "252",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "431",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "234",
+            "localId" : "421",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "244",
+              "localId" : "423",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "245",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "424",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "235",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "localId" : "422",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "99999999999999999999.99999999",
               "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "434",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimals_above_max_value",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "434",
+            "s" : [ {
+              "value" : [ "", "define ", "decimals_above_max_value", ": " ]
             }, {
-              "type" : "As",
-              "localId" : "242",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "236",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+              "r" : "444",
+              "s" : [ {
+                "value" : [ "Sum", "(" ]
+              }, {
+                "r" : "435",
+                "s" : [ {
+                  "r" : "436",
+                  "value" : [ "{", "99999999999999999999.99999999", ", ", "99999999999999999999.99999999", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Sum",
+          "localId" : "444",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "445",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "446",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "435",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "438",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "439",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
               }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "436",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "99999999999999999999.99999999",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "437",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "99999999999999999999.99999999",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "449",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimals_at_min_value",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "449",
+            "s" : [ {
+              "value" : [ "", "define ", "decimals_at_min_value", ": " ]
             }, {
+              "r" : "460",
+              "s" : [ {
+                "value" : [ "Sum", "(" ]
+              }, {
+                "r" : "450",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "451",
+                  "s" : [ {
+                    "r" : "452",
+                    "value" : [ "-", "99999999999999999999.99999999" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Sum",
+          "localId" : "460",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "461",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "462",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "450",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "454",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "455",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
               "type" : "Negate",
-              "localId" : "237",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "451",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "239",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "453",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "238",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "As",
-              "localId" : "243",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "240",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "452",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "99999999999999999999.99999999",
                 "annotation" : [ ]
               }
-            }, {
-              "type" : "Literal",
-              "localId" : "241",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "255",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "empty",
+        "localId" : "465",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimals_below_min_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "255",
+            "r" : "465",
             "s" : [ {
-              "value" : [ "", "define ", "empty", ": " ]
+              "value" : [ "", "define ", "decimals_below_min_value", ": " ]
             }, {
-              "r" : "265",
+              "r" : "479",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "257",
+                "r" : "466",
                 "s" : [ {
-                  "value" : [ "List<" ]
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "256",
+                  "r" : "467",
                   "s" : [ {
-                    "value" : [ "Integer" ]
+                    "r" : "468",
+                    "value" : [ "-", "99999999999999999999.99999999" ]
                   } ]
                 }, {
-                  "value" : [ ">{}" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "470",
+                  "s" : [ {
+                    "r" : "471",
+                    "value" : [ "-", "99999999999999999999.99999999" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -2017,100 +2079,131 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "265",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Sum",
+          "localId" : "479",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "266",
+            "localId" : "480",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "267",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "481",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "257",
+            "localId" : "466",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "259",
+              "localId" : "473",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "260",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "474",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
-            "element" : [ ]
+            "element" : [ {
+              "type" : "Negate",
+              "localId" : "467",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "469",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "468",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "99999999999999999999.99999999",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Negate",
+              "localId" : "470",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "472",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "471",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "99999999999999999999.99999999",
+                "annotation" : [ ]
+              }
+            } ]
           }
         }
       }, {
-        "localId" : "270",
+        "localId" : "484",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "not_null_q",
+        "name" : "quantities",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "270",
+            "r" : "484",
             "s" : [ {
-              "value" : [ "", "define ", "not_null_q", ": " ]
+              "value" : [ "", "define ", "quantities", ": " ]
             }, {
-              "r" : "284",
+              "r" : "497",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "271",
+                "r" : "485",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "272",
+                  "r" : "486",
                   "s" : [ {
                     "value" : [ "1 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "273",
+                  "r" : "487",
                   "s" : [ {
                     "value" : [ "2 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "274",
+                  "r" : "488",
                   "s" : [ {
                     "value" : [ "3 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "275",
+                  "r" : "489",
                   "s" : [ {
                     "value" : [ "4 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "276",
+                  "r" : "490",
                   "s" : [ {
                     "value" : [ "5 ", "'ml'" ]
                   } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "277",
-                  "s" : [ {
-                    "value" : [ "0 ", "'ml'" ]
-                  } ]
                 }, {
                   "value" : [ "}" ]
                 } ]
@@ -2121,127 +2214,99 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "284",
+          "type" : "Sum",
+          "localId" : "497",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "285",
+            "localId" : "498",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "286",
+              "localId" : "499",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "271",
+            "localId" : "485",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "278",
+              "localId" : "491",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "279",
+                "localId" : "492",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "272",
+              "localId" : "486",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "273",
+              "localId" : "487",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "274",
+              "localId" : "488",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 3,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "275",
+              "localId" : "489",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "276",
+              "localId" : "490",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "ml",
               "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "277",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0,
-              "unit" : "ml",
-              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "289",
+        "localId" : "502",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "has_null_q",
+        "name" : "quantities_at_max_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "289",
+            "r" : "502",
             "s" : [ {
-              "value" : [ "", "define ", "has_null_q", ": " ]
+              "value" : [ "", "define ", "quantities_at_max_value", ": " ]
             }, {
-              "r" : "306",
+              "r" : "511",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "290",
+                "r" : "503",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "291",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "r" : "292",
-                  "value" : [ ",", "null", "," ]
-                }, {
-                  "r" : "293",
-                  "s" : [ {
-                    "value" : [ "-" ]
-                  }, {
-                    "r" : "294",
-                    "s" : [ {
-                      "value" : [ "1 ", "'ml'" ]
-                    } ]
-                  } ]
-                }, {
-                  "r" : "296",
-                  "value" : [ ",", "null", "," ]
-                }, {
-                  "r" : "297",
+                  "r" : "504",
                   "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
+                    "value" : [ "99999999999999999999.99999999 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -2253,156 +2318,78 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "306",
+          "type" : "Sum",
+          "localId" : "511",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "307",
+            "localId" : "512",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "308",
+              "localId" : "513",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "290",
+            "localId" : "503",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "300",
+              "localId" : "505",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "301",
+                "localId" : "506",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "291",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "As",
-              "localId" : "298",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "292",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "Negate",
-              "localId" : "293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "295",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Quantity",
-                "localId" : "294",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 1,
-                "unit" : "ml",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "As",
-              "localId" : "299",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "296",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "Quantity",
-              "localId" : "297",
+              "localId" : "504",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
+              "value" : 1.0E20,
               "unit" : "ml",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "311",
+        "localId" : "516",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "q_diff_units",
+        "name" : "quantities_above_max_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "311",
+            "r" : "516",
             "s" : [ {
-              "value" : [ "", "define ", "q_diff_units", ": " ]
+              "value" : [ "", "define ", "quantities_above_max_value", ": " ]
             }, {
-              "r" : "325",
+              "r" : "526",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "312",
+                "r" : "517",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "313",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "314",
-                  "s" : [ {
-                    "value" : [ "2 ", "'dl'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "315",
-                  "s" : [ {
-                    "value" : [ "3 ", "'l'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "316",
-                  "s" : [ {
-                    "value" : [ "4 ", "'l'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "317",
+                  "r" : "518",
                   "s" : [ {
-                    "value" : [ "5 ", "'l'" ]
+                    "value" : [ "99999999999999999999.99999999 ", "'ml'" ]
                   } ]
                 }, {
-                  "value" : [ "," ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "318",
+                  "r" : "519",
                   "s" : [ {
-                    "value" : [ "0 ", "'ml'" ]
+                    "value" : [ "99999999999999999999.99999999 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -2414,135 +2401,83 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "325",
+          "type" : "Sum",
+          "localId" : "526",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "326",
+            "localId" : "527",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "327",
+              "localId" : "528",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "312",
+            "localId" : "517",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "319",
+              "localId" : "520",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "320",
+                "localId" : "521",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "313",
+              "localId" : "518",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
+              "value" : 1.0E20,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "314",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "dl",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "315",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "l",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "316",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "l",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "317",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "l",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "318",
+              "localId" : "519",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0,
+              "value" : 1.0E20,
               "unit" : "ml",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "330",
+        "localId" : "531",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "NumbersAndQuantities",
+        "name" : "quantities_at_min_value",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "330",
+            "r" : "531",
             "s" : [ {
-              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+              "value" : [ "", "define ", "quantities_at_min_value", ": " ]
             }, {
-              "r" : "347",
+              "r" : "542",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "331",
+                "r" : "532",
                 "s" : [ {
-                  "r" : "332",
-                  "value" : [ "{", "1", " ," ]
-                }, {
-                  "r" : "333",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "334",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "335",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "336",
-                  "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "337",
+                  "r" : "533",
                   "s" : [ {
-                    "value" : [ "0 ", "'ml'" ]
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "534",
+                    "s" : [ {
+                      "value" : [ "99999999999999999999.99999999 ", "'ml'" ]
+                    } ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -2554,114 +2489,204 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "347",
+          "type" : "Sum",
+          "localId" : "542",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "348",
+            "localId" : "543",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "349",
+              "localId" : "544",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "331",
+            "localId" : "532",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "341",
+              "localId" : "536",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "342",
+                "localId" : "537",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "ToQuantity",
-              "localId" : "339",
+              "type" : "Negate",
+              "localId" : "533",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "340",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "535",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               } ],
               "operand" : {
-                "type" : "Literal",
-                "localId" : "332",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
+                "type" : "Quantity",
+                "localId" : "534",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1.0E20,
+                "unit" : "ml",
+                "annotation" : [ ]
               }
+            } ]
+          }
+        }
+      }, {
+        "localId" : "547",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "quantities_below_min_value",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "547",
+            "s" : [ {
+              "value" : [ "", "define ", "quantities_below_min_value", ": " ]
             }, {
-              "type" : "Quantity",
-              "localId" : "333",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "334",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "335",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "r" : "561",
+              "s" : [ {
+                "value" : [ "Sum", "(" ]
+              }, {
+                "r" : "548",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "549",
+                  "s" : [ {
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "550",
+                    "s" : [ {
+                      "value" : [ "99999999999999999999.99999999 ", "'ml'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "552",
+                  "s" : [ {
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "553",
+                    "s" : [ {
+                      "value" : [ "99999999999999999999.99999999 ", "'ml'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Sum",
+          "localId" : "561",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "562",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "563",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "336",
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "548",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "555",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "556",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Negate",
+              "localId" : "549",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "551",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Quantity",
+                "localId" : "550",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1.0E20,
+                "unit" : "ml",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "337",
+              "type" : "Negate",
+              "localId" : "552",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "554",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Quantity",
+                "localId" : "553",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1.0E20,
+                "unit" : "ml",
+                "annotation" : [ ]
+              }
             } ]
           }
         }
       }, {
-        "localId" : "352",
+        "localId" : "566",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerMin",
+        "name" : "has_null",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "352",
+            "r" : "566",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerMin", ": " ]
+              "value" : [ "", "define ", "has_null", ": " ]
             }, {
-              "r" : "364",
+              "r" : "582",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "353",
+                "r" : "567",
                 "s" : [ {
-                  "r" : "354",
-                  "value" : [ "{ ", "2", ", ", "4", ", ", "8", ", ", "6", " }" ]
+                  "r" : "568",
+                  "value" : [ "{", "1", ",", "null", ",", "null", ",", "null", ",", "2", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -2670,97 +2695,125 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "364",
+          "type" : "Sum",
+          "localId" : "582",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "365",
+            "localId" : "583",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "366",
+              "localId" : "584",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "353",
+            "localId" : "567",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "358",
+              "localId" : "576",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "359",
+                "localId" : "577",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "354",
+              "localId" : "568",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "355",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "573",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "569",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Literal",
-              "localId" : "356",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "574",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "570",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "As",
+              "localId" : "575",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "571",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }, {
               "type" : "Literal",
-              "localId" : "357",
+              "localId" : "572",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
+              "value" : "2",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "369",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalMin",
+        "localId" : "587",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "has_null_q",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "369",
+            "r" : "587",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalMin", ": " ]
+              "value" : [ "", "define ", "has_null_q", ": " ]
             }, {
-              "r" : "383",
+              "r" : "603",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "370",
+                "r" : "588",
                 "s" : [ {
-                  "r" : "371",
-                  "value" : [ "{ ", "5.0", ", ", "4.9", ", ", "5.1", ", " ]
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "374",
+                  "r" : "589",
                   "s" : [ {
-                    "r" : "375",
-                    "value" : [ "-", "5.0" ]
+                    "value" : [ "1 ", "'ml'" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "r" : "590",
+                  "value" : [ ",", "null", ",", "null", ",", "null", "," ]
+                }, {
+                  "r" : "593",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -2769,101 +2822,152 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "383",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Sum",
+          "localId" : "603",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "384",
+            "localId" : "604",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "385",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "605",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "370",
+            "localId" : "588",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "377",
+              "localId" : "597",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "378",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "598",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "371",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "5.0",
+              "type" : "Quantity",
+              "localId" : "589",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "372",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.9",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "373",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "5.1",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "594",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "590",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Negate",
-              "localId" : "374",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "type" : "As",
+              "localId" : "595",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "376",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "591",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              } ],
+              }
+            }, {
+              "type" : "As",
+              "localId" : "596",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
               "operand" : {
-                "type" : "Literal",
-                "localId" : "375",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "value" : "5.0",
+                "type" : "Null",
+                "localId" : "592",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            }, {
+              "type" : "Quantity",
+              "localId" : "593",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "388",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "DateMin",
+        "localId" : "608",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "unmatched_units_q",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "388",
+            "r" : "608",
             "s" : [ {
-              "value" : [ "", "define ", "DateMin", ": " ]
+              "value" : [ "", "define ", "unmatched_units_q", ": " ]
             }, {
-              "r" : "411",
+              "r" : "622",
               "s" : [ {
                 "value" : [ "Min", "(" ]
               }, {
-                "r" : "389",
+                "r" : "609",
                 "s" : [ {
-                  "r" : "394",
-                  "value" : [ "{ ", "@2012-12-31", ", ", "@2013-01-01", ", ", "@2012-01-01", " }" ]
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "610",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "611",
+                  "s" : [ {
+                    "value" : [ "2 ", "'m'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "612",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "613",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "614",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "615",
+                  "s" : [ {
+                    "value" : [ "0 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -2873,156 +2977,108 @@ module.exports['Min'] = {
         } ],
         "expression" : {
           "type" : "Min",
-          "localId" : "411",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "localId" : "622",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "412",
+            "localId" : "623",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "413",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "624",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "389",
+            "localId" : "609",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "405",
+              "localId" : "616",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "406",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "617",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Date",
-              "localId" : "394",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "391",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "392",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "393",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "610",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
             }, {
-              "type" : "Date",
-              "localId" : "399",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "396",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "397",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "398",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "611",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "m",
+              "annotation" : [ ]
             }, {
-              "type" : "Date",
-              "localId" : "404",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "401",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "402",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "403",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "612",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "613",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "614",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "615",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0,
+              "unit" : "ml",
+              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "416",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "DateTimeMin",
+        "localId" : "627",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "empty",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "416",
+            "r" : "627",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeMin", ": " ]
+              "value" : [ "", "define ", "empty", ": " ]
             }, {
-              "r" : "448",
+              "r" : "637",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "417",
+                "r" : "629",
                 "s" : [ {
-                  "value" : [ "{ " ]
-                }, {
-                  "r" : "426",
-                  "s" : [ {
-                    "r" : "418",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "value" : [ "List<" ]
                 }, {
-                  "r" : "438",
+                  "r" : "628",
                   "s" : [ {
-                    "r" : "430",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "5", ")" ]
+                    "value" : [ "Integer" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ ">{}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3031,171 +3087,225 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "448",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Sum",
+          "localId" : "637",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "449",
+            "localId" : "638",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "450",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "639",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "417",
+            "localId" : "629",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "442",
+              "localId" : "631",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "443",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "632",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
-            "element" : [ {
-              "type" : "DateTime",
-              "localId" : "426",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "427",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "428",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "429",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "418",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "419",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "420",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              }
+            "element" : [ ]
+          }
+        }
+      }, {
+        "localId" : "642",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "q_diff_units",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "642",
+            "s" : [ {
+              "value" : [ "", "define ", "q_diff_units", ": " ]
             }, {
-              "type" : "DateTime",
-              "localId" : "438",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "439",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "r" : "655",
+              "s" : [ {
+                "value" : [ "Sum", "(" ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "440",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "643",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "644",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "645",
+                  "s" : [ {
+                    "value" : [ "0.002 ", "'l'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "646",
+                  "s" : [ {
+                    "value" : [ "0.03 ", "'dl'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "647",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "648",
+                  "s" : [ {
+                    "value" : [ "0.005 ", "'l'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
               }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Sum",
+          "localId" : "655",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "656",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "657",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "643",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "649",
+              "annotation" : [ ],
+              "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "441",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "430",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "431",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "432",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
+                "localId" : "650",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "644",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "645",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.002,
+              "unit" : "l",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "646",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.03,
+              "unit" : "dl",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "647",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "648",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.005,
+              "unit" : "l",
+              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "453",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimeMin",
+        "localId" : "660",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "NumbersAndQuantities",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "453",
+            "r" : "660",
             "s" : [ {
-              "value" : [ "", "define ", "TimeMin", ": " ]
+              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
             }, {
-              "r" : "497",
+              "r" : "677",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "454",
+                "r" : "661",
                 "s" : [ {
-                  "value" : [ "{ " ]
+                  "r" : "662",
+                  "value" : [ "{", "1", " ," ]
                 }, {
-                  "r" : "463",
+                  "r" : "663",
                   "s" : [ {
-                    "r" : "455",
-                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "4", ")" ]
+                    "value" : [ "2 ", "'ml'" ]
                   } ]
                 }, {
-                  "value" : [ ", " ]
+                  "value" : [ "," ]
                 }, {
-                  "r" : "475",
+                  "r" : "664",
                   "s" : [ {
-                    "r" : "467",
-                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "3", ")" ]
+                    "value" : [ "3 ", "'ml'" ]
                   } ]
                 }, {
-                  "value" : [ ", " ]
+                  "value" : [ "," ]
                 }, {
-                  "r" : "487",
+                  "r" : "665",
                   "s" : [ {
-                    "r" : "479",
-                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "5", ")" ]
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "666",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "667",
+                  "s" : [ {
+                    "value" : [ "0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -3207,220 +3317,124 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "497",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "Sum",
+          "localId" : "677",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "498",
+            "localId" : "678",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "499",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "679",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "454",
+            "localId" : "661",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "491",
+              "localId" : "671",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "492",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "672",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Time",
-              "localId" : "463",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "type" : "ToQuantity",
+              "localId" : "669",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "464",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "465",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "466",
+                "localId" : "670",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "455",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "456",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "30",
-                "annotation" : [ ]
-              },
-              "second" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "457",
+                "localId" : "662",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "value" : "1",
                 "annotation" : [ ]
               }
             }, {
-              "type" : "Time",
-              "localId" : "475",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "476",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "477",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "478",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "467",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "468",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "30",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "469",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "663",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
             }, {
-              "type" : "Time",
-              "localId" : "487",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "488",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "489",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "490",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "479",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "480",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "30",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "481",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "664",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "665",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "666",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "667",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0,
+              "unit" : "ml",
+              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "502",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "StringMin",
+        "localId" : "682",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "IncompatibleUnitsNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "502",
+            "r" : "682",
             "s" : [ {
-              "value" : [ "", "define ", "StringMin", ": " ]
+              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
             }, {
-              "r" : "518",
+              "r" : "692",
               "s" : [ {
-                "value" : [ "Min", "(" ]
+                "value" : [ "Sum", "(" ]
               }, {
-                "r" : "503",
+                "r" : "683",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "504",
-                  "s" : [ {
-                    "value" : [ "'def'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "506",
-                  "s" : [ {
-                    "value" : [ "'abc'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "508",
+                  "r" : "684",
                   "s" : [ {
-                    "value" : [ "'jkl'" ]
+                    "value" : [ "1 ", "'mg/d'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "510",
+                  "r" : "685",
                   "s" : [ {
-                    "value" : [ "'ghi'" ]
+                    "value" : [ "0.002 ", "'/d'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -3432,127 +3446,187 @@ module.exports['Min'] = {
           }
         } ],
         "expression" : {
-          "type" : "Min",
-          "localId" : "518",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+          "type" : "Sum",
+          "localId" : "692",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "519",
+            "localId" : "693",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "520",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "localId" : "694",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "503",
+            "localId" : "683",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "512",
+              "localId" : "686",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "513",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "687",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "504",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "def",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "506",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "abc",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "508",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "jkl",
+              "type" : "Quantity",
+              "localId" : "684",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg/d",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "510",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "ghi",
+              "type" : "Quantity",
+              "localId" : "685",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.002,
+              "unit" : "/d",
               "annotation" : [ ]
             } ]
           }
         }
+      } ]
+    }
+  }
+}
+
+/* Min
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define not_null: Min({1,2,3,4,5,0})
+define has_null: Min({1,null,-1,null,2})
+define empty: Min(List<Integer>{})
+define not_null_q: Min({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
+define has_null_q: Min({1 'ml',null,-1 'ml',null,2 'ml'})
+define q_diff_units: Min({1 'ml',2 'dl',3 'l',4 'l',5 'l',0 'ml'})
+define NumbersAndQuantities: Min({1 ,2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
+define IntegerMin: Min({ 2, 4, 8, 6 })
+define LongMin: Min({ 4L, 2L, 8L, 6L })
+define DecimalMin: Min({ 5.0, 4.9, 5.1, -5.0 })
+define DateMin: Min({ @2012-12-31, @2013-01-01, @2012-01-01 })
+define DateTimeMin: Min({ DateTime(2012, 9, 9), DateTime(2012, 9, 5) })
+define TimeMin: Min({ Time(12, 30, 4), Time(12, 30, 3), Time(12, 30, 5)})
+define StringMin: Min({'def', 'abc', 'jkl', 'ghi'})
+define MinIsNull: Min({ null as Quantity, null as Quantity, null as Quantity })
+define MinIsAlsoNull: Min(null as List<Decimal>)
+define IncompatibleUnitsNull: Min({1 'mg/d', 0.002 '/d'})
+*/
+
+module.exports['Min'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "580",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
       }, {
-        "localId" : "523",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "MinIsNull",
-        "context" : "Patient",
-        "accessLevel" : "Public",
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "523",
+            "r" : "206",
             "s" : [ {
-              "value" : [ "", "define ", "MinIsNull", ": " ]
+              "value" : [ "", "using " ]
             }, {
-              "r" : "540",
               "s" : [ {
-                "value" : [ "Min", "(" ]
-              }, {
-                "r" : "524",
-                "s" : [ {
-                  "value" : [ "{ " ]
-                }, {
-                  "r" : "525",
-                  "s" : [ {
-                    "r" : "526",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "527",
-                    "s" : [ {
-                      "value" : [ "Quantity" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "528",
-                  "s" : [ {
-                    "r" : "529",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "530",
-                    "s" : [ {
-                      "value" : [ "Quantity" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "531",
-                  "s" : [ {
-                    "r" : "532",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "533",
-                    "s" : [ {
-                      "value" : [ "Quantity" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ " }" ]
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "not_null",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "not_null", ": " ]
+            }, {
+              "r" : "228",
+              "s" : [ {
+                "value" : [ "Min", "(" ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "r" : "216",
+                  "value" : [ "{", "1", ",", "2", ",", "3", ",", "4", ",", "5", ",", "0", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3562,132 +3636,111 @@ module.exports['Min'] = {
         } ],
         "expression" : {
           "type" : "Min",
-          "localId" : "540",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "228",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "541",
+            "localId" : "229",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "542",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "230",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "524",
+            "localId" : "215",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "534",
+              "localId" : "222",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "535",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "223",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "As",
-              "localId" : "525",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "strict" : false,
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "526",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              },
-              "asTypeSpecifier" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "527",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             }, {
-              "type" : "As",
-              "localId" : "528",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "strict" : false,
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "529",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              },
-              "asTypeSpecifier" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "530",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
             }, {
-              "type" : "As",
-              "localId" : "531",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "strict" : false,
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "532",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              },
-              "asTypeSpecifier" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "533",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "219",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "545",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "MinIsAlsoNull",
+        "localId" : "233",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "has_null",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "545",
+            "r" : "233",
             "s" : [ {
-              "value" : [ "", "define ", "MinIsAlsoNull", ": " ]
+              "value" : [ "", "define ", "has_null", ": " ]
             }, {
-              "r" : "558",
+              "r" : "250",
               "s" : [ {
                 "value" : [ "Min", "(" ]
               }, {
-                "r" : "546",
+                "r" : "234",
                 "s" : [ {
-                  "r" : "547",
-                  "value" : [ "null", " as " ]
+                  "r" : "235",
+                  "value" : [ "{", "1", ",", "null", "," ]
                 }, {
-                  "r" : "548",
+                  "r" : "237",
                   "s" : [ {
-                    "value" : [ "List<" ]
-                  }, {
-                    "r" : "549",
-                    "s" : [ {
-                      "value" : [ "Decimal" ]
-                    } ]
-                  }, {
-                    "value" : [ ">" ]
+                    "r" : "238",
+                    "value" : [ "-", "1" ]
                   } ]
+                }, {
+                  "r" : "240",
+                  "value" : [ ",", "null", ",", "2", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3697,100 +3750,224 @@ module.exports['Min'] = {
         } ],
         "expression" : {
           "type" : "Min",
-          "localId" : "558",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "559",
+            "localId" : "251",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "560",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "252",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
-            "type" : "As",
-            "localId" : "546",
-            "strict" : false,
+            "type" : "List",
+            "localId" : "234",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "552",
+              "localId" : "244",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "553",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "245",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "547",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "235",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
+            }, {
+              "type" : "As",
+              "localId" : "242",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "236",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Negate",
+              "localId" : "237",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "239",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "238",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "As",
+              "localId" : "243",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "240",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "255",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "empty",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "255",
+            "s" : [ {
+              "value" : [ "", "define ", "empty", ": " ]
+            }, {
+              "r" : "265",
+              "s" : [ {
+                "value" : [ "Min", "(" ]
+              }, {
+                "r" : "257",
+                "s" : [ {
+                  "value" : [ "List<" ]
+                }, {
+                  "r" : "256",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                }, {
+                  "value" : [ ">{}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Min",
+          "localId" : "265",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "266",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "267",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "257",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "548",
+              "localId" : "259",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "ListTypeSpecifier",
-                "localId" : "550",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "551",
-                  "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "annotation" : [ ]
-                }
-              },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "549",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "260",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            }
+            },
+            "element" : [ ]
           }
         }
       }, {
-        "localId" : "563",
+        "localId" : "270",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "IncompatibleUnitsNull",
+        "name" : "not_null_q",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "563",
+            "r" : "270",
             "s" : [ {
-              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+              "value" : [ "", "define ", "not_null_q", ": " ]
             }, {
-              "r" : "573",
+              "r" : "284",
               "s" : [ {
                 "value" : [ "Min", "(" ]
               }, {
-                "r" : "564",
+                "r" : "271",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "565",
+                  "r" : "272",
                   "s" : [ {
-                    "value" : [ "1 ", "'mg/d'" ]
+                    "value" : [ "1 ", "'ml'" ]
                   } ]
                 }, {
-                  "value" : [ ", " ]
+                  "value" : [ "," ]
                 }, {
-                  "r" : "566",
+                  "r" : "273",
                   "s" : [ {
-                    "value" : [ "0.002 ", "'/d'" ]
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "274",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "275",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "276",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "277",
+                  "s" : [ {
+                    "value" : [ "0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -3803,187 +3980,129 @@ module.exports['Min'] = {
         } ],
         "expression" : {
           "type" : "Min",
-          "localId" : "573",
+          "localId" : "284",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "574",
+            "localId" : "285",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "575",
+              "localId" : "286",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "564",
+            "localId" : "271",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "567",
+              "localId" : "278",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "568",
+                "localId" : "279",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "565",
+              "localId" : "272",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
-              "unit" : "mg/d",
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "566",
+              "localId" : "273",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "/d",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "276",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "277",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0,
+              "unit" : "ml",
               "annotation" : [ ]
             } ]
           }
         }
-      } ]
-    }
-  }
-}
-
-/* Max
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define not_null: Max({10,1,2,3,4,5})
-define has_null: Max({1,null,null,2})
-define not_null_q: Max({10 'ml',1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
-define has_null_q: Max({1 'ml',null,null,2 'ml'})
-define q_diff_units: Max({10 'ml',1 'ml',2 'ml',3 'ml',4 'ml',5 'l'})
-define NumbersAndQuantities: Max({10 ,1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
-define IncompatibleUnitsNull: Max({1 'mg/d', 0.002 '/d'})
-
-define empty: Max(List<Integer>{})
-
-define IntegerMax: Max({ 2, 4, 8, 6 })
-define DecimalMax: Max({ 5.0, 4.9, 5.1, -5.0 })
-define DateMax: Max({ @2012-12-31, @2013-01-01, @2012-01-01 })
-define DateTimeMax: Max({ DateTime(2012, 2, 3), DateTime(2012, 9, 5) })
-define TimeMax: Max({ Time(12, 30, 1), Time(12, 30, 3), Time(12, 30, 2)})
-define StringMax: Max({'def', 'abc', 'jkl', 'ghi'})
-define MaxIsNull: Max({ null as Quantity, null as Quantity, null as Quantity })
-define MaxIsAlsoNull: Max(null as List<Decimal>)
-*/
-
-module.exports['Max'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "554",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "not_null",
+        "localId" : "289",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "has_null_q",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "not_null", ": " ]
+              "value" : [ "", "define ", "has_null_q", ": " ]
             }, {
-              "r" : "228",
+              "r" : "306",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "215",
+                "r" : "290",
                 "s" : [ {
-                  "r" : "216",
-                  "value" : [ "{", "10", ",", "1", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "291",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "r" : "292",
+                  "value" : [ ",", "null", "," ]
+                }, {
+                  "r" : "293",
+                  "s" : [ {
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "294",
+                    "s" : [ {
+                      "value" : [ "1 ", "'ml'" ]
+                    } ]
+                  } ]
+                }, {
+                  "r" : "296",
+                  "value" : [ ",", "null", "," ]
+                }, {
+                  "r" : "297",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3992,242 +4111,156 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "228",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Min",
+          "localId" : "306",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "229",
+            "localId" : "307",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "230",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "308",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "215",
+            "localId" : "290",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "222",
+              "localId" : "300",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "223",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "301",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "type" : "Quantity",
+              "localId" : "291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "298",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "292",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Literal",
-              "localId" : "219",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "293",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "295",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Quantity",
+                "localId" : "294",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1,
+                "unit" : "ml",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "299",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "296",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "type" : "Quantity",
+              "localId" : "297",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "233",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "has_null",
+        "localId" : "311",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "q_diff_units",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "233",
+            "r" : "311",
             "s" : [ {
-              "value" : [ "", "define ", "has_null", ": " ]
+              "value" : [ "", "define ", "q_diff_units", ": " ]
             }, {
-              "r" : "247",
+              "r" : "325",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "234",
-                "s" : [ {
-                  "r" : "235",
-                  "value" : [ "{", "1", ",", "null", ",", "null", ",", "2", "}" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Max",
-          "localId" : "247",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "248",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "249",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "source" : {
-            "type" : "List",
-            "localId" : "234",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "241",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "242",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "element" : [ {
-              "type" : "Literal",
-              "localId" : "235",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }, {
-              "type" : "As",
-              "localId" : "239",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "236",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "As",
-              "localId" : "240",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "237",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "Literal",
-              "localId" : "238",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            } ]
-          }
-        }
-      }, {
-        "localId" : "252",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "not_null_q",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "252",
-            "s" : [ {
-              "value" : [ "", "define ", "not_null_q", ": " ]
-            }, {
-              "r" : "266",
-              "s" : [ {
-                "value" : [ "Max", "(" ]
-              }, {
-                "r" : "253",
+                "r" : "312",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "254",
+                  "r" : "313",
                   "s" : [ {
-                    "value" : [ "10 ", "'ml'" ]
+                    "value" : [ "1 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "255",
+                  "r" : "314",
                   "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
+                    "value" : [ "2 ", "'dl'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "256",
+                  "r" : "315",
                   "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
+                    "value" : [ "3 ", "'l'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "257",
+                  "r" : "316",
                   "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
+                    "value" : [ "4 ", "'l'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "258",
+                  "r" : "317",
                   "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
+                    "value" : [ "5 ", "'l'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "259",
+                  "r" : "318",
                   "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
+                    "value" : [ "0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -4239,114 +4272,135 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "266",
+          "type" : "Min",
+          "localId" : "325",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "267",
+            "localId" : "326",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "268",
+              "localId" : "327",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "253",
+            "localId" : "312",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "260",
+              "localId" : "319",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "261",
+                "localId" : "320",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "254",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "255",
+              "localId" : "313",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "256",
+              "localId" : "314",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
-              "unit" : "ml",
+              "unit" : "dl",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "257",
+              "localId" : "315",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 3,
-              "unit" : "ml",
+              "unit" : "l",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "258",
+              "localId" : "316",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
-              "unit" : "ml",
+              "unit" : "l",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "259",
+              "localId" : "317",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
+              "unit" : "l",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "318",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0,
               "unit" : "ml",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "271",
+        "localId" : "330",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "has_null_q",
+        "name" : "NumbersAndQuantities",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "271",
+            "r" : "330",
             "s" : [ {
-              "value" : [ "", "define ", "has_null_q", ": " ]
+              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
             }, {
-              "r" : "285",
+              "r" : "347",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "272",
+                "r" : "331",
                 "s" : [ {
-                  "value" : [ "{" ]
+                  "r" : "332",
+                  "value" : [ "{", "1", " ," ]
                 }, {
-                  "r" : "273",
+                  "r" : "333",
                   "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
+                    "value" : [ "2 ", "'ml'" ]
                   } ]
                 }, {
-                  "r" : "274",
-                  "value" : [ ",", "null", ",", "null", "," ]
+                  "value" : [ "," ]
                 }, {
-                  "r" : "276",
+                  "r" : "334",
                   "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "335",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "336",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "337",
+                  "s" : [ {
+                    "value" : [ "0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -4358,140 +4412,114 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "285",
+          "type" : "Min",
+          "localId" : "347",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "286",
+            "localId" : "348",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "287",
+              "localId" : "349",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "272",
+            "localId" : "331",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "279",
+              "localId" : "341",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "280",
+                "localId" : "342",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "273",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "As",
-              "localId" : "277",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "ToQuantity",
+              "localId" : "339",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "274",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "340",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }, {
-              "type" : "As",
-              "localId" : "278",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ ],
+              } ],
               "operand" : {
-                "type" : "Null",
-                "localId" : "275",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "type" : "Literal",
+                "localId" : "332",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
               }
             }, {
               "type" : "Quantity",
-              "localId" : "276",
+              "localId" : "333",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "ml",
               "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "334",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "335",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "336",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "337",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0,
+              "unit" : "ml",
+              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "290",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "q_diff_units",
+        "localId" : "352",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerMin",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "290",
+            "r" : "352",
             "s" : [ {
-              "value" : [ "", "define ", "q_diff_units", ": " ]
+              "value" : [ "", "define ", "IntegerMin", ": " ]
             }, {
-              "r" : "304",
+              "r" : "364",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "291",
+                "r" : "353",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "292",
-                  "s" : [ {
-                    "value" : [ "10 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "293",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "294",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "295",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "296",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "297",
-                  "s" : [ {
-                    "value" : [ "5 ", "'l'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "354",
+                  "value" : [ "{ ", "2", ", ", "4", ", ", "8", ", ", "6", " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4500,138 +4528,89 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "304",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Min",
+          "localId" : "364",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "305",
+            "localId" : "365",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "306",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "366",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "291",
+            "localId" : "353",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "298",
+              "localId" : "358",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "299",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "359",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "294",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "354",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "295",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "355",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "356",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "8",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "l",
+              "type" : "Literal",
+              "localId" : "357",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "309",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "NumbersAndQuantities",
+        "localId" : "369",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongMin",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "309",
+            "r" : "369",
             "s" : [ {
-              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+              "value" : [ "", "define ", "LongMin", ": " ]
             }, {
-              "r" : "326",
+              "r" : "381",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "310",
+                "r" : "370",
                 "s" : [ {
-                  "r" : "311",
-                  "value" : [ "{", "10", " ," ]
-                }, {
-                  "r" : "312",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "313",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "314",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "315",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "316",
-                  "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "371",
+                  "value" : [ "{ ", "4L", ", ", "2L", ", ", "8L", ", ", "6L", " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4640,127 +4619,97 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "326",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Min",
+          "localId" : "381",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "327",
+            "localId" : "382",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "328",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "383",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "310",
+            "localId" : "370",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "320",
+              "localId" : "375",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "321",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "376",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "ToQuantity",
-              "localId" : "318",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "319",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "311",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "Quantity",
-              "localId" : "312",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "313",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "314",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "372",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "315",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "373",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "8",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "316",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "374",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "331",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "IncompatibleUnitsNull",
+        "localId" : "386",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalMin",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "331",
+            "r" : "386",
             "s" : [ {
-              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+              "value" : [ "", "define ", "DecimalMin", ": " ]
             }, {
-              "r" : "341",
+              "r" : "400",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "332",
+                "r" : "387",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "333",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg/d'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "r" : "388",
+                  "value" : [ "{ ", "5.0", ", ", "4.9", ", ", "5.1", ", " ]
                 }, {
-                  "r" : "334",
+                  "r" : "391",
                   "s" : [ {
-                    "value" : [ "0.002 ", "'/d'" ]
+                    "r" : "392",
+                    "value" : [ "-", "5.0" ]
                   } ]
                 }, {
-                  "value" : [ "}" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4769,81 +4718,101 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "341",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Min",
+          "localId" : "400",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "342",
+            "localId" : "401",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "343",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "402",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "332",
+            "localId" : "387",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "335",
+              "localId" : "394",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "336",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "395",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "333",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg/d",
+              "type" : "Literal",
+              "localId" : "388",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "5.0",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "334",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "/d",
+              "type" : "Literal",
+              "localId" : "389",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.9",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "390",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "5.1",
               "annotation" : [ ]
+            }, {
+              "type" : "Negate",
+              "localId" : "391",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "393",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "392",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "5.0",
+                "annotation" : [ ]
+              }
             } ]
           }
         }
       }, {
-        "localId" : "346",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "empty",
+        "localId" : "405",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateMin",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "346",
+            "r" : "405",
             "s" : [ {
-              "value" : [ "", "define ", "empty", ": " ]
+              "value" : [ "", "define ", "DateMin", ": " ]
             }, {
-              "r" : "356",
+              "r" : "428",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "348",
+                "r" : "406",
                 "s" : [ {
-                  "value" : [ "List<" ]
-                }, {
-                  "r" : "347",
-                  "s" : [ {
-                    "value" : [ "Integer" ]
-                  } ]
-                }, {
-                  "value" : [ ">{}" ]
+                  "r" : "411",
+                  "value" : [ "{ ", "@2012-12-31", ", ", "@2013-01-01", ", ", "@2012-01-01", " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4852,157 +4821,154 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "356",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Min",
+          "localId" : "428",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "357",
+            "localId" : "429",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "358",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "430",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "348",
+            "localId" : "406",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "350",
+              "localId" : "422",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "351",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "423",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             },
-            "element" : [ ]
+            "element" : [ {
+              "type" : "Date",
+              "localId" : "411",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "408",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "409",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "410",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Date",
+              "localId" : "416",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "413",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "414",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "415",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Date",
+              "localId" : "421",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "418",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "419",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "420",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            } ]
           }
         }
       }, {
-        "localId" : "361",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerMax",
+        "localId" : "433",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeMin",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "361",
+            "r" : "433",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerMax", ": " ]
+              "value" : [ "", "define ", "DateTimeMin", ": " ]
             }, {
-              "r" : "373",
+              "r" : "465",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "362",
+                "r" : "434",
                 "s" : [ {
-                  "r" : "363",
-                  "value" : [ "{ ", "2", ", ", "4", ", ", "8", ", ", "6", " }" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Max",
-          "localId" : "373",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "374",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "375",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "source" : {
-            "type" : "List",
-            "localId" : "362",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "367",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "368",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "element" : [ {
-              "type" : "Literal",
-              "localId" : "363",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "364",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "365",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "366",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
-              "annotation" : [ ]
-            } ]
-          }
-        }
-      }, {
-        "localId" : "378",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalMax",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "378",
-            "s" : [ {
-              "value" : [ "", "define ", "DecimalMax", ": " ]
-            }, {
-              "r" : "392",
-              "s" : [ {
-                "value" : [ "Max", "(" ]
-              }, {
-                "r" : "379",
-                "s" : [ {
-                  "r" : "380",
-                  "value" : [ "{ ", "5.0", ", ", "4.9", ", ", "5.1", ", " ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "383",
+                  "r" : "443",
                   "s" : [ {
-                    "r" : "384",
-                    "value" : [ "-", "5.0" ]
+                    "r" : "435",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "455",
+                  "s" : [ {
+                    "r" : "447",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "5", ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -5014,101 +4980,174 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "392",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Min",
+          "localId" : "465",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "393",
+            "localId" : "466",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "394",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "467",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "379",
+            "localId" : "434",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "386",
+              "localId" : "459",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "387",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "460",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "380",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "5.0",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "381",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.9",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "382",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "5.1",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "443",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "444",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "445",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "446",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "435",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "436",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "437",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Negate",
-              "localId" : "383",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "type" : "DateTime",
+              "localId" : "455",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "385",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "456",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "457",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "458",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "operand" : {
+              "year" : {
                 "type" : "Literal",
-                "localId" : "384",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "value" : "5.0",
+                "localId" : "447",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "448",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "449",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
                 "annotation" : [ ]
               }
             } ]
           }
         }
       }, {
-        "localId" : "397",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "DateMax",
+        "localId" : "470",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeMin",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "397",
+            "r" : "470",
             "s" : [ {
-              "value" : [ "", "define ", "DateMax", ": " ]
+              "value" : [ "", "define ", "TimeMin", ": " ]
             }, {
-              "r" : "420",
+              "r" : "514",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "398",
+                "r" : "471",
                 "s" : [ {
-                  "r" : "403",
-                  "value" : [ "{ ", "@2012-12-31", ", ", "@2013-01-01", ", ", "@2012-01-01", " }" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "480",
+                  "s" : [ {
+                    "r" : "472",
+                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "4", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "492",
+                  "s" : [ {
+                    "r" : "484",
+                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "504",
+                  "s" : [ {
+                    "r" : "496",
+                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "5", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5117,280 +5156,166 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "420",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "Min",
+          "localId" : "514",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "421",
+            "localId" : "515",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "422",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "516",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "398",
+            "localId" : "471",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "414",
+              "localId" : "508",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "415",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "509",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Date",
-              "localId" : "403",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "type" : "Time",
+              "localId" : "480",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ],
-              "signature" : [ ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "400",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "401",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "402",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "Date",
-              "localId" : "408",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "405",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "481",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "406",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "482",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "407",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "483",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }, {
-              "type" : "Date",
-              "localId" : "413",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "year" : {
+              } ],
+              "hour" : {
                 "type" : "Literal",
-                "localId" : "410",
+                "localId" : "472",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "12",
                 "annotation" : [ ]
               },
-              "month" : {
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "411",
+                "localId" : "473",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "30",
                 "annotation" : [ ]
               },
-              "day" : {
+              "second" : {
                 "type" : "Literal",
-                "localId" : "412",
+                "localId" : "474",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "4",
                 "annotation" : [ ]
               }
-            } ]
-          }
-        }
-      }, {
-        "localId" : "425",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "DateTimeMax",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "425",
-            "s" : [ {
-              "value" : [ "", "define ", "DateTimeMax", ": " ]
             }, {
-              "r" : "457",
-              "s" : [ {
-                "value" : [ "Max", "(" ]
-              }, {
-                "r" : "426",
-                "s" : [ {
-                  "value" : [ "{ " ]
-                }, {
-                  "r" : "435",
-                  "s" : [ {
-                    "r" : "427",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "447",
-                  "s" : [ {
-                    "r" : "439",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "5", ")" ]
-                  } ]
-                }, {
-                  "value" : [ " }" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Max",
-          "localId" : "457",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "458",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "459",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "source" : {
-            "type" : "List",
-            "localId" : "426",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "451",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "452",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "element" : [ {
-              "type" : "DateTime",
-              "localId" : "435",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Time",
+              "localId" : "492",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "436",
+                "localId" : "493",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "437",
+                "localId" : "494",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "438",
+                "localId" : "495",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
+              "hour" : {
                 "type" : "Literal",
-                "localId" : "427",
+                "localId" : "484",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "12",
                 "annotation" : [ ]
               },
-              "month" : {
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "428",
+                "localId" : "485",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "30",
                 "annotation" : [ ]
               },
-              "day" : {
+              "second" : {
                 "type" : "Literal",
-                "localId" : "429",
+                "localId" : "486",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
                 "annotation" : [ ]
               }
             }, {
-              "type" : "DateTime",
-              "localId" : "447",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Time",
+              "localId" : "504",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "448",
+                "localId" : "505",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "449",
+                "localId" : "506",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "450",
+                "localId" : "507",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
+              "hour" : {
                 "type" : "Literal",
-                "localId" : "439",
+                "localId" : "496",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "12",
                 "annotation" : [ ]
               },
-              "month" : {
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "440",
+                "localId" : "497",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "30",
                 "annotation" : [ ]
               },
-              "day" : {
+              "second" : {
                 "type" : "Literal",
-                "localId" : "441",
+                "localId" : "498",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "5",
@@ -5400,47 +5325,51 @@ module.exports['Max'] = {
           }
         }
       }, {
-        "localId" : "462",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimeMax",
+        "localId" : "519",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+        "name" : "StringMin",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "462",
+            "r" : "519",
             "s" : [ {
-              "value" : [ "", "define ", "TimeMax", ": " ]
+              "value" : [ "", "define ", "StringMin", ": " ]
             }, {
-              "r" : "506",
+              "r" : "535",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "463",
+                "r" : "520",
                 "s" : [ {
-                  "value" : [ "{ " ]
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "521",
+                  "s" : [ {
+                    "value" : [ "'def'" ]
+                  } ]
                 }, {
-                  "r" : "472",
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "523",
                   "s" : [ {
-                    "r" : "464",
-                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "1", ")" ]
+                    "value" : [ "'abc'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "484",
+                  "r" : "525",
                   "s" : [ {
-                    "r" : "476",
-                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "3", ")" ]
+                    "value" : [ "'jkl'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "496",
+                  "r" : "527",
                   "s" : [ {
-                    "r" : "488",
-                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "2", ")" ]
+                    "value" : [ "'ghi'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -5452,285 +5381,60 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "506",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "Min",
+          "localId" : "535",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "507",
+            "localId" : "536",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "508",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "537",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "463",
+            "localId" : "520",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "500",
+              "localId" : "529",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "501",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ]
-              }
-            },
-            "element" : [ {
-              "type" : "Time",
-              "localId" : "472",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "473",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "474",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "475",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "464",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "465",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "30",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "466",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "Time",
-              "localId" : "484",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "485",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "486",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "487",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "476",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "477",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "30",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "478",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "Time",
-              "localId" : "496",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "497",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "498",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "499",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "488",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "489",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "30",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "490",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              }
-            } ]
-          }
-        }
-      }, {
-        "localId" : "511",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "StringMax",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "511",
-            "s" : [ {
-              "value" : [ "", "define ", "StringMax", ": " ]
-            }, {
-              "r" : "527",
-              "s" : [ {
-                "value" : [ "Max", "(" ]
-              }, {
-                "r" : "512",
-                "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "513",
-                  "s" : [ {
-                    "value" : [ "'def'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "515",
-                  "s" : [ {
-                    "value" : [ "'abc'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "517",
-                  "s" : [ {
-                    "value" : [ "'jkl'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "519",
-                  "s" : [ {
-                    "value" : [ "'ghi'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Max",
-          "localId" : "527",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "528",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "529",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
-              "annotation" : [ ]
-            }
-          } ],
-          "source" : {
-            "type" : "List",
-            "localId" : "512",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "521",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "522",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "530",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "513",
+              "localId" : "521",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "def",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "515",
+              "localId" : "523",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "abc",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "517",
+              "localId" : "525",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "jkl",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "519",
+              "localId" : "527",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "ghi",
@@ -5739,33 +5443,33 @@ module.exports['Max'] = {
           }
         }
       }, {
-        "localId" : "532",
+        "localId" : "540",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "MaxIsNull",
+        "name" : "MinIsNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "532",
+            "r" : "540",
             "s" : [ {
-              "value" : [ "", "define ", "MaxIsNull", ": " ]
+              "value" : [ "", "define ", "MinIsNull", ": " ]
             }, {
-              "r" : "549",
+              "r" : "557",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "533",
+                "r" : "541",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "534",
+                  "r" : "542",
                   "s" : [ {
-                    "r" : "535",
+                    "r" : "543",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "536",
+                    "r" : "544",
                     "s" : [ {
                       "value" : [ "Quantity" ]
                     } ]
@@ -5773,12 +5477,12 @@ module.exports['Max'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "537",
+                  "r" : "545",
                   "s" : [ {
-                    "r" : "538",
+                    "r" : "546",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "539",
+                    "r" : "547",
                     "s" : [ {
                       "value" : [ "Quantity" ]
                     } ]
@@ -5786,12 +5490,12 @@ module.exports['Max'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "540",
+                  "r" : "548",
                   "s" : [ {
-                    "r" : "541",
+                    "r" : "549",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "542",
+                    "r" : "550",
                     "s" : [ {
                       "value" : [ "Quantity" ]
                     } ]
@@ -5806,92 +5510,92 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "549",
+          "type" : "Min",
+          "localId" : "557",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "550",
+            "localId" : "558",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "551",
+              "localId" : "559",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "533",
+            "localId" : "541",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "543",
+              "localId" : "551",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "544",
+                "localId" : "552",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "As",
-              "localId" : "534",
+              "localId" : "542",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "535",
+                "localId" : "543",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "536",
+                "localId" : "544",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }, {
               "type" : "As",
-              "localId" : "537",
+              "localId" : "545",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "538",
+                "localId" : "546",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "539",
+                "localId" : "547",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }, {
               "type" : "As",
-              "localId" : "540",
+              "localId" : "548",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "541",
+                "localId" : "549",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "542",
+                "localId" : "550",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
@@ -5900,33 +5604,33 @@ module.exports['Max'] = {
           }
         }
       }, {
-        "localId" : "554",
+        "localId" : "562",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "MaxIsAlsoNull",
+        "name" : "MinIsAlsoNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "554",
+            "r" : "562",
             "s" : [ {
-              "value" : [ "", "define ", "MaxIsAlsoNull", ": " ]
+              "value" : [ "", "define ", "MinIsAlsoNull", ": " ]
             }, {
-              "r" : "567",
+              "r" : "575",
               "s" : [ {
-                "value" : [ "Max", "(" ]
+                "value" : [ "Min", "(" ]
               }, {
-                "r" : "555",
+                "r" : "563",
                 "s" : [ {
-                  "r" : "556",
+                  "r" : "564",
                   "value" : [ "null", " as " ]
                 }, {
-                  "r" : "557",
+                  "r" : "565",
                   "s" : [ {
                     "value" : [ "List<" ]
                   }, {
-                    "r" : "558",
+                    "r" : "566",
                     "s" : [ {
                       "value" : [ "Decimal" ]
                     } ]
@@ -5941,33 +5645,33 @@ module.exports['Max'] = {
           }
         } ],
         "expression" : {
-          "type" : "Max",
-          "localId" : "567",
+          "type" : "Min",
+          "localId" : "575",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "568",
+            "localId" : "576",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "569",
+              "localId" : "577",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "As",
-            "localId" : "555",
+            "localId" : "563",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "561",
+              "localId" : "569",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "562",
+                "localId" : "570",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
@@ -5975,28 +5679,28 @@ module.exports['Max'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "556",
+              "localId" : "564",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "557",
+              "localId" : "565",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "559",
+                "localId" : "567",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "560",
+                  "localId" : "568",
                   "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "558",
+                "localId" : "566",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
@@ -6004,38 +5708,139 @@ module.exports['Max'] = {
             }
           }
         }
-      } ]
-    }
-  }
-}
-
-/* Avg
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define not_null: Avg({1,2,3,4,5})
-define has_null: Avg({1,null,null,2})
-define not_null_q: Avg({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
-define has_null_q: Avg({1 'ml',null,null,2 'ml'})
-define empty: Avg(List<Integer>{})
-define q_diff_units: Avg({1 'ml',0.002 'l',0.03 'dl',4 'ml',5 'ml'})
-define NumbersAndQuantities: Avg({1 ,2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
-define IncompatibleUnitsNull: Avg({1 'mg/d', 0.002 '/d'})
-*/
-
-module.exports['Avg'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
+      }, {
+        "localId" : "580",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "IncompatibleUnitsNull",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "580",
+            "s" : [ {
+              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+            }, {
+              "r" : "590",
+              "s" : [ {
+                "value" : [ "Min", "(" ]
+              }, {
+                "r" : "581",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "582",
+                  "s" : [ {
+                    "value" : [ "1 ", "'mg/d'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "583",
+                  "s" : [ {
+                    "value" : [ "0.002 ", "'/d'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Min",
+          "localId" : "590",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "591",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "592",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "581",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "584",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "585",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "582",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg/d",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "583",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.002,
+              "unit" : "/d",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Max
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define not_null: Max({10,1,2,3,4,5})
+define has_null: Max({1,null,null,2})
+define not_null_q: Max({10 'ml',1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
+define has_null_q: Max({1 'ml',null,null,2 'ml'})
+define q_diff_units: Max({10 'ml',1 'ml',2 'ml',3 'ml',4 'ml',5 'l'})
+define NumbersAndQuantities: Max({10 ,1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
+define IncompatibleUnitsNull: Max({1 'mg/d', 0.002 '/d'})
+
+define empty: Max(List<Integer>{})
+
+define IntegerMax: Max({ 2, 4, 8, 6 })
+define LongMax: Max({ 2L, 4L, 8L, 6L })
+define DecimalMax: Max({ 5.0, 4.9, 5.1, -5.0 })
+define DateMax: Max({ @2012-12-31, @2013-01-01, @2012-01-01 })
+define DateTimeMax: Max({ DateTime(2012, 2, 3), DateTime(2012, 9, 5) })
+define TimeMax: Max({ Time(12, 30, 1), Time(12, 30, 3), Time(12, 30, 2)})
+define StringMax: Max({'def', 'abc', 'jkl', 'ghi'})
+define MaxIsNull: Max({ null as Quantity, null as Quantity, null as Quantity })
+define MaxIsAlsoNull: Max(null as List<Decimal>)
+*/
+
+module.exports['Max'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "385",
+        "r" : "571",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -6109,7 +5914,7 @@ module.exports['Avg'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "not_null",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -6121,14 +5926,14 @@ module.exports['Avg'] = {
             "s" : [ {
               "value" : [ "", "define ", "not_null", ": " ]
             }, {
-              "r" : "234",
+              "r" : "228",
               "s" : [ {
-                "value" : [ "Avg", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
                 "r" : "215",
                 "s" : [ {
                   "r" : "216",
-                  "value" : [ "{", "1", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
+                  "value" : [ "{", "10", ",", "1", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -6137,129 +5942,102 @@ module.exports['Avg'] = {
           }
         } ],
         "expression" : {
-          "type" : "Avg",
-          "localId" : "234",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Max",
+          "localId" : "228",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "242",
+            "localId" : "229",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "243",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "230",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
-            "type" : "Query",
-            "localId" : "235",
+            "type" : "List",
+            "localId" : "215",
             "annotation" : [ ],
-            "source" : [ {
-              "localId" : "236",
-              "alias" : "X",
-              "annotation" : [ ],
-              "expression" : {
-                "type" : "List",
-                "localId" : "215",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "ListTypeSpecifier",
-                  "localId" : "221",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "222",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                },
-                "element" : [ {
-                  "type" : "Literal",
-                  "localId" : "216",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "217",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "218",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "219",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "220",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                } ]
-              }
-            } ],
-            "let" : [ ],
-            "relationship" : [ ],
-            "return" : {
-              "localId" : "237",
-              "distinct" : false,
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "222",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "ToDecimal",
-                "localId" : "240",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "241",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "AliasRef",
-                  "localId" : "238",
-                  "name" : "X",
-                  "annotation" : [ ]
-                }
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "223",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }
-            }
-          }
-        }
-      }, {
-        "localId" : "246",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "has_null",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "246",
-            "s" : [ {
-              "value" : [ "", "define ", "has_null", ": " ]
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }, {
-              "r" : "267",
-              "s" : [ {
-                "value" : [ "Avg", "(" ]
-              }, {
-                "r" : "247",
-                "s" : [ {
-                  "r" : "248",
+              "type" : "Literal",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "219",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "233",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "has_null",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "233",
+            "s" : [ {
+              "value" : [ "", "define ", "has_null", ": " ]
+            }, {
+              "r" : "247",
+              "s" : [ {
+                "value" : [ "Max", "(" ]
+              }, {
+                "r" : "234",
+                "s" : [ {
+                  "r" : "235",
                   "value" : [ "{", "1", ",", "null", ",", "null", ",", "2", "}" ]
                 } ]
               }, {
@@ -6269,113 +6047,79 @@ module.exports['Avg'] = {
           }
         } ],
         "expression" : {
-          "type" : "Avg",
-          "localId" : "267",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Max",
+          "localId" : "247",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "275",
+            "localId" : "248",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "276",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "249",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
-            "type" : "Query",
-            "localId" : "268",
+            "type" : "List",
+            "localId" : "234",
             "annotation" : [ ],
-            "source" : [ {
-              "localId" : "269",
-              "alias" : "X",
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "241",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "List",
-                "localId" : "247",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "ListTypeSpecifier",
-                  "localId" : "254",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "255",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                },
-                "element" : [ {
-                  "type" : "Literal",
-                  "localId" : "248",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "As",
-                  "localId" : "252",
-                  "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ],
-                  "signature" : [ ],
-                  "operand" : {
-                    "type" : "Null",
-                    "localId" : "249",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "type" : "As",
-                  "localId" : "253",
-                  "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ],
-                  "signature" : [ ],
-                  "operand" : {
-                    "type" : "Null",
-                    "localId" : "250",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "type" : "Literal",
-                  "localId" : "251",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                } ]
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "242",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }
-            } ],
-            "let" : [ ],
-            "relationship" : [ ],
-            "return" : {
-              "localId" : "270",
-              "distinct" : false,
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "235",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "As",
+              "localId" : "239",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "ToDecimal",
-                "localId" : "273",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "274",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "AliasRef",
-                  "localId" : "271",
-                  "name" : "X",
-                  "annotation" : [ ]
-                }
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "236",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
-            }
+            }, {
+              "type" : "As",
+              "localId" : "240",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "237",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Literal",
+              "localId" : "238",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            } ]
           }
         }
       }, {
-        "localId" : "279",
+        "localId" : "252",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "not_null_q",
         "context" : "Patient",
@@ -6384,47 +6128,54 @@ module.exports['Avg'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "279",
+            "r" : "252",
             "s" : [ {
               "value" : [ "", "define ", "not_null_q", ": " ]
             }, {
-              "r" : "292",
+              "r" : "266",
               "s" : [ {
-                "value" : [ "Avg", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "280",
+                "r" : "253",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "281",
+                  "r" : "254",
+                  "s" : [ {
+                    "value" : [ "10 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "255",
                   "s" : [ {
                     "value" : [ "1 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "282",
+                  "r" : "256",
                   "s" : [ {
                     "value" : [ "2 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "283",
+                  "r" : "257",
                   "s" : [ {
                     "value" : [ "3 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "284",
+                  "r" : "258",
                   "s" : [ {
                     "value" : [ "4 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "285",
+                  "r" : "259",
                   "s" : [ {
                     "value" : [ "5 ", "'ml'" ]
                   } ]
@@ -6438,67 +6189,74 @@ module.exports['Avg'] = {
           }
         } ],
         "expression" : {
-          "type" : "Avg",
-          "localId" : "292",
+          "type" : "Max",
+          "localId" : "266",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "293",
+            "localId" : "267",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "294",
+              "localId" : "268",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "280",
+            "localId" : "253",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "286",
+              "localId" : "260",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "287",
+                "localId" : "261",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "281",
+              "localId" : "254",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 10,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "255",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "282",
+              "localId" : "256",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "283",
+              "localId" : "257",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 3,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "284",
+              "localId" : "258",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "285",
+              "localId" : "259",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "ml",
@@ -6507,7 +6265,7 @@ module.exports['Avg'] = {
           }
         }
       }, {
-        "localId" : "297",
+        "localId" : "271",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "has_null_q",
         "context" : "Patient",
@@ -6516,27 +6274,27 @@ module.exports['Avg'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "297",
+            "r" : "271",
             "s" : [ {
               "value" : [ "", "define ", "has_null_q", ": " ]
             }, {
-              "r" : "311",
+              "r" : "285",
               "s" : [ {
-                "value" : [ "Avg", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "298",
+                "r" : "272",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "299",
+                  "r" : "273",
                   "s" : [ {
                     "value" : [ "1 ", "'ml'" ]
                   } ]
                 }, {
-                  "r" : "300",
+                  "r" : "274",
                   "value" : [ ",", "null", ",", "null", "," ]
                 }, {
-                  "r" : "302",
+                  "r" : "276",
                   "s" : [ {
                     "value" : [ "2 ", "'ml'" ]
                   } ]
@@ -6550,70 +6308,70 @@ module.exports['Avg'] = {
           }
         } ],
         "expression" : {
-          "type" : "Avg",
-          "localId" : "311",
+          "type" : "Max",
+          "localId" : "285",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "312",
+            "localId" : "286",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "313",
+              "localId" : "287",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "298",
+            "localId" : "272",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "305",
+              "localId" : "279",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "306",
+                "localId" : "280",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "299",
+              "localId" : "273",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "303",
+              "localId" : "277",
               "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "300",
+                "localId" : "274",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
               "type" : "As",
-              "localId" : "304",
+              "localId" : "278",
               "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "301",
+                "localId" : "275",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
               "type" : "Quantity",
-              "localId" : "302",
+              "localId" : "276",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "ml",
@@ -6622,110 +6380,7 @@ module.exports['Avg'] = {
           }
         }
       }, {
-        "localId" : "316",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "empty",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "316",
-            "s" : [ {
-              "value" : [ "", "define ", "empty", ": " ]
-            }, {
-              "r" : "333",
-              "s" : [ {
-                "value" : [ "Avg", "(" ]
-              }, {
-                "r" : "318",
-                "s" : [ {
-                  "value" : [ "List<" ]
-                }, {
-                  "r" : "317",
-                  "s" : [ {
-                    "value" : [ "Integer" ]
-                  } ]
-                }, {
-                  "value" : [ ">{}" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Avg",
-          "localId" : "333",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "341",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "342",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          } ],
-          "source" : {
-            "type" : "Query",
-            "localId" : "334",
-            "annotation" : [ ],
-            "source" : [ {
-              "localId" : "335",
-              "alias" : "X",
-              "annotation" : [ ],
-              "expression" : {
-                "type" : "List",
-                "localId" : "318",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "ListTypeSpecifier",
-                  "localId" : "320",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "321",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                },
-                "element" : [ ]
-              }
-            } ],
-            "let" : [ ],
-            "relationship" : [ ],
-            "return" : {
-              "localId" : "336",
-              "distinct" : false,
-              "annotation" : [ ],
-              "expression" : {
-                "type" : "ToDecimal",
-                "localId" : "339",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "340",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "AliasRef",
-                  "localId" : "337",
-                  "name" : "X",
-                  "annotation" : [ ]
-                }
-              }
-            }
-          }
-        }
-      }, {
-        "localId" : "345",
+        "localId" : "290",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "q_diff_units",
         "context" : "Patient",
@@ -6734,49 +6389,56 @@ module.exports['Avg'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "345",
+            "r" : "290",
             "s" : [ {
               "value" : [ "", "define ", "q_diff_units", ": " ]
             }, {
-              "r" : "358",
+              "r" : "304",
               "s" : [ {
-                "value" : [ "Avg", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "346",
+                "r" : "291",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "347",
+                  "r" : "292",
+                  "s" : [ {
+                    "value" : [ "10 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "293",
                   "s" : [ {
                     "value" : [ "1 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "348",
+                  "r" : "294",
                   "s" : [ {
-                    "value" : [ "0.002 ", "'l'" ]
+                    "value" : [ "2 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "349",
+                  "r" : "295",
                   "s" : [ {
-                    "value" : [ "0.03 ", "'dl'" ]
+                    "value" : [ "3 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "350",
+                  "r" : "296",
                   "s" : [ {
                     "value" : [ "4 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "351",
+                  "r" : "297",
                   "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
+                    "value" : [ "5 ", "'l'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -6788,76 +6450,83 @@ module.exports['Avg'] = {
           }
         } ],
         "expression" : {
-          "type" : "Avg",
-          "localId" : "358",
+          "type" : "Max",
+          "localId" : "304",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "359",
+            "localId" : "305",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "360",
+              "localId" : "306",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "346",
+            "localId" : "291",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "352",
+              "localId" : "298",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "353",
+                "localId" : "299",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "347",
+              "localId" : "292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 10,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "293",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "348",
+              "localId" : "294",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "l",
+              "value" : 2,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "349",
+              "localId" : "295",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.03,
-              "unit" : "dl",
+              "value" : 3,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "350",
+              "localId" : "296",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "351",
+              "localId" : "297",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
-              "unit" : "ml",
+              "unit" : "l",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "363",
+        "localId" : "309",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "NumbersAndQuantities",
         "context" : "Patient",
@@ -6866,50 +6535,50 @@ module.exports['Avg'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "363",
+            "r" : "309",
             "s" : [ {
               "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
             }, {
-              "r" : "380",
+              "r" : "326",
               "s" : [ {
-                "value" : [ "Avg", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "364",
+                "r" : "310",
                 "s" : [ {
-                  "r" : "365",
-                  "value" : [ "{", "1", " ," ]
+                  "r" : "311",
+                  "value" : [ "{", "10", " ," ]
                 }, {
-                  "r" : "366",
+                  "r" : "312",
                   "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
+                    "value" : [ "1 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "367",
+                  "r" : "313",
                   "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
+                    "value" : [ "2 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "368",
+                  "r" : "314",
                   "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
+                    "value" : [ "3 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "369",
+                  "r" : "315",
                   "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
+                    "value" : [ "4 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "370",
+                  "r" : "316",
                   "s" : [ {
-                    "value" : [ "0 ", "'ml'" ]
+                    "value" : [ "5 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -6921,94 +6590,94 @@ module.exports['Avg'] = {
           }
         } ],
         "expression" : {
-          "type" : "Avg",
-          "localId" : "380",
+          "type" : "Max",
+          "localId" : "326",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "381",
+            "localId" : "327",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "382",
+              "localId" : "328",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "364",
+            "localId" : "310",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "374",
+              "localId" : "320",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "375",
+                "localId" : "321",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "ToQuantity",
-              "localId" : "372",
+              "localId" : "318",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "373",
+                "localId" : "319",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "365",
+                "localId" : "311",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "10",
                 "annotation" : [ ]
               }
             }, {
               "type" : "Quantity",
-              "localId" : "366",
+              "localId" : "312",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
+              "value" : 1,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "367",
+              "localId" : "313",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
+              "value" : 2,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "368",
+              "localId" : "314",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
+              "value" : 3,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "369",
+              "localId" : "315",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
+              "value" : 4,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "370",
+              "localId" : "316",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0,
+              "value" : 5,
               "unit" : "ml",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "385",
+        "localId" : "331",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "IncompatibleUnitsNull",
         "context" : "Patient",
@@ -7017,26 +6686,26 @@ module.exports['Avg'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "385",
+            "r" : "331",
             "s" : [ {
               "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
             }, {
-              "r" : "395",
+              "r" : "341",
               "s" : [ {
-                "value" : [ "Avg", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "386",
+                "r" : "332",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "387",
+                  "r" : "333",
                   "s" : [ {
                     "value" : [ "1 ", "'mg/d'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "388",
+                  "r" : "334",
                   "s" : [ {
                     "value" : [ "0.002 ", "'/d'" ]
                   } ]
@@ -7050,46 +6719,46 @@ module.exports['Avg'] = {
           }
         } ],
         "expression" : {
-          "type" : "Avg",
-          "localId" : "395",
+          "type" : "Max",
+          "localId" : "341",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "396",
+            "localId" : "342",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "397",
+              "localId" : "343",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "386",
+            "localId" : "332",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "389",
+              "localId" : "335",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "390",
+                "localId" : "336",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "387",
+              "localId" : "333",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "mg/d",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "388",
+              "localId" : "334",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 0.002,
               "unit" : "/d",
@@ -7097,138 +6766,97 @@ module.exports['Avg'] = {
             } ]
           }
         }
-      } ]
-    }
-  }
-}
-
-/* Median
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define odd: Median({5,1,2,3,4})
-define even: Median({5,1,2,3,4,6})
-define odd_q: Median({5 'ml',1 'ml',2 'ml',3 'ml',4 'ml'})
-define even_q: Median({5 'ml',1 'ml',2 'ml',3 'ml',4 'ml',6 'ml'})
-define q_diff_units: Median({5 'ml',0.001 'l',0.02 'dl',3 'ml',4 'ml',6 'ml'})
-define NumbersAndQuantities: Median({5 ,1 ,2 ,3 ,4 'ml',6 'ml'})
-
-define empty: Median(List<Integer>{})
-define has_null: Median({1,null,null,2})
-define dup_vals_even: Median({3,1,2,2,2,3,4,5})
-define dup_vals_odd:  Median({3,1,2,2,2,3,4,5,6})
-define has_null_q: Median({1 'ml',null,null,2 'ml'})
-define dup_vals_even_q: Median({3 'ml',1 'ml',2 'ml',2 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
-define dup_vals_odd_q:  Median({3 'ml',1 'ml',2 'ml',2 'ml',2 'ml',3 'ml',4 'ml',5 'ml',6 'ml'})
-define IncompatibleUnitsNull: Median({1 'mg/d', 0.002 '/d'})
-*/
-
-module.exports['Median'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "561",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "346",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "empty",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "346",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "empty", ": " ]
             }, {
+              "r" : "356",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "Max", "(" ]
+              }, {
+                "r" : "348",
+                "s" : [ {
+                  "value" : [ "List<" ]
+                }, {
+                  "r" : "347",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                }, {
+                  "value" : [ ">{}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Max",
+          "localId" : "356",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "357",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "358",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "348",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "350",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "351",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ ]
           }
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "odd",
+        "localId" : "361",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerMax",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "361",
             "s" : [ {
-              "value" : [ "", "define ", "odd", ": " ]
+              "value" : [ "", "define ", "IntegerMax", ": " ]
             }, {
-              "r" : "234",
+              "r" : "373",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "215",
+                "r" : "362",
                 "s" : [ {
-                  "r" : "216",
-                  "value" : [ "{", "5", ",", "1", ",", "2", ",", "3", ",", "4", "}" ]
+                  "r" : "363",
+                  "value" : [ "{ ", "2", ", ", "4", ", ", "8", ", ", "6", " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -7237,130 +6865,188 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "234",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Max",
+          "localId" : "373",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "242",
+            "localId" : "374",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "243",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "375",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
-            "type" : "Query",
-            "localId" : "235",
-            "annotation" : [ ],
-            "source" : [ {
-              "localId" : "236",
-              "alias" : "X",
+            "type" : "List",
+            "localId" : "362",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "367",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "List",
-                "localId" : "215",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "ListTypeSpecifier",
-                  "localId" : "221",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "222",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                },
-                "element" : [ {
-                  "type" : "Literal",
-                  "localId" : "216",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "217",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "218",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "219",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "220",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                } ]
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }
-            } ],
-            "let" : [ ],
-            "relationship" : [ ],
-            "return" : {
-              "localId" : "237",
-              "distinct" : false,
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "363",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "8",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "378",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongMax",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "378",
+            "s" : [ {
+              "value" : [ "", "define ", "LongMax", ": " ]
+            }, {
+              "r" : "390",
+              "s" : [ {
+                "value" : [ "Max", "(" ]
+              }, {
+                "r" : "379",
+                "s" : [ {
+                  "r" : "380",
+                  "value" : [ "{ ", "2L", ", ", "4L", ", ", "8L", ", ", "6L", " }" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Max",
+          "localId" : "390",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "391",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "392",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "379",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "384",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "ToDecimal",
-                "localId" : "240",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "241",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "AliasRef",
-                  "localId" : "238",
-                  "name" : "X",
-                  "annotation" : [ ]
-                }
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "385",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
               }
-            }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "380",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "381",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "8",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
+            } ]
           }
         }
       }, {
-        "localId" : "246",
+        "localId" : "395",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "even",
+        "name" : "DecimalMax",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "246",
+            "r" : "395",
             "s" : [ {
-              "value" : [ "", "define ", "even", ": " ]
+              "value" : [ "", "define ", "DecimalMax", ": " ]
             }, {
-              "r" : "267",
+              "r" : "409",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "247",
+                "r" : "396",
                 "s" : [ {
-                  "r" : "248",
-                  "value" : [ "{", "5", ",", "1", ",", "2", ",", "3", ",", "4", ",", "6", "}" ]
+                  "r" : "397",
+                  "value" : [ "{ ", "5.0", ", ", "4.9", ", ", "5.1", ", " ]
+                }, {
+                  "r" : "400",
+                  "s" : [ {
+                    "r" : "401",
+                    "value" : [ "-", "5.0" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -7369,171 +7055,101 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "267",
+          "type" : "Max",
+          "localId" : "409",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "275",
+            "localId" : "410",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "276",
+              "localId" : "411",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
-            "type" : "Query",
-            "localId" : "268",
+            "type" : "List",
+            "localId" : "396",
             "annotation" : [ ],
-            "source" : [ {
-              "localId" : "269",
-              "alias" : "X",
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "403",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "List",
-                "localId" : "247",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "ListTypeSpecifier",
-                  "localId" : "254",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "255",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                },
-                "element" : [ {
-                  "type" : "Literal",
-                  "localId" : "248",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "249",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "250",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "251",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "252",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "253",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "6",
-                  "annotation" : [ ]
-                } ]
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "404",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
               }
-            } ],
-            "let" : [ ],
-            "relationship" : [ ],
-            "return" : {
-              "localId" : "270",
-              "distinct" : false,
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "397",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "5.0",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "398",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.9",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "399",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "5.1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Negate",
+              "localId" : "400",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "ToDecimal",
-                "localId" : "273",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "274",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "AliasRef",
-                  "localId" : "271",
-                  "name" : "X",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "402",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "401",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "5.0",
+                "annotation" : [ ]
               }
-            }
+            } ]
           }
         }
       }, {
-        "localId" : "279",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "odd_q",
+        "localId" : "414",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateMax",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "279",
+            "r" : "414",
             "s" : [ {
-              "value" : [ "", "define ", "odd_q", ": " ]
+              "value" : [ "", "define ", "DateMax", ": " ]
             }, {
-              "r" : "292",
+              "r" : "437",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "280",
+                "r" : "415",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "281",
-                  "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "282",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "283",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "284",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "285",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "420",
+                  "value" : [ "{ ", "@2012-12-31", ", ", "@2013-01-01", ", ", "@2012-01-01", " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -7542,137 +7158,157 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "292",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Max",
+          "localId" : "437",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "293",
+            "localId" : "438",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "294",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "439",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "280",
+            "localId" : "415",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "286",
+              "localId" : "431",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "287",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "432",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "281",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "282",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "283",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Date",
+              "localId" : "420",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "417",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "418",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "419",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "284",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Date",
+              "localId" : "425",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "422",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "423",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "424",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "285",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
-            } ]
-          }
-        }
-      }, {
-        "localId" : "297",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "even_q",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "297",
+              "type" : "Date",
+              "localId" : "430",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "427",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "428",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "429",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            } ]
+          }
+        }
+      }, {
+        "localId" : "442",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeMax",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "442",
             "s" : [ {
-              "value" : [ "", "define ", "even_q", ": " ]
+              "value" : [ "", "define ", "DateTimeMax", ": " ]
             }, {
-              "r" : "311",
+              "r" : "474",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "298",
+                "r" : "443",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "299",
-                  "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "300",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "301",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "302",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "303",
+                  "r" : "452",
                   "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
+                    "r" : "444",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "3", ")" ]
                   } ]
                 }, {
-                  "value" : [ "," ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "304",
+                  "r" : "464",
                   "s" : [ {
-                    "value" : [ "6 ", "'ml'" ]
+                    "r" : "456",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "5", ")" ]
                   } ]
                 }, {
-                  "value" : [ "}" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -7681,141 +7317,171 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "311",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Max",
+          "localId" : "474",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "312",
+            "localId" : "475",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "313",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "476",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "298",
+            "localId" : "443",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "305",
+              "localId" : "468",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "306",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "469",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "299",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "300",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "301",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "302",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "303",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "452",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "453",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "454",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "455",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "444",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "445",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "446",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "304",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 6,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "464",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "465",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "466",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "467",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "456",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "457",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "458",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
+                "annotation" : [ ]
+              }
             } ]
           }
         }
       }, {
-        "localId" : "316",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "q_diff_units",
+        "localId" : "479",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeMax",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "316",
+            "r" : "479",
             "s" : [ {
-              "value" : [ "", "define ", "q_diff_units", ": " ]
+              "value" : [ "", "define ", "TimeMax", ": " ]
             }, {
-              "r" : "330",
+              "r" : "523",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "317",
+                "r" : "480",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "318",
-                  "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "319",
+                  "r" : "489",
                   "s" : [ {
-                    "value" : [ "0.001 ", "'l'" ]
+                    "r" : "481",
+                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "1", ")" ]
                   } ]
                 }, {
-                  "value" : [ "," ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "320",
+                  "r" : "501",
                   "s" : [ {
-                    "value" : [ "0.02 ", "'dl'" ]
+                    "r" : "493",
+                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "3", ")" ]
                   } ]
                 }, {
-                  "value" : [ "," ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "321",
+                  "r" : "513",
                   "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "322",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "323",
-                  "s" : [ {
-                    "value" : [ "6 ", "'ml'" ]
+                    "r" : "505",
+                    "value" : [ "Time", "(", "12", ", ", "30", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -7827,114 +7493,220 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "330",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Max",
+          "localId" : "523",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "331",
+            "localId" : "524",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "332",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "525",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "317",
+            "localId" : "480",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "324",
+              "localId" : "517",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "325",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "518",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "318",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "319",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.001,
-              "unit" : "l",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "320",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.02,
-              "unit" : "dl",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "321",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Time",
+              "localId" : "489",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "490",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "491",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "492",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "481",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "482",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "30",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "483",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "322",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Time",
+              "localId" : "501",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "502",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "503",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "504",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "493",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "494",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "30",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "495",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "323",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 6,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Time",
+              "localId" : "513",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "514",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "515",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "516",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "505",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "506",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "30",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "507",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             } ]
           }
         }
       }, {
-        "localId" : "335",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "NumbersAndQuantities",
+        "localId" : "528",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+        "name" : "StringMax",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "335",
+            "r" : "528",
             "s" : [ {
-              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+              "value" : [ "", "define ", "StringMax", ": " ]
             }, {
-              "r" : "361",
+              "r" : "544",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "336",
+                "r" : "529",
                 "s" : [ {
-                  "r" : "337",
-                  "value" : [ "{", "5", " ,", "1", " ,", "2", " ,", "3", " ," ]
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "341",
+                  "r" : "530",
                   "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
+                    "value" : [ "'def'" ]
                   } ]
                 }, {
-                  "value" : [ "," ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "342",
+                  "r" : "532",
                   "s" : [ {
-                    "value" : [ "6 ", "'ml'" ]
+                    "value" : [ "'abc'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "534",
+                  "s" : [ {
+                    "value" : [ "'jkl'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "536",
+                  "s" : [ {
+                    "value" : [ "'ghi'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -7946,153 +7718,127 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "361",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Max",
+          "localId" : "544",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "362",
+            "localId" : "545",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "363",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "546",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "336",
+            "localId" : "529",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "355",
+              "localId" : "538",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "356",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "539",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "ToQuantity",
-              "localId" : "344",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "345",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "337",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "ToQuantity",
-              "localId" : "347",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "348",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "338",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "ToQuantity",
-              "localId" : "350",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "351",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "339",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "530",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "def",
+              "annotation" : [ ]
             }, {
-              "type" : "ToQuantity",
-              "localId" : "353",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "354",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "340",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "532",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "abc",
+              "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "341",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "534",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "jkl",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "342",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 6,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "536",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "ghi",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "366",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "empty",
+        "localId" : "549",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "MaxIsNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "366",
+            "r" : "549",
             "s" : [ {
-              "value" : [ "", "define ", "empty", ": " ]
+              "value" : [ "", "define ", "MaxIsNull", ": " ]
             }, {
-              "r" : "383",
+              "r" : "566",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "368",
+                "r" : "550",
                 "s" : [ {
-                  "value" : [ "List<" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "367",
+                  "r" : "551",
                   "s" : [ {
-                    "value" : [ "Integer" ]
+                    "r" : "552",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "553",
+                    "s" : [ {
+                      "value" : [ "Quantity" ]
+                    } ]
                   } ]
                 }, {
-                  "value" : [ ">{}" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "554",
+                  "s" : [ {
+                    "r" : "555",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "556",
+                    "s" : [ {
+                      "value" : [ "Quantity" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "557",
+                  "s" : [ {
+                    "r" : "558",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "559",
+                    "s" : [ {
+                      "value" : [ "Quantity" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -8101,95 +7847,133 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "383",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Max",
+          "localId" : "566",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "391",
+            "localId" : "567",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "392",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "568",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
-            "type" : "Query",
-            "localId" : "384",
+            "type" : "List",
+            "localId" : "550",
             "annotation" : [ ],
-            "source" : [ {
-              "localId" : "385",
-              "alias" : "X",
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "560",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "List",
-                "localId" : "368",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "ListTypeSpecifier",
-                  "localId" : "370",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "371",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                },
-                "element" : [ ]
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "561",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
               }
-            } ],
-            "let" : [ ],
-            "relationship" : [ ],
-            "return" : {
-              "localId" : "386",
-              "distinct" : false,
+            },
+            "element" : [ {
+              "type" : "As",
+              "localId" : "551",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "strict" : false,
               "annotation" : [ ],
-              "expression" : {
-                "type" : "ToDecimal",
-                "localId" : "389",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "390",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "AliasRef",
-                  "localId" : "387",
-                  "name" : "X",
-                  "annotation" : [ ]
-                }
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "552",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              },
+              "asTypeSpecifier" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "553",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
               }
-            }
+            }, {
+              "type" : "As",
+              "localId" : "554",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "strict" : false,
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "555",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              },
+              "asTypeSpecifier" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "556",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "As",
+              "localId" : "557",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "strict" : false,
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "558",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              },
+              "asTypeSpecifier" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "559",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            } ]
           }
         }
       }, {
-        "localId" : "395",
+        "localId" : "571",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "has_null",
+        "name" : "MaxIsAlsoNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "395",
+            "r" : "571",
             "s" : [ {
-              "value" : [ "", "define ", "has_null", ": " ]
+              "value" : [ "", "define ", "MaxIsAlsoNull", ": " ]
             }, {
-              "r" : "416",
+              "r" : "584",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "Max", "(" ]
               }, {
-                "r" : "396",
+                "r" : "572",
                 "s" : [ {
-                  "r" : "397",
-                  "value" : [ "{", "1", ",", "null", ",", "null", ",", "2", "}" ]
+                  "r" : "573",
+                  "value" : [ "null", " as " ]
+                }, {
+                  "r" : "574",
+                  "s" : [ {
+                    "value" : [ "List<" ]
+                  }, {
+                    "r" : "575",
+                    "s" : [ {
+                      "value" : [ "Decimal" ]
+                    } ]
+                  }, {
+                    "value" : [ ">" ]
+                  } ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -8198,133 +7982,194 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "416",
+          "type" : "Max",
+          "localId" : "584",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "424",
+            "localId" : "585",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "425",
+              "localId" : "586",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
-            "type" : "Query",
-            "localId" : "417",
+            "type" : "As",
+            "localId" : "572",
+            "strict" : false,
             "annotation" : [ ],
-            "source" : [ {
-              "localId" : "418",
-              "alias" : "X",
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "578",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "List",
-                "localId" : "396",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "ListTypeSpecifier",
-                  "localId" : "403",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "404",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                },
-                "element" : [ {
-                  "type" : "Literal",
-                  "localId" : "397",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "As",
-                  "localId" : "401",
-                  "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ],
-                  "signature" : [ ],
-                  "operand" : {
-                    "type" : "Null",
-                    "localId" : "398",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "type" : "As",
-                  "localId" : "402",
-                  "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ],
-                  "signature" : [ ],
-                  "operand" : {
-                    "type" : "Null",
-                    "localId" : "399",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "type" : "Literal",
-                  "localId" : "400",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                } ]
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "579",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
               }
-            } ],
-            "let" : [ ],
-            "relationship" : [ ],
-            "return" : {
-              "localId" : "419",
-              "distinct" : false,
+            },
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "573",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "574",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "ToDecimal",
-                "localId" : "422",
+              "resultTypeSpecifier" : {
+                "type" : "ListTypeSpecifier",
+                "localId" : "576",
                 "annotation" : [ ],
-                "signature" : [ {
+                "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "423",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "AliasRef",
-                  "localId" : "420",
-                  "name" : "X",
+                  "localId" : "577",
+                  "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "annotation" : [ ]
                 }
+              },
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "575",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
               }
             }
           }
         }
+      } ]
+    }
+  }
+}
+
+/* Avg
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define not_null: Avg({1,2,3,4,5})
+define has_null: Avg({1,null,null,2})
+define not_null_q: Avg({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
+define has_null_q: Avg({1 'ml',null,null,2 'ml'})
+define empty: Avg(List<Integer>{})
+define q_diff_units: Avg({1 'ml',0.002 'l',0.03 'dl',4 'ml',5 'ml'})
+define NumbersAndQuantities: Avg({1 ,2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
+define IncompatibleUnitsNull: Avg({1 'mg/d', 0.002 '/d'})
+*/
+
+module.exports['Avg'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "385",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "428",
+        "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "dup_vals_even",
+        "name" : "not_null",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "428",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "dup_vals_even", ": " ]
+              "value" : [ "", "define ", "not_null", ": " ]
             }, {
-              "r" : "451",
+              "r" : "234",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "Avg", "(" ]
               }, {
-                "r" : "429",
+                "r" : "215",
                 "s" : [ {
-                  "r" : "430",
-                  "value" : [ "{", "3", ",", "1", ",", "2", ",", "2", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
+                  "r" : "216",
+                  "value" : [ "{", "1", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -8333,96 +8178,75 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "451",
+          "type" : "Avg",
+          "localId" : "234",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "459",
+            "localId" : "242",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "460",
+              "localId" : "243",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "Query",
-            "localId" : "452",
+            "localId" : "235",
             "annotation" : [ ],
             "source" : [ {
-              "localId" : "453",
+              "localId" : "236",
               "alias" : "X",
               "annotation" : [ ],
               "expression" : {
                 "type" : "List",
-                "localId" : "429",
+                "localId" : "215",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "ListTypeSpecifier",
-                  "localId" : "438",
+                  "localId" : "221",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "439",
+                    "localId" : "222",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 },
                 "element" : [ {
                   "type" : "Literal",
-                  "localId" : "430",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "431",
+                  "localId" : "216",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "432",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "433",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "434",
+                  "localId" : "217",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "435",
+                  "localId" : "218",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "436",
+                  "localId" : "219",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "4",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "437",
+                  "localId" : "220",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "5",
@@ -8433,22 +8257,22 @@ module.exports['Median'] = {
             "let" : [ ],
             "relationship" : [ ],
             "return" : {
-              "localId" : "454",
+              "localId" : "237",
               "distinct" : false,
               "annotation" : [ ],
               "expression" : {
                 "type" : "ToDecimal",
-                "localId" : "457",
+                "localId" : "240",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "458",
+                  "localId" : "241",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "operand" : {
                   "type" : "AliasRef",
-                  "localId" : "455",
+                  "localId" : "238",
                   "name" : "X",
                   "annotation" : [ ]
                 }
@@ -8457,27 +8281,27 @@ module.exports['Median'] = {
           }
         }
       }, {
-        "localId" : "463",
+        "localId" : "246",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "dup_vals_odd",
+        "name" : "has_null",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "463",
+            "r" : "246",
             "s" : [ {
-              "value" : [ "", "define ", "dup_vals_odd", ":  " ]
+              "value" : [ "", "define ", "has_null", ": " ]
             }, {
-              "r" : "487",
+              "r" : "267",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "Avg", "(" ]
               }, {
-                "r" : "464",
+                "r" : "247",
                 "s" : [ {
-                  "r" : "465",
-                  "value" : [ "{", "3", ",", "1", ",", "2", ",", "2", ",", "2", ",", "3", ",", "4", ",", "5", ",", "6", "}" ]
+                  "r" : "248",
+                  "value" : [ "{", "1", ",", "null", ",", "null", ",", "2", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -8486,129 +8310,104 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "487",
+          "type" : "Avg",
+          "localId" : "267",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "495",
+            "localId" : "275",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "496",
+              "localId" : "276",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "Query",
-            "localId" : "488",
+            "localId" : "268",
             "annotation" : [ ],
             "source" : [ {
-              "localId" : "489",
+              "localId" : "269",
               "alias" : "X",
               "annotation" : [ ],
               "expression" : {
                 "type" : "List",
-                "localId" : "464",
+                "localId" : "247",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "ListTypeSpecifier",
-                  "localId" : "474",
+                  "localId" : "254",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "475",
+                    "localId" : "255",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 },
                 "element" : [ {
                   "type" : "Literal",
-                  "localId" : "465",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "466",
+                  "localId" : "248",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 }, {
-                  "type" : "Literal",
-                  "localId" : "467",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
+                  "type" : "As",
+                  "localId" : "252",
+                  "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ],
+                  "signature" : [ ],
+                  "operand" : {
+                    "type" : "Null",
+                    "localId" : "249",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
                 }, {
-                  "type" : "Literal",
-                  "localId" : "468",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
+                  "type" : "As",
+                  "localId" : "253",
+                  "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ],
+                  "signature" : [ ],
+                  "operand" : {
+                    "type" : "Null",
+                    "localId" : "250",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
                 }, {
                   "type" : "Literal",
-                  "localId" : "469",
+                  "localId" : "251",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
                   "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "470",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "471",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "472",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "473",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "6",
-                  "annotation" : [ ]
                 } ]
               }
             } ],
             "let" : [ ],
             "relationship" : [ ],
             "return" : {
-              "localId" : "490",
+              "localId" : "270",
               "distinct" : false,
               "annotation" : [ ],
               "expression" : {
                 "type" : "ToDecimal",
-                "localId" : "493",
+                "localId" : "273",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "494",
+                  "localId" : "274",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "operand" : {
                   "type" : "AliasRef",
-                  "localId" : "491",
+                  "localId" : "271",
                   "name" : "X",
                   "annotation" : [ ]
                 }
@@ -8617,41 +8416,4525 @@ module.exports['Median'] = {
           }
         }
       }, {
-        "localId" : "499",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "has_null_q",
+        "localId" : "279",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "not_null_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "279",
+            "s" : [ {
+              "value" : [ "", "define ", "not_null_q", ": " ]
+            }, {
+              "r" : "292",
+              "s" : [ {
+                "value" : [ "Avg", "(" ]
+              }, {
+                "r" : "280",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "281",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "282",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "283",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "284",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "285",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Avg",
+          "localId" : "292",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "293",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "294",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "280",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "286",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "287",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "281",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "282",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "283",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "285",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "297",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "has_null_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "297",
+            "s" : [ {
+              "value" : [ "", "define ", "has_null_q", ": " ]
+            }, {
+              "r" : "311",
+              "s" : [ {
+                "value" : [ "Avg", "(" ]
+              }, {
+                "r" : "298",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "299",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "r" : "300",
+                  "value" : [ ",", "null", ",", "null", "," ]
+                }, {
+                  "r" : "302",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Avg",
+          "localId" : "311",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "312",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "313",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "298",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "305",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "306",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "299",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "As",
+              "localId" : "303",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "300",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "As",
+              "localId" : "304",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "301",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Quantity",
+              "localId" : "302",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "316",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "empty",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "316",
+            "s" : [ {
+              "value" : [ "", "define ", "empty", ": " ]
+            }, {
+              "r" : "333",
+              "s" : [ {
+                "value" : [ "Avg", "(" ]
+              }, {
+                "r" : "318",
+                "s" : [ {
+                  "value" : [ "List<" ]
+                }, {
+                  "r" : "317",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                }, {
+                  "value" : [ ">{}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Avg",
+          "localId" : "333",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "341",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "342",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "Query",
+            "localId" : "334",
+            "annotation" : [ ],
+            "source" : [ {
+              "localId" : "335",
+              "alias" : "X",
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "List",
+                "localId" : "318",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "ListTypeSpecifier",
+                  "localId" : "320",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "321",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                },
+                "element" : [ ]
+              }
+            } ],
+            "let" : [ ],
+            "relationship" : [ ],
+            "return" : {
+              "localId" : "336",
+              "distinct" : false,
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "ToDecimal",
+                "localId" : "339",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "340",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "AliasRef",
+                  "localId" : "337",
+                  "name" : "X",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }
+        }
+      }, {
+        "localId" : "345",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "q_diff_units",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "345",
+            "s" : [ {
+              "value" : [ "", "define ", "q_diff_units", ": " ]
+            }, {
+              "r" : "358",
+              "s" : [ {
+                "value" : [ "Avg", "(" ]
+              }, {
+                "r" : "346",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "347",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "348",
+                  "s" : [ {
+                    "value" : [ "0.002 ", "'l'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "349",
+                  "s" : [ {
+                    "value" : [ "0.03 ", "'dl'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "350",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "351",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Avg",
+          "localId" : "358",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "359",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "360",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "346",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "352",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "353",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "348",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.002,
+              "unit" : "l",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "349",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.03,
+              "unit" : "dl",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "350",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "351",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "363",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "NumbersAndQuantities",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "363",
+            "s" : [ {
+              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+            }, {
+              "r" : "380",
+              "s" : [ {
+                "value" : [ "Avg", "(" ]
+              }, {
+                "r" : "364",
+                "s" : [ {
+                  "r" : "365",
+                  "value" : [ "{", "1", " ," ]
+                }, {
+                  "r" : "366",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "367",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "368",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "369",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "370",
+                  "s" : [ {
+                    "value" : [ "0 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Avg",
+          "localId" : "380",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "381",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "382",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "364",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "374",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "375",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "ToQuantity",
+              "localId" : "372",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "373",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "365",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Quantity",
+              "localId" : "366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "367",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "368",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "369",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "370",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "385",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "IncompatibleUnitsNull",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "385",
+            "s" : [ {
+              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+            }, {
+              "r" : "395",
+              "s" : [ {
+                "value" : [ "Avg", "(" ]
+              }, {
+                "r" : "386",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "387",
+                  "s" : [ {
+                    "value" : [ "1 ", "'mg/d'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "388",
+                  "s" : [ {
+                    "value" : [ "0.002 ", "'/d'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Avg",
+          "localId" : "395",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "396",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "397",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "386",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "389",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "390",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "387",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg/d",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "388",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.002,
+              "unit" : "/d",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Median
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define odd: Median({5,1,2,3,4})
+define even: Median({5,1,2,3,4,6})
+define odd_q: Median({5 'ml',1 'ml',2 'ml',3 'ml',4 'ml'})
+define even_q: Median({5 'ml',1 'ml',2 'ml',3 'ml',4 'ml',6 'ml'})
+define q_diff_units: Median({5 'ml',0.001 'l',0.02 'dl',3 'ml',4 'ml',6 'ml'})
+define NumbersAndQuantities: Median({5 ,1 ,2 ,3 ,4 'ml',6 'ml'})
+
+define empty: Median(List<Integer>{})
+define has_null: Median({1,null,null,2})
+define dup_vals_even: Median({3,1,2,2,2,3,4,5})
+define dup_vals_odd:  Median({3,1,2,2,2,3,4,5,6})
+define has_null_q: Median({1 'ml',null,null,2 'ml'})
+define dup_vals_even_q: Median({3 'ml',1 'ml',2 'ml',2 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
+define dup_vals_odd_q:  Median({3 'ml',1 'ml',2 'ml',2 'ml',2 'ml',3 'ml',4 'ml',5 'ml',6 'ml'})
+define IncompatibleUnitsNull: Median({1 'mg/d', 0.002 '/d'})
+*/
+
+module.exports['Median'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "561",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "odd",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "odd", ": " ]
+            }, {
+              "r" : "234",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "r" : "216",
+                  "value" : [ "{", "5", ",", "1", ",", "2", ",", "3", ",", "4", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "234",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "242",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "243",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "Query",
+            "localId" : "235",
+            "annotation" : [ ],
+            "source" : [ {
+              "localId" : "236",
+              "alias" : "X",
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "List",
+                "localId" : "215",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "ListTypeSpecifier",
+                  "localId" : "221",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "222",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                },
+                "element" : [ {
+                  "type" : "Literal",
+                  "localId" : "216",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "217",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "218",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "219",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "220",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                } ]
+              }
+            } ],
+            "let" : [ ],
+            "relationship" : [ ],
+            "return" : {
+              "localId" : "237",
+              "distinct" : false,
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "ToDecimal",
+                "localId" : "240",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "241",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "AliasRef",
+                  "localId" : "238",
+                  "name" : "X",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }
+        }
+      }, {
+        "localId" : "246",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "even",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "246",
+            "s" : [ {
+              "value" : [ "", "define ", "even", ": " ]
+            }, {
+              "r" : "267",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "247",
+                "s" : [ {
+                  "r" : "248",
+                  "value" : [ "{", "5", ",", "1", ",", "2", ",", "3", ",", "4", ",", "6", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "267",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "275",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "276",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "Query",
+            "localId" : "268",
+            "annotation" : [ ],
+            "source" : [ {
+              "localId" : "269",
+              "alias" : "X",
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "List",
+                "localId" : "247",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "ListTypeSpecifier",
+                  "localId" : "254",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "255",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                },
+                "element" : [ {
+                  "type" : "Literal",
+                  "localId" : "248",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "249",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "250",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "251",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "252",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "253",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "6",
+                  "annotation" : [ ]
+                } ]
+              }
+            } ],
+            "let" : [ ],
+            "relationship" : [ ],
+            "return" : {
+              "localId" : "270",
+              "distinct" : false,
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "ToDecimal",
+                "localId" : "273",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "274",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "AliasRef",
+                  "localId" : "271",
+                  "name" : "X",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }
+        }
+      }, {
+        "localId" : "279",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "odd_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "279",
+            "s" : [ {
+              "value" : [ "", "define ", "odd_q", ": " ]
+            }, {
+              "r" : "292",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "280",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "281",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "282",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "283",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "284",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "285",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "292",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "293",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "294",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "280",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "286",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "287",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "281",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "282",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "283",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "285",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "297",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "even_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "297",
+            "s" : [ {
+              "value" : [ "", "define ", "even_q", ": " ]
+            }, {
+              "r" : "311",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "298",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "299",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "300",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "301",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "302",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "303",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "304",
+                  "s" : [ {
+                    "value" : [ "6 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "311",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "312",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "313",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "298",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "305",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "306",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "299",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "300",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "301",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "302",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "303",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "304",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 6,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "316",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "q_diff_units",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "316",
+            "s" : [ {
+              "value" : [ "", "define ", "q_diff_units", ": " ]
+            }, {
+              "r" : "330",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "317",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "318",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "319",
+                  "s" : [ {
+                    "value" : [ "0.001 ", "'l'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "320",
+                  "s" : [ {
+                    "value" : [ "0.02 ", "'dl'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "321",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "322",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "323",
+                  "s" : [ {
+                    "value" : [ "6 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "330",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "331",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "332",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "317",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "324",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "325",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "318",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "319",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.001,
+              "unit" : "l",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "320",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.02,
+              "unit" : "dl",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "321",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "322",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 6,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "335",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "NumbersAndQuantities",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "335",
+            "s" : [ {
+              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+            }, {
+              "r" : "361",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "336",
+                "s" : [ {
+                  "r" : "337",
+                  "value" : [ "{", "5", " ,", "1", " ,", "2", " ,", "3", " ," ]
+                }, {
+                  "r" : "341",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "342",
+                  "s" : [ {
+                    "value" : [ "6 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "361",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "362",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "363",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "336",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "355",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "356",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "ToQuantity",
+              "localId" : "344",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "345",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "337",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ToQuantity",
+              "localId" : "347",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "348",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "338",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ToQuantity",
+              "localId" : "350",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "351",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "339",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ToQuantity",
+              "localId" : "353",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "354",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "340",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Quantity",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 6,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "366",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "empty",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "366",
+            "s" : [ {
+              "value" : [ "", "define ", "empty", ": " ]
+            }, {
+              "r" : "383",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "368",
+                "s" : [ {
+                  "value" : [ "List<" ]
+                }, {
+                  "r" : "367",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                }, {
+                  "value" : [ ">{}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "383",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "391",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "392",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "Query",
+            "localId" : "384",
+            "annotation" : [ ],
+            "source" : [ {
+              "localId" : "385",
+              "alias" : "X",
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "List",
+                "localId" : "368",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "ListTypeSpecifier",
+                  "localId" : "370",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "371",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                },
+                "element" : [ ]
+              }
+            } ],
+            "let" : [ ],
+            "relationship" : [ ],
+            "return" : {
+              "localId" : "386",
+              "distinct" : false,
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "ToDecimal",
+                "localId" : "389",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "390",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "AliasRef",
+                  "localId" : "387",
+                  "name" : "X",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }
+        }
+      }, {
+        "localId" : "395",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "has_null",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "395",
+            "s" : [ {
+              "value" : [ "", "define ", "has_null", ": " ]
+            }, {
+              "r" : "416",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "396",
+                "s" : [ {
+                  "r" : "397",
+                  "value" : [ "{", "1", ",", "null", ",", "null", ",", "2", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "416",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "424",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "425",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "Query",
+            "localId" : "417",
+            "annotation" : [ ],
+            "source" : [ {
+              "localId" : "418",
+              "alias" : "X",
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "List",
+                "localId" : "396",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "ListTypeSpecifier",
+                  "localId" : "403",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "404",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                },
+                "element" : [ {
+                  "type" : "Literal",
+                  "localId" : "397",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "As",
+                  "localId" : "401",
+                  "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ],
+                  "signature" : [ ],
+                  "operand" : {
+                    "type" : "Null",
+                    "localId" : "398",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "type" : "As",
+                  "localId" : "402",
+                  "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ],
+                  "signature" : [ ],
+                  "operand" : {
+                    "type" : "Null",
+                    "localId" : "399",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "type" : "Literal",
+                  "localId" : "400",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                } ]
+              }
+            } ],
+            "let" : [ ],
+            "relationship" : [ ],
+            "return" : {
+              "localId" : "419",
+              "distinct" : false,
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "ToDecimal",
+                "localId" : "422",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "423",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "AliasRef",
+                  "localId" : "420",
+                  "name" : "X",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }
+        }
+      }, {
+        "localId" : "428",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "dup_vals_even",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "428",
+            "s" : [ {
+              "value" : [ "", "define ", "dup_vals_even", ": " ]
+            }, {
+              "r" : "451",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "429",
+                "s" : [ {
+                  "r" : "430",
+                  "value" : [ "{", "3", ",", "1", ",", "2", ",", "2", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "451",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "459",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "460",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "Query",
+            "localId" : "452",
+            "annotation" : [ ],
+            "source" : [ {
+              "localId" : "453",
+              "alias" : "X",
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "List",
+                "localId" : "429",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "ListTypeSpecifier",
+                  "localId" : "438",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "439",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                },
+                "element" : [ {
+                  "type" : "Literal",
+                  "localId" : "430",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "431",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "432",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "433",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "434",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "435",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "436",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "437",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                } ]
+              }
+            } ],
+            "let" : [ ],
+            "relationship" : [ ],
+            "return" : {
+              "localId" : "454",
+              "distinct" : false,
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "ToDecimal",
+                "localId" : "457",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "458",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "AliasRef",
+                  "localId" : "455",
+                  "name" : "X",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }
+        }
+      }, {
+        "localId" : "463",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "dup_vals_odd",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "463",
+            "s" : [ {
+              "value" : [ "", "define ", "dup_vals_odd", ":  " ]
+            }, {
+              "r" : "487",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "464",
+                "s" : [ {
+                  "r" : "465",
+                  "value" : [ "{", "3", ",", "1", ",", "2", ",", "2", ",", "2", ",", "3", ",", "4", ",", "5", ",", "6", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "487",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "495",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "496",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "Query",
+            "localId" : "488",
+            "annotation" : [ ],
+            "source" : [ {
+              "localId" : "489",
+              "alias" : "X",
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "List",
+                "localId" : "464",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "ListTypeSpecifier",
+                  "localId" : "474",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "475",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                },
+                "element" : [ {
+                  "type" : "Literal",
+                  "localId" : "465",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "466",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "467",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "468",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "469",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "470",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "471",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "472",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "473",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "6",
+                  "annotation" : [ ]
+                } ]
+              }
+            } ],
+            "let" : [ ],
+            "relationship" : [ ],
+            "return" : {
+              "localId" : "490",
+              "distinct" : false,
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "ToDecimal",
+                "localId" : "493",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "494",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "AliasRef",
+                  "localId" : "491",
+                  "name" : "X",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }
+        }
+      }, {
+        "localId" : "499",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "has_null_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "499",
+            "s" : [ {
+              "value" : [ "", "define ", "has_null_q", ": " ]
+            }, {
+              "r" : "513",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "500",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "501",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "r" : "502",
+                  "value" : [ ",", "null", ",", "null", "," ]
+                }, {
+                  "r" : "504",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "513",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "514",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "515",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "500",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "507",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "508",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "501",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "As",
+              "localId" : "505",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "502",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "As",
+              "localId" : "506",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "503",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Quantity",
+              "localId" : "504",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "518",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "dup_vals_even_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "518",
+            "s" : [ {
+              "value" : [ "", "define ", "dup_vals_even_q", ": " ]
+            }, {
+              "r" : "534",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "519",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "520",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "521",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "522",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "523",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "524",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "525",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "526",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "527",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "534",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "535",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "536",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "519",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "528",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "529",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "520",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "521",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "522",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "523",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "524",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "525",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "526",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "527",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "539",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "dup_vals_odd_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "539",
+            "s" : [ {
+              "value" : [ "", "define ", "dup_vals_odd_q", ":  " ]
+            }, {
+              "r" : "556",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "540",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "541",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "542",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "543",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "544",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "545",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "546",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "547",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "548",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "549",
+                  "s" : [ {
+                    "value" : [ "6 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "556",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "557",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "558",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "540",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "550",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "551",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "541",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "542",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "543",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "544",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "545",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "546",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "547",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "548",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "549",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 6,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "561",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "IncompatibleUnitsNull",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "561",
+            "s" : [ {
+              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+            }, {
+              "r" : "571",
+              "s" : [ {
+                "value" : [ "Median", "(" ]
+              }, {
+                "r" : "562",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "563",
+                  "s" : [ {
+                    "value" : [ "1 ", "'mg/d'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "564",
+                  "s" : [ {
+                    "value" : [ "0.002 ", "'/d'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Median",
+          "localId" : "571",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "572",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "573",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "562",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "565",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "566",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "563",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg/d",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "564",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.002,
+              "unit" : "/d",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Mode
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define not_null: Mode({1,2,2,2,3,4,5})
+define longs: Mode({1L,2L,2L,2L,3L,4L,5L})
+define has_null: Mode({1,null,null,2,2})
+define empty: Mode({})
+
+define bi_modal: Mode({1,2,2,2,3,3,3,4,5})
+define NumbersAndQuantities: Mode({1 ,2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
+define IncompatibleUnitsNull: Mode({1 'mg/d', 0.002 '/d'})
+*/
+
+module.exports['Mode'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "331",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "not_null",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "not_null", ": " ]
+            }, {
+              "r" : "229",
+              "s" : [ {
+                "value" : [ "Mode", "(" ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "r" : "216",
+                  "value" : [ "{", "1", ",", "2", ",", "2", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Mode",
+          "localId" : "229",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "230",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "231",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "215",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "223",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "219",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "222",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longs",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "longs", ": " ]
+            }, {
+              "r" : "249",
+              "s" : [ {
+                "value" : [ "Mode", "(" ]
+              }, {
+                "r" : "235",
+                "s" : [ {
+                  "r" : "236",
+                  "value" : [ "{", "1L", ",", "2L", ",", "2L", ",", "2L", ",", "3L", ",", "4L", ",", "5L", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Mode",
+          "localId" : "249",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "250",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "251",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "235",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "243",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "244",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "237",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "238",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "254",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "has_null",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "254",
+            "s" : [ {
+              "value" : [ "", "define ", "has_null", ": " ]
+            }, {
+              "r" : "269",
+              "s" : [ {
+                "value" : [ "Mode", "(" ]
+              }, {
+                "r" : "255",
+                "s" : [ {
+                  "r" : "256",
+                  "value" : [ "{", "1", ",", "null", ",", "null", ",", "2", ",", "2", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Mode",
+          "localId" : "269",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "270",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "271",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "255",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "263",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "264",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "As",
+              "localId" : "261",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "257",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "As",
+              "localId" : "262",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "258",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Literal",
+              "localId" : "259",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "260",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "274",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+        "name" : "empty",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "274",
+            "s" : [ {
+              "value" : [ "", "define ", "empty", ": " ]
+            }, {
+              "r" : "282",
+              "s" : [ {
+                "r" : "275",
+                "value" : [ "Mode", "(", "{}", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Mode",
+          "localId" : "282",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "283",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "284",
+              "name" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "275",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "276",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "277",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ ]
+          }
+        }
+      }, {
+        "localId" : "287",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "bi_modal",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "287",
+            "s" : [ {
+              "value" : [ "", "define ", "bi_modal", ": " ]
+            }, {
+              "r" : "304",
+              "s" : [ {
+                "value" : [ "Mode", "(" ]
+              }, {
+                "r" : "288",
+                "s" : [ {
+                  "r" : "289",
+                  "value" : [ "{", "1", ",", "2", ",", "2", ",", "2", ",", "3", ",", "3", ",", "3", ",", "4", ",", "5", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Mode",
+          "localId" : "304",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "305",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "306",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "288",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "298",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "299",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "289",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "290",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "293",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "294",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "295",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "297",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "309",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "NumbersAndQuantities",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "309",
+            "s" : [ {
+              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+            }, {
+              "r" : "326",
+              "s" : [ {
+                "value" : [ "Mode", "(" ]
+              }, {
+                "r" : "310",
+                "s" : [ {
+                  "r" : "311",
+                  "value" : [ "{", "1", " ," ]
+                }, {
+                  "r" : "312",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "313",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "314",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "315",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "316",
+                  "s" : [ {
+                    "value" : [ "0 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Mode",
+          "localId" : "326",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "327",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "328",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "310",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "320",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "321",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "ToQuantity",
+              "localId" : "318",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "319",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "311",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Quantity",
+              "localId" : "312",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "313",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "314",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "315",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "316",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "331",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "IncompatibleUnitsNull",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "331",
+            "s" : [ {
+              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+            }, {
+              "r" : "341",
+              "s" : [ {
+                "value" : [ "Mode", "(" ]
+              }, {
+                "r" : "332",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "333",
+                  "s" : [ {
+                    "value" : [ "1 ", "'mg/d'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "334",
+                  "s" : [ {
+                    "value" : [ "0.002 ", "'/d'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Mode",
+          "localId" : "341",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "342",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "343",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "332",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "335",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "336",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "333",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg/d",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "334",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.002,
+              "unit" : "/d",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Variance
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define v: Variance({1,2,3,4,5})
+define v_q: Variance({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
+define q_diff_units: Variance({1.0 'ml',0.002 'l',0.003 'l',0.04 'dl',5.0 'ml'})
+define NumbersAndQuantities: Variance({1.0 ,2.0 ,3.0 ,4.0 'ml',5.0 'ml'})
+define IncompatibleUnitsNull: Variance({1 'mg/d', 0.002 '/d'})
+*/
+
+module.exports['Variance'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "309",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "v",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "v", ": " ]
+            }, {
+              "r" : "234",
+              "s" : [ {
+                "value" : [ "Variance", "(" ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "r" : "216",
+                  "value" : [ "{", "1", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Variance",
+          "localId" : "234",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "242",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "243",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "Query",
+            "localId" : "235",
+            "annotation" : [ ],
+            "source" : [ {
+              "localId" : "236",
+              "alias" : "X",
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "List",
+                "localId" : "215",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "ListTypeSpecifier",
+                  "localId" : "221",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "222",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                },
+                "element" : [ {
+                  "type" : "Literal",
+                  "localId" : "216",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "217",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "218",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "219",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "220",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                } ]
+              }
+            } ],
+            "let" : [ ],
+            "relationship" : [ ],
+            "return" : {
+              "localId" : "237",
+              "distinct" : false,
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "ToDecimal",
+                "localId" : "240",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "241",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "AliasRef",
+                  "localId" : "238",
+                  "name" : "X",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }
+        }
+      }, {
+        "localId" : "246",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "v_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "246",
+            "s" : [ {
+              "value" : [ "", "define ", "v_q", ": " ]
+            }, {
+              "r" : "259",
+              "s" : [ {
+                "value" : [ "Variance", "(" ]
+              }, {
+                "r" : "247",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "248",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "249",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "250",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "251",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "252",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Variance",
+          "localId" : "259",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "260",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "247",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "253",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "254",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "248",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "249",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "250",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "251",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "q_diff_units",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "264",
+            "s" : [ {
+              "value" : [ "", "define ", "q_diff_units", ": " ]
+            }, {
+              "r" : "277",
+              "s" : [ {
+                "value" : [ "Variance", "(" ]
+              }, {
+                "r" : "265",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "266",
+                  "s" : [ {
+                    "value" : [ "1.0 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "267",
+                  "s" : [ {
+                    "value" : [ "0.002 ", "'l'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "268",
+                  "s" : [ {
+                    "value" : [ "0.003 ", "'l'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "269",
+                  "s" : [ {
+                    "value" : [ "0.04 ", "'dl'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "270",
+                  "s" : [ {
+                    "value" : [ "5.0 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Variance",
+          "localId" : "277",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "278",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "279",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "265",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "271",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "272",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1.0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "267",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.002,
+              "unit" : "l",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "268",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.003,
+              "unit" : "l",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.04,
+              "unit" : "dl",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5.0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "282",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "NumbersAndQuantities",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "282",
+            "s" : [ {
+              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+            }, {
+              "r" : "304",
+              "s" : [ {
+                "value" : [ "Variance", "(" ]
+              }, {
+                "r" : "283",
+                "s" : [ {
+                  "r" : "284",
+                  "value" : [ "{", "1.0", " ,", "2.0", " ,", "3.0", " ," ]
+                }, {
+                  "r" : "287",
+                  "s" : [ {
+                    "value" : [ "4.0 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "288",
+                  "s" : [ {
+                    "value" : [ "5.0 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Variance",
+          "localId" : "304",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "305",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "306",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "283",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "298",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "299",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "ToQuantity",
+              "localId" : "290",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "284",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "1.0",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ToQuantity",
+              "localId" : "293",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "294",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "285",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "2.0",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ToQuantity",
+              "localId" : "296",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "297",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "286",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "3.0",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Quantity",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4.0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5.0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "309",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "IncompatibleUnitsNull",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "309",
+            "s" : [ {
+              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+            }, {
+              "r" : "319",
+              "s" : [ {
+                "value" : [ "Variance", "(" ]
+              }, {
+                "r" : "310",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "311",
+                  "s" : [ {
+                    "value" : [ "1 ", "'mg/d'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "312",
+                  "s" : [ {
+                    "value" : [ "0.002 ", "'/d'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Variance",
+          "localId" : "319",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "320",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "321",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "310",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "313",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg/d",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "312",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.002,
+              "unit" : "/d",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* PopulationVariance
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define v: PopulationVariance({1.0,2.0,3.0,4.0,5.0})
+define v_q: PopulationVariance({1.0 'ml',2.0 'ml',3.0 'ml',4.0 'ml',5.0 'ml'})
+define q_diff_units: PopulationVariance({1.0 'ml',0.002 'l',0.003 'l',0.04 'dl',5.0 'ml'})
+define NumbersAndQuantities: PopulationVariance({1.0 ,2.0 ,3.0 ,4.0 'ml',5.0 'ml'})
+define IncompatibleUnitsNull: PopulationVariance({1 'mg/d', 0.002 '/d'})
+*/
+
+module.exports['PopulationVariance'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "295",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "v",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "499",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "has_null_q", ": " ]
+              "value" : [ "", "define ", "v", ": " ]
             }, {
-              "r" : "513",
+              "r" : "227",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "PopulationVariance", "(" ]
               }, {
-                "r" : "500",
+                "r" : "215",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "501",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "r" : "502",
-                  "value" : [ ",", "null", ",", "null", "," ]
-                }, {
-                  "r" : "504",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "216",
+                  "value" : [ "{", "1.0", ",", "2.0", ",", "3.0", ",", "4.0", ",", "5.0", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -8660,151 +12943,259 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "513",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "PopulationVariance",
+          "localId" : "227",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "514",
+            "localId" : "228",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "515",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "500",
+            "localId" : "215",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "507",
+              "localId" : "221",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "508",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "222",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "501",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
               "annotation" : [ ]
             }, {
-              "type" : "As",
-              "localId" : "505",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "502",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
+              "annotation" : [ ]
             }, {
-              "type" : "As",
-              "localId" : "506",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "503",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.0",
+              "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "504",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "219",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.0",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "5.0",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "518",
+        "localId" : "232",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "dup_vals_even_q",
+        "name" : "v_q",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "518",
+            "r" : "232",
             "s" : [ {
-              "value" : [ "", "define ", "dup_vals_even_q", ": " ]
+              "value" : [ "", "define ", "v_q", ": " ]
             }, {
-              "r" : "534",
+              "r" : "245",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "PopulationVariance", "(" ]
               }, {
-                "r" : "519",
+                "r" : "233",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "520",
+                  "r" : "234",
                   "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
+                    "value" : [ "1.0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "521",
+                  "r" : "235",
                   "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
+                    "value" : [ "2.0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "522",
+                  "r" : "236",
                   "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
+                    "value" : [ "3.0 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "237",
+                  "s" : [ {
+                    "value" : [ "4.0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "523",
+                  "r" : "238",
+                  "s" : [ {
+                    "value" : [ "5.0 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "PopulationVariance",
+          "localId" : "245",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "246",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "247",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "233",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "239",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "240",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1.0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "235",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2.0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3.0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "237",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4.0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "238",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5.0,
+              "unit" : "ml",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "250",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "q_diff_units",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "250",
+            "s" : [ {
+              "value" : [ "", "define ", "q_diff_units", ": " ]
+            }, {
+              "r" : "263",
+              "s" : [ {
+                "value" : [ "PopulationVariance", "(" ]
+              }, {
+                "r" : "251",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "252",
                   "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
+                    "value" : [ "1.0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "524",
+                  "r" : "253",
                   "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
+                    "value" : [ "0.002 ", "'l'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "525",
+                  "r" : "254",
                   "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
+                    "value" : [ "0.003 ", "'l'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "526",
+                  "r" : "255",
                   "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
+                    "value" : [ "0.04 ", "'dl'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "527",
+                  "r" : "256",
                   "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
+                    "value" : [ "5.0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -8816,176 +13207,107 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "534",
+          "type" : "PopulationVariance",
+          "localId" : "263",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "535",
+            "localId" : "264",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "536",
+              "localId" : "265",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "519",
+            "localId" : "251",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "528",
+              "localId" : "257",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "529",
+                "localId" : "258",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "520",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "521",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "522",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "523",
+              "localId" : "252",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
+              "value" : 1.0,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "524",
+              "localId" : "253",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
+              "value" : 0.002,
+              "unit" : "l",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "525",
+              "localId" : "254",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
+              "value" : 0.003,
+              "unit" : "l",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "526",
+              "localId" : "255",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "value" : 0.04,
+              "unit" : "dl",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "527",
+              "localId" : "256",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
+              "value" : 5.0,
               "unit" : "ml",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "539",
+        "localId" : "268",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "dup_vals_odd_q",
+        "name" : "NumbersAndQuantities",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "539",
+            "r" : "268",
             "s" : [ {
-              "value" : [ "", "define ", "dup_vals_odd_q", ":  " ]
+              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
             }, {
-              "r" : "556",
+              "r" : "290",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "PopulationVariance", "(" ]
               }, {
-                "r" : "540",
+                "r" : "269",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "541",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "542",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "543",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "544",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "545",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "546",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "547",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
+                  "r" : "270",
+                  "value" : [ "{", "1.0", " ,", "2.0", " ,", "3.0", " ," ]
                 }, {
-                  "r" : "548",
+                  "r" : "273",
                   "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
+                    "value" : [ "4.0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "549",
+                  "r" : "274",
                   "s" : [ {
-                    "value" : [ "6 ", "'ml'" ]
+                    "value" : [ "5.0 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -8997,104 +13319,109 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "556",
+          "type" : "PopulationVariance",
+          "localId" : "290",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "557",
+            "localId" : "291",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "558",
+              "localId" : "292",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "540",
+            "localId" : "269",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "550",
+              "localId" : "284",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "551",
+                "localId" : "285",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "541",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "542",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "543",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "544",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "545",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "ToQuantity",
+              "localId" : "276",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "277",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "270",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "1.0",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "546",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "ToQuantity",
+              "localId" : "279",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "280",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "271",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "2.0",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "547",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "ToQuantity",
+              "localId" : "282",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "283",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "272",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "3.0",
+                "annotation" : [ ]
+              }
             }, {
               "type" : "Quantity",
-              "localId" : "548",
+              "localId" : "273",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
+              "value" : 4.0,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "549",
+              "localId" : "274",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 6,
+              "value" : 5.0,
               "unit" : "ml",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "561",
+        "localId" : "295",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "IncompatibleUnitsNull",
         "context" : "Patient",
@@ -9103,26 +13430,26 @@ module.exports['Median'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "561",
+            "r" : "295",
             "s" : [ {
               "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
             }, {
-              "r" : "571",
+              "r" : "305",
               "s" : [ {
-                "value" : [ "Median", "(" ]
+                "value" : [ "PopulationVariance", "(" ]
               }, {
-                "r" : "562",
+                "r" : "296",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "563",
+                  "r" : "297",
                   "s" : [ {
                     "value" : [ "1 ", "'mg/d'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "564",
+                  "r" : "298",
                   "s" : [ {
                     "value" : [ "0.002 ", "'/d'" ]
                   } ]
@@ -9136,46 +13463,46 @@ module.exports['Median'] = {
           }
         } ],
         "expression" : {
-          "type" : "Median",
-          "localId" : "571",
+          "type" : "PopulationVariance",
+          "localId" : "305",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "572",
+            "localId" : "306",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "573",
+              "localId" : "307",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "562",
+            "localId" : "296",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "565",
+              "localId" : "299",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "566",
+                "localId" : "300",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "563",
+              "localId" : "297",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "mg/d",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "564",
+              "localId" : "298",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 0.002,
               "unit" : "/d",
@@ -9188,20 +13515,19 @@ module.exports['Median'] = {
   }
 }
 
-/* Mode
+/* StdDev
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define not_null: Mode({1,2,2,2,3,4,5})
-define has_null: Mode({1,null,null,2,2})
-define empty: Mode({})
-
-define bi_modal: Mode({1,2,2,2,3,3,3,4,5})
-define NumbersAndQuantities: Mode({1 ,2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
-define IncompatibleUnitsNull: Mode({1 'mg/d', 0.002 '/d'})
+define std: StdDev({1,2,3,4,5})
+define std_q: StdDev({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
+define q_diff_units: StdDev({1 'ml', 0.002 'l',3 'ml',4 'ml', 0.05 'dl'})
+define sq_throw1: StdDev({1 'ml',2 'ml',3 'ml',4 'ml',5 'm'})
+define NumbersAndQuantities: StdDev({1 ,2 ,3 ,4 'ml',5 })
+define IncompatibleUnitsNull: StdDev({1 'mg/d', 0.002 '/d'})
 */
 
-module.exports['Mode'] = {
+module.exports['StdDev'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -9213,7 +13539,7 @@ module.exports['Mode'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "311",
+        "r" : "330",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -9287,8 +13613,8 @@ module.exports['Mode'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "not_null",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "std",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -9297,16 +13623,16 @@ module.exports['Mode'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "not_null", ": " ]
+              "value" : [ "", "define ", "std", ": " ]
             }, {
-              "r" : "229",
+              "r" : "234",
               "s" : [ {
-                "value" : [ "Mode", "(" ]
+                "value" : [ "StdDev", "(" ]
               }, {
                 "r" : "215",
                 "s" : [ {
                   "r" : "216",
-                  "value" : [ "{", "1", ",", "2", ",", "2", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
+                  "value" : [ "{", "1", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -9315,110 +13641,164 @@ module.exports['Mode'] = {
           }
         } ],
         "expression" : {
-          "type" : "Mode",
-          "localId" : "229",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "StdDev",
+          "localId" : "234",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "230",
+            "localId" : "242",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "231",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "243",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
-            "type" : "List",
-            "localId" : "215",
+            "type" : "Query",
+            "localId" : "235",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "223",
+            "source" : [ {
+              "localId" : "236",
+              "alias" : "X",
               "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "224",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "expression" : {
+                "type" : "List",
+                "localId" : "215",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "ListTypeSpecifier",
+                  "localId" : "221",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "222",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                },
+                "element" : [ {
+                  "type" : "Literal",
+                  "localId" : "216",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "217",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "218",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "219",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "220",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                } ]
               }
-            },
-            "element" : [ {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "219",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "222",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            } ]
+            } ],
+            "let" : [ ],
+            "relationship" : [ ],
+            "return" : {
+              "localId" : "237",
+              "distinct" : false,
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "ToDecimal",
+                "localId" : "240",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "241",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "AliasRef",
+                  "localId" : "238",
+                  "name" : "X",
+                  "annotation" : [ ]
+                }
+              }
+            }
           }
-        }
-      }, {
-        "localId" : "234",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "has_null",
+        }
+      }, {
+        "localId" : "246",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "std_q",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "246",
             "s" : [ {
-              "value" : [ "", "define ", "has_null", ": " ]
+              "value" : [ "", "define ", "std_q", ": " ]
             }, {
-              "r" : "249",
+              "r" : "259",
               "s" : [ {
-                "value" : [ "Mode", "(" ]
+                "value" : [ "StdDev", "(" ]
               }, {
-                "r" : "235",
+                "r" : "247",
                 "s" : [ {
-                  "r" : "236",
-                  "value" : [ "{", "1", ",", "null", ",", "null", ",", "2", ",", "2", "}" ]
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "248",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "249",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "250",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "251",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "252",
+                  "s" : [ {
+                    "value" : [ "5 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -9427,162 +13807,262 @@ module.exports['Mode'] = {
           }
         } ],
         "expression" : {
-          "type" : "Mode",
-          "localId" : "249",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "StdDev",
+          "localId" : "259",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "250",
+            "localId" : "260",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "251",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "235",
+            "localId" : "247",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "243",
+              "localId" : "253",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "244",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "254",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "236",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "type" : "Quantity",
+              "localId" : "248",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
-              "type" : "As",
-              "localId" : "241",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "237",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "249",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
+              "annotation" : [ ]
             }, {
-              "type" : "As",
-              "localId" : "242",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "238",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "250",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "type" : "Quantity",
+              "localId" : "251",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "240",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "type" : "Quantity",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "ml",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "254",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-        "name" : "empty",
+        "localId" : "264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "q_diff_units",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "254",
+            "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "empty", ": " ]
+              "value" : [ "", "define ", "q_diff_units", ": " ]
             }, {
-              "r" : "262",
+              "r" : "277",
               "s" : [ {
-                "r" : "255",
-                "value" : [ "Mode", "(", "{}", ")" ]
+                "value" : [ "StdDev", "(" ]
+              }, {
+                "r" : "265",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "266",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "267",
+                  "s" : [ {
+                    "value" : [ "0.002 ", "'l'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "268",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "269",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "270",
+                  "s" : [ {
+                    "value" : [ "0.05 ", "'dl'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Mode",
-          "localId" : "262",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+          "type" : "StdDev",
+          "localId" : "277",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "263",
+            "localId" : "278",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "264",
-              "name" : "{urn:hl7-org:elm-types:r1}Any",
+              "localId" : "279",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "255",
+            "localId" : "265",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "256",
+              "localId" : "271",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "257",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "272",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
-            "element" : [ ]
+            "element" : [ {
+              "type" : "Quantity",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "267",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.002,
+              "unit" : "l",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "268",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.05,
+              "unit" : "dl",
+              "annotation" : [ ]
+            } ]
           }
         }
       }, {
-        "localId" : "267",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "bi_modal",
+        "localId" : "282",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "sq_throw1",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "267",
+            "r" : "282",
             "s" : [ {
-              "value" : [ "", "define ", "bi_modal", ": " ]
+              "value" : [ "", "define ", "sq_throw1", ": " ]
             }, {
-              "r" : "284",
+              "r" : "295",
               "s" : [ {
-                "value" : [ "Mode", "(" ]
+                "value" : [ "StdDev", "(" ]
               }, {
-                "r" : "268",
+                "r" : "283",
                 "s" : [ {
-                  "r" : "269",
-                  "value" : [ "{", "1", ",", "2", ",", "2", ",", "2", ",", "3", ",", "3", ",", "3", ",", "4", ",", "5", "}" ]
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "284",
+                  "s" : [ {
+                    "value" : [ "1 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "285",
+                  "s" : [ {
+                    "value" : [ "2 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "286",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "287",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "288",
+                  "s" : [ {
+                    "value" : [ "5 ", "'m'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -9591,104 +14071,76 @@ module.exports['Mode'] = {
           }
         } ],
         "expression" : {
-          "type" : "Mode",
-          "localId" : "284",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "StdDev",
+          "localId" : "295",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "285",
+            "localId" : "296",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "286",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "297",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "268",
+            "localId" : "283",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "278",
+              "localId" : "289",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "279",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "290",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "271",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "272",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "273",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "type" : "Quantity",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "type" : "Quantity",
+              "localId" : "285",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "type" : "Quantity",
+              "localId" : "286",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "276",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "type" : "Quantity",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "277",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "type" : "Quantity",
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "m",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "289",
+        "localId" : "300",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "NumbersAndQuantities",
         "context" : "Patient",
@@ -9697,53 +14149,26 @@ module.exports['Mode'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "289",
+            "r" : "300",
             "s" : [ {
               "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
             }, {
-              "r" : "306",
+              "r" : "325",
               "s" : [ {
-                "value" : [ "Mode", "(" ]
+                "value" : [ "StdDev", "(" ]
               }, {
-                "r" : "290",
+                "r" : "301",
                 "s" : [ {
-                  "r" : "291",
-                  "value" : [ "{", "1", " ," ]
-                }, {
-                  "r" : "292",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "293",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
+                  "r" : "302",
+                  "value" : [ "{", "1", " ,", "2", " ,", "3", " ," ]
                 }, {
-                  "r" : "294",
+                  "r" : "305",
                   "s" : [ {
                     "value" : [ "4 ", "'ml'" ]
                   } ]
                 }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "295",
-                  "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "296",
-                  "s" : [ {
-                    "value" : [ "0 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "306",
+                  "value" : [ ",", "5", " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -9752,94 +14177,120 @@ module.exports['Mode'] = {
           }
         } ],
         "expression" : {
-          "type" : "Mode",
-          "localId" : "306",
+          "type" : "StdDev",
+          "localId" : "325",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "307",
+            "localId" : "326",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "308",
+              "localId" : "327",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "290",
+            "localId" : "301",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "300",
+              "localId" : "319",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "301",
+                "localId" : "320",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "ToQuantity",
-              "localId" : "298",
+              "localId" : "308",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "299",
+                "localId" : "309",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "291",
+                "localId" : "302",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
               }
             }, {
-              "type" : "Quantity",
-              "localId" : "292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "ToQuantity",
+              "localId" : "311",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "312",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "303",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "294",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "ToQuantity",
+              "localId" : "314",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "315",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "304",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
             }, {
               "type" : "Quantity",
-              "localId" : "295",
+              "localId" : "305",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
+              "value" : 4,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "ToQuantity",
+              "localId" : "317",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "318",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "306",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
+                "annotation" : [ ]
+              }
             } ]
           }
         }
       }, {
-        "localId" : "311",
+        "localId" : "330",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "IncompatibleUnitsNull",
         "context" : "Patient",
@@ -9848,26 +14299,26 @@ module.exports['Mode'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "311",
+            "r" : "330",
             "s" : [ {
               "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
             }, {
-              "r" : "321",
+              "r" : "340",
               "s" : [ {
-                "value" : [ "Mode", "(" ]
+                "value" : [ "StdDev", "(" ]
               }, {
-                "r" : "312",
+                "r" : "331",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "313",
+                  "r" : "332",
                   "s" : [ {
                     "value" : [ "1 ", "'mg/d'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "314",
+                  "r" : "333",
                   "s" : [ {
                     "value" : [ "0.002 ", "'/d'" ]
                   } ]
@@ -9881,46 +14332,46 @@ module.exports['Mode'] = {
           }
         } ],
         "expression" : {
-          "type" : "Mode",
-          "localId" : "321",
+          "type" : "StdDev",
+          "localId" : "340",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "322",
+            "localId" : "341",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "323",
+              "localId" : "342",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "312",
+            "localId" : "331",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "315",
+              "localId" : "334",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "316",
+                "localId" : "335",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "313",
+              "localId" : "332",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "mg/d",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "314",
+              "localId" : "333",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 0.002,
               "unit" : "/d",
@@ -9933,18 +14384,18 @@ module.exports['Mode'] = {
   }
 }
 
-/* Variance
+/* PopulationStdDev
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define v: Variance({1,2,3,4,5})
-define v_q: Variance({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
-define q_diff_units: Variance({1.0 'ml',0.002 'l',0.003 'l',0.04 'dl',5.0 'ml'})
-define NumbersAndQuantities: Variance({1.0 ,2.0 ,3.0 ,4.0 'ml',5.0 'ml'})
-define IncompatibleUnitsNull: Variance({1 'mg/d', 0.002 '/d'})
+define dev: PopulationStdDev({1,2,3,4,5})
+define dev_q: PopulationStdDev({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
+define q_diff_units: PopulationStdDev({1 'ml', 0.002 'l',3 'ml',4 'ml', 0.05 'dl'})
+define NumbersAndQuantities: PopulationStdDev({1 ,2 ,3 ,4 'ml',5 })
+define IncompatibleUnitsNull: PopulationStdDev({1 'mg/d', 0.002 '/d'})
 */
 
-module.exports['Variance'] = {
+module.exports['PopulationStdDev'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -9956,7 +14407,7 @@ module.exports['Variance'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "309",
+        "r" : "312",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -10031,7 +14482,7 @@ module.exports['Variance'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "v",
+        "name" : "dev",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -10040,11 +14491,11 @@ module.exports['Variance'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "v", ": " ]
+              "value" : [ "", "define ", "dev", ": " ]
             }, {
               "r" : "234",
               "s" : [ {
-                "value" : [ "Variance", "(" ]
+                "value" : [ "PopulationStdDev", "(" ]
               }, {
                 "r" : "215",
                 "s" : [ {
@@ -10058,7 +14509,7 @@ module.exports['Variance'] = {
           }
         } ],
         "expression" : {
-          "type" : "Variance",
+          "type" : "PopulationStdDev",
           "localId" : "234",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
@@ -10121,230 +14572,98 @@ module.exports['Variance'] = {
                   "type" : "Literal",
                   "localId" : "219",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "220",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                } ]
-              }
-            } ],
-            "let" : [ ],
-            "relationship" : [ ],
-            "return" : {
-              "localId" : "237",
-              "distinct" : false,
-              "annotation" : [ ],
-              "expression" : {
-                "type" : "ToDecimal",
-                "localId" : "240",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "241",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "AliasRef",
-                  "localId" : "238",
-                  "name" : "X",
-                  "annotation" : [ ]
-                }
-              }
-            }
-          }
-        }
-      }, {
-        "localId" : "246",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "v_q",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "246",
-            "s" : [ {
-              "value" : [ "", "define ", "v_q", ": " ]
-            }, {
-              "r" : "259",
-              "s" : [ {
-                "value" : [ "Variance", "(" ]
-              }, {
-                "r" : "247",
-                "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "248",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "249",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "250",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "251",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "252",
-                  "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Variance",
-          "localId" : "259",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "260",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "261",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            }
-          } ],
-          "source" : {
-            "type" : "List",
-            "localId" : "247",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "253",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "254",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "element" : [ {
-              "type" : "Quantity",
-              "localId" : "248",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "249",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "250",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
-              "annotation" : [ ]
-            } ]
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "220",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                } ]
+              }
+            } ],
+            "let" : [ ],
+            "relationship" : [ ],
+            "return" : {
+              "localId" : "237",
+              "distinct" : false,
+              "annotation" : [ ],
+              "expression" : {
+                "type" : "ToDecimal",
+                "localId" : "240",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "241",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "AliasRef",
+                  "localId" : "238",
+                  "name" : "X",
+                  "annotation" : [ ]
+                }
+              }
+            }
           }
         }
       }, {
-        "localId" : "264",
+        "localId" : "246",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "q_diff_units",
+        "name" : "dev_q",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "246",
             "s" : [ {
-              "value" : [ "", "define ", "q_diff_units", ": " ]
+              "value" : [ "", "define ", "dev_q", ": " ]
             }, {
-              "r" : "277",
+              "r" : "259",
               "s" : [ {
-                "value" : [ "Variance", "(" ]
+                "value" : [ "PopulationStdDev", "(" ]
               }, {
-                "r" : "265",
+                "r" : "247",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "266",
+                  "r" : "248",
                   "s" : [ {
-                    "value" : [ "1.0 ", "'ml'" ]
+                    "value" : [ "1 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "267",
+                  "r" : "249",
                   "s" : [ {
-                    "value" : [ "0.002 ", "'l'" ]
+                    "value" : [ "2 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "268",
+                  "r" : "250",
                   "s" : [ {
-                    "value" : [ "0.003 ", "'l'" ]
+                    "value" : [ "3 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "269",
+                  "r" : "251",
                   "s" : [ {
-                    "value" : [ "0.04 ", "'dl'" ]
+                    "value" : [ "4 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "270",
+                  "r" : "252",
                   "s" : [ {
-                    "value" : [ "5.0 ", "'ml'" ]
+                    "value" : [ "5 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -10356,251 +14675,127 @@ module.exports['Variance'] = {
           }
         } ],
         "expression" : {
-          "type" : "Variance",
-          "localId" : "277",
+          "type" : "PopulationStdDev",
+          "localId" : "259",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "278",
+            "localId" : "260",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "279",
+              "localId" : "261",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "265",
+            "localId" : "247",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "271",
+              "localId" : "253",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "272",
+                "localId" : "254",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "266",
+              "localId" : "248",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1.0,
+              "value" : 1,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "267",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "l",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "268",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.003,
-              "unit" : "l",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "269",
+              "localId" : "249",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.04,
-              "unit" : "dl",
+              "value" : 2,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "270",
+              "localId" : "250",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
+              "value" : 3,
               "unit" : "ml",
               "annotation" : [ ]
-            } ]
-          }
-        }
-      }, {
-        "localId" : "282",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "NumbersAndQuantities",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "282",
-            "s" : [ {
-              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
-            }, {
-              "r" : "304",
-              "s" : [ {
-                "value" : [ "Variance", "(" ]
-              }, {
-                "r" : "283",
-                "s" : [ {
-                  "r" : "284",
-                  "value" : [ "{", "1.0", " ,", "2.0", " ,", "3.0", " ," ]
-                }, {
-                  "r" : "287",
-                  "s" : [ {
-                    "value" : [ "4.0 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "288",
-                  "s" : [ {
-                    "value" : [ "5.0 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Variance",
-          "localId" : "304",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "305",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "306",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            }
-          } ],
-          "source" : {
-            "type" : "List",
-            "localId" : "283",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "298",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "299",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "element" : [ {
-              "type" : "ToQuantity",
-              "localId" : "290",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "291",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "284",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "value" : "1.0",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "ToQuantity",
-              "localId" : "293",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "294",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "285",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "value" : "2.0",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "ToQuantity",
-              "localId" : "296",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "297",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "286",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "value" : "3.0",
-                "annotation" : [ ]
-              }
             }, {
               "type" : "Quantity",
-              "localId" : "287",
+              "localId" : "251",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4.0,
+              "value" : 4,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "288",
+              "localId" : "252",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
+              "value" : 5,
               "unit" : "ml",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "309",
+        "localId" : "264",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "IncompatibleUnitsNull",
+        "name" : "q_diff_units",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "309",
+            "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+              "value" : [ "", "define ", "q_diff_units", ": " ]
             }, {
-              "r" : "319",
+              "r" : "277",
               "s" : [ {
-                "value" : [ "Variance", "(" ]
+                "value" : [ "PopulationStdDev", "(" ]
               }, {
-                "r" : "310",
+                "r" : "265",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "311",
+                  "r" : "266",
                   "s" : [ {
-                    "value" : [ "1 ", "'mg/d'" ]
+                    "value" : [ "1 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "312",
+                  "r" : "267",
                   "s" : [ {
-                    "value" : [ "0.002 ", "'/d'" ]
+                    "value" : [ "0.002 ", "'l'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "268",
+                  "s" : [ {
+                    "value" : [ "3 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "269",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "270",
+                  "s" : [ {
+                    "value" : [ "0.05 ", "'dl'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -10612,175 +14807,104 @@ module.exports['Variance'] = {
           }
         } ],
         "expression" : {
-          "type" : "Variance",
-          "localId" : "319",
+          "type" : "PopulationStdDev",
+          "localId" : "277",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "320",
+            "localId" : "278",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "321",
+              "localId" : "279",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "310",
+            "localId" : "265",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "313",
+              "localId" : "271",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "314",
+                "localId" : "272",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "311",
+              "localId" : "266",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
-              "unit" : "mg/d",
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "312",
+              "localId" : "267",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 0.002,
-              "unit" : "/d",
+              "unit" : "l",
               "annotation" : [ ]
-            } ]
-          }
-        }
-      } ]
-    }
-  }
-}
-
-/* PopulationVariance
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define v: PopulationVariance({1.0,2.0,3.0,4.0,5.0})
-define v_q: PopulationVariance({1.0 'ml',2.0 'ml',3.0 'ml',4.0 'ml',5.0 'ml'})
-define q_diff_units: PopulationVariance({1.0 'ml',0.002 'l',0.003 'l',0.04 'dl',5.0 'ml'})
-define NumbersAndQuantities: PopulationVariance({1.0 ,2.0 ,3.0 ,4.0 'ml',5.0 'ml'})
-define IncompatibleUnitsNull: PopulationVariance({1 'mg/d', 0.002 '/d'})
-*/
-
-module.exports['PopulationVariance'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "295",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
             }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
+              "type" : "Quantity",
+              "localId" : "268",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 3,
+              "unit" : "ml",
+              "annotation" : [ ]
             }, {
-              "value" : [ " version '1.0.0'" ]
+              "type" : "Quantity",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 0.05,
+              "unit" : "dl",
+              "annotation" : [ ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "v",
+        "localId" : "282",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "NumbersAndQuantities",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "282",
             "s" : [ {
-              "value" : [ "", "define ", "v", ": " ]
+              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
             }, {
-              "r" : "227",
+              "r" : "307",
               "s" : [ {
-                "value" : [ "PopulationVariance", "(" ]
+                "value" : [ "PopulationStdDev", "(" ]
               }, {
-                "r" : "215",
+                "r" : "283",
                 "s" : [ {
-                  "r" : "216",
-                  "value" : [ "{", "1.0", ",", "2.0", ",", "3.0", ",", "4.0", ",", "5.0", "}" ]
+                  "r" : "284",
+                  "value" : [ "{", "1", " ,", "2", " ,", "3", " ," ]
+                }, {
+                  "r" : "287",
+                  "s" : [ {
+                    "value" : [ "4 ", "'ml'" ]
+                  } ]
+                }, {
+                  "r" : "288",
+                  "value" : [ ",", "5", " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -10789,127 +14913,150 @@ module.exports['PopulationVariance'] = {
           }
         } ],
         "expression" : {
-          "type" : "PopulationVariance",
-          "localId" : "227",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "PopulationStdDev",
+          "localId" : "307",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "228",
+            "localId" : "308",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "309",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "215",
+            "localId" : "283",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "221",
+              "localId" : "301",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "302",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "ToQuantity",
+              "localId" : "290",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "284",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ToQuantity",
+              "localId" : "293",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "294",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "285",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ToQuantity",
+              "localId" : "296",
               "annotation" : [ ],
-              "elementType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "222",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "297",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "286",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
                 "annotation" : [ ]
               }
-            },
-            "element" : [ {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.0",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "3.0",
-              "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "219",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.0",
+              "type" : "Quantity",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "ml",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "5.0",
-              "annotation" : [ ]
+              "type" : "ToQuantity",
+              "localId" : "299",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "300",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "288",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
+                "annotation" : [ ]
+              }
             } ]
           }
         }
       }, {
-        "localId" : "232",
+        "localId" : "312",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "v_q",
+        "name" : "IncompatibleUnitsNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "232",
+            "r" : "312",
             "s" : [ {
-              "value" : [ "", "define ", "v_q", ": " ]
+              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
             }, {
-              "r" : "245",
+              "r" : "322",
               "s" : [ {
-                "value" : [ "PopulationVariance", "(" ]
+                "value" : [ "PopulationStdDev", "(" ]
               }, {
-                "r" : "233",
+                "r" : "313",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "234",
-                  "s" : [ {
-                    "value" : [ "1.0 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "235",
-                  "s" : [ {
-                    "value" : [ "2.0 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "236",
-                  "s" : [ {
-                    "value" : [ "3.0 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "237",
+                  "r" : "314",
                   "s" : [ {
-                    "value" : [ "4.0 ", "'ml'" ]
+                    "value" : [ "1 ", "'mg/d'" ]
                   } ]
                 }, {
-                  "value" : [ "," ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "238",
+                  "r" : "315",
                   "s" : [ {
-                    "value" : [ "5.0 ", "'ml'" ]
+                    "value" : [ "0.002 ", "'/d'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -10921,130 +15068,198 @@ module.exports['PopulationVariance'] = {
           }
         } ],
         "expression" : {
-          "type" : "PopulationVariance",
-          "localId" : "245",
+          "type" : "PopulationStdDev",
+          "localId" : "322",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "246",
+            "localId" : "323",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "247",
+              "localId" : "324",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "233",
+            "localId" : "313",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "239",
+              "localId" : "316",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "240",
+                "localId" : "317",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "234",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1.0,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "235",
+              "localId" : "314",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2.0,
-              "unit" : "ml",
+              "value" : 1,
+              "unit" : "mg/d",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "236",
+              "localId" : "315",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3.0,
-              "unit" : "ml",
+              "value" : 0.002,
+              "unit" : "/d",
               "annotation" : [ ]
+            } ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Product
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define integer_product: Product({5, 4, 5})
+define integers_at_max_value_product: Product({1, 2147483647}) // 2147483647
+define integers_above_max_value_product: Product({2, 1073741824}) // 2147483648
+define integers_at_min_value_product: Product({-1, 2, 1073741824}) // -2147483648
+define integers_below_min_value_product: Product({-2, 1073741825}) // -2147483650
+define long_product: Product({5L, 4L, 5L})
+define longs_at_max_value_product: Product({1L, 9223372036854775807L}) // 9223372036854775807
+define longs_above_max_value_product: Product({2L, 4611686018427387904L}) // 9223372036854775808
+define longs_at_min_value_product: Product({-1L, 2L, 4611686018427387904L}) // -9223372036854775808
+define longs_below_min_value_product: Product({-1L, 3L, 3074457345618258603L}) // -9223372036854775809
+define decimal_product: Product({1.0, 2.0, 3.0, 4.0})
+define decimals_at_max_value_product: Product({99999999999999999999.99999999, 1.0})
+define decimals_above_max_value_product: Product({99999999999999999999.99999999, 2.0})
+define decimals_at_min_value_product: Product({-99999999999999999999.99999999, 1.0})
+define decimals_below_min_value_product: Product({-99999999999999999999.99999999, 2.0})
+define quantity_product: Product({1.0 'g', 2.0 'g', 3.0 'g', 4.0 'g'})
+define quantities_at_max_value_product: Product({99999999999999999999.99999999 'g', 1.0 'g'})
+define quantities_above_max_value_product: Product({99999999999999999999.99999999 'g', 2.0 'g'})
+define quantities_at_min_value_product: Product({-99999999999999999999.99999999 'g', 1.0 'g'})
+define quantities_below_min_value_product: Product({-99999999999999999999.99999999 'g', 2.0 'g'})
+define quantity_zero_product: Product({1.0 'g', 2.0 'g', 0 'g'})
+define zero_product: Product({0, 5, 10})
+define product_with_null: Product({5, 4, null})
+define product_of_nulls: Product({null as Integer, null, null})
+define product_null: Product(null as List<Decimal>)
+define product_quantity_null: Product({null as Quantity, null as Quantity, null as Quantity})
+define NumbersAndQuantities: Product({1 ,2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
+define IncompatibleUnitsNull: Product({1 'mg/d', 0.002 '/d'})
+*/
+
+module.exports['Product'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "670",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
             }, {
-              "type" : "Quantity",
-              "localId" : "237",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4.0,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
             }, {
-              "type" : "Quantity",
-              "localId" : "238",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "value" : [ " version '1.0.0'" ]
             } ]
           }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
         }
       }, {
-        "localId" : "250",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "q_diff_units",
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "integer_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "250",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "q_diff_units", ": " ]
+              "value" : [ "", "define ", "integer_product", ": " ]
             }, {
-              "r" : "263",
+              "r" : "225",
               "s" : [ {
-                "value" : [ "PopulationVariance", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "251",
+                "r" : "215",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "252",
-                  "s" : [ {
-                    "value" : [ "1.0 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "253",
-                  "s" : [ {
-                    "value" : [ "0.002 ", "'l'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "254",
-                  "s" : [ {
-                    "value" : [ "0.003 ", "'l'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "255",
-                  "s" : [ {
-                    "value" : [ "0.04 ", "'dl'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "256",
-                  "s" : [ {
-                    "value" : [ "5.0 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "216",
+                  "value" : [ "{", "5", ", ", "4", ", ", "5", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -11053,110 +15268,82 @@ module.exports['PopulationVariance'] = {
           }
         } ],
         "expression" : {
-          "type" : "PopulationVariance",
-          "localId" : "263",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Product",
+          "localId" : "225",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "264",
+            "localId" : "226",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "265",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "227",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "251",
+            "localId" : "215",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "257",
+              "localId" : "219",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "258",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "220",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1.0,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "253",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "l",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "254",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.003,
-              "unit" : "l",
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "255",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.04,
-              "unit" : "dl",
+              "type" : "Literal",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "256",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "268",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "NumbersAndQuantities",
+        "localId" : "230",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "integers_at_max_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "268",
+            "r" : "230",
             "s" : [ {
-              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+              "value" : [ "", "define ", "integers_at_max_value_product", ": " ]
             }, {
-              "r" : "290",
+              "r" : "240",
               "s" : [ {
-                "value" : [ "PopulationVariance", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "269",
+                "r" : "231",
                 "s" : [ {
-                  "r" : "270",
-                  "value" : [ "{", "1.0", " ,", "2.0", " ,", "3.0", " ," ]
-                }, {
-                  "r" : "273",
-                  "s" : [ {
-                    "value" : [ "4.0 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "274",
-                  "s" : [ {
-                    "value" : [ "5.0 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "232",
+                  "value" : [ "{", "1", ", ", "2147483647", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -11165,142 +15352,75 @@ module.exports['PopulationVariance'] = {
           }
         } ],
         "expression" : {
-          "type" : "PopulationVariance",
-          "localId" : "290",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Product",
+          "localId" : "240",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "291",
+            "localId" : "241",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "292",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "242",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "269",
+            "localId" : "231",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "284",
+              "localId" : "234",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "285",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "235",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "ToQuantity",
-              "localId" : "276",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "277",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "270",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "value" : "1.0",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "ToQuantity",
-              "localId" : "279",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "280",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "271",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "value" : "2.0",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "ToQuantity",
-              "localId" : "282",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "283",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "272",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "value" : "3.0",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "Quantity",
-              "localId" : "273",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4.0,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "232",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "233",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2147483647",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "295",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "IncompatibleUnitsNull",
+        "localId" : "245",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "integers_above_max_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "295",
+            "r" : "245",
             "s" : [ {
-              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+              "value" : [ "// 2147483647\n", "define ", "integers_above_max_value_product", ": " ]
             }, {
-              "r" : "305",
+              "r" : "255",
               "s" : [ {
-                "value" : [ "PopulationVariance", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "296",
+                "r" : "246",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "297",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg/d'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "298",
-                  "s" : [ {
-                    "value" : [ "0.002 ", "'/d'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "247",
+                  "value" : [ "{", "2", ", ", "1073741824", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -11309,176 +15429,83 @@ module.exports['PopulationVariance'] = {
           }
         } ],
         "expression" : {
-          "type" : "PopulationVariance",
-          "localId" : "305",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Product",
+          "localId" : "255",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "306",
+            "localId" : "256",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "307",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "257",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "296",
+            "localId" : "246",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "299",
+              "localId" : "249",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "300",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "250",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg/d",
+              "type" : "Literal",
+              "localId" : "247",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "298",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "/d",
+              "type" : "Literal",
+              "localId" : "248",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1073741824",
               "annotation" : [ ]
             } ]
           }
         }
-      } ]
-    }
-  }
-}
-
-/* StdDev
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define std: StdDev({1,2,3,4,5})
-define std_q: StdDev({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
-define q_diff_units: StdDev({1 'ml', 0.002 'l',3 'ml',4 'ml', 0.05 'dl'})
-define sq_throw1: StdDev({1 'ml',2 'ml',3 'ml',4 'ml',5 'm'})
-define NumbersAndQuantities: StdDev({1 ,2 ,3 ,4 'ml',5 })
-define IncompatibleUnitsNull: StdDev({1 'mg/d', 0.002 '/d'})
-*/
-
-module.exports['StdDev'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "330",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "std",
+        "localId" : "260",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "integers_at_min_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "260",
             "s" : [ {
-              "value" : [ "", "define ", "std", ": " ]
+              "value" : [ "// 2147483648\n", "define ", "integers_at_min_value_product", ": " ]
             }, {
-              "r" : "234",
+              "r" : "273",
               "s" : [ {
-                "value" : [ "StdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "215",
+                "r" : "261",
                 "s" : [ {
-                  "r" : "216",
-                  "value" : [ "{", "1", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "262",
+                  "s" : [ {
+                    "r" : "263",
+                    "value" : [ "-", "1" ]
+                  } ]
+                }, {
+                  "r" : "265",
+                  "value" : [ ", ", "2", ", ", "1073741824", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -11487,164 +15514,102 @@ module.exports['StdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "StdDev",
-          "localId" : "234",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Product",
+          "localId" : "273",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "242",
+            "localId" : "274",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "243",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "275",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
-            "type" : "Query",
-            "localId" : "235",
+            "type" : "List",
+            "localId" : "261",
             "annotation" : [ ],
-            "source" : [ {
-              "localId" : "236",
-              "alias" : "X",
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "267",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "List",
-                "localId" : "215",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "ListTypeSpecifier",
-                  "localId" : "221",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "222",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                },
-                "element" : [ {
-                  "type" : "Literal",
-                  "localId" : "216",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "217",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "218",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "219",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "220",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                } ]
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "268",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }
-            } ],
-            "let" : [ ],
-            "relationship" : [ ],
-            "return" : {
-              "localId" : "237",
-              "distinct" : false,
+            },
+            "element" : [ {
+              "type" : "Negate",
+              "localId" : "262",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "ToDecimal",
-                "localId" : "240",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "241",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "AliasRef",
-                  "localId" : "238",
-                  "name" : "X",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "264",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "263",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
               }
-            }
+            }, {
+              "type" : "Literal",
+              "localId" : "265",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1073741824",
+              "annotation" : [ ]
+            } ]
           }
         }
       }, {
-        "localId" : "246",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "std_q",
+        "localId" : "278",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "integers_below_min_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "246",
+            "r" : "278",
             "s" : [ {
-              "value" : [ "", "define ", "std_q", ": " ]
+              "value" : [ "// -2147483648\n", "define ", "integers_below_min_value_product", ": " ]
             }, {
-              "r" : "259",
+              "r" : "290",
               "s" : [ {
-                "value" : [ "StdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "247",
+                "r" : "279",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "248",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "249",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "250",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "251",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "252",
+                  "r" : "280",
                   "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
+                    "r" : "281",
+                    "value" : [ "-", "2" ]
                   } ]
                 }, {
-                  "value" : [ "}" ]
+                  "r" : "283",
+                  "value" : [ ", ", "1073741825", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -11653,130 +15618,171 @@ module.exports['StdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "StdDev",
-          "localId" : "259",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Product",
+          "localId" : "290",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "260",
+            "localId" : "291",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "261",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "292",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "247",
+            "localId" : "279",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "253",
+              "localId" : "284",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "254",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "285",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "248",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "249",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "250",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "280",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "282",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "281",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "283",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1073741825",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "264",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "q_diff_units",
+        "localId" : "295",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "long_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "295",
             "s" : [ {
-              "value" : [ "", "define ", "q_diff_units", ": " ]
+              "value" : [ "// -2147483650\n", "define ", "long_product", ": " ]
             }, {
-              "r" : "277",
+              "r" : "306",
               "s" : [ {
-                "value" : [ "StdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "265",
+                "r" : "296",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "266",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "267",
-                  "s" : [ {
-                    "value" : [ "0.002 ", "'l'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "268",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "269",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "270",
-                  "s" : [ {
-                    "value" : [ "0.05 ", "'dl'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "297",
+                  "value" : [ "{", "5L", ", ", "4L", ", ", "5L", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Product",
+          "localId" : "306",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "307",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "308",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "296",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "300",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "301",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "297",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "298",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "299",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "311",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longs_at_max_value_product",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "311",
+            "s" : [ {
+              "value" : [ "", "define ", "longs_at_max_value_product", ": " ]
+            }, {
+              "r" : "321",
+              "s" : [ {
+                "value" : [ "Product", "(" ]
+              }, {
+                "r" : "312",
+                "s" : [ {
+                  "r" : "313",
+                  "value" : [ "{", "1L", ", ", "9223372036854775807L", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -11785,130 +15791,75 @@ module.exports['StdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "StdDev",
-          "localId" : "277",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Product",
+          "localId" : "321",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "278",
+            "localId" : "322",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "279",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "323",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "265",
+            "localId" : "312",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "271",
+              "localId" : "315",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "272",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "316",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "266",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "267",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "l",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "268",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "313",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.05,
-              "unit" : "dl",
+              "type" : "Literal",
+              "localId" : "314",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "9223372036854775807",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "282",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "sq_throw1",
+        "localId" : "326",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longs_above_max_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "282",
+            "r" : "326",
             "s" : [ {
-              "value" : [ "", "define ", "sq_throw1", ": " ]
+              "value" : [ "// 9223372036854775807\n", "define ", "longs_above_max_value_product", ": " ]
             }, {
-              "r" : "295",
+              "r" : "336",
               "s" : [ {
-                "value" : [ "StdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "283",
+                "r" : "327",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "284",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "285",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "286",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "287",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "288",
-                  "s" : [ {
-                    "value" : [ "5 ", "'m'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "328",
+                  "value" : [ "{", "2L", ", ", "4611686018427387904L", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -11917,104 +15868,83 @@ module.exports['StdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "StdDev",
-          "localId" : "295",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Product",
+          "localId" : "336",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "296",
+            "localId" : "337",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "297",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "338",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "283",
+            "localId" : "327",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "289",
+              "localId" : "330",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "290",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "331",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "284",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "285",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "286",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "287",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "288",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "m",
+              "type" : "Literal",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4611686018427387904",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "300",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "NumbersAndQuantities",
+        "localId" : "341",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longs_at_min_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "300",
+            "r" : "341",
             "s" : [ {
-              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+              "value" : [ "// 9223372036854775808\n", "define ", "longs_at_min_value_product", ": " ]
             }, {
-              "r" : "325",
+              "r" : "354",
               "s" : [ {
-                "value" : [ "StdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "301",
+                "r" : "342",
                 "s" : [ {
-                  "r" : "302",
-                  "value" : [ "{", "1", " ,", "2", " ,", "3", " ," ]
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "305",
+                  "r" : "343",
                   "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
+                    "r" : "344",
+                    "value" : [ "-", "1L" ]
                   } ]
                 }, {
-                  "r" : "306",
-                  "value" : [ ",", "5", " }" ]
+                  "r" : "346",
+                  "value" : [ ", ", "2L", ", ", "4611686018427387904L", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -12023,153 +15953,198 @@ module.exports['StdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "StdDev",
-          "localId" : "325",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Product",
+          "localId" : "354",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "326",
+            "localId" : "355",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "327",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "356",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "301",
+            "localId" : "342",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "319",
+              "localId" : "348",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "320",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "349",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "ToQuantity",
-              "localId" : "308",
+              "type" : "Negate",
+              "localId" : "343",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "309",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "345",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "302",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "344",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "1",
                 "annotation" : [ ]
               }
             }, {
-              "type" : "ToQuantity",
-              "localId" : "311",
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4611686018427387904",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "359",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longs_below_min_value_product",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "359",
+            "s" : [ {
+              "value" : [ "// -9223372036854775808\n", "define ", "longs_below_min_value_product", ": " ]
+            }, {
+              "r" : "372",
+              "s" : [ {
+                "value" : [ "Product", "(" ]
+              }, {
+                "r" : "360",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "361",
+                  "s" : [ {
+                    "r" : "362",
+                    "value" : [ "-", "1L" ]
+                  } ]
+                }, {
+                  "r" : "364",
+                  "value" : [ ", ", "3L", ", ", "3074457345618258603L", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Product",
+          "localId" : "372",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "373",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "374",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "360",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "366",
               "annotation" : [ ],
-              "signature" : [ {
+              "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "312",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "303",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "localId" : "367",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
-            }, {
-              "type" : "ToQuantity",
-              "localId" : "314",
+            },
+            "element" : [ {
+              "type" : "Negate",
+              "localId" : "361",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "315",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "363",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "304",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "localId" : "362",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
                 "annotation" : [ ]
               }
             }, {
-              "type" : "Quantity",
-              "localId" : "305",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
               "annotation" : [ ]
             }, {
-              "type" : "ToQuantity",
-              "localId" : "317",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "318",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "306",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3074457345618258603",
+              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "330",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "IncompatibleUnitsNull",
+        "localId" : "377",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimal_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "330",
+            "r" : "377",
             "s" : [ {
-              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+              "value" : [ "// -9223372036854775809\n", "define ", "decimal_product", ": " ]
             }, {
-              "r" : "340",
+              "r" : "389",
               "s" : [ {
-                "value" : [ "StdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "331",
+                "r" : "378",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "332",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg/d'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "333",
-                  "s" : [ {
-                    "value" : [ "0.002 ", "'/d'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "379",
+                  "value" : [ "{", "1.0", ", ", "2.0", ", ", "3.0", ", ", "4.0", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -12178,175 +16153,166 @@ module.exports['StdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "StdDev",
-          "localId" : "340",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Product",
+          "localId" : "389",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "341",
+            "localId" : "390",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "342",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "391",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "331",
+            "localId" : "378",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "334",
+              "localId" : "383",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "335",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "384",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "332",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg/d",
+              "type" : "Literal",
+              "localId" : "379",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "333",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "/d",
+              "type" : "Literal",
+              "localId" : "380",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "381",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.0",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.0",
               "annotation" : [ ]
             } ]
           }
         }
-      } ]
-    }
-  }
-}
-
-/* PopulationStdDev
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define dev: PopulationStdDev({1,2,3,4,5})
-define dev_q: PopulationStdDev({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})
-define q_diff_units: PopulationStdDev({1 'ml', 0.002 'l',3 'ml',4 'ml', 0.05 'dl'})
-define NumbersAndQuantities: PopulationStdDev({1 ,2 ,3 ,4 'ml',5 })
-define IncompatibleUnitsNull: PopulationStdDev({1 'mg/d', 0.002 '/d'})
-*/
-
-module.exports['PopulationStdDev'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "312",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "394",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimals_at_max_value_product",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "394",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "decimals_at_max_value_product", ": " ]
             }, {
+              "r" : "404",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "Product", "(" ]
+              }, {
+                "r" : "395",
+                "s" : [ {
+                  "r" : "396",
+                  "value" : [ "{", "99999999999999999999.99999999", ", ", "1.0", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Product",
+          "localId" : "404",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "405",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "406",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "395",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "398",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "399",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "99999999999999999999.99999999",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "397",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
+              "annotation" : [ ]
+            } ]
           }
         }
       }, {
-        "localId" : "214",
+        "localId" : "409",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "dev",
+        "name" : "decimals_above_max_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "409",
             "s" : [ {
-              "value" : [ "", "define ", "dev", ": " ]
+              "value" : [ "", "define ", "decimals_above_max_value_product", ": " ]
             }, {
-              "r" : "234",
+              "r" : "419",
               "s" : [ {
-                "value" : [ "PopulationStdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "215",
+                "r" : "410",
                 "s" : [ {
-                  "r" : "216",
-                  "value" : [ "{", "1", ",", "2", ",", "3", ",", "4", ",", "5", "}" ]
+                  "r" : "411",
+                  "value" : [ "{", "99999999999999999999.99999999", ", ", "2.0", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -12355,164 +16321,83 @@ module.exports['PopulationStdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "PopulationStdDev",
-          "localId" : "234",
+          "type" : "Product",
+          "localId" : "419",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "242",
+            "localId" : "420",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "243",
+              "localId" : "421",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
-            "type" : "Query",
-            "localId" : "235",
+            "type" : "List",
+            "localId" : "410",
             "annotation" : [ ],
-            "source" : [ {
-              "localId" : "236",
-              "alias" : "X",
-              "annotation" : [ ],
-              "expression" : {
-                "type" : "List",
-                "localId" : "215",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "ListTypeSpecifier",
-                  "localId" : "221",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "222",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                },
-                "element" : [ {
-                  "type" : "Literal",
-                  "localId" : "216",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "217",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "218",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "219",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "220",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                } ]
-              }
-            } ],
-            "let" : [ ],
-            "relationship" : [ ],
-            "return" : {
-              "localId" : "237",
-              "distinct" : false,
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "413",
               "annotation" : [ ],
-              "expression" : {
-                "type" : "ToDecimal",
-                "localId" : "240",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "241",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "AliasRef",
-                  "localId" : "238",
-                  "name" : "X",
-                  "annotation" : [ ]
-                }
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "414",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
               }
-            }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "411",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "99999999999999999999.99999999",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "412",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
+              "annotation" : [ ]
+            } ]
           }
         }
       }, {
-        "localId" : "246",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "dev_q",
+        "localId" : "424",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimals_at_min_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "246",
+            "r" : "424",
             "s" : [ {
-              "value" : [ "", "define ", "dev_q", ": " ]
+              "value" : [ "", "define ", "decimals_at_min_value_product", ": " ]
             }, {
-              "r" : "259",
+              "r" : "436",
               "s" : [ {
-                "value" : [ "PopulationStdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "247",
+                "r" : "425",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "248",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "249",
-                  "s" : [ {
-                    "value" : [ "2 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "250",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "251",
-                  "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "252",
+                  "r" : "426",
                   "s" : [ {
-                    "value" : [ "5 ", "'ml'" ]
+                    "r" : "427",
+                    "value" : [ "-", "99999999999999999999.99999999" ]
                   } ]
                 }, {
-                  "value" : [ "}" ]
+                  "r" : "429",
+                  "value" : [ ", ", "1.0", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -12521,130 +16406,95 @@ module.exports['PopulationStdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "PopulationStdDev",
-          "localId" : "259",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Product",
+          "localId" : "436",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "260",
+            "localId" : "437",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "261",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "438",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "247",
+            "localId" : "425",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "253",
+              "localId" : "430",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "254",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "431",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "248",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "249",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "250",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "426",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "428",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "427",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "99999999999999999999.99999999",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "ml",
+              "type" : "Literal",
+              "localId" : "429",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "264",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "q_diff_units",
+        "localId" : "441",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimals_below_min_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "441",
             "s" : [ {
-              "value" : [ "", "define ", "q_diff_units", ": " ]
+              "value" : [ "", "define ", "decimals_below_min_value_product", ": " ]
             }, {
-              "r" : "277",
+              "r" : "453",
               "s" : [ {
-                "value" : [ "PopulationStdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "265",
+                "r" : "442",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "266",
-                  "s" : [ {
-                    "value" : [ "1 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "267",
-                  "s" : [ {
-                    "value" : [ "0.002 ", "'l'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "268",
-                  "s" : [ {
-                    "value" : [ "3 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "269",
+                  "r" : "443",
                   "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "270",
-                  "s" : [ {
-                    "value" : [ "0.05 ", "'dl'" ]
+                    "r" : "444",
+                    "value" : [ "-", "99999999999999999999.99999999" ]
                   } ]
                 }, {
-                  "value" : [ "}" ]
+                  "r" : "446",
+                  "value" : [ ", ", "2.0", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -12653,104 +16503,114 @@ module.exports['PopulationStdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "PopulationStdDev",
-          "localId" : "277",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Product",
+          "localId" : "453",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "278",
+            "localId" : "454",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "279",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "455",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "265",
+            "localId" : "442",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "271",
+              "localId" : "447",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "272",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "448",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "266",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "267",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "l",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "268",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3,
-              "unit" : "ml",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "443",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "445",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "444",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "value" : "99999999999999999999.99999999",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Quantity",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.05,
-              "unit" : "dl",
+              "type" : "Literal",
+              "localId" : "446",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "282",
+        "localId" : "458",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "NumbersAndQuantities",
+        "name" : "quantity_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "282",
+            "r" : "458",
             "s" : [ {
-              "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
+              "value" : [ "", "define ", "quantity_product", ": " ]
             }, {
-              "r" : "307",
+              "r" : "470",
               "s" : [ {
-                "value" : [ "PopulationStdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "283",
+                "r" : "459",
                 "s" : [ {
-                  "r" : "284",
-                  "value" : [ "{", "1", " ,", "2", " ,", "3", " ," ]
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "287",
+                  "r" : "460",
                   "s" : [ {
-                    "value" : [ "4 ", "'ml'" ]
+                    "value" : [ "1.0 ", "'g'" ]
                   } ]
                 }, {
-                  "r" : "288",
-                  "value" : [ ",", "5", " }" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "461",
+                  "s" : [ {
+                    "value" : [ "2.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "462",
+                  "s" : [ {
+                    "value" : [ "3.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "463",
+                  "s" : [ {
+                    "value" : [ "4.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -12759,150 +16619,99 @@ module.exports['PopulationStdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "PopulationStdDev",
-          "localId" : "307",
+          "type" : "Product",
+          "localId" : "470",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "308",
+            "localId" : "471",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "309",
+              "localId" : "472",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "283",
+            "localId" : "459",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "301",
+              "localId" : "464",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "302",
+                "localId" : "465",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "ToQuantity",
-              "localId" : "290",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "291",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "284",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "ToQuantity",
-              "localId" : "293",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "294",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "285",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "460",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1.0,
+              "unit" : "g",
+              "annotation" : [ ]
             }, {
-              "type" : "ToQuantity",
-              "localId" : "296",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "297",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "286",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "461",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2.0,
+              "unit" : "g",
+              "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "287",
+              "localId" : "462",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "ml",
+              "value" : 3.0,
+              "unit" : "g",
               "annotation" : [ ]
             }, {
-              "type" : "ToQuantity",
-              "localId" : "299",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "300",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "288",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "463",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4.0,
+              "unit" : "g",
+              "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "312",
+        "localId" : "475",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "IncompatibleUnitsNull",
+        "name" : "quantities_at_max_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "312",
+            "r" : "475",
             "s" : [ {
-              "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
+              "value" : [ "", "define ", "quantities_at_max_value_product", ": " ]
             }, {
-              "r" : "322",
+              "r" : "485",
               "s" : [ {
-                "value" : [ "PopulationStdDev", "(" ]
+                "value" : [ "Product", "(" ]
               }, {
-                "r" : "313",
+                "r" : "476",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "314",
+                  "r" : "477",
                   "s" : [ {
-                    "value" : [ "1 ", "'mg/d'" ]
+                    "value" : [ "99999999999999999999.99999999 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "315",
+                  "r" : "478",
                   "s" : [ {
-                    "value" : [ "0.002 ", "'/d'" ]
+                    "value" : [ "1.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -12914,181 +16723,88 @@ module.exports['PopulationStdDev'] = {
           }
         } ],
         "expression" : {
-          "type" : "PopulationStdDev",
-          "localId" : "322",
+          "type" : "Product",
+          "localId" : "485",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "323",
+            "localId" : "486",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "324",
+              "localId" : "487",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "313",
+            "localId" : "476",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "316",
+              "localId" : "479",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "317",
+                "localId" : "480",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "314",
+              "localId" : "477",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg/d",
+              "value" : 1.0E20,
+              "unit" : "g",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "315",
+              "localId" : "478",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.002,
-              "unit" : "/d",
+              "value" : 1.0,
+              "unit" : "g",
               "annotation" : [ ]
             } ]
           }
         }
-      } ]
-    }
-  }
-}
-
-/* Product
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define decimal_product: Product({1.0, 2.0, 3.0, 4.0})
-define integer_product: Product({5, 4, 5})
-define zero_product: Product({0, 5, 10})
-define quantity_product: Product({1.0 'g', 2.0 'g', 3.0 'g', 4.0 'g'})
-define quantity_zero_product: Product({1.0 'g', 2.0 'g', 0 'g'})
-define product_with_null: Product({5, 4, null})
-define product_of_nulls: Product({null as Integer, null, null})
-define product_null: Product(null as List<Decimal>)
-define product_quantity_null: Product({null as Quantity, null as Quantity, null as Quantity})
-define NumbersAndQuantities: Product({1 ,2 'ml',3 'ml',4 'ml',5 'ml',0 'ml'})
-define IncompatibleUnitsNull: Product({1 'mg/d', 0.002 '/d'})
-*/
-
-module.exports['Product'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "395",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "decimal_product",
+        "localId" : "490",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "quantities_above_max_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "490",
             "s" : [ {
-              "value" : [ "", "define ", "decimal_product", ": " ]
+              "value" : [ "", "define ", "quantities_above_max_value_product", ": " ]
             }, {
-              "r" : "226",
+              "r" : "500",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "215",
+                "r" : "491",
                 "s" : [ {
-                  "r" : "216",
-                  "value" : [ "{", "1.0", ", ", "2.0", ", ", "3.0", ", ", "4.0", "}" ]
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "492",
+                  "s" : [ {
+                    "value" : [ "99999999999999999999.99999999 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "493",
+                  "s" : [ {
+                    "value" : [ "2.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -13098,88 +16814,92 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "226",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "localId" : "500",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "227",
+            "localId" : "501",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "228",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "502",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "215",
+            "localId" : "491",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "220",
+              "localId" : "494",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "221",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "495",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.0",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "3.0",
+              "type" : "Quantity",
+              "localId" : "492",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1.0E20,
+              "unit" : "g",
               "annotation" : [ ]
             }, {
-              "type" : "Literal",
-              "localId" : "219",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.0",
+              "type" : "Quantity",
+              "localId" : "493",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2.0,
+              "unit" : "g",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "231",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "integer_product",
+        "localId" : "505",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "quantities_at_min_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "231",
+            "r" : "505",
             "s" : [ {
-              "value" : [ "", "define ", "integer_product", ": " ]
+              "value" : [ "", "define ", "quantities_at_min_value_product", ": " ]
             }, {
-              "r" : "242",
+              "r" : "517",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "232",
+                "r" : "506",
                 "s" : [ {
-                  "r" : "233",
-                  "value" : [ "{", "5", ", ", "4", ", ", "5", "}" ]
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "507",
+                  "s" : [ {
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "508",
+                    "s" : [ {
+                      "value" : [ "99999999999999999999.99999999 ", "'g'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "510",
+                  "s" : [ {
+                    "value" : [ "1.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -13189,81 +16909,104 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "242",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "localId" : "517",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "243",
+            "localId" : "518",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "244",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "519",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "232",
+            "localId" : "506",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "236",
+              "localId" : "511",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "237",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "512",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "233",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "234",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "507",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "509",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Quantity",
+                "localId" : "508",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1.0E20,
+                "unit" : "g",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Literal",
-              "localId" : "235",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "type" : "Quantity",
+              "localId" : "510",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1.0,
+              "unit" : "g",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "247",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "zero_product",
+        "localId" : "522",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "quantities_below_min_value_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "247",
+            "r" : "522",
             "s" : [ {
-              "value" : [ "", "define ", "zero_product", ": " ]
+              "value" : [ "", "define ", "quantities_below_min_value_product", ": " ]
             }, {
-              "r" : "258",
+              "r" : "534",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "248",
+                "r" : "523",
                 "s" : [ {
-                  "r" : "249",
-                  "value" : [ "{", "0", ", ", "5", ", ", "10", "}" ]
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "524",
+                  "s" : [ {
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "525",
+                    "s" : [ {
+                      "value" : [ "99999999999999999999.99999999 ", "'g'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "527",
+                  "s" : [ {
+                    "value" : [ "2.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -13273,105 +17016,103 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "258",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "localId" : "534",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "259",
+            "localId" : "535",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "260",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "536",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "248",
+            "localId" : "523",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "252",
+              "localId" : "528",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "253",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "529",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "249",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "250",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "524",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "526",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Quantity",
+                "localId" : "525",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1.0E20,
+                "unit" : "g",
+                "annotation" : [ ]
+              }
             }, {
-              "type" : "Literal",
-              "localId" : "251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "type" : "Quantity",
+              "localId" : "527",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2.0,
+              "unit" : "g",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "263",
+        "localId" : "539",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "quantity_product",
+        "name" : "quantity_zero_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "263",
+            "r" : "539",
             "s" : [ {
-              "value" : [ "", "define ", "quantity_product", ": " ]
+              "value" : [ "", "define ", "quantity_zero_product", ": " ]
             }, {
-              "r" : "275",
+              "r" : "550",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "264",
+                "r" : "540",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "265",
+                  "r" : "541",
                   "s" : [ {
                     "value" : [ "1.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "266",
+                  "r" : "542",
                   "s" : [ {
                     "value" : [ "2.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "267",
-                  "s" : [ {
-                    "value" : [ "3.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "268",
+                  "r" : "543",
                   "s" : [ {
-                    "value" : [ "4.0 ", "'g'" ]
+                    "value" : [ "0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -13384,108 +17125,81 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "275",
+          "localId" : "550",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "276",
+            "localId" : "551",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "277",
+              "localId" : "552",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "264",
+            "localId" : "540",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "269",
+              "localId" : "544",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "270",
+                "localId" : "545",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "265",
+              "localId" : "541",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1.0,
               "unit" : "g",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "266",
+              "localId" : "542",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2.0,
               "unit" : "g",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "267",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 3.0,
-              "unit" : "g",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "268",
+              "localId" : "543",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4.0,
+              "value" : 0,
               "unit" : "g",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "280",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "quantity_zero_product",
+        "localId" : "555",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "zero_product",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "280",
+            "r" : "555",
             "s" : [ {
-              "value" : [ "", "define ", "quantity_zero_product", ": " ]
+              "value" : [ "", "define ", "zero_product", ": " ]
             }, {
-              "r" : "291",
+              "r" : "566",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "281",
+                "r" : "556",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "282",
-                  "s" : [ {
-                    "value" : [ "1.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "283",
-                  "s" : [ {
-                    "value" : [ "2.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "284",
-                  "s" : [ {
-                    "value" : [ "0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "557",
+                  "value" : [ "{", "0", ", ", "5", ", ", "10", "}" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -13495,61 +17209,61 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "291",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "566",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "292",
+            "localId" : "567",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "293",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "568",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "281",
+            "localId" : "556",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "285",
+              "localId" : "560",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "286",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "561",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Quantity",
-              "localId" : "282",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1.0,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "557",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "283",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2.0,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "558",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }, {
-              "type" : "Quantity",
-              "localId" : "284",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "559",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
               "annotation" : [ ]
             } ]
           }
         }
       }, {
-        "localId" : "296",
+        "localId" : "571",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "product_with_null",
         "context" : "Patient",
@@ -13558,17 +17272,17 @@ module.exports['Product'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "296",
+            "r" : "571",
             "s" : [ {
               "value" : [ "", "define ", "product_with_null", ": " ]
             }, {
-              "r" : "308",
+              "r" : "583",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "297",
+                "r" : "572",
                 "s" : [ {
-                  "r" : "298",
+                  "r" : "573",
                   "value" : [ "{", "5", ", ", "4", ", ", "null", "}" ]
                 } ]
               }, {
@@ -13579,58 +17293,58 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "308",
+          "localId" : "583",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "309",
+            "localId" : "584",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "310",
+              "localId" : "585",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "297",
+            "localId" : "572",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "302",
+              "localId" : "577",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "303",
+                "localId" : "578",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "298",
+              "localId" : "573",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "299",
+              "localId" : "574",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "301",
+              "localId" : "576",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "300",
+                "localId" : "575",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -13638,7 +17352,7 @@ module.exports['Product'] = {
           }
         }
       }, {
-        "localId" : "313",
+        "localId" : "588",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "product_of_nulls",
         "context" : "Patient",
@@ -13647,30 +17361,30 @@ module.exports['Product'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "313",
+            "r" : "588",
             "s" : [ {
               "value" : [ "", "define ", "product_of_nulls", ": " ]
             }, {
-              "r" : "328",
+              "r" : "603",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "314",
+                "r" : "589",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "315",
+                  "r" : "590",
                   "s" : [ {
-                    "r" : "316",
+                    "r" : "591",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "317",
+                    "r" : "592",
                     "s" : [ {
                       "value" : [ "Integer" ]
                     } ]
                   } ]
                 }, {
-                  "r" : "318",
+                  "r" : "593",
                   "value" : [ ", ", "null", ", ", "null", "}" ]
                 } ]
               }, {
@@ -13681,76 +17395,76 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "328",
+          "localId" : "603",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "329",
+            "localId" : "604",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "330",
+              "localId" : "605",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "314",
+            "localId" : "589",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "322",
+              "localId" : "597",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "323",
+                "localId" : "598",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "As",
-              "localId" : "315",
+              "localId" : "590",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "316",
+                "localId" : "591",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "317",
+                "localId" : "592",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
               "type" : "As",
-              "localId" : "320",
+              "localId" : "595",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "318",
+                "localId" : "593",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
               "type" : "As",
-              "localId" : "321",
+              "localId" : "596",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "319",
+                "localId" : "594",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -13758,7 +17472,7 @@ module.exports['Product'] = {
           }
         }
       }, {
-        "localId" : "333",
+        "localId" : "608",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
         "name" : "product_null",
         "context" : "Patient",
@@ -13767,24 +17481,24 @@ module.exports['Product'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "333",
+            "r" : "608",
             "s" : [ {
               "value" : [ "", "define ", "product_null", ": " ]
             }, {
-              "r" : "346",
+              "r" : "621",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "334",
+                "r" : "609",
                 "s" : [ {
-                  "r" : "335",
+                  "r" : "610",
                   "value" : [ "null", " as " ]
                 }, {
-                  "r" : "336",
+                  "r" : "611",
                   "s" : [ {
                     "value" : [ "List<" ]
                   }, {
-                    "r" : "337",
+                    "r" : "612",
                     "s" : [ {
                       "value" : [ "Decimal" ]
                     } ]
@@ -13800,32 +17514,32 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "346",
+          "localId" : "621",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "347",
+            "localId" : "622",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "348",
+              "localId" : "623",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "As",
-            "localId" : "334",
+            "localId" : "609",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "340",
+              "localId" : "615",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "341",
+                "localId" : "616",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
@@ -13833,28 +17547,28 @@ module.exports['Product'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "335",
+              "localId" : "610",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "336",
+              "localId" : "611",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "338",
+                "localId" : "613",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "339",
+                  "localId" : "614",
                   "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "337",
+                "localId" : "612",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
@@ -13863,7 +17577,7 @@ module.exports['Product'] = {
           }
         }
       }, {
-        "localId" : "351",
+        "localId" : "626",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "product_quantity_null",
         "context" : "Patient",
@@ -13872,24 +17586,24 @@ module.exports['Product'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "351",
+            "r" : "626",
             "s" : [ {
               "value" : [ "", "define ", "product_quantity_null", ": " ]
             }, {
-              "r" : "368",
+              "r" : "643",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "352",
+                "r" : "627",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "353",
+                  "r" : "628",
                   "s" : [ {
-                    "r" : "354",
+                    "r" : "629",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "355",
+                    "r" : "630",
                     "s" : [ {
                       "value" : [ "Quantity" ]
                     } ]
@@ -13897,12 +17611,12 @@ module.exports['Product'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "356",
+                  "r" : "631",
                   "s" : [ {
-                    "r" : "357",
+                    "r" : "632",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "358",
+                    "r" : "633",
                     "s" : [ {
                       "value" : [ "Quantity" ]
                     } ]
@@ -13910,12 +17624,12 @@ module.exports['Product'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "359",
+                  "r" : "634",
                   "s" : [ {
-                    "r" : "360",
+                    "r" : "635",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "361",
+                    "r" : "636",
                     "s" : [ {
                       "value" : [ "Quantity" ]
                     } ]
@@ -13931,91 +17645,91 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "368",
+          "localId" : "643",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "369",
+            "localId" : "644",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "370",
+              "localId" : "645",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "352",
+            "localId" : "627",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "362",
+              "localId" : "637",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "363",
+                "localId" : "638",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "As",
-              "localId" : "353",
+              "localId" : "628",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "354",
+                "localId" : "629",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "355",
+                "localId" : "630",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }, {
               "type" : "As",
-              "localId" : "356",
+              "localId" : "631",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "357",
+                "localId" : "632",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "358",
+                "localId" : "633",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }, {
               "type" : "As",
-              "localId" : "359",
+              "localId" : "634",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "360",
+                "localId" : "635",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "361",
+                "localId" : "636",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
@@ -14024,7 +17738,7 @@ module.exports['Product'] = {
           }
         }
       }, {
-        "localId" : "373",
+        "localId" : "648",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "NumbersAndQuantities",
         "context" : "Patient",
@@ -14033,48 +17747,48 @@ module.exports['Product'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "373",
+            "r" : "648",
             "s" : [ {
               "value" : [ "", "define ", "NumbersAndQuantities", ": " ]
             }, {
-              "r" : "390",
+              "r" : "665",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "374",
+                "r" : "649",
                 "s" : [ {
-                  "r" : "375",
+                  "r" : "650",
                   "value" : [ "{", "1", " ," ]
                 }, {
-                  "r" : "376",
+                  "r" : "651",
                   "s" : [ {
                     "value" : [ "2 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "377",
+                  "r" : "652",
                   "s" : [ {
                     "value" : [ "3 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "378",
+                  "r" : "653",
                   "s" : [ {
                     "value" : [ "4 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "379",
+                  "r" : "654",
                   "s" : [ {
                     "value" : [ "5 ", "'ml'" ]
                   } ]
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "380",
+                  "r" : "655",
                   "s" : [ {
                     "value" : [ "0 ", "'ml'" ]
                   } ]
@@ -14089,48 +17803,48 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "390",
+          "localId" : "665",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "391",
+            "localId" : "666",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "392",
+              "localId" : "667",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "374",
+            "localId" : "649",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "384",
+              "localId" : "659",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "385",
+                "localId" : "660",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "ToQuantity",
-              "localId" : "382",
+              "localId" : "657",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "383",
+                "localId" : "658",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "375",
+                "localId" : "650",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -14138,35 +17852,35 @@ module.exports['Product'] = {
               }
             }, {
               "type" : "Quantity",
-              "localId" : "376",
+              "localId" : "651",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "377",
+              "localId" : "652",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 3,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "378",
+              "localId" : "653",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "379",
+              "localId" : "654",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "ml",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "380",
+              "localId" : "655",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 0,
               "unit" : "ml",
@@ -14175,7 +17889,7 @@ module.exports['Product'] = {
           }
         }
       }, {
-        "localId" : "395",
+        "localId" : "670",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
         "name" : "IncompatibleUnitsNull",
         "context" : "Patient",
@@ -14184,26 +17898,26 @@ module.exports['Product'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "395",
+            "r" : "670",
             "s" : [ {
               "value" : [ "", "define ", "IncompatibleUnitsNull", ": " ]
             }, {
-              "r" : "405",
+              "r" : "680",
               "s" : [ {
                 "value" : [ "Product", "(" ]
               }, {
-                "r" : "396",
+                "r" : "671",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "397",
+                  "r" : "672",
                   "s" : [ {
                     "value" : [ "1 ", "'mg/d'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "398",
+                  "r" : "673",
                   "s" : [ {
                     "value" : [ "0.002 ", "'/d'" ]
                   } ]
@@ -14218,45 +17932,45 @@ module.exports['Product'] = {
         } ],
         "expression" : {
           "type" : "Product",
-          "localId" : "405",
+          "localId" : "680",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "406",
+            "localId" : "681",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "407",
+              "localId" : "682",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "396",
+            "localId" : "671",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "399",
+              "localId" : "674",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "400",
+                "localId" : "675",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Quantity",
-              "localId" : "397",
+              "localId" : "672",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "mg/d",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "398",
+              "localId" : "673",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 0.002,
               "unit" : "/d",
diff --git a/test/elm/arithmetic/arithmetic-test.ts b/test/elm/arithmetic/arithmetic-test.ts
index 63dc0d51a..9dde8fd39 100644
--- a/test/elm/arithmetic/arithmetic-test.ts
+++ b/test/elm/arithmetic/arithmetic-test.ts
@@ -8,6 +8,22 @@ import {
   Quantity
 } from '../../../src/datatypes/quantity';
 import setup from '../../setup';
+import {
+  MAX_FLOAT_VALUE,
+  MAX_INT_VALUE,
+  MAX_LONG_VALUE,
+  MIN_FLOAT_VALUE,
+  MIN_INT_VALUE,
+  MIN_LONG_VALUE
+} from '../../../src/util/math';
+import {
+  MAX_DATE_VALUE,
+  MAX_DATETIME_VALUE,
+  MAX_TIME_VALUE,
+  MIN_DATE_VALUE,
+  MIN_DATETIME_VALUE,
+  MIN_TIME_VALUE
+} from '../../../src/datatypes/datetime';
 
 const data = require('./data');
 
@@ -59,6 +75,18 @@ describe('Add', () => {
     (await this.addVariables.exec(this.ctx)).should.equal(21);
   });
 
+  it('should add two longs', async function () {
+    (await this.onePlusTwoLong.exec(this.ctx)).should.equal(3n);
+  });
+
+  it('should add integer and long', async function () {
+    (await this.onePlusTwoMixed.exec(this.ctx)).should.equal(3n);
+  });
+
+  it('should add long and integer', async function () {
+    (await this.onePlusTwoReverseMixed.exec(this.ctx)).should.equal(3n);
+  });
+
   it('should add Time/Quantity', async function () {
     (await this.addTime.exec(this.ctx)).isTime().should.be.true();
   });
@@ -99,6 +127,18 @@ describe('Subtract', () => {
     (await this.subtractVariables.exec(this.ctx)).should.equal(1);
   });
 
+  it('should subtract two longs', async function () {
+    (await this.fiveMinusTwoLong.exec(this.ctx)).should.equal(3n);
+  });
+
+  it('should subtract long from integer', async function () {
+    (await this.fiveMinusTwoMixed.exec(this.ctx)).should.equal(3n);
+  });
+
+  it('should subtract integer from long', async function () {
+    (await this.fiveMinusTwoReverseMixed.exec(this.ctx)).should.equal(3n);
+  });
+
   it('should subtract uncertainty from uncertainty', async function () {
     const result = await this.subtractUncertainties.exec(this.ctx);
     result.low.should.equal(-6);
@@ -135,6 +175,18 @@ describe('Multiply', () => {
     (await this.multiplyVariables.exec(this.ctx)).should.equal(110);
   });
 
+  it('should multiply two longs', async function () {
+    (await this.fiveTimesTwoLong.exec(this.ctx)).should.equal(10n);
+  });
+
+  it('should multiply two integer by long', async function () {
+    (await this.fiveTimesTwoMixed.exec(this.ctx)).should.equal(10n);
+  });
+
+  it('should multiply long by integer', async function () {
+    (await this.fiveTimesTwoReverseMixed.exec(this.ctx)).should.equal(10n);
+  });
+
   it('should multiply uncertainty and uncertainty', async function () {
     const result = await this.multiplyUncertainties.exec(this.ctx);
     result.low.should.equal(12);
@@ -175,6 +227,33 @@ describe('Divide', () => {
     (await this.divideVariables.exec(this.ctx)).should.equal(25);
   });
 
+  it('should divide two longs', async function () {
+    // NOTE: Divide always returns a Decimal
+    (await this.tenDividedByTwoLong.exec(this.ctx)).should.equal(5);
+  });
+
+  it('should divide integer by long', async function () {
+    // NOTE: Divide always returns a Decimal
+    (await this.tenDividedByTwoMixed.exec(this.ctx)).should.equal(5);
+  });
+
+  it('should divide long by integer', async function () {
+    // NOTE: Divide always returns a Decimal
+    (await this.tenDividedByTwoReverseMixed.exec(this.ctx)).should.equal(5);
+  });
+
+  it('should divide two longs with decimal result', async function () {
+    (await this.tenDividedByFourLong.exec(this.ctx)).should.equal(2.5);
+  });
+
+  it('should divide integer by long with decimal result', async function () {
+    (await this.tenDividedByFourMixed.exec(this.ctx)).should.equal(2.5);
+  });
+
+  it('should divide long by integer with decimal result', async function () {
+    (await this.tenDividedByFourReverseMixed.exec(this.ctx)).should.equal(2.5);
+  });
+
   it('should divide uncertainty by uncertainty', async function () {
     const result = await this.divideUncertainties.exec(this.ctx);
     result.low.should.equal(6 / 14);
@@ -202,6 +281,18 @@ describe('Negate', () => {
   it('should negate a number', async function () {
     (await this.negativeOne.exec(this.ctx)).should.equal(-1);
   });
+
+  it('should return null when negating minimum Integer', async function () {
+    should(await this.negateMinInteger.exec(this.ctx)).be.null();
+  });
+
+  it('should negate a long', async function () {
+    (await this.negativeOneLong.exec(this.ctx)).should.equal(-1n);
+  });
+
+  it('should return null when negating minimum Long', async function () {
+    should(await this.negateMinLong.exec(this.ctx)).be.null();
+  });
 });
 
 describe('MathPrecedence', () => {
@@ -226,6 +317,30 @@ describe('Power', () => {
   it('should be able to calculate the power of a number', async function () {
     (await this.pow.exec(this.ctx)).should.equal(81);
   });
+
+  it('should be able to calculate the negative power of a number', async function () {
+    (await this.negPow.exec(this.ctx)).should.equal(0.1);
+  });
+
+  it('should be able to calculate the power of a long', async function () {
+    (await this.threeExpFourLong.exec(this.ctx)).should.equal(81n);
+  });
+
+  it('should be able to calculate the long power of an integer', async function () {
+    (await this.threeExpFourMixed.exec(this.ctx)).should.equal(81n);
+  });
+
+  it('should be able to calculate the integer power of a long', async function () {
+    (await this.threeExpFourReverseMixed.exec(this.ctx)).should.equal(81n);
+  });
+
+  it('should be able to calculate the negative power of a long', async function () {
+    (await this.tenLongExpNegativeOneLong.exec(this.ctx)).should.equal(0.1);
+  });
+
+  it('should return null when a long power exponent is too large', async function () {
+    should(await this.twoLongExpMaxLong.exec(this.ctx)).be.null();
+  });
 });
 
 describe('MinValue', () => {
@@ -235,12 +350,33 @@ describe('MinValue', () => {
 
   it('of Integer should return minimum representable Integer value', async function () {
     const minIntegerValue = -2147483648;
-    (await this.minInteger.exec(this.ctx)).should.equal(minIntegerValue);
+    const minIntegerStringValue = '-2147483648';
+    const minIntegerResult = await this.minInteger.exec(this.ctx);
+    minIntegerResult.should.equal(minIntegerValue);
+    String(minIntegerResult).should.equal(minIntegerStringValue);
   });
 
-  it('of Decimal should return minimum representable Decimal value', async function () {
+  it('of Long should return exact minimum representable Long value', async function () {
+    const minLongValue = -9223372036854775808n;
+    const minLongStringValue = '-9223372036854775808';
+    const minLongResult = await this.minLong.exec(this.ctx);
+    minLongResult.should.equal(minLongValue);
+    String(minLongResult).should.equal(minLongStringValue);
+  });
+
+  // JS number doesn't handle limits of decimal precisely, but this ensures we are in the ballpark
+  it('of Decimal should return approximate minimum representable Decimal value', async function () {
+    const minDecimalValue = -99999999999999999999.99999999;
+    const minDecimalResult = await this.minDecimal.exec(this.ctx);
+    minDecimalResult.should.be.approximately(minDecimalValue, 0.000000001);
+  });
+
+  it.skip('of Decimal should return exact minimum representable Decimal value', async function () {
     const minDecimalValue = -99999999999999999999.99999999;
-    (await this.minDecimal.exec(this.ctx)).should.be.approximately(minDecimalValue, 0.000000001);
+    const minDecimalStringValue = '-99999999999999999999.99999999';
+    const minDecimalResult = await this.minDecimal.exec(this.ctx);
+    minDecimalResult.should.equal(minDecimalValue);
+    String(minDecimalResult).should.equal(minDecimalStringValue);
   });
 
   it('of DateTime should return minimum representable DateTime value', async function () {
@@ -274,12 +410,33 @@ describe('MaxValue', () => {
 
   it('of Integer should return maximum representable Integer value', async function () {
     const maxIntegerValue = 2147483647;
-    (await this.maxInteger.exec(this.ctx)).should.equal(maxIntegerValue);
+    const maxIntegerStringValue = '2147483647';
+    const maxIntegerResult = await this.maxInteger.exec(this.ctx);
+    maxIntegerResult.should.equal(maxIntegerValue);
+    String(maxIntegerResult).should.equal(maxIntegerStringValue);
+  });
+
+  it('of Long should return exact maximum representable Long value', async function () {
+    const maxLongValue = 9223372036854775807n;
+    const maxLongStringValue = '9223372036854775807';
+    const maxLongResult = await this.maxLong.exec(this.ctx);
+    maxLongResult.should.equal(maxLongValue);
+    String(maxLongResult).should.equal(maxLongStringValue);
+  });
+
+  // JS number doesn't handle limits of decimal precisely, but this ensures we are in the ballpark
+  it('of Decimal should return approximate maximum representable Decimal value', async function () {
+    const maxDecimalValue = 99999999999999999999.99999999;
+    const maxDecimalResult = await this.maxDecimal.exec(this.ctx);
+    maxDecimalResult.should.be.approximately(maxDecimalValue, 0.000000001);
   });
 
-  it('of Decimal should return maximum representable Decimal value', async function () {
+  it.skip('of Decimal should return exact maximum representable Decimal value', async function () {
     const maxDecimalValue = 99999999999999999999.99999999;
-    (await this.maxDecimal.exec(this.ctx)).should.be.approximately(maxDecimalValue, 0.000000001);
+    const maxDecimalStringValue = '99999999999999999999.99999999';
+    const maxDecimalResult = await this.maxDecimal.exec(this.ctx);
+    maxDecimalResult.should.equal(maxDecimalValue, 0.000000001);
+    String(maxDecimalResult).should.equal(maxDecimalStringValue);
   });
 
   it('of DateTime should return maximum representable DateTime value', async function () {
@@ -328,6 +485,18 @@ describe('TruncatedDivide', () => {
     (await this.trunc.exec(this.ctx)).should.equal(3);
     (await this.even.exec(this.ctx)).should.equal(3);
   });
+
+  it('should be able to return just the long portion of a division', async function () {
+    (await this.tenDivThreeLong.exec(this.ctx)).should.equal(3n);
+  });
+
+  it('should be able to return just the long portion of a dividing an integer by a long', async function () {
+    (await this.tenDivThreeMixed.exec(this.ctx)).should.equal(3n);
+  });
+
+  it('should be able to return just the long portion of a dividing a long by an integer', async function () {
+    (await this.tenDivThreeReverseMixed.exec(this.ctx)).should.equal(3n);
+  });
 });
 
 describe('Truncate', () => {
@@ -339,6 +508,11 @@ describe('Truncate', () => {
     (await this.trunc.exec(this.ctx)).should.equal(10);
     (await this.even.exec(this.ctx)).should.equal(10);
   });
+
+  it('should be able to return the long portion of a number', async function () {
+    // NOTE: Truncate returns an integer (not specified to return a Long)
+    (await this.truncTenLong.exec(this.ctx)).should.equal(10);
+  });
 });
 
 describe('Floor', () => {
@@ -349,6 +523,8 @@ describe('Floor', () => {
   it('should be able to round down to the closest integer', async function () {
     (await this.flr.exec(this.ctx)).should.equal(10);
     (await this.even.exec(this.ctx)).should.equal(10);
+    // NOTE: Floor returns an Integer (not specified to return a Long)
+    (await this.floorTenLong.exec(this.ctx)).should.equal(10);
   });
 });
 
@@ -360,6 +536,8 @@ describe('Ceiling', () => {
   it('should be able to round up to the closest integer', async function () {
     (await this.ceil.exec(this.ctx)).should.equal(11);
     (await this.even.exec(this.ctx)).should.equal(10);
+    // Note: Ceiling returns an Integer (not specified to return a Long)
+    (await this.ceilTenLong.exec(this.ctx)).should.equal(10);
   });
 });
 
@@ -371,6 +549,10 @@ describe('Ln', () => {
   it('should be able to return the natural log of a number', async function () {
     (await this.ln.exec(this.ctx)).should.equal(Math.log(4));
   });
+
+  it('should be able to return the natural log of a long', async function () {
+    (await this.lnFourLong.exec(this.ctx)).should.equal(Math.log(4));
+  });
 });
 
 describe('Log', () => {
@@ -381,6 +563,10 @@ describe('Log', () => {
   it('should be able to return the log of a number based on an arbitrary base value', async function () {
     (await this.log.exec(this.ctx)).should.equal(0.25);
   });
+
+  it('should be able to return the log of a long based on an arbitrary base value', async function () {
+    (await this.logLong.exec(this.ctx)).should.equal(0.25);
+  });
 });
 
 describe('Modulo', () => {
@@ -391,6 +577,30 @@ describe('Modulo', () => {
   it('should be able to return the remainder of a division', async function () {
     (await this.mod.exec(this.ctx)).should.equal(1);
   });
+
+  it('should return null for Integer modulo by zero', async function () {
+    should(await this.threeModZero.exec(this.ctx)).be.null();
+  });
+
+  it('should be able to return the long remainder of a division', async function () {
+    (await this.threeModTwoLong.exec(this.ctx)).should.equal(1n);
+  });
+
+  it('should be able to return the long remainder of a dividing an integer by a long', async function () {
+    (await this.threeModTwoMixed.exec(this.ctx)).should.equal(1n);
+  });
+
+  it('should be able to return the long remainder of a dividing a long by an integer', async function () {
+    (await this.threeModTwoReverseMixed.exec(this.ctx)).should.equal(1n);
+  });
+
+  it('should return null for Long modulo by zero', async function () {
+    should(await this.threeModZeroLong.exec(this.ctx)).be.null();
+  });
+
+  it('should return null for Decimal modulo by zero', async function () {
+    should(await this.threeModZeroDecimal.exec(this.ctx)).be.null();
+  });
 });
 
 describe('Abs', () => {
@@ -407,6 +617,15 @@ describe('Abs', () => {
   it('should be able to return the absolute value of 0', async function () {
     (await this.zero.exec(this.ctx)).should.equal(0);
   });
+  it('should return null for absolute value of minimum Integer', async function () {
+    should(await this.absMinInteger.exec(this.ctx)).be.null();
+  });
+  it('should be able to return the absolute value of a negative long', async function () {
+    (await this.absNegTenLong.exec(this.ctx)).should.equal(10n);
+  });
+  it('should return null for absolute value of minimum Long', async function () {
+    should(await this.absMinLong.exec(this.ctx)).be.null();
+  });
 });
 
 describe('Round', () => {
@@ -432,6 +651,11 @@ describe('Successor', () => {
   it('should be able to get Integer Successor', async function () {
     (await this.is.exec(this.ctx)).should.equal(3);
   });
+
+  it('should be able to get Long Successor', async function () {
+    (await this.ls.exec(this.ctx)).should.equal(3n);
+  });
+
   it('should be able to get Real Successor', async function () {
     (await this.rs.exec(this.ctx)).should.equal(2.2 + Math.pow(10, -8));
   });
@@ -530,9 +754,15 @@ describe('Predecessor', () => {
   it('should be able to get Integer Predecessor', async function () {
     (await this.is.exec(this.ctx)).should.equal(1);
   });
+
+  it('should be able to get Long Predecessor', async function () {
+    (await this.ls.exec(this.ctx)).should.equal(1n);
+  });
+
   it('should be able to get Real Predecessor', async function () {
     (await this.rs.exec(this.ctx)).should.equal(2.2 - Math.pow(10, -8));
   });
+
   it('should return null for Predecessor greater than Integer Max value', async function () {
     should(await this.ufr.exec(this.ctx)).be.null();
   });
@@ -739,6 +969,14 @@ describe('OutOfBounds', () => {
       should(await this.integerAddUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Add near overflow', async function () {
+      should(await this.integerAddNearOverflow.exec(this.ctx)).equal(MAX_INT_VALUE);
+    });
+
+    it('should return value for Add near underflow', async function () {
+      should(await this.integerAddNearUnderflow.exec(this.ctx)).equal(MIN_INT_VALUE);
+    });
+
     it('should return null for Subtract overflow', async function () {
       should(await this.integerSubtractOverflow.exec(this.ctx)).be.null();
     });
@@ -747,6 +985,14 @@ describe('OutOfBounds', () => {
       should(await this.integerSubtractUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Subtract near overflow', async function () {
+      should(await this.integerSubtractNearOverflow.exec(this.ctx)).equal(MAX_INT_VALUE);
+    });
+
+    it('should return value for Subtract near underflow', async function () {
+      should(await this.integerSubtractNearUnderflow.exec(this.ctx)).equal(MIN_INT_VALUE);
+    });
+
     it('should return null for Multiply overflow', async function () {
       should(await this.integerMultiplyOverflow.exec(this.ctx)).be.null();
     });
@@ -755,6 +1001,14 @@ describe('OutOfBounds', () => {
       should(await this.integerMultiplyUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Multiply near overflow', async function () {
+      should(await this.integerMultiplyNearOverflow.exec(this.ctx)).equal(MAX_INT_VALUE);
+    });
+
+    it('should return value for Multiply near underflow', async function () {
+      should(await this.integerMultiplyNearUnderflow.exec(this.ctx)).equal(MIN_INT_VALUE);
+    });
+
     it('should return null for Divide overflow', async function () {
       should(await this.integerDivideOverflow.exec(this.ctx)).be.null();
     });
@@ -763,6 +1017,16 @@ describe('OutOfBounds', () => {
       should(await this.integerDivideUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Divide near overflow', async function () {
+      // not really near overflow, but more than max integer and near JavaScript max safe number
+      should(await this.integerDivideNearOverflow.exec(this.ctx)).equal(8589934588000000);
+    });
+
+    it('should return value for Divide near underflow', async function () {
+      // not really near underflow, but less than min integer and near JavaScript min safe number
+      should(await this.integerDivideNearUnderflow.exec(this.ctx)).equal(-8589934592000000);
+    });
+
     it('should return null for Divide By Zero', async function () {
       should(await this.integerDivideByZero.exec(this.ctx)).be.null();
     });
@@ -775,6 +1039,14 @@ describe('OutOfBounds', () => {
       should(await this.integerPowerUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Power near overflow', async function () {
+      should(await this.integerPowerNearOverflow.exec(this.ctx)).equal(MAX_INT_VALUE);
+    });
+
+    it('should return value for Power near underflow', async function () {
+      should(await this.integerPowerNearUnderflow.exec(this.ctx)).equal(MIN_INT_VALUE);
+    });
+
     it('should return null for successor overflow', async function () {
       should(await this.integerSuccessorOverflow.exec(this.ctx)).be.null();
     });
@@ -782,6 +1054,118 @@ describe('OutOfBounds', () => {
     it('should return null for predecessor underflow', async function () {
       should(await this.integerPredecessorUnderflow.exec(this.ctx)).be.null();
     });
+
+    it('should return value for successor near overflow', async function () {
+      should(await this.integerSuccessorNearOverflow.exec(this.ctx)).equal(MAX_INT_VALUE);
+    });
+
+    it('should return null for predecessor near underflow', async function () {
+      should(await this.integerPredecessorNearUnderflow.exec(this.ctx)).equal(MIN_INT_VALUE);
+    });
+  });
+
+  describe('Long', () => {
+    it('should return null for Add overflow', async function () {
+      should(await this.longAddOverflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return null for Add underflow', async function () {
+      should(await this.longAddUnderflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return value for Add near overflow', async function () {
+      should(await this.longAddNearOverflow.exec(this.ctx)).equal(MAX_LONG_VALUE);
+    });
+
+    it('should return value for Add near underflow', async function () {
+      should(await this.longAddNearUnderflow.exec(this.ctx)).equal(MIN_LONG_VALUE);
+    });
+
+    it('should return null for Subtract overflow', async function () {
+      should(await this.longSubtractOverflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return null for Subtract underflow', async function () {
+      should(await this.longSubtractUnderflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return value for Subtract near overflow', async function () {
+      should(await this.longSubtractNearOverflow.exec(this.ctx)).equal(MAX_LONG_VALUE);
+    });
+
+    it('should return value for Subtract near underflow', async function () {
+      should(await this.longSubtractNearUnderflow.exec(this.ctx)).equal(MIN_LONG_VALUE);
+    });
+
+    it('should return null for Multiply overflow', async function () {
+      should(await this.longMultiplyOverflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return null for Multiply underflow', async function () {
+      should(await this.longMultiplyUnderflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return value for Multiply near overflow', async function () {
+      should(await this.longMultiplyNearOverflow.exec(this.ctx)).equal(MAX_LONG_VALUE);
+    });
+
+    it('should return value for Multiply near underflow', async function () {
+      should(await this.longMultiplyNearUnderflow.exec(this.ctx)).equal(MIN_LONG_VALUE);
+    });
+
+    it('should return null for Divide overflow', async function () {
+      should(await this.longDivideOverflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return null for Divide underflow', async function () {
+      should(await this.longDivideUnderflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return value for Divide near overflow', async function () {
+      // not really near overflow, but near JavaScript max safe number
+      should(await this.longDivideNearOverflow.exec(this.ctx)).equal(9007199254740992);
+    });
+
+    it('should return value for Divide near underflow', async function () {
+      // not really near underflow, but near JavaScript min safe number
+      should(await this.longDivideNearUnderflow.exec(this.ctx)).equal(-9007199254740992);
+    });
+
+    it('should return null for Divide By Zero', async function () {
+      should(await this.longDivideByZero.exec(this.ctx)).be.null();
+    });
+
+    it('should return null for Power overflow', async function () {
+      should(await this.longPowerOverflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return null for Power underflow', async function () {
+      should(await this.longPowerUnderflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return value for Power near overflow', async function () {
+      should(await this.longPowerNearOverflow.exec(this.ctx)).equal(MAX_LONG_VALUE);
+    });
+
+    it('should return value for Power near underflow', async function () {
+      should(await this.longPowerNearUnderflow.exec(this.ctx)).equal(MIN_LONG_VALUE);
+    });
+
+    it('should return null for successor overflow', async function () {
+      should(await this.longSuccessorOverflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return null for predecessor underflow', async function () {
+      should(await this.longPredecessorUnderflow.exec(this.ctx)).be.null();
+    });
+
+    it('should return value for successor near overflow', async function () {
+      should(await this.longSuccessorNearOverflow.exec(this.ctx)).equal(MAX_LONG_VALUE);
+    });
+
+    it('should return value for predecessor near underflow', async function () {
+      should(await this.longPredecessorNearUnderflow.exec(this.ctx)).equal(MIN_LONG_VALUE);
+    });
   });
 
   describe('Decimal', () => {
@@ -793,6 +1177,14 @@ describe('OutOfBounds', () => {
       should(await this.decimalAddUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Add near overflow', async function () {
+      should(await this.decimalAddNearOverflow.exec(this.ctx)).equal(MAX_FLOAT_VALUE);
+    });
+
+    it('should return value for Add near underflow', async function () {
+      should(await this.decimalAddNearUnderflow.exec(this.ctx)).equal(MIN_FLOAT_VALUE);
+    });
+
     it('should return null for Subtract overflow', async function () {
       should(await this.decimalSubtractOverflow.exec(this.ctx)).be.null();
     });
@@ -801,6 +1193,14 @@ describe('OutOfBounds', () => {
       should(await this.decimalSubtractUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Subtract near overflow', async function () {
+      should(await this.decimalSubtractNearOverflow.exec(this.ctx)).equal(MAX_FLOAT_VALUE);
+    });
+
+    it('should return value for Subtract near underflow', async function () {
+      should(await this.decimalSubtractNearUnderflow.exec(this.ctx)).equal(MIN_FLOAT_VALUE);
+    });
+
     it('should return null for Multiply overflow', async function () {
       should(await this.decimalMultiplyOverflow.exec(this.ctx)).be.null();
     });
@@ -809,6 +1209,14 @@ describe('OutOfBounds', () => {
       should(await this.decimalMultiplyUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Multiply near overflow', async function () {
+      should(await this.decimalMultiplyNearOverflow.exec(this.ctx)).equal(MAX_FLOAT_VALUE);
+    });
+
+    it('should return value for Multiply near underflow', async function () {
+      should(await this.decimalMultiplyNearUnderflow.exec(this.ctx)).equal(MIN_FLOAT_VALUE);
+    });
+
     it('should return null for Divide overflow', async function () {
       should(await this.decimalDivideOverflow.exec(this.ctx)).be.null();
     });
@@ -817,6 +1225,14 @@ describe('OutOfBounds', () => {
       should(await this.decimalDivideUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Divide near overflow', async function () {
+      should(await this.decimalDivideNearOverflow.exec(this.ctx)).equal(MAX_FLOAT_VALUE);
+    });
+
+    it('should return value for Divide near underflow', async function () {
+      should(await this.decimalDivideNearUnderflow.exec(this.ctx)).equal(MIN_FLOAT_VALUE);
+    });
+
     it('should return null for Divide By Zero', async function () {
       should(await this.decimalDivideByZero.exec(this.ctx)).be.null();
     });
@@ -829,6 +1245,14 @@ describe('OutOfBounds', () => {
       should(await this.decimalPowerUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Power near overflow', async function () {
+      should(await this.decimalPowerNearOverflow.exec(this.ctx)).equal(MAX_FLOAT_VALUE);
+    });
+
+    it('should return value for Power near underflow', async function () {
+      should(await this.decimalPowerNearUnderflow.exec(this.ctx)).equal(MIN_FLOAT_VALUE);
+    });
+
     it('should return null for successor overflow', async function () {
       should(await this.decimalSuccessorOverflow.exec(this.ctx)).be.null();
     });
@@ -836,6 +1260,15 @@ describe('OutOfBounds', () => {
     it('should return null for predecessor underflow', async function () {
       should(await this.decimalPredecessorUnderflow.exec(this.ctx)).be.null();
     });
+
+    // NOTE: skipping successor/predecessor tests near overflow due to JS Number imprecision
+    it.skip('should return value for successor near overflow', async function () {
+      should(await this.decimalSuccessorNearOverflow.exec(this.ctx)).equal(MAX_FLOAT_VALUE);
+    });
+
+    it.skip('should return value for predecessor near underflow', async function () {
+      should(await this.decimalPredecessorNearUnderflow.exec(this.ctx)).equal(MIN_FLOAT_VALUE);
+    });
   });
 
   describe('Quantity', () => {
@@ -847,6 +1280,18 @@ describe('OutOfBounds', () => {
       should(await this.quantityAddUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Add near overflow', async function () {
+      const result = await this.quantityAddNearOverflow.exec(this.ctx);
+      should(result).not.be.null();
+      validateQuantity(result, MAX_FLOAT_VALUE, 'mm');
+    });
+
+    it('should return value for Add near underflow', async function () {
+      const result = await this.quantityAddNearUnderflow.exec(this.ctx);
+      should(result).not.be.null();
+      validateQuantity(result, MIN_FLOAT_VALUE, 'mm');
+    });
+
     it('should return null for Subtract overflow', async function () {
       should(await this.quantitySubtractOverflow.exec(this.ctx)).be.null();
     });
@@ -855,6 +1300,18 @@ describe('OutOfBounds', () => {
       should(await this.quantitySubtractUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Subtract near overflow', async function () {
+      const result = await this.quantitySubtractNearOverflow.exec(this.ctx);
+      should(result).not.be.null();
+      validateQuantity(result, MAX_FLOAT_VALUE, 'mm');
+    });
+
+    it('should return value for Subtract near underflow', async function () {
+      const result = await this.quantitySubtractNearUnderflow.exec(this.ctx);
+      should(result).not.be.null();
+      validateQuantity(result, MIN_FLOAT_VALUE, 'mm');
+    });
+
     it('should return null for Multiply overflow', async function () {
       should(await this.quantityMultiplyOverflow.exec(this.ctx)).be.null();
     });
@@ -863,6 +1320,18 @@ describe('OutOfBounds', () => {
       should(await this.quantityMultiplyUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Multiply near overflow', async function () {
+      const result = await this.quantityMultiplyNearOverflow.exec(this.ctx);
+      should(result).not.be.null();
+      validateQuantity(result, MAX_FLOAT_VALUE, 'mm2');
+    });
+
+    it('should return value for Multiply near underflow', async function () {
+      const result = await this.quantityMultiplyNearUnderflow.exec(this.ctx);
+      should(result).not.be.null();
+      validateQuantity(result, MIN_FLOAT_VALUE, 'mm2');
+    });
+
     it('should return null for Divide overflow', async function () {
       should(await this.quantityDivideOverflow.exec(this.ctx)).be.null();
     });
@@ -871,6 +1340,18 @@ describe('OutOfBounds', () => {
       should(await this.quantityDivideUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Divide near overflow', async function () {
+      const result = await this.quantityDivideNearOverflow.exec(this.ctx);
+      should(result).not.be.null();
+      validateQuantity(result, MAX_FLOAT_VALUE, '1');
+    });
+
+    it('should return value for Divide near underflow', async function () {
+      const result = await this.quantityDivideNearUnderflow.exec(this.ctx);
+      should(result).not.be.null();
+      validateQuantity(result, MIN_FLOAT_VALUE, '1');
+    });
+
     it('should return null for Divide By Zero', async function () {
       should(await this.quantityDivideByZero.exec(this.ctx)).be.null();
     });
@@ -882,6 +1363,19 @@ describe('OutOfBounds', () => {
     it('should return null for predecessor underflow', async function () {
       should(await this.quantityPredecessorUnderflow.exec(this.ctx)).be.null();
     });
+
+    // NOTE: skipping successor/predecessor tests near overflow due to JS Number imprecision
+    it.skip('should return value for successor near overflow', async function () {
+      const result = await this.quantitySuccessorNearOverflow.exec(this.ctx);
+      should(result).not.be.null();
+      validateQuantity(result, MAX_FLOAT_VALUE, 'mm');
+    });
+
+    it.skip('should return value for predecessor near underflow', async function () {
+      const result = await this.quantitPpredecessorNearOverflow.exec(this.ctx);
+      should(result).not.be.null();
+      validateQuantity(result, MIN_FLOAT_VALUE, 'mm');
+    });
   });
 
   describe('DateTime', () => {
@@ -889,24 +1383,34 @@ describe('OutOfBounds', () => {
       should(await this.dateTimeAddOverflow.exec(this.ctx)).be.null();
     });
 
-    // TODO: Fix the logic so this test passes. It's been broken for a long time, but due to a
-    // faulty test, this was not noticed until now. The cause of the failure is not obvious, so
-    // this should be revisited (but is lower priority since it's an extremely rare use case).
-    it.skip('should return null for Add underflow', async function () {
+    it('should return null for Add underflow', async function () {
       should(await this.dateTimeAddUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Add near overflow', async function () {
+      should(await this.dateTimeAddNearOverflow.exec(this.ctx)).eql(MAX_DATETIME_VALUE);
+    });
+
+    it('should return value for Add near underflow', async function () {
+      should(await this.dateTimeAddNearUnderflow.exec(this.ctx)).eql(MIN_DATETIME_VALUE);
+    });
+
     it('should return null for Subtract overflow', async function () {
       should(await this.dateTimeSubtractOverflow.exec(this.ctx)).be.null();
     });
 
-    // TODO: Fix the logic so this test passes. It's been broken for a long time, but due to a
-    // faulty test, this was not noticed until now. The cause of the failure is not obvious, so
-    // this should be revisited (but is lower priority since it's an extremely rare use case).
-    it.skip('should return null for Subtract underflow', async function () {
+    it('should return null for Subtract underflow', async function () {
       should(await this.dateTimeSubtractUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Subtract near overflow', async function () {
+      should(await this.dateTimeSubtractNearOverflow.exec(this.ctx)).eql(MAX_DATETIME_VALUE);
+    });
+
+    it('should return value for Subtract near underflow', async function () {
+      should(await this.dateTimeSubtractNearUnderflow.exec(this.ctx)).eql(MIN_DATETIME_VALUE);
+    });
+
     it('should return null for successor overflow', async function () {
       should(await this.dateTimeSuccessorOverflow.exec(this.ctx)).be.null();
     });
@@ -915,6 +1419,14 @@ describe('OutOfBounds', () => {
       should(await this.dateTimePredecessorUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for successor near overflow', async function () {
+      should(await this.dateTimeSuccessorNearOverflow.exec(this.ctx)).eql(MAX_DATETIME_VALUE);
+    });
+
+    it('should return value for predecessor near underflow', async function () {
+      should(await this.dateTimePredecessorNearUnderflow.exec(this.ctx)).eql(MIN_DATETIME_VALUE);
+    });
+
     // Tests for Precision are include in the spec tests
   });
 
@@ -923,24 +1435,34 @@ describe('OutOfBounds', () => {
       should(await this.dateAddOverflow.exec(this.ctx)).be.null();
     });
 
-    // TODO: Fix the logic so this test passes. It's been broken for a long time, but due to a
-    // faulty test, this was not noticed until now. The cause of the failure is not obvious, so
-    // this should be revisited (but is lower priority since it's an extremely rare use case).
-    it.skip('should return null for Add underflow', async function () {
+    it('should return null for Add underflow', async function () {
       should(await this.dateAddUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Add near overflow', async function () {
+      should(await this.dateAddNearOverflow.exec(this.ctx)).eql(MAX_DATE_VALUE);
+    });
+
+    it('should return value for Add near underflow', async function () {
+      should(await this.dateAddNearUnderflow.exec(this.ctx)).eql(MIN_DATE_VALUE);
+    });
+
     it('should return null for Subtract overflow', async function () {
       should(await this.dateSubtractOverflow.exec(this.ctx)).be.null();
     });
 
-    // TODO: Fix the logic so this test passes. It's been broken for a long time, but due to a
-    // faulty test, this was not noticed until now. The cause of the failure is not obvious, so
-    // this should be revisited (but is lower priority since it's an extremely rare use case).
-    it.skip('should return null for Subtract underflow', async function () {
+    it('should return null for Subtract underflow', async function () {
       should(await this.dateSubtractUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Subtract near overflow', async function () {
+      should(await this.dateSubtractNearOverflow.exec(this.ctx)).eql(MAX_DATE_VALUE);
+    });
+
+    it('should return value for Subtract near underflow', async function () {
+      should(await this.dateSubtractNearUnderflow.exec(this.ctx)).eql(MIN_DATE_VALUE);
+    });
+
     it('should return null for successor overflow', async function () {
       should(await this.dateSuccessorOverflow.exec(this.ctx)).be.null();
     });
@@ -949,6 +1471,14 @@ describe('OutOfBounds', () => {
       should(await this.datePredecessorUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for successor near overflow', async function () {
+      should(await this.dateSuccessorNearOverflow.exec(this.ctx)).eql(MAX_DATE_VALUE);
+    });
+
+    it('should return value for predecessor near underflow', async function () {
+      should(await this.datePredecessorNearUnderflow.exec(this.ctx)).eql(MIN_DATE_VALUE);
+    });
+
     // Tests for Precision are include in the spec tests
   });
 
@@ -961,6 +1491,14 @@ describe('OutOfBounds', () => {
       should(await this.timeAddUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Add near overflow', async function () {
+      should(await this.timeAddNearOverflow.exec(this.ctx)).eql(MAX_TIME_VALUE);
+    });
+
+    it('should return value for Add near underflow', async function () {
+      should(await this.timeAddNearUnderflow.exec(this.ctx)).eql(MIN_TIME_VALUE);
+    });
+
     it('should return null for Subtract overflow', async function () {
       should(await this.timeSubtractOverflow.exec(this.ctx)).be.null();
     });
@@ -969,6 +1507,14 @@ describe('OutOfBounds', () => {
       should(await this.timeSubtractUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for Subtract near overflow', async function () {
+      should(await this.timeSubtractNearOverflow.exec(this.ctx)).eql(MAX_TIME_VALUE);
+    });
+
+    it('should return value for Subtract near underflow', async function () {
+      should(await this.timeSubtractNearUnderflow.exec(this.ctx)).eql(MIN_TIME_VALUE);
+    });
+
     it('should return null for successor overflow', async function () {
       should(await this.timeSuccessorOverflow.exec(this.ctx)).be.null();
     });
@@ -977,6 +1523,14 @@ describe('OutOfBounds', () => {
       should(await this.timePredecessorUnderflow.exec(this.ctx)).be.null();
     });
 
+    it('should return value for successor near overflow', async function () {
+      should(await this.timeSuccessorNearOverflow.exec(this.ctx)).eql(MAX_TIME_VALUE);
+    });
+
+    it('should return value for predecessor near underflow', async function () {
+      should(await this.timePredecessorNearUnderflow.exec(this.ctx)).eql(MIN_TIME_VALUE);
+    });
+
     // Tests for Precision are include in the spec tests
   });
 
diff --git a/test/elm/arithmetic/data.cql b/test/elm/arithmetic/data.cql
index 677d082d1..62489ebda 100644
--- a/test/elm/arithmetic/data.cql
+++ b/test/elm/arithmetic/data.cql
@@ -4,6 +4,9 @@ define Eleven: 11
 define OnePlusTwo: 1 + 2
 define AddMultiple: 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10
 define AddVariables: Ten + Eleven
+define OnePlusTwoLong: 1L + 2L
+define OnePlusTwoMixed: 1 + 2L
+define OnePlusTwoReverseMixed: 1L + 2
 define AddTime: Time(12) + 1 'hour'
 define UncertaintyZeroToTwelve: months between DateTime(2005, 12) and DateTime(2006)
 define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
@@ -17,6 +20,9 @@ define Eleven: 11
 define FiveMinusTwo: 5 - 2
 define SubtractMultiple: 100 - 50 - 25 - 10
 define SubtractVariables: Eleven - Ten
+define FiveMinusTwoLong: 5L - 2L
+define FiveMinusTwoMixed: 5 - 2L
+define FiveMinusTwoReverseMixed: 5L - 2
 define UncertaintyZeroToTwelve: months between DateTime(2005, 12) and DateTime(2006)
 define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
 define SubtractUncertainties: UncertaintySixToEighteen - UncertaintyZeroToTwelve
@@ -29,6 +35,9 @@ define Eleven: 11
 define FiveTimesTwo: 5 * 2
 define MultiplyMultiple: 1 * 2 * 3 * 4 * 5
 define MultiplyVariables: Eleven * Ten
+define FiveTimesTwoLong: 5L * 2L
+define FiveTimesTwoMixed: 5 * 2L
+define FiveTimesTwoReverseMixed: 5L * 2
 define UncertaintyTwoToFourteen: months between DateTime(2005, 10) and DateTime(2006)
 define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
 define MultiplyUncertainties: UncertaintyTwoToFourteen * UncertaintySixToEighteen
@@ -42,6 +51,12 @@ define TenDividedByTwo: 10 / 2
 define TenDividedByFour: 10 / 4
 define DivideMultiple: 1000 / 4 / 10 / 5
 define DivideVariables: Hundred / Four
+define TenDividedByTwoLong: 10L / 2L
+define TenDividedByTwoMixed: 10 / 2L
+define TenDividedByTwoReverseMixed: 10L / 2
+define TenDividedByFourLong: 10L / 4L
+define TenDividedByFourMixed: 10 / 4L
+define TenDividedByFourReverseMixed: 10L / 4
 define UncertaintyTwoToFourteen: months between DateTime(2005, 10) and DateTime(2006)
 define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
 define DivideUncertainties: UncertaintySixToEighteen / UncertaintyTwoToFourteen
@@ -50,6 +65,9 @@ define DivideNumberByUncertainty: 36 / UncertaintySixToEighteen
 
 // @Test: Negate
 define NegativeOne: -1
+define NegateMinInteger: -(minimum Integer)
+define NegativeOneLong: -1L
+define NegateMinLong: -(minimum Long)
 
 // @Test: MathPrecedence
 define Mixed: 1 + 5 * 10 - 15 / 3
@@ -57,9 +75,16 @@ define Parenthetical: (1 + 5) * (10 - 15) / 3
 
 // @Test: Power
 define Pow: 3 ^ 4
+define NegPow: 10 ^ -1
+define ThreeExpFourLong: 3L ^ 4L
+define ThreeExpFourMixed: 3 ^ 4L
+define ThreeExpFourReverseMixed: 3L ^ 4
+define TenLongExpNegativeOneLong: 10L ^ -1L
+define TwoLongExpMaxLong: 2L ^ maximum Long
 
 // @Test: MinValue
 define MinInteger: minimum Integer
+define MinLong: minimum Long
 define MinDecimal: minimum Decimal
 define MinDateTime: minimum  DateTime
 define MinTime: minimum Time
@@ -67,6 +92,7 @@ define MinWrongType: minimum Quantity
 
 // @Test: MaxValue
 define MaxInteger: maximum Integer
+define MaxLong: maximum Long
 define MaxDecimal: maximum Decimal
 define MaxDateTime: maximum DateTime
 define MaxTime: maximum Time
@@ -75,26 +101,42 @@ define MaxWrongType: maximum Quantity
 // @Test: TruncatedDivide
 define Trunc: 10 div 3
 define Even: 9 div 3
+define TenDivThreeLong: 10L div 3L
+define TenDivThreeMixed: 10 div 3L
+define TenDivThreeReverseMixed: 10L div 3
 
 // @Test: Modulo
 define Mod: 3 mod 2
+define ThreeModZero: 3 mod 0
+define ThreeModTwoLong: 3L mod 2L
+define ThreeModTwoMixed: 3 mod 2L
+define ThreeModTwoReverseMixed: 3L mod 2
+define ThreeModZeroLong: 3L mod 0L
+define ThreeModZeroDecimal: 3.0 mod 0.0
+
 
 // @Test: Ceiling
 define Ceil: Ceiling(10.1)
 define Even: Ceiling(10)
+define CeilTenLong: Ceiling(10L)
 
 // @Test: Floor
 define flr: Floor(10.1)
 define Even: Floor(10)
+define FloorTenLong: Floor(10L)
 
 // @Test: Truncate
 define Trunc: Truncate(10.1)
 define Even: Truncate(10)
+define TruncTenLong: Truncate(10L)
 
 // @Test: Abs
 define Pos: Abs(10)
 define Neg: Abs(-10)
 define Zero: Abs(0)
+define AbsMinInteger: Abs(minimum Integer)
+define AbsNegTenLong: Abs(-10L)
+define AbsMinLong: Abs(minimum Long)
 
 // @Test: Round
 define Up: Round(4.56)
@@ -104,12 +146,15 @@ define Down_percent: Round(4.43,1)
 
 // @Test: Ln
 define ln: Ln(4)
+define LnFourLong: Ln(4L)
 
 // @Test: Log
 define log: Log(10,10000)
+define logLong: Log(10L,10000L)
 
 // @Test: Successor
 define Is: successor of 2
+define Ls: successor of 2L
 define Rs: successor of 2.2
 define ofr: successor of 2147483647
 define y_date: successor of DateTime(2015)
@@ -123,6 +168,7 @@ define max_date: successor of DateTime(9999,12,31,23,59,59,999)
 
 // @Test: Predecessor
 define Is: predecessor of 2
+define Ls: predecessor of 2L
 define Rs: predecessor of 2.2
 define ufr: predecessor of -2147483648
 define y_date: predecessor of DateTime(2015)
@@ -163,65 +209,147 @@ define SubtractUcum: (25 'km' - 5 'm') = 24995 'm'
 // @Test: OutOfBounds
 define IntegerAddOverflow: maximum Integer + 1
 define IntegerAddUnderflow: minimum Integer + -1
+define IntegerAddNearOverflow: maximum Integer + 0
+define IntegerAddNearUnderflow: minimum Integer + 0
 define IntegerSubtractOverflow: maximum Integer - -1
 define IntegerSubtractUnderflow: minimum Integer - 1
+define IntegerSubtractNearOverflow: maximum Integer - 0
+define IntegerSubtractNearUnderflow: minimum Integer - 0
 define IntegerMultiplyOverflow: maximum Integer * 2
-define IntegerMultiplyUnderflow: minimum Integer * -2
-define IntegerDivideOverflow: maximum Integer / (0.5)
-define IntegerDivideUnderflow: minimum Integer / (-0.5)
+define IntegerMultiplyUnderflow: minimum Integer * 2
+define IntegerMultiplyNearOverflow: maximum Integer * 1
+define IntegerMultiplyNearUnderflow: minimum Integer * 1
+// NOTE: Integer division results in decimal, so it must overflow/underflow decimal
+define IntegerDivideOverflow: maximum Integer / 0.00000000001
+define IntegerDivideUnderflow: minimum Integer / 0.00000000001
+define IntegerDivideNearOverflow: maximum Integer / 0.00000025
+define IntegerDivideNearUnderflow: minimum Integer / 0.00000025
 define IntegerDivideByZero: 1 / 0
 define IntegerPowerOverflow: (maximum Integer)^3
 define IntegerPowerUnderflow: (minimum Integer)^3
+define IntegerPowerNearOverflow: (maximum Integer)^1
+define IntegerPowerNearUnderflow: (minimum Integer)^1
 define IntegerSuccessorOverflow: successor of maximum Integer
 define IntegerPredecessorUnderflow: predecessor of minimum Integer
+define IntegerSuccessorNearOverflow: successor of (maximum Integer - 1)
+define IntegerPredecessorNearUnderflow: predecessor of (minimum Integer + 1)
+
+define LongAddOverflow: maximum Long + 1L
+define LongAddUnderflow: minimum Long + -1L
+define LongAddNearOverflow: maximum Long + 0L
+define LongAddNearUnderflow: minimum Long + 0L
+define LongSubtractOverflow: maximum Long - -1L
+define LongSubtractUnderflow: minimum Long - 1L
+define LongSubtractNearOverflow: maximum Long - 0L
+define LongSubtractNearUnderflow: minimum Long - 0L
+define LongMultiplyOverflow: maximum Long * 2L
+define LongMultiplyUnderflow: minimum Long * 2L
+define LongMultiplyNearOverflow: maximum Long * 1L
+define LongMultiplyNearUnderflow: minimum Long * 1L
+// NOTE: Long division results in decimal, so it must overflow/underflow decimal
+define LongDivideOverflow: maximum Long / 0.05
+define LongDivideUnderflow: minimum Long / 0.05
+define LongDivideNearOverflow: maximum Long / 1024L
+define LongDivideNearUnderflow: minimum Long / 1024L
+define LongDivideByZero: 1L / 0L
+define LongPowerOverflow: (maximum Long)^3L
+define LongPowerUnderflow: (minimum Long)^3L
+define LongPowerNearOverflow: (maximum Long)^1L
+define LongPowerNearUnderflow: (minimum Long)^1L
+define LongSuccessorOverflow: successor of maximum Long
+define LongPredecessorUnderflow: predecessor of minimum Long
+define LongSuccessorNearOverflow: successor of (maximum Long - 1L)
+define LongPredecessorNearUnderflow: predecessor of (minimum Long + 1L)
 
-define DecimalAddOverflow: maximum Decimal + 1.0
-define DecimalAddUnderflow: minimum Decimal + -1.0
-define DecimalSubtractOverflow: maximum Decimal - -1.0
-define DecimalSubtractUnderflow: minimum Decimal - 1.0
+// NOTE: Due to JS Number imprecision, we need to exceed min/max by 10000 for it to actually produce a different number
+define DecimalAddOverflow: maximum Decimal + 10000.0
+define DecimalAddUnderflow: minimum Decimal + -10000.0
+define DecimalAddNearOverflow: maximum Decimal + 0.0
+define DecimalAddNearUnderflow: minimum Decimal + 0.0
+define DecimalSubtractOverflow: maximum Decimal - -10000.0
+define DecimalSubtractUnderflow: minimum Decimal - 10000.0
+define DecimalSubtractNearOverflow: maximum Decimal - 0.0
+define DecimalSubtractNearUnderflow: minimum Decimal - 0.0
 define DecimalMultiplyOverflow: maximum Decimal * 2
-define DecimalMultiplyUnderflow: minimum Decimal * -2
-define DecimalDivideOverflow: maximum Decimal / (0.5)
-define DecimalDivideUnderflow: minimum Decimal / (-0.5)
+define DecimalMultiplyUnderflow: minimum Decimal * 2
+define DecimalMultiplyNearOverflow: maximum Decimal * 1
+define DecimalMultiplyNearUnderflow: minimum Decimal * 1
+define DecimalDivideOverflow: maximum Decimal / 0.5
+define DecimalDivideUnderflow: minimum Decimal / 0.5
+define DecimalDivideNearOverflow: maximum Decimal / 1.0
+define DecimalDivideNearUnderflow: minimum Decimal / 1.0
 define DecimalDivideByZero: 1.0 / 0
 define DecimalPowerOverflow: (maximum Decimal)^2
 define DecimalPowerUnderflow: (minimum Decimal)^3
+define DecimalPowerNearOverflow: (maximum Decimal)^1
+define DecimalPowerNearUnderflow: (minimum Decimal)^1
 define DecimalSuccessorOverflow: successor of maximum Decimal
 define DecimalPredecessorUnderflow: predecessor of minimum Decimal
+define DecimalSuccessorNearOverflow: successor of (maximum Decimal - 0.00000001)
+define DecimalPredecessorNearUnderflow: predecessor of (minimum Decimal + 0.00000001)
 
 define MaxQuantity: Quantity { value: maximum Decimal, unit: 'mm' }
 define MinQuantity: Quantity { value: minimum Decimal, unit: 'mm' }
-define QuantityAddOverflow: MaxQuantity + 1.0 'mm'
-define QuantityAddUnderflow: MinQuantity + (-1.0 'mm')
-define QuantitySubtractOverflow: MaxQuantity - (-1 'mm')
-define QuantitySubtractUnderflow: MinQuantity - 1 'mm'
+// NOTE: Due to JS Number imprecision, we need to exceed min/max by 10000 for it to actually produce a different number
+define QuantityAddOverflow: MaxQuantity + 10000.0 'mm'
+define QuantityAddUnderflow: MinQuantity + (-10000.0 'mm')
+define QuantityAddNearOverflow: MaxQuantity + 0.0 'mm'
+define QuantityAddNearUnderflow: MinQuantity + 0.0 'mm'
+define QuantitySubtractOverflow: MaxQuantity - (-10000 'mm')
+define QuantitySubtractUnderflow: MinQuantity - 10000 'mm'
+define QuantitySubtractNearOverflow: MaxQuantity - 0.0 'mm'
+define QuantitySubtractNearUnderflow: MinQuantity - 0.0 'mm'
 define QuantityMultiplyOverflow: MaxQuantity * 2 'mm'
 define QuantityMultiplyUnderflow: MinQuantity * 2 'mm'
+define QuantityMultiplyNearOverflow: MaxQuantity * 1 'mm'
+define QuantityMultiplyNearUnderflow: MinQuantity * 1 'mm'
 define QuantityDivideOverflow: MaxQuantity / 0.5 'mm'
-define QuantityDivideUnderflow: MinQuantity / (-0.5 'mm')
+define QuantityDivideUnderflow: MinQuantity / 0.5 'mm'
+define QuantityDivideNearOverflow: MaxQuantity / 1 'mm'
+define QuantityDivideNearUnderflow: MinQuantity / 1 'mm'
 define QuantityDivideByZero: 1.0 'mm' / 0 'mm'
 define QuantitySuccessorOverflow: successor of MaxQuantity
 define QuantityPredecessorUnderflow: predecessor of MinQuantity
+define QuantitySuccessorNearOverflow: successor of Quantity { value: maximum Decimal - 0.00000001, unit: 'mm' }
+define QuantityPredecessorNearUnderflow: predecessor of Quantity { value: minimum Decimal + 0.00000001, unit: 'mm' }
 
 define DateTimeAddOverflow: maximum DateTime + 1 day
 define DateTimeAddUnderflow: minimum DateTime + (-1 day)
+define DateTimeAddNearOverflow: maximum DateTime + 0 days
+define DateTimeAddNearUnderflow: minimum DateTime + 0 days
 define DateTimeSubtractOverflow: maximum DateTime - (-1 day)
 define DateTimeSubtractUnderflow: minimum DateTime - 1 day
+define DateTimeSubtractNearOverflow: maximum DateTime - 0 days
+define DateTimeSubtractNearUnderflow: minimum DateTime - 0 days
 define DateTimeSuccessorOverflow: successor of maximum DateTime
 define DateTimePredecessorUnderflow: predecessor of minimum DateTime
+define DateTimeSuccessorNearOverflow: successor of (maximum DateTime - 1 millisecond)
+define DateTimePredecessorNearUnderflow: predecessor of (minimum DateTime + 1 millisecond)
 
 define DateAddOverflow: maximum Date + 1 day
 define DateAddUnderflow: minimum Date + (-1 day)
+define DateAddNearOverflow: maximum Date + 0 days
+define DateAddNearUnderflow: minimum Date + 0 days
 define DateSubtractOverflow: maximum Date - (-1 day)
 define DateSubtractUnderflow: minimum Date - 1 day
+define DateSubtractNearOverflow: maximum Date - 0 days
+define DateSubtractNearUnderflow: minimum Date - 0 days
 define DateSuccessorOverflow: successor of maximum Date
 define DatePredecessorUnderflow: predecessor of minimum Date
+define DateSuccessorNearOverflow: successor of (maximum Date - 1 day)
+define DatePredecessorNearUnderflow: predecessor of (minimum Date + 1 day)
 
 define TimeAddOverflow: maximum Time + 1 second
 define TimeAddUnderflow: minimum Time + (-1 second)
+define TimeAddNearOverflow: maximum Time + 0 seconds
+define TimeAddNearUnderflow: minimum Time + 0 seconds
 define TimeSubtractOverflow: maximum Time - (-1 second)
 define TimeSubtractUnderflow: minimum Time - 1 second
+define TimeSubtractNearOverflow: maximum Time - 0 seconds
+define TimeSubtractNearUnderflow: minimum Time - 0 seconds
 define TimeSuccessorOverflow: successor of maximum Time
 define TimePredecessorUnderflow: predecessor of minimum Time
+define TimeSuccessorNearOverflow: successor of (maximum Time - 1 millisecond)
+define TimePredecessorNearUnderflow: predecessor of (minimum Time + 1 millisecond)
 
-define ExpOverflow: Exp(maximum Decimal)
\ No newline at end of file
+define ExpOverflow: Exp(maximum Decimal)
diff --git a/test/elm/arithmetic/data.js b/test/elm/arithmetic/data.js
index 985c4dfbd..14f42cc2b 100644
--- a/test/elm/arithmetic/data.js
+++ b/test/elm/arithmetic/data.js
@@ -17,6 +17,9 @@ define Eleven: 11
 define OnePlusTwo: 1 + 2
 define AddMultiple: 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10
 define AddVariables: Ten + Eleven
+define OnePlusTwoLong: 1L + 2L
+define OnePlusTwoMixed: 1 + 2L
+define OnePlusTwoReverseMixed: 1L + 2
 define AddTime: Time(12) + 1 'hour'
 define UncertaintyZeroToTwelve: months between DateTime(2005, 12) and DateTime(2006)
 define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
@@ -37,7 +40,7 @@ module.exports['Add'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "349",
+        "r" : "379",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -570,6 +573,190 @@ module.exports['Add'] = {
         }
       }, {
         "localId" : "278",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "OnePlusTwoLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "278",
+            "s" : [ {
+              "value" : [ "", "define ", "OnePlusTwoLong", ": " ]
+            }, {
+              "r" : "279",
+              "s" : [ {
+                "r" : "280",
+                "value" : [ "1L", " + ", "2L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Add",
+          "localId" : "279",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "282",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "283",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "280",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "281",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "286",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "OnePlusTwoMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "286",
+            "s" : [ {
+              "value" : [ "", "define ", "OnePlusTwoMixed", ": " ]
+            }, {
+              "r" : "287",
+              "s" : [ {
+                "r" : "288",
+                "value" : [ "1", " + ", "2L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Add",
+          "localId" : "287",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "293",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "294",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToLong",
+            "localId" : "291",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "292",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "289",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "297",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "OnePlusTwoReverseMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "297",
+            "s" : [ {
+              "value" : [ "", "define ", "OnePlusTwoReverseMixed", ": " ]
+            }, {
+              "r" : "298",
+              "s" : [ {
+                "r" : "299",
+                "value" : [ "1L", " + ", "2" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Add",
+          "localId" : "298",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "304",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "305",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "299",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToLong",
+            "localId" : "302",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "303",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "300",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "308",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
         "name" : "AddTime",
         "context" : "Patient",
@@ -578,21 +765,21 @@ module.exports['Add'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "278",
+            "r" : "308",
             "s" : [ {
               "value" : [ "", "define ", "AddTime", ": " ]
             }, {
-              "r" : "279",
+              "r" : "309",
               "s" : [ {
-                "r" : "284",
+                "r" : "314",
                 "s" : [ {
-                  "r" : "280",
+                  "r" : "310",
                   "value" : [ "Time", "(", "12", ")" ]
                 } ]
               }, {
                 "value" : [ " + " ]
               }, {
-                "r" : "286",
+                "r" : "316",
                 "s" : [ {
                   "value" : [ "1 ", "'hour'" ]
                 } ]
@@ -602,34 +789,34 @@ module.exports['Add'] = {
         } ],
         "expression" : {
           "type" : "Add",
-          "localId" : "279",
+          "localId" : "309",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "287",
+            "localId" : "317",
             "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "288",
+            "localId" : "318",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Time",
-            "localId" : "284",
+            "localId" : "314",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "285",
+              "localId" : "315",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "hour" : {
               "type" : "Literal",
-              "localId" : "280",
+              "localId" : "310",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -637,7 +824,7 @@ module.exports['Add'] = {
             }
           }, {
             "type" : "Quantity",
-            "localId" : "286",
+            "localId" : "316",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
             "unit" : "hour",
@@ -645,7 +832,7 @@ module.exports['Add'] = {
           } ]
         }
       }, {
-        "localId" : "291",
+        "localId" : "321",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "UncertaintyZeroToTwelve",
         "context" : "Patient",
@@ -654,25 +841,25 @@ module.exports['Add'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "291",
+            "r" : "321",
             "s" : [ {
               "value" : [ "", "define ", "UncertaintyZeroToTwelve", ": " ]
             }, {
-              "r" : "292",
+              "r" : "322",
               "s" : [ {
                 "value" : [ "months between " ]
               }, {
-                "r" : "299",
+                "r" : "329",
                 "s" : [ {
-                  "r" : "293",
+                  "r" : "323",
                   "value" : [ "DateTime", "(", "2005", ", ", "12", ")" ]
                 } ]
               }, {
                 "value" : [ " and " ]
               }, {
-                "r" : "306",
+                "r" : "336",
                 "s" : [ {
-                  "r" : "302",
+                  "r" : "332",
                   "value" : [ "DateTime", "(", "2006", ")" ]
                 } ]
               } ]
@@ -681,40 +868,40 @@ module.exports['Add'] = {
         } ],
         "expression" : {
           "type" : "DurationBetween",
-          "localId" : "292",
+          "localId" : "322",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "precision" : "Month",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "308",
+            "localId" : "338",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "309",
+            "localId" : "339",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "299",
+            "localId" : "329",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "300",
+              "localId" : "330",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "301",
+              "localId" : "331",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "293",
+              "localId" : "323",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2005",
@@ -722,7 +909,7 @@ module.exports['Add'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "294",
+              "localId" : "324",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -730,18 +917,18 @@ module.exports['Add'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "306",
+            "localId" : "336",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "307",
+              "localId" : "337",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "302",
+              "localId" : "332",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2006",
@@ -750,7 +937,7 @@ module.exports['Add'] = {
           } ]
         }
       }, {
-        "localId" : "312",
+        "localId" : "342",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "UncertaintySixToEighteen",
         "context" : "Patient",
@@ -759,25 +946,25 @@ module.exports['Add'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "312",
+            "r" : "342",
             "s" : [ {
               "value" : [ "", "define ", "UncertaintySixToEighteen", ": " ]
             }, {
-              "r" : "313",
+              "r" : "343",
               "s" : [ {
                 "value" : [ "months between " ]
               }, {
-                "r" : "318",
+                "r" : "348",
                 "s" : [ {
-                  "r" : "314",
+                  "r" : "344",
                   "value" : [ "DateTime", "(", "2005", ")" ]
                 } ]
               }, {
                 "value" : [ " and " ]
               }, {
-                "r" : "326",
+                "r" : "356",
                 "s" : [ {
-                  "r" : "320",
+                  "r" : "350",
                   "value" : [ "DateTime", "(", "2006", ", ", "7", ")" ]
                 } ]
               } ]
@@ -786,35 +973,35 @@ module.exports['Add'] = {
         } ],
         "expression" : {
           "type" : "DurationBetween",
-          "localId" : "313",
+          "localId" : "343",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "precision" : "Month",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "329",
+            "localId" : "359",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "330",
+            "localId" : "360",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "318",
+            "localId" : "348",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "319",
+              "localId" : "349",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "314",
+              "localId" : "344",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2005",
@@ -822,23 +1009,23 @@ module.exports['Add'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "326",
+            "localId" : "356",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "327",
+              "localId" : "357",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "328",
+              "localId" : "358",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "320",
+              "localId" : "350",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2006",
@@ -846,7 +1033,7 @@ module.exports['Add'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "321",
+              "localId" : "351",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "7",
@@ -855,7 +1042,7 @@ module.exports['Add'] = {
           } ]
         }
       }, {
-        "localId" : "333",
+        "localId" : "363",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "AddUncertainties",
         "context" : "Patient",
@@ -864,20 +1051,20 @@ module.exports['Add'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "333",
+            "r" : "363",
             "s" : [ {
               "value" : [ "", "define ", "AddUncertainties", ": " ]
             }, {
-              "r" : "334",
+              "r" : "364",
               "s" : [ {
-                "r" : "335",
+                "r" : "365",
                 "s" : [ {
                   "value" : [ "UncertaintyZeroToTwelve" ]
                 } ]
               }, {
                 "value" : [ " + " ]
               }, {
-                "r" : "336",
+                "r" : "366",
                 "s" : [ {
                   "value" : [ "UncertaintySixToEighteen" ]
                 } ]
@@ -887,36 +1074,36 @@ module.exports['Add'] = {
         } ],
         "expression" : {
           "type" : "Add",
-          "localId" : "334",
+          "localId" : "364",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "337",
+            "localId" : "367",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "338",
+            "localId" : "368",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "335",
+            "localId" : "365",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintyZeroToTwelve",
             "annotation" : [ ]
           }, {
             "type" : "ExpressionRef",
-            "localId" : "336",
+            "localId" : "366",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintySixToEighteen",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "341",
+        "localId" : "371",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "AddUncertaintyAndNumber",
         "context" : "Patient",
@@ -925,18 +1112,18 @@ module.exports['Add'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "341",
+            "r" : "371",
             "s" : [ {
               "value" : [ "", "define ", "AddUncertaintyAndNumber", ": " ]
             }, {
-              "r" : "342",
+              "r" : "372",
               "s" : [ {
-                "r" : "343",
+                "r" : "373",
                 "s" : [ {
                   "value" : [ "UncertaintyZeroToTwelve" ]
                 } ]
               }, {
-                "r" : "344",
+                "r" : "374",
                 "value" : [ " + ", "5" ]
               } ]
             } ]
@@ -944,29 +1131,29 @@ module.exports['Add'] = {
         } ],
         "expression" : {
           "type" : "Add",
-          "localId" : "342",
+          "localId" : "372",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "345",
+            "localId" : "375",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "346",
+            "localId" : "376",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "343",
+            "localId" : "373",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintyZeroToTwelve",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "344",
+            "localId" : "374",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "5",
@@ -974,7 +1161,7 @@ module.exports['Add'] = {
           } ]
         }
       }, {
-        "localId" : "349",
+        "localId" : "379",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "AddNumberAndUncertainty",
         "context" : "Patient",
@@ -983,16 +1170,16 @@ module.exports['Add'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "349",
+            "r" : "379",
             "s" : [ {
               "value" : [ "", "define ", "AddNumberAndUncertainty", ": " ]
             }, {
-              "r" : "350",
+              "r" : "380",
               "s" : [ {
-                "r" : "351",
+                "r" : "381",
                 "value" : [ "10", " + " ]
               }, {
-                "r" : "352",
+                "r" : "382",
                 "s" : [ {
                   "value" : [ "UncertaintyZeroToTwelve" ]
                 } ]
@@ -1002,30 +1189,30 @@ module.exports['Add'] = {
         } ],
         "expression" : {
           "type" : "Add",
-          "localId" : "350",
+          "localId" : "380",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "353",
+            "localId" : "383",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "354",
+            "localId" : "384",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "351",
+            "localId" : "381",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "10",
             "annotation" : [ ]
           }, {
             "type" : "ExpressionRef",
-            "localId" : "352",
+            "localId" : "382",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintyZeroToTwelve",
             "annotation" : [ ]
@@ -1045,6 +1232,9 @@ define Eleven: 11
 define FiveMinusTwo: 5 - 2
 define SubtractMultiple: 100 - 50 - 25 - 10
 define SubtractVariables: Eleven - Ten
+define FiveMinusTwoLong: 5L - 2L
+define FiveMinusTwoMixed: 5 - 2L
+define FiveMinusTwoReverseMixed: 5L - 2
 define UncertaintyZeroToTwelve: months between DateTime(2005, 12) and DateTime(2006)
 define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
 define SubtractUncertainties: UncertaintySixToEighteen - UncertaintyZeroToTwelve
@@ -1064,7 +1254,7 @@ module.exports['Subtract'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "312",
+        "r" : "342",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -1417,8 +1607,8 @@ module.exports['Subtract'] = {
         }
       }, {
         "localId" : "254",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "UncertaintyZeroToTwelve",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "FiveMinusTwoLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1427,65 +1617,249 @@ module.exports['Subtract'] = {
           "s" : {
             "r" : "254",
             "s" : [ {
-              "value" : [ "", "define ", "UncertaintyZeroToTwelve", ": " ]
+              "value" : [ "", "define ", "FiveMinusTwoLong", ": " ]
             }, {
               "r" : "255",
               "s" : [ {
-                "value" : [ "months between " ]
-              }, {
-                "r" : "262",
-                "s" : [ {
-                  "r" : "256",
-                  "value" : [ "DateTime", "(", "2005", ", ", "12", ")" ]
-                } ]
-              }, {
-                "value" : [ " and " ]
-              }, {
-                "r" : "269",
-                "s" : [ {
-                  "r" : "265",
-                  "value" : [ "DateTime", "(", "2006", ")" ]
-                } ]
+                "r" : "256",
+                "value" : [ "5L", " - ", "2L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "DurationBetween",
+          "type" : "Subtract",
           "localId" : "255",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "258",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "259",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "256",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "257",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "262",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "FiveMinusTwoMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "262",
+            "s" : [ {
+              "value" : [ "", "define ", "FiveMinusTwoMixed", ": " ]
+            }, {
+              "r" : "263",
+              "s" : [ {
+                "r" : "264",
+                "value" : [ "5", " - ", "2L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Subtract",
+          "localId" : "263",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "269",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "270",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToLong",
+            "localId" : "267",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "268",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "264",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "265",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "273",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "FiveMinusTwoReverseMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "273",
+            "s" : [ {
+              "value" : [ "", "define ", "FiveMinusTwoReverseMixed", ": " ]
+            }, {
+              "r" : "274",
+              "s" : [ {
+                "r" : "275",
+                "value" : [ "5L", " - ", "2" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Subtract",
+          "localId" : "274",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "280",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "281",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "275",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToLong",
+            "localId" : "278",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "279",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "276",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "284",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "UncertaintyZeroToTwelve",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "284",
+            "s" : [ {
+              "value" : [ "", "define ", "UncertaintyZeroToTwelve", ": " ]
+            }, {
+              "r" : "285",
+              "s" : [ {
+                "value" : [ "months between " ]
+              }, {
+                "r" : "292",
+                "s" : [ {
+                  "r" : "286",
+                  "value" : [ "DateTime", "(", "2005", ", ", "12", ")" ]
+                } ]
+              }, {
+                "value" : [ " and " ]
+              }, {
+                "r" : "299",
+                "s" : [ {
+                  "r" : "295",
+                  "value" : [ "DateTime", "(", "2006", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "DurationBetween",
+          "localId" : "285",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "precision" : "Month",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "271",
+            "localId" : "301",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "272",
+            "localId" : "302",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "262",
+            "localId" : "292",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "263",
+              "localId" : "293",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "264",
+              "localId" : "294",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "256",
+              "localId" : "286",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2005",
@@ -1493,7 +1867,7 @@ module.exports['Subtract'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "257",
+              "localId" : "287",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -1501,18 +1875,18 @@ module.exports['Subtract'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "269",
+            "localId" : "299",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "270",
+              "localId" : "300",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "265",
+              "localId" : "295",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2006",
@@ -1521,7 +1895,7 @@ module.exports['Subtract'] = {
           } ]
         }
       }, {
-        "localId" : "275",
+        "localId" : "305",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "UncertaintySixToEighteen",
         "context" : "Patient",
@@ -1530,25 +1904,25 @@ module.exports['Subtract'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "275",
+            "r" : "305",
             "s" : [ {
               "value" : [ "", "define ", "UncertaintySixToEighteen", ": " ]
             }, {
-              "r" : "276",
+              "r" : "306",
               "s" : [ {
                 "value" : [ "months between " ]
               }, {
-                "r" : "281",
+                "r" : "311",
                 "s" : [ {
-                  "r" : "277",
+                  "r" : "307",
                   "value" : [ "DateTime", "(", "2005", ")" ]
                 } ]
               }, {
                 "value" : [ " and " ]
               }, {
-                "r" : "289",
+                "r" : "319",
                 "s" : [ {
-                  "r" : "283",
+                  "r" : "313",
                   "value" : [ "DateTime", "(", "2006", ", ", "7", ")" ]
                 } ]
               } ]
@@ -1557,35 +1931,35 @@ module.exports['Subtract'] = {
         } ],
         "expression" : {
           "type" : "DurationBetween",
-          "localId" : "276",
+          "localId" : "306",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "precision" : "Month",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "292",
+            "localId" : "322",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "293",
+            "localId" : "323",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "281",
+            "localId" : "311",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "282",
+              "localId" : "312",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "277",
+              "localId" : "307",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2005",
@@ -1593,23 +1967,23 @@ module.exports['Subtract'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "289",
+            "localId" : "319",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "290",
+              "localId" : "320",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "291",
+              "localId" : "321",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "283",
+              "localId" : "313",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2006",
@@ -1617,7 +1991,7 @@ module.exports['Subtract'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "284",
+              "localId" : "314",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "7",
@@ -1626,7 +2000,7 @@ module.exports['Subtract'] = {
           } ]
         }
       }, {
-        "localId" : "296",
+        "localId" : "326",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "SubtractUncertainties",
         "context" : "Patient",
@@ -1635,20 +2009,20 @@ module.exports['Subtract'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "296",
+            "r" : "326",
             "s" : [ {
               "value" : [ "", "define ", "SubtractUncertainties", ": " ]
             }, {
-              "r" : "297",
+              "r" : "327",
               "s" : [ {
-                "r" : "298",
+                "r" : "328",
                 "s" : [ {
                   "value" : [ "UncertaintySixToEighteen" ]
                 } ]
               }, {
                 "value" : [ " - " ]
               }, {
-                "r" : "299",
+                "r" : "329",
                 "s" : [ {
                   "value" : [ "UncertaintyZeroToTwelve" ]
                 } ]
@@ -1658,36 +2032,36 @@ module.exports['Subtract'] = {
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "297",
+          "localId" : "327",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "300",
+            "localId" : "330",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "301",
+            "localId" : "331",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "298",
+            "localId" : "328",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintySixToEighteen",
             "annotation" : [ ]
           }, {
             "type" : "ExpressionRef",
-            "localId" : "299",
+            "localId" : "329",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintyZeroToTwelve",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "304",
+        "localId" : "334",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "SubtractNumberFromUncertainty",
         "context" : "Patient",
@@ -1696,18 +2070,18 @@ module.exports['Subtract'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "304",
+            "r" : "334",
             "s" : [ {
               "value" : [ "", "define ", "SubtractNumberFromUncertainty", ": " ]
             }, {
-              "r" : "305",
+              "r" : "335",
               "s" : [ {
-                "r" : "306",
+                "r" : "336",
                 "s" : [ {
                   "value" : [ "UncertaintySixToEighteen" ]
                 } ]
               }, {
-                "r" : "307",
+                "r" : "337",
                 "value" : [ " - ", "5" ]
               } ]
             } ]
@@ -1715,29 +2089,29 @@ module.exports['Subtract'] = {
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "305",
+          "localId" : "335",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "308",
+            "localId" : "338",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "309",
+            "localId" : "339",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "306",
+            "localId" : "336",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintySixToEighteen",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "307",
+            "localId" : "337",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "5",
@@ -1745,7 +2119,7 @@ module.exports['Subtract'] = {
           } ]
         }
       }, {
-        "localId" : "312",
+        "localId" : "342",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "SubtractUncertaintyFromNumber",
         "context" : "Patient",
@@ -1754,16 +2128,16 @@ module.exports['Subtract'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "312",
+            "r" : "342",
             "s" : [ {
               "value" : [ "", "define ", "SubtractUncertaintyFromNumber", ": " ]
             }, {
-              "r" : "313",
+              "r" : "343",
               "s" : [ {
-                "r" : "314",
+                "r" : "344",
                 "value" : [ "10", " - " ]
               }, {
-                "r" : "315",
+                "r" : "345",
                 "s" : [ {
                   "value" : [ "UncertaintySixToEighteen" ]
                 } ]
@@ -1773,30 +2147,30 @@ module.exports['Subtract'] = {
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "313",
+          "localId" : "343",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "316",
+            "localId" : "346",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "317",
+            "localId" : "347",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "314",
+            "localId" : "344",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "10",
             "annotation" : [ ]
           }, {
             "type" : "ExpressionRef",
-            "localId" : "315",
+            "localId" : "345",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintySixToEighteen",
             "annotation" : [ ]
@@ -1816,6 +2190,9 @@ define Eleven: 11
 define FiveTimesTwo: 5 * 2
 define MultiplyMultiple: 1 * 2 * 3 * 4 * 5
 define MultiplyVariables: Eleven * Ten
+define FiveTimesTwoLong: 5L * 2L
+define FiveTimesTwoMixed: 5 * 2L
+define FiveTimesTwoReverseMixed: 5L * 2
 define UncertaintyTwoToFourteen: months between DateTime(2005, 10) and DateTime(2006)
 define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
 define MultiplyUncertainties: UncertaintyTwoToFourteen * UncertaintySixToEighteen
@@ -1835,7 +2212,7 @@ module.exports['Multiply'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "316",
+        "r" : "346",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -2218,8 +2595,8 @@ module.exports['Multiply'] = {
         }
       }, {
         "localId" : "258",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "UncertaintyTwoToFourteen",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "FiveTimesTwoLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -2228,65 +2605,249 @@ module.exports['Multiply'] = {
           "s" : {
             "r" : "258",
             "s" : [ {
-              "value" : [ "", "define ", "UncertaintyTwoToFourteen", ": " ]
+              "value" : [ "", "define ", "FiveTimesTwoLong", ": " ]
             }, {
               "r" : "259",
               "s" : [ {
-                "value" : [ "months between " ]
-              }, {
-                "r" : "266",
-                "s" : [ {
-                  "r" : "260",
-                  "value" : [ "DateTime", "(", "2005", ", ", "10", ")" ]
-                } ]
-              }, {
-                "value" : [ " and " ]
-              }, {
-                "r" : "273",
-                "s" : [ {
-                  "r" : "269",
-                  "value" : [ "DateTime", "(", "2006", ")" ]
-                } ]
+                "r" : "260",
+                "value" : [ "5L", " * ", "2L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "DurationBetween",
+          "type" : "Multiply",
           "localId" : "259",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "precision" : "Month",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "275",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "262",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "276",
+            "localId" : "263",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "260",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "261",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "266",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "FiveTimesTwoMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "266",
+            "s" : [ {
+              "value" : [ "", "define ", "FiveTimesTwoMixed", ": " ]
+            }, {
+              "r" : "267",
+              "s" : [ {
+                "r" : "268",
+                "value" : [ "5", " * ", "2L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Multiply",
+          "localId" : "267",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "273",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "274",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToLong",
+            "localId" : "271",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "272",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "268",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "269",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "277",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "FiveTimesTwoReverseMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "277",
+            "s" : [ {
+              "value" : [ "", "define ", "FiveTimesTwoReverseMixed", ": " ]
+            }, {
+              "r" : "278",
+              "s" : [ {
+                "r" : "279",
+                "value" : [ "5L", " * ", "2" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Multiply",
+          "localId" : "278",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "284",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "285",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "279",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToLong",
+            "localId" : "282",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "283",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "280",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "288",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "UncertaintyTwoToFourteen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "288",
+            "s" : [ {
+              "value" : [ "", "define ", "UncertaintyTwoToFourteen", ": " ]
+            }, {
+              "r" : "289",
+              "s" : [ {
+                "value" : [ "months between " ]
+              }, {
+                "r" : "296",
+                "s" : [ {
+                  "r" : "290",
+                  "value" : [ "DateTime", "(", "2005", ", ", "10", ")" ]
+                } ]
+              }, {
+                "value" : [ " and " ]
+              }, {
+                "r" : "303",
+                "s" : [ {
+                  "r" : "299",
+                  "value" : [ "DateTime", "(", "2006", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "DurationBetween",
+          "localId" : "289",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "precision" : "Month",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "305",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "306",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "266",
+            "localId" : "296",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "267",
+              "localId" : "297",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "268",
+              "localId" : "298",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "260",
+              "localId" : "290",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2005",
@@ -2294,7 +2855,7 @@ module.exports['Multiply'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "261",
+              "localId" : "291",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -2302,18 +2863,18 @@ module.exports['Multiply'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "273",
+            "localId" : "303",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "274",
+              "localId" : "304",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "269",
+              "localId" : "299",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2006",
@@ -2322,7 +2883,7 @@ module.exports['Multiply'] = {
           } ]
         }
       }, {
-        "localId" : "279",
+        "localId" : "309",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "UncertaintySixToEighteen",
         "context" : "Patient",
@@ -2331,25 +2892,25 @@ module.exports['Multiply'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "279",
+            "r" : "309",
             "s" : [ {
               "value" : [ "", "define ", "UncertaintySixToEighteen", ": " ]
             }, {
-              "r" : "280",
+              "r" : "310",
               "s" : [ {
                 "value" : [ "months between " ]
               }, {
-                "r" : "285",
+                "r" : "315",
                 "s" : [ {
-                  "r" : "281",
+                  "r" : "311",
                   "value" : [ "DateTime", "(", "2005", ")" ]
                 } ]
               }, {
                 "value" : [ " and " ]
               }, {
-                "r" : "293",
+                "r" : "323",
                 "s" : [ {
-                  "r" : "287",
+                  "r" : "317",
                   "value" : [ "DateTime", "(", "2006", ", ", "7", ")" ]
                 } ]
               } ]
@@ -2358,35 +2919,35 @@ module.exports['Multiply'] = {
         } ],
         "expression" : {
           "type" : "DurationBetween",
-          "localId" : "280",
+          "localId" : "310",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "precision" : "Month",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "296",
+            "localId" : "326",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "297",
+            "localId" : "327",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "285",
+            "localId" : "315",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "286",
+              "localId" : "316",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "281",
+              "localId" : "311",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2005",
@@ -2394,23 +2955,23 @@ module.exports['Multiply'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "293",
+            "localId" : "323",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "294",
+              "localId" : "324",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "295",
+              "localId" : "325",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "287",
+              "localId" : "317",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2006",
@@ -2418,7 +2979,7 @@ module.exports['Multiply'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "288",
+              "localId" : "318",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "7",
@@ -2427,7 +2988,7 @@ module.exports['Multiply'] = {
           } ]
         }
       }, {
-        "localId" : "300",
+        "localId" : "330",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "MultiplyUncertainties",
         "context" : "Patient",
@@ -2436,20 +2997,20 @@ module.exports['Multiply'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "300",
+            "r" : "330",
             "s" : [ {
               "value" : [ "", "define ", "MultiplyUncertainties", ": " ]
             }, {
-              "r" : "301",
+              "r" : "331",
               "s" : [ {
-                "r" : "302",
+                "r" : "332",
                 "s" : [ {
                   "value" : [ "UncertaintyTwoToFourteen" ]
                 } ]
               }, {
                 "value" : [ " * " ]
               }, {
-                "r" : "303",
+                "r" : "333",
                 "s" : [ {
                   "value" : [ "UncertaintySixToEighteen" ]
                 } ]
@@ -2459,36 +3020,36 @@ module.exports['Multiply'] = {
         } ],
         "expression" : {
           "type" : "Multiply",
-          "localId" : "301",
+          "localId" : "331",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "304",
+            "localId" : "334",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "305",
+            "localId" : "335",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "302",
+            "localId" : "332",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintyTwoToFourteen",
             "annotation" : [ ]
           }, {
             "type" : "ExpressionRef",
-            "localId" : "303",
+            "localId" : "333",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintySixToEighteen",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "308",
+        "localId" : "338",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "MultiplyUncertaintyAndNumber",
         "context" : "Patient",
@@ -2497,18 +3058,18 @@ module.exports['Multiply'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "308",
+            "r" : "338",
             "s" : [ {
               "value" : [ "", "define ", "MultiplyUncertaintyAndNumber", ": " ]
             }, {
-              "r" : "309",
+              "r" : "339",
               "s" : [ {
-                "r" : "310",
+                "r" : "340",
                 "s" : [ {
                   "value" : [ "UncertaintyTwoToFourteen" ]
                 } ]
               }, {
-                "r" : "311",
+                "r" : "341",
                 "value" : [ " * ", "5" ]
               } ]
             } ]
@@ -2516,29 +3077,29 @@ module.exports['Multiply'] = {
         } ],
         "expression" : {
           "type" : "Multiply",
-          "localId" : "309",
+          "localId" : "339",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "312",
+            "localId" : "342",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "313",
+            "localId" : "343",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "310",
+            "localId" : "340",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintyTwoToFourteen",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "311",
+            "localId" : "341",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "5",
@@ -2546,7 +3107,7 @@ module.exports['Multiply'] = {
           } ]
         }
       }, {
-        "localId" : "316",
+        "localId" : "346",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "MultiplyNumberAndUncertainty",
         "context" : "Patient",
@@ -2555,16 +3116,16 @@ module.exports['Multiply'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "316",
+            "r" : "346",
             "s" : [ {
               "value" : [ "", "define ", "MultiplyNumberAndUncertainty", ": " ]
             }, {
-              "r" : "317",
+              "r" : "347",
               "s" : [ {
-                "r" : "318",
+                "r" : "348",
                 "value" : [ "10", " * " ]
               }, {
-                "r" : "319",
+                "r" : "349",
                 "s" : [ {
                   "value" : [ "UncertaintyTwoToFourteen" ]
                 } ]
@@ -2574,30 +3135,30 @@ module.exports['Multiply'] = {
         } ],
         "expression" : {
           "type" : "Multiply",
-          "localId" : "317",
+          "localId" : "347",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "320",
+            "localId" : "350",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "321",
+            "localId" : "351",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "318",
+            "localId" : "348",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "10",
             "annotation" : [ ]
           }, {
             "type" : "ExpressionRef",
-            "localId" : "319",
+            "localId" : "349",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "UncertaintyTwoToFourteen",
             "annotation" : [ ]
@@ -2618,6 +3179,12 @@ define TenDividedByTwo: 10 / 2
 define TenDividedByFour: 10 / 4
 define DivideMultiple: 1000 / 4 / 10 / 5
 define DivideVariables: Hundred / Four
+define TenDividedByTwoLong: 10L / 2L
+define TenDividedByTwoMixed: 10 / 2L
+define TenDividedByTwoReverseMixed: 10L / 2
+define TenDividedByFourLong: 10L / 4L
+define TenDividedByFourMixed: 10 / 4L
+define TenDividedByFourReverseMixed: 10L / 4
 define UncertaintyTwoToFourteen: months between DateTime(2005, 10) and DateTime(2006)
 define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
 define DivideUncertainties: UncertaintySixToEighteen / UncertaintyTwoToFourteen
@@ -2637,7 +3204,7 @@ module.exports['Divide'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "362",
+        "r" : "446",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -3154,8 +3721,8 @@ module.exports['Divide'] = {
         }
       }, {
         "localId" : "292",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "UncertaintyTwoToFourteen",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "TenDividedByTwoLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -3164,200 +3731,218 @@ module.exports['Divide'] = {
           "s" : {
             "r" : "292",
             "s" : [ {
-              "value" : [ "", "define ", "UncertaintyTwoToFourteen", ": " ]
+              "value" : [ "", "define ", "TenDividedByTwoLong", ": " ]
             }, {
               "r" : "293",
               "s" : [ {
-                "value" : [ "months between " ]
-              }, {
-                "r" : "300",
-                "s" : [ {
-                  "r" : "294",
-                  "value" : [ "DateTime", "(", "2005", ", ", "10", ")" ]
-                } ]
-              }, {
-                "value" : [ " and " ]
-              }, {
-                "r" : "307",
-                "s" : [ {
-                  "r" : "303",
-                  "value" : [ "DateTime", "(", "2006", ")" ]
-                } ]
+                "r" : "294",
+                "value" : [ "10L", " / ", "2L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "DurationBetween",
+          "type" : "Divide",
           "localId" : "293",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "precision" : "Month",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "309",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "302",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "310",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "303",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "DateTime",
+            "type" : "ToDecimal",
+            "localId" : "297",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "298",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "294",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ToDecimal",
             "localId" : "300",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
               "localId" : "301",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "295",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "306",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "TenDividedByTwoMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "306",
+            "s" : [ {
+              "value" : [ "", "define ", "TenDividedByTwoMixed", ": " ]
             }, {
+              "r" : "307",
+              "s" : [ {
+                "r" : "308",
+                "value" : [ "10", " / ", "2L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Divide",
+          "localId" : "307",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "316",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "317",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "311",
+            "annotation" : [ ],
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "302",
+              "localId" : "312",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "294",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2005",
-              "annotation" : [ ]
-            },
-            "month" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "295",
+              "localId" : "308",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
               "annotation" : [ ]
             }
           }, {
-            "type" : "DateTime",
-            "localId" : "307",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "ToDecimal",
+            "localId" : "314",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "308",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "315",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "303",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2006",
+              "localId" : "309",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "313",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "UncertaintySixToEighteen",
+        "localId" : "320",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "TenDividedByTwoReverseMixed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "313",
+            "r" : "320",
             "s" : [ {
-              "value" : [ "", "define ", "UncertaintySixToEighteen", ": " ]
+              "value" : [ "", "define ", "TenDividedByTwoReverseMixed", ": " ]
             }, {
-              "r" : "314",
+              "r" : "321",
               "s" : [ {
-                "value" : [ "months between " ]
-              }, {
-                "r" : "319",
-                "s" : [ {
-                  "r" : "315",
-                  "value" : [ "DateTime", "(", "2005", ")" ]
-                } ]
-              }, {
-                "value" : [ " and " ]
-              }, {
-                "r" : "327",
-                "s" : [ {
-                  "r" : "321",
-                  "value" : [ "DateTime", "(", "2006", ", ", "7", ")" ]
-                } ]
+                "r" : "322",
+                "value" : [ "10L", " / ", "2" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "DurationBetween",
-          "localId" : "314",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "precision" : "Month",
+          "type" : "Divide",
+          "localId" : "321",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
             "localId" : "330",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
             "localId" : "331",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "DateTime",
-            "localId" : "319",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "ToDecimal",
+            "localId" : "325",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "320",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "326",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "315",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2005",
+              "localId" : "322",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
-            "type" : "DateTime",
-            "localId" : "327",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "ToDecimal",
+            "localId" : "328",
             "annotation" : [ ],
             "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "328",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
               "type" : "NamedTypeSpecifier",
               "localId" : "329",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "321",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2006",
-              "annotation" : [ ]
-            },
-            "month" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "322",
+              "localId" : "323",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
+              "value" : "2",
               "annotation" : [ ]
             }
           } ]
@@ -3365,7 +3950,7 @@ module.exports['Divide'] = {
       }, {
         "localId" : "334",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DivideUncertainties",
+        "name" : "TenDividedByFourLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -3374,21 +3959,12 @@ module.exports['Divide'] = {
           "s" : {
             "r" : "334",
             "s" : [ {
-              "value" : [ "", "define ", "DivideUncertainties", ": " ]
+              "value" : [ "", "define ", "TenDividedByFourLong", ": " ]
             }, {
               "r" : "335",
               "s" : [ {
                 "r" : "336",
-                "s" : [ {
-                  "value" : [ "UncertaintySixToEighteen" ]
-                } ]
-              }, {
-                "value" : [ " / " ]
-              }, {
-                "r" : "337",
-                "s" : [ {
-                  "value" : [ "UncertaintyTwoToFourteen" ]
-                } ]
+                "value" : [ "10L", " / ", "4L" ]
               } ]
             } ]
           }
@@ -3416,14 +3992,15 @@ module.exports['Divide'] = {
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
               "localId" : "340",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
             "operand" : {
-              "type" : "ExpressionRef",
+              "type" : "Literal",
               "localId" : "336",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "name" : "UncertaintySixToEighteen",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
@@ -3433,14 +4010,15 @@ module.exports['Divide'] = {
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
               "localId" : "343",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
             "operand" : {
-              "type" : "ExpressionRef",
+              "type" : "Literal",
               "localId" : "337",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "name" : "UncertaintyTwoToFourteen",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
@@ -3448,7 +4026,7 @@ module.exports['Divide'] = {
       }, {
         "localId" : "348",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DivideUncertaintyByNumber",
+        "name" : "TenDividedByFourMixed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -3457,17 +4035,12 @@ module.exports['Divide'] = {
           "s" : {
             "r" : "348",
             "s" : [ {
-              "value" : [ "", "define ", "DivideUncertaintyByNumber", ": " ]
+              "value" : [ "", "define ", "TenDividedByFourMixed", ": " ]
             }, {
               "r" : "349",
               "s" : [ {
                 "r" : "350",
-                "s" : [ {
-                  "value" : [ "UncertaintySixToEighteen" ]
-                } ]
-              }, {
-                "r" : "351",
-                "value" : [ " / ", "2" ]
+                "value" : [ "10", " / ", "4L" ]
               } ]
             } ]
           }
@@ -3499,10 +4072,11 @@ module.exports['Divide'] = {
               "annotation" : [ ]
             } ],
             "operand" : {
-              "type" : "ExpressionRef",
+              "type" : "Literal",
               "localId" : "350",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "name" : "UncertaintySixToEighteen",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
@@ -3512,15 +4086,15 @@ module.exports['Divide'] = {
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
               "localId" : "357",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
               "localId" : "351",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
@@ -3528,7 +4102,7 @@ module.exports['Divide'] = {
       }, {
         "localId" : "362",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DivideNumberByUncertainty",
+        "name" : "TenDividedByFourReverseMixed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -3537,17 +4111,12 @@ module.exports['Divide'] = {
           "s" : {
             "r" : "362",
             "s" : [ {
-              "value" : [ "", "define ", "DivideNumberByUncertainty", ": " ]
+              "value" : [ "", "define ", "TenDividedByFourReverseMixed", ": " ]
             }, {
               "r" : "363",
               "s" : [ {
                 "r" : "364",
-                "value" : [ "36", " / " ]
-              }, {
-                "r" : "365",
-                "s" : [ {
-                  "value" : [ "UncertaintySixToEighteen" ]
-                } ]
+                "value" : [ "10L", " / ", "4" ]
               } ]
             } ]
           }
@@ -3575,15 +4144,15 @@ module.exports['Divide'] = {
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
               "localId" : "368",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
               "localId" : "364",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "36",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
@@ -3597,600 +4166,464 @@ module.exports['Divide'] = {
               "annotation" : [ ]
             } ],
             "operand" : {
-              "type" : "ExpressionRef",
+              "type" : "Literal",
               "localId" : "365",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "name" : "UncertaintySixToEighteen",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Negate
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define NegativeOne: -1
-*/
-
-module.exports['Negate'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "214",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "376",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "UncertaintyTwoToFourteen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "376",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "UncertaintyTwoToFourteen", ": " ]
             }, {
+              "r" : "377",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "months between " ]
+              }, {
+                "r" : "384",
+                "s" : [ {
+                  "r" : "378",
+                  "value" : [ "DateTime", "(", "2005", ", ", "10", ")" ]
+                } ]
+              }, {
+                "value" : [ " and " ]
+              }, {
+                "r" : "391",
+                "s" : [ {
+                  "r" : "387",
+                  "value" : [ "DateTime", "(", "2006", ")" ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "DurationBetween",
+          "localId" : "377",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "precision" : "Month",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "393",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "394",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "DateTime",
+            "localId" : "384",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "385",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "386",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "378",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2005",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "379",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "DateTime",
+            "localId" : "391",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "392",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "387",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2006",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "397",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "NegativeOne",
+        "name" : "UncertaintySixToEighteen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "397",
             "s" : [ {
-              "value" : [ "", "define ", "NegativeOne", ": " ]
+              "value" : [ "", "define ", "UncertaintySixToEighteen", ": " ]
             }, {
-              "r" : "215",
+              "r" : "398",
               "s" : [ {
-                "r" : "216",
-                "value" : [ "-", "1" ]
+                "value" : [ "months between " ]
+              }, {
+                "r" : "403",
+                "s" : [ {
+                  "r" : "399",
+                  "value" : [ "DateTime", "(", "2005", ")" ]
+                } ]
+              }, {
+                "value" : [ " and " ]
+              }, {
+                "r" : "411",
+                "s" : [ {
+                  "r" : "405",
+                  "value" : [ "DateTime", "(", "2006", ", ", "7", ")" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Negate",
-          "localId" : "215",
+          "type" : "DurationBetween",
+          "localId" : "398",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "precision" : "Month",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "217",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "414",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
-          } ],
-          "operand" : {
-            "type" : "Literal",
-            "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "1",
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "415",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
-          }
-        }
-      } ]
-    }
-  }
-}
-
-/* MathPrecedence
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define Mixed: 1 + 5 * 10 - 15 / 3
-define Parenthetical: (1 + 5) * (10 - 15) / 3
-*/
-
-module.exports['MathPrecedence'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "243",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
+          } ],
+          "operand" : [ {
+            "type" : "DateTime",
+            "localId" : "403",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "404",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "399",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2005",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "DateTime",
+            "localId" : "411",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "412",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
             }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+              "type" : "NamedTypeSpecifier",
+              "localId" : "413",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "405",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2006",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "406",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "7",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "418",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "Mixed",
+        "name" : "DivideUncertainties",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "418",
             "s" : [ {
-              "value" : [ "", "define ", "Mixed", ": " ]
+              "value" : [ "", "define ", "DivideUncertainties", ": " ]
             }, {
-              "r" : "215",
+              "r" : "419",
               "s" : [ {
-                "r" : "216",
+                "r" : "420",
                 "s" : [ {
-                  "r" : "217",
-                  "value" : [ "1", " + " ]
-                }, {
-                  "r" : "218",
-                  "s" : [ {
-                    "r" : "219",
-                    "value" : [ "5", " * ", "10" ]
-                  } ]
+                  "value" : [ "UncertaintySixToEighteen" ]
                 } ]
               }, {
-                "value" : [ " - " ]
+                "value" : [ " / " ]
               }, {
-                "r" : "225",
+                "r" : "421",
                 "s" : [ {
-                  "r" : "226",
-                  "value" : [ "15", " / ", "3" ]
+                  "value" : [ "UncertaintyTwoToFourteen" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Subtract",
-          "localId" : "215",
+          "type" : "Divide",
+          "localId" : "419",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "239",
+            "localId" : "428",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "240",
+            "localId" : "429",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToDecimal",
-            "localId" : "237",
+            "localId" : "423",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "238",
+              "localId" : "424",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
-              "type" : "Add",
-              "localId" : "216",
+              "type" : "ExpressionRef",
+              "localId" : "420",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "223",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "224",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : [ {
-                "type" : "Literal",
-                "localId" : "217",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }, {
-                "type" : "Multiply",
-                "localId" : "218",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "221",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "222",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : [ {
-                  "type" : "Literal",
-                  "localId" : "219",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "220",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "10",
-                  "annotation" : [ ]
-                } ]
-              } ]
+              "name" : "UncertaintySixToEighteen",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "Divide",
-            "localId" : "225",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "type" : "ToDecimal",
+            "localId" : "426",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "234",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "235",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "427",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "operand" : [ {
-              "type" : "ToDecimal",
-              "localId" : "229",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "230",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "226",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "ToDecimal",
-              "localId" : "232",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "233",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "227",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
-            } ]
+            "operand" : {
+              "type" : "ExpressionRef",
+              "localId" : "421",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "UncertaintyTwoToFourteen",
+              "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "243",
+        "localId" : "432",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "Parenthetical",
+        "name" : "DivideUncertaintyByNumber",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "243",
+            "r" : "432",
             "s" : [ {
-              "value" : [ "", "define ", "Parenthetical", ": " ]
+              "value" : [ "", "define ", "DivideUncertaintyByNumber", ": " ]
             }, {
-              "r" : "244",
+              "r" : "433",
               "s" : [ {
-                "r" : "245",
+                "r" : "434",
                 "s" : [ {
-                  "r" : "246",
-                  "s" : [ {
-                    "value" : [ "(" ]
-                  }, {
-                    "r" : "246",
-                    "s" : [ {
-                      "r" : "247",
-                      "value" : [ "1", " + ", "5" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
-                  } ]
-                }, {
-                  "value" : [ " * " ]
-                }, {
-                  "r" : "251",
-                  "s" : [ {
-                    "value" : [ "(" ]
-                  }, {
-                    "r" : "251",
-                    "s" : [ {
-                      "r" : "252",
-                      "value" : [ "10", " - ", "15" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
-                  } ]
+                  "value" : [ "UncertaintySixToEighteen" ]
                 } ]
               }, {
-                "r" : "258",
-                "value" : [ " / ", "3" ]
+                "r" : "435",
+                "value" : [ " / ", "2" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Divide",
-          "localId" : "244",
+          "localId" : "433",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "265",
+            "localId" : "442",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "266",
+            "localId" : "443",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToDecimal",
-            "localId" : "260",
+            "localId" : "437",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "261",
+              "localId" : "438",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
-              "type" : "Multiply",
-              "localId" : "245",
+              "type" : "ExpressionRef",
+              "localId" : "434",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "256",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "257",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : [ {
-                "type" : "Add",
-                "localId" : "246",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "249",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "250",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : [ {
-                  "type" : "Literal",
-                  "localId" : "247",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "248",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                } ]
+              "name" : "UncertaintySixToEighteen",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "440",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "441",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "435",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "446",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DivideNumberByUncertainty",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "446",
+            "s" : [ {
+              "value" : [ "", "define ", "DivideNumberByUncertainty", ": " ]
+            }, {
+              "r" : "447",
+              "s" : [ {
+                "r" : "448",
+                "value" : [ "36", " / " ]
               }, {
-                "type" : "Subtract",
-                "localId" : "251",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "254",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "255",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "operand" : [ {
-                  "type" : "Literal",
-                  "localId" : "252",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "10",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "Literal",
-                  "localId" : "253",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "15",
-                  "annotation" : [ ]
+                "r" : "449",
+                "s" : [ {
+                  "value" : [ "UncertaintySixToEighteen" ]
                 } ]
               } ]
-            }
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Divide",
+          "localId" : "447",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "456",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
           }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "457",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
             "type" : "ToDecimal",
-            "localId" : "263",
+            "localId" : "451",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "264",
+              "localId" : "452",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "258",
+              "localId" : "448",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "36",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "454",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "455",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "ExpressionRef",
+              "localId" : "449",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "UncertaintySixToEighteen",
               "annotation" : [ ]
             }
           } ]
@@ -4200,14 +4633,17 @@ module.exports['MathPrecedence'] = {
   }
 }
 
-/* Power
+/* Negate
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define Pow: 3 ^ 4
+define NegativeOne: -1
+define NegateMinInteger: -(minimum Integer)
+define NegativeOneLong: -1L
+define NegateMinLong: -(minimum Long)
 */
 
-module.exports['Power'] = {
+module.exports['Negate'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -4219,7 +4655,7 @@ module.exports['Power'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "214",
+        "r" : "233",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -4294,7 +4730,7 @@ module.exports['Power'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Pow",
+        "name" : "NegativeOne",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -4303,330 +4739,206 @@ module.exports['Power'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "Pow", ": " ]
+              "value" : [ "", "define ", "NegativeOne", ": " ]
             }, {
               "r" : "215",
               "s" : [ {
                 "r" : "216",
-                "value" : [ "3", " ^ ", "4" ]
+                "value" : [ "-", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Power",
+          "type" : "Negate",
           "localId" : "215",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "218",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "219",
+            "localId" : "217",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : [ {
+          "operand" : {
             "type" : "Literal",
             "localId" : "216",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "3",
-            "annotation" : [ ]
-          }, {
-            "type" : "Literal",
-            "localId" : "217",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "4",
+            "value" : "1",
             "annotation" : [ ]
-          } ]
+          }
         }
-      } ]
-    }
-  }
-}
-
-/* MinValue
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define MinInteger: minimum Integer
-define MinDecimal: minimum Decimal
-define MinDateTime: minimum  DateTime
-define MinTime: minimum Time
-define MinWrongType: minimum Quantity
-*/
-
-module.exports['MinValue'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "234",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "220",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "NegateMinInteger",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "220",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "NegateMinInteger", ": " ]
             }, {
+              "r" : "221",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "-" ]
+              }, {
+                "r" : "223",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "223",
+                  "s" : [ {
+                    "value" : [ "minimum", " " ]
+                  }, {
+                    "r" : "222",
+                    "s" : [ {
+                      "value" : [ "Integer" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Negate",
+          "localId" : "221",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
-          "signature" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "224",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
           "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
-      }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "MinInteger",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "214",
-            "s" : [ {
-              "value" : [ "", "define ", "MinInteger", ": " ]
-            }, {
-              "r" : "216",
-              "s" : [ {
-                "value" : [ "minimum", " " ]
-              }, {
-                "r" : "215",
-                "s" : [ {
-                  "value" : [ "Integer" ]
-                } ]
-              } ]
-            } ]
+            "type" : "MinValue",
+            "localId" : "223",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
           }
-        } ],
-        "expression" : {
-          "type" : "MinValue",
-          "localId" : "216",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-          "annotation" : [ ]
         }
       }, {
-        "localId" : "219",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "MinDecimal",
+        "localId" : "227",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "NegativeOneLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "219",
+            "r" : "227",
             "s" : [ {
-              "value" : [ "", "define ", "MinDecimal", ": " ]
+              "value" : [ "", "define ", "NegativeOneLong", ": " ]
             }, {
-              "r" : "221",
+              "r" : "228",
               "s" : [ {
-                "value" : [ "minimum", " " ]
-              }, {
-                "r" : "220",
-                "s" : [ {
-                  "value" : [ "Decimal" ]
-                } ]
+                "r" : "229",
+                "value" : [ "-", "1L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MinValue",
-          "localId" : "221",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-          "annotation" : [ ]
-        }
-      }, {
-        "localId" : "224",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "MinDateTime",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "224",
-            "s" : [ {
-              "value" : [ "", "define ", "MinDateTime", ": " ]
-            }, {
-              "r" : "226",
-              "s" : [ {
-                "value" : [ "minimum", "  " ]
-              }, {
-                "r" : "225",
-                "s" : [ {
-                  "value" : [ "DateTime" ]
-                } ]
-              } ]
-            } ]
+          "type" : "Negate",
+          "localId" : "228",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "230",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "229",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
           }
-        } ],
-        "expression" : {
-          "type" : "MinValue",
-          "localId" : "226",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ]
         }
       }, {
-        "localId" : "229",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "MinTime",
+        "localId" : "233",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "NegateMinLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "229",
+            "r" : "233",
             "s" : [ {
-              "value" : [ "", "define ", "MinTime", ": " ]
+              "value" : [ "", "define ", "NegateMinLong", ": " ]
             }, {
-              "r" : "231",
+              "r" : "234",
               "s" : [ {
-                "value" : [ "minimum", " " ]
+                "value" : [ "-" ]
               }, {
-                "r" : "230",
+                "r" : "236",
                 "s" : [ {
-                  "value" : [ "Time" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "236",
+                  "s" : [ {
+                    "value" : [ "minimum", " " ]
+                  }, {
+                    "r" : "235",
+                    "s" : [ {
+                      "value" : [ "Long" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MinValue",
-          "localId" : "231",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Time",
-          "annotation" : [ ]
-        }
-      }, {
-        "localId" : "234",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "MinWrongType",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "234",
-            "s" : [ {
-              "value" : [ "", "define ", "MinWrongType", ": " ]
-            }, {
-              "r" : "236",
-              "s" : [ {
-                "value" : [ "minimum", " " ]
-              }, {
-                "r" : "235",
-                "s" : [ {
-                  "value" : [ "Quantity" ]
-                } ]
-              } ]
-            } ]
+          "type" : "Negate",
+          "localId" : "234",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "237",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "MinValue",
+            "localId" : "236",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
           }
-        } ],
-        "expression" : {
-          "type" : "MinValue",
-          "localId" : "236",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "annotation" : [ ]
         }
       } ]
     }
   }
 }
 
-/* MaxValue
+/* MathPrecedence
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define MaxInteger: maximum Integer
-define MaxDecimal: maximum Decimal
-define MaxDateTime: maximum DateTime
-define MaxTime: maximum Time
-define MaxWrongType: maximum Quantity
+define Mixed: 1 + 5 * 10 - 15 / 3
+define Parenthetical: (1 + 5) * (10 - 15) / 3
 */
 
-module.exports['MaxValue'] = {
+module.exports['MathPrecedence'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -4638,7 +4950,7 @@ module.exports['MaxValue'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "234",
+        "r" : "243",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -4712,8 +5024,8 @@ module.exports['MaxValue'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "MaxInteger",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "Mixed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -4722,720 +5034,8292 @@ module.exports['MaxValue'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "MaxInteger", ": " ]
+              "value" : [ "", "define ", "Mixed", ": " ]
             }, {
-              "r" : "216",
+              "r" : "215",
               "s" : [ {
-                "value" : [ "maximum", " " ]
+                "r" : "216",
+                "s" : [ {
+                  "r" : "217",
+                  "value" : [ "1", " + " ]
+                }, {
+                  "r" : "218",
+                  "s" : [ {
+                    "r" : "219",
+                    "value" : [ "5", " * ", "10" ]
+                  } ]
+                } ]
               }, {
-                "r" : "215",
+                "value" : [ " - " ]
+              }, {
+                "r" : "225",
                 "s" : [ {
-                  "value" : [ "Integer" ]
+                  "r" : "226",
+                  "value" : [ "15", " / ", "3" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MaxValue",
-          "localId" : "216",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-          "annotation" : [ ]
-        }
-      }, {
-        "localId" : "219",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "MaxDecimal",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
+          "type" : "Subtract",
+          "localId" : "215",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "239",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "240",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "237",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "238",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Add",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "223",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : [ {
+                "type" : "Literal",
+                "localId" : "217",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }, {
+                "type" : "Multiply",
+                "localId" : "218",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "221",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "222",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : [ {
+                  "type" : "Literal",
+                  "localId" : "219",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "220",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "10",
+                  "annotation" : [ ]
+                } ]
+              } ]
+            }
+          }, {
+            "type" : "Divide",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "234",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "235",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "ToDecimal",
+              "localId" : "229",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "230",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "226",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "15",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ToDecimal",
+              "localId" : "232",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "233",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "227",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "243",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "Parenthetical",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "243",
+            "s" : [ {
+              "value" : [ "", "define ", "Parenthetical", ": " ]
+            }, {
+              "r" : "244",
+              "s" : [ {
+                "r" : "245",
+                "s" : [ {
+                  "r" : "246",
+                  "s" : [ {
+                    "value" : [ "(" ]
+                  }, {
+                    "r" : "246",
+                    "s" : [ {
+                      "r" : "247",
+                      "value" : [ "1", " + ", "5" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                }, {
+                  "value" : [ " * " ]
+                }, {
+                  "r" : "251",
+                  "s" : [ {
+                    "value" : [ "(" ]
+                  }, {
+                    "r" : "251",
+                    "s" : [ {
+                      "r" : "252",
+                      "value" : [ "10", " - ", "15" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "258",
+                "value" : [ " / ", "3" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Divide",
+          "localId" : "244",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "265",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "266",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "260",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Multiply",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "256",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "257",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : [ {
+                "type" : "Add",
+                "localId" : "246",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "249",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "250",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : [ {
+                  "type" : "Literal",
+                  "localId" : "247",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "248",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                } ]
+              }, {
+                "type" : "Subtract",
+                "localId" : "251",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "254",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "255",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "operand" : [ {
+                  "type" : "Literal",
+                  "localId" : "252",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "10",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "253",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "15",
+                  "annotation" : [ ]
+                } ]
+              } ]
+            }
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "263",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "264",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "258",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* Power
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define Pow: 3 ^ 4
+define NegPow: 10 ^ -1
+define ThreeExpFourLong: 3L ^ 4L
+define ThreeExpFourMixed: 3 ^ 4L
+define ThreeExpFourReverseMixed: 3L ^ 4
+define TenLongExpNegativeOneLong: 10L ^ -1L
+define TwoLongExpMaxLong: 2L ^ maximum Long
+*/
+
+module.exports['Power'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "272",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Pow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "Pow", ": " ]
+            }, {
+              "r" : "215",
+              "s" : [ {
+                "r" : "216",
+                "value" : [ "3", " ^ ", "4" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Power",
+          "localId" : "215",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "218",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "219",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "3",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "217",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "4",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "222",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "NegPow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "222",
+            "s" : [ {
+              "value" : [ "", "define ", "NegPow", ": " ]
+            }, {
+              "r" : "223",
+              "s" : [ {
+                "r" : "224",
+                "value" : [ "10", " ^ " ]
+              }, {
+                "r" : "225",
+                "s" : [ {
+                  "r" : "226",
+                  "value" : [ "-", "1" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Power",
+          "localId" : "223",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "228",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "229",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "224",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
+          }, {
+            "type" : "Negate",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "227",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "226",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "232",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "ThreeExpFourLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "232",
+            "s" : [ {
+              "value" : [ "", "define ", "ThreeExpFourLong", ": " ]
+            }, {
+              "r" : "233",
+              "s" : [ {
+                "r" : "234",
+                "value" : [ "3L", " ^ ", "4L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Power",
+          "localId" : "233",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "236",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "237",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "234",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "235",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "4",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "240",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "ThreeExpFourMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "240",
+            "s" : [ {
+              "value" : [ "", "define ", "ThreeExpFourMixed", ": " ]
+            }, {
+              "r" : "241",
+              "s" : [ {
+                "r" : "242",
+                "value" : [ "3", " ^ ", "4L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Power",
+          "localId" : "241",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "247",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "248",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToLong",
+            "localId" : "245",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "246",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "243",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "4",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "251",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "ThreeExpFourReverseMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "251",
+            "s" : [ {
+              "value" : [ "", "define ", "ThreeExpFourReverseMixed", ": " ]
+            }, {
+              "r" : "252",
+              "s" : [ {
+                "r" : "253",
+                "value" : [ "3L", " ^ ", "4" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Power",
+          "localId" : "252",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "258",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "259",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "253",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToLong",
+            "localId" : "256",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "257",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "254",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "262",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "TenLongExpNegativeOneLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "262",
+            "s" : [ {
+              "value" : [ "", "define ", "TenLongExpNegativeOneLong", ": " ]
+            }, {
+              "r" : "263",
+              "s" : [ {
+                "r" : "264",
+                "value" : [ "10L", " ^ " ]
+              }, {
+                "r" : "265",
+                "s" : [ {
+                  "r" : "266",
+                  "value" : [ "-", "1L" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Power",
+          "localId" : "263",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "268",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "269",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "264",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "10",
+            "annotation" : [ ]
+          }, {
+            "type" : "Negate",
+            "localId" : "265",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "267",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "272",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "TwoLongExpMaxLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "272",
+            "s" : [ {
+              "value" : [ "", "define ", "TwoLongExpMaxLong", ": " ]
+            }, {
+              "r" : "273",
+              "s" : [ {
+                "r" : "274",
+                "value" : [ "2L", " ^ " ]
+              }, {
+                "r" : "276",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "275",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Power",
+          "localId" : "273",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "277",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "278",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "274",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          }, {
+            "type" : "MaxValue",
+            "localId" : "276",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* MinValue
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define MinInteger: minimum Integer
+define MinLong: minimum Long
+define MinDecimal: minimum Decimal
+define MinDateTime: minimum  DateTime
+define MinTime: minimum Time
+define MinWrongType: minimum Quantity
+*/
+
+module.exports['MinValue'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "239",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "MinInteger",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "MinInteger", ": " ]
+            }, {
+              "r" : "216",
+              "s" : [ {
+                "value" : [ "minimum", " " ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "value" : [ "Integer" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MinValue",
+          "localId" : "216",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "219",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "MinLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "219",
+            "s" : [ {
+              "value" : [ "", "define ", "MinLong", ": " ]
+            }, {
+              "r" : "221",
+              "s" : [ {
+                "value" : [ "minimum", " " ]
+              }, {
+                "r" : "220",
+                "s" : [ {
+                  "value" : [ "Long" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MinValue",
+          "localId" : "221",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "224",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "MinDecimal",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "MinDecimal", ": " ]
+            }, {
+              "r" : "226",
+              "s" : [ {
+                "value" : [ "minimum", " " ]
+              }, {
+                "r" : "225",
+                "s" : [ {
+                  "value" : [ "Decimal" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MinValue",
+          "localId" : "226",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "229",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "MinDateTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "229",
+            "s" : [ {
+              "value" : [ "", "define ", "MinDateTime", ": " ]
+            }, {
+              "r" : "231",
+              "s" : [ {
+                "value" : [ "minimum", "  " ]
+              }, {
+                "r" : "230",
+                "s" : [ {
+                  "value" : [ "DateTime" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MinValue",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "MinTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "MinTime", ": " ]
+            }, {
+              "r" : "236",
+              "s" : [ {
+                "value" : [ "minimum", " " ]
+              }, {
+                "r" : "235",
+                "s" : [ {
+                  "value" : [ "Time" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MinValue",
+          "localId" : "236",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Time",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "239",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "MinWrongType",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "239",
+            "s" : [ {
+              "value" : [ "", "define ", "MinWrongType", ": " ]
+            }, {
+              "r" : "241",
+              "s" : [ {
+                "value" : [ "minimum", " " ]
+              }, {
+                "r" : "240",
+                "s" : [ {
+                  "value" : [ "Quantity" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MinValue",
+          "localId" : "241",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ]
+        }
+      } ]
+    }
+  }
+}
+
+/* MaxValue
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define MaxInteger: maximum Integer
+define MaxLong: maximum Long
+define MaxDecimal: maximum Decimal
+define MaxDateTime: maximum DateTime
+define MaxTime: maximum Time
+define MaxWrongType: maximum Quantity
+*/
+
+module.exports['MaxValue'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "239",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "MaxInteger",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "MaxInteger", ": " ]
+            }, {
+              "r" : "216",
+              "s" : [ {
+                "value" : [ "maximum", " " ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "value" : [ "Integer" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MaxValue",
+          "localId" : "216",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "219",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "MaxLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "219",
+            "s" : [ {
+              "value" : [ "", "define ", "MaxLong", ": " ]
+            }, {
+              "r" : "221",
+              "s" : [ {
+                "value" : [ "maximum", " " ]
+              }, {
+                "r" : "220",
+                "s" : [ {
+                  "value" : [ "Long" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MaxValue",
+          "localId" : "221",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "224",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "MaxDecimal",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "MaxDecimal", ": " ]
+            }, {
+              "r" : "226",
+              "s" : [ {
+                "value" : [ "maximum", " " ]
+              }, {
+                "r" : "225",
+                "s" : [ {
+                  "value" : [ "Decimal" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MaxValue",
+          "localId" : "226",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "229",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "MaxDateTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "229",
+            "s" : [ {
+              "value" : [ "", "define ", "MaxDateTime", ": " ]
+            }, {
+              "r" : "231",
+              "s" : [ {
+                "value" : [ "maximum", " " ]
+              }, {
+                "r" : "230",
+                "s" : [ {
+                  "value" : [ "DateTime" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MaxValue",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "MaxTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "MaxTime", ": " ]
+            }, {
+              "r" : "236",
+              "s" : [ {
+                "value" : [ "maximum", " " ]
+              }, {
+                "r" : "235",
+                "s" : [ {
+                  "value" : [ "Time" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MaxValue",
+          "localId" : "236",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Time",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "239",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "MaxWrongType",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "239",
+            "s" : [ {
+              "value" : [ "", "define ", "MaxWrongType", ": " ]
+            }, {
+              "r" : "241",
+              "s" : [ {
+                "value" : [ "maximum", " " ]
+              }, {
+                "r" : "240",
+                "s" : [ {
+                  "value" : [ "Quantity" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MaxValue",
+          "localId" : "241",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ]
+        }
+      } ]
+    }
+  }
+}
+
+/* TruncatedDivide
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define Trunc: 10 div 3
+define Even: 9 div 3
+define TenDivThreeLong: 10L div 3L
+define TenDivThreeMixed: 10 div 3L
+define TenDivThreeReverseMixed: 10L div 3
+*/
+
+module.exports['TruncatedDivide'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "249",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Trunc",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "Trunc", ": " ]
+            }, {
+              "r" : "215",
+              "s" : [ {
+                "r" : "216",
+                "value" : [ "10", " div ", "3" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "TruncatedDivide",
+          "localId" : "215",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "218",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "219",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "217",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "3",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "222",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Even",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "222",
+            "s" : [ {
+              "value" : [ "", "define ", "Even", ": " ]
+            }, {
+              "r" : "223",
+              "s" : [ {
+                "r" : "224",
+                "value" : [ "9", " div ", "3" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "TruncatedDivide",
+          "localId" : "223",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "226",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "227",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "224",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "9",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "3",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "230",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "TenDivThreeLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "230",
+            "s" : [ {
+              "value" : [ "", "define ", "TenDivThreeLong", ": " ]
+            }, {
+              "r" : "231",
+              "s" : [ {
+                "r" : "232",
+                "value" : [ "10L", " div ", "3L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "TruncatedDivide",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "234",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "232",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "10",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "233",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "238",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "TenDivThreeMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "238",
+            "s" : [ {
+              "value" : [ "", "define ", "TenDivThreeMixed", ": " ]
+            }, {
+              "r" : "239",
+              "s" : [ {
+                "r" : "240",
+                "value" : [ "10", " div ", "3L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "TruncatedDivide",
+          "localId" : "239",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "245",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "246",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToLong",
+            "localId" : "243",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "244",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "249",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "TenDivThreeReverseMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "249",
+            "s" : [ {
+              "value" : [ "", "define ", "TenDivThreeReverseMixed", ": " ]
+            }, {
+              "r" : "250",
+              "s" : [ {
+                "r" : "251",
+                "value" : [ "10L", " div ", "3" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "TruncatedDivide",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "256",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "257",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "251",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "10",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToLong",
+            "localId" : "254",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "255",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* Modulo
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define Mod: 3 mod 2
+define ThreeModZero: 3 mod 0
+define ThreeModTwoLong: 3L mod 2L
+define ThreeModTwoMixed: 3 mod 2L
+define ThreeModTwoReverseMixed: 3L mod 2
+define ThreeModZeroLong: 3L mod 0L
+define ThreeModZeroDecimal: 3.0 mod 0.0
+*/
+
+module.exports['Modulo'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "268",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Mod",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "Mod", ": " ]
+            }, {
+              "r" : "215",
+              "s" : [ {
+                "r" : "216",
+                "value" : [ "3", " mod ", "2" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Modulo",
+          "localId" : "215",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "218",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "219",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "3",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "217",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "222",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "ThreeModZero",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "222",
+            "s" : [ {
+              "value" : [ "", "define ", "ThreeModZero", ": " ]
+            }, {
+              "r" : "223",
+              "s" : [ {
+                "r" : "224",
+                "value" : [ "3", " mod ", "0" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Modulo",
+          "localId" : "223",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "226",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "227",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "224",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "3",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "230",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "ThreeModTwoLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "230",
+            "s" : [ {
+              "value" : [ "", "define ", "ThreeModTwoLong", ": " ]
+            }, {
+              "r" : "231",
+              "s" : [ {
+                "r" : "232",
+                "value" : [ "3L", " mod ", "2L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Modulo",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "234",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "232",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "233",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "238",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "ThreeModTwoMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "238",
+            "s" : [ {
+              "value" : [ "", "define ", "ThreeModTwoMixed", ": " ]
+            }, {
+              "r" : "239",
+              "s" : [ {
+                "r" : "240",
+                "value" : [ "3", " mod ", "2L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Modulo",
+          "localId" : "239",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "245",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "246",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToLong",
+            "localId" : "243",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "244",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "249",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "ThreeModTwoReverseMixed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "249",
+            "s" : [ {
+              "value" : [ "", "define ", "ThreeModTwoReverseMixed", ": " ]
+            }, {
+              "r" : "250",
+              "s" : [ {
+                "r" : "251",
+                "value" : [ "3L", " mod ", "2" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Modulo",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "256",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "257",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "251",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToLong",
+            "localId" : "254",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "255",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "260",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "ThreeModZeroLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "260",
+            "s" : [ {
+              "value" : [ "", "define ", "ThreeModZeroLong", ": " ]
+            }, {
+              "r" : "261",
+              "s" : [ {
+                "r" : "262",
+                "value" : [ "3L", " mod ", "0L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Modulo",
+          "localId" : "261",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "264",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "265",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "262",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "263",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "268",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "ThreeModZeroDecimal",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "268",
+            "s" : [ {
+              "value" : [ "", "define ", "ThreeModZeroDecimal", ": " ]
+            }, {
+              "r" : "269",
+              "s" : [ {
+                "r" : "270",
+                "value" : [ "3.0", " mod ", "0.0" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Modulo",
+          "localId" : "269",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "272",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "273",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "270",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "3.0",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "271",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.0",
+            "annotation" : [ ]
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* Ceiling
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define Ceil: Ceiling(10.1)
+define Even: Ceiling(10)
+define CeilTenLong: Ceiling(10L)
+*/
+
+module.exports['Ceiling'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "238",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Ceil",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "Ceil", ": " ]
+            }, {
+              "r" : "219",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "Ceiling", "(", "10.1", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Ceiling",
+          "localId" : "219",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "220",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "10.1",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "223",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Even",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "223",
+            "s" : [ {
+              "value" : [ "", "define ", "Even", ": " ]
+            }, {
+              "r" : "231",
+              "s" : [ {
+                "r" : "224",
+                "value" : [ "Ceiling", "(", "10", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Ceiling",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ToDecimal",
+            "localId" : "233",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "234",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "224",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "238",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "CeilTenLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "238",
+            "s" : [ {
+              "value" : [ "", "define ", "CeilTenLong", ": " ]
+            }, {
+              "r" : "246",
+              "s" : [ {
+                "r" : "239",
+                "value" : [ "Ceiling", "(", "10L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Ceiling",
+          "localId" : "246",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "250",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ToDecimal",
+            "localId" : "248",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "249",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Floor
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define flr: Floor(10.1)
+define Even: Floor(10)
+define FloorTenLong: Floor(10L)
+*/
+
+module.exports['Floor'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "238",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "flr",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "flr", ": " ]
+            }, {
+              "r" : "219",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "Floor", "(", "10.1", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Floor",
+          "localId" : "219",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "220",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "10.1",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "223",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Even",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "223",
+            "s" : [ {
+              "value" : [ "", "define ", "Even", ": " ]
+            }, {
+              "r" : "231",
+              "s" : [ {
+                "r" : "224",
+                "value" : [ "Floor", "(", "10", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Floor",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ToDecimal",
+            "localId" : "233",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "234",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "224",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "238",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "FloorTenLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "238",
+            "s" : [ {
+              "value" : [ "", "define ", "FloorTenLong", ": " ]
+            }, {
+              "r" : "246",
+              "s" : [ {
+                "r" : "239",
+                "value" : [ "Floor", "(", "10L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Floor",
+          "localId" : "246",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "250",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ToDecimal",
+            "localId" : "248",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "249",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Truncate
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define Trunc: Truncate(10.1)
+define Even: Truncate(10)
+define TruncTenLong: Truncate(10L)
+*/
+
+module.exports['Truncate'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "238",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Trunc",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "Trunc", ": " ]
+            }, {
+              "r" : "219",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "Truncate", "(", "10.1", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Truncate",
+          "localId" : "219",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "220",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "10.1",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "223",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Even",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "223",
+            "s" : [ {
+              "value" : [ "", "define ", "Even", ": " ]
+            }, {
+              "r" : "231",
+              "s" : [ {
+                "r" : "224",
+                "value" : [ "Truncate", "(", "10", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Truncate",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ToDecimal",
+            "localId" : "233",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "234",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "224",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "238",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "TruncTenLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "238",
+            "s" : [ {
+              "value" : [ "", "define ", "TruncTenLong", ": " ]
+            }, {
+              "r" : "246",
+              "s" : [ {
+                "r" : "239",
+                "value" : [ "Truncate", "(", "10L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Truncate",
+          "localId" : "246",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "250",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ToDecimal",
+            "localId" : "248",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "249",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Abs
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define Pos: Abs(10)
+define Neg: Abs(-10)
+define Zero: Abs(0)
+define AbsMinInteger: Abs(minimum Integer)
+define AbsNegTenLong: Abs(-10L)
+define AbsMinLong: Abs(minimum Long)
+*/
+
+module.exports['Abs'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "264",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Pos",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "Pos", ": " ]
+            }, {
+              "r" : "219",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "Abs", "(", "10", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Abs",
+          "localId" : "219",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "220",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "223",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Neg",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "223",
+            "s" : [ {
+              "value" : [ "", "define ", "Neg", ": " ]
+            }, {
+              "r" : "230",
+              "s" : [ {
+                "value" : [ "Abs", "(" ]
+              }, {
+                "r" : "224",
+                "s" : [ {
+                  "r" : "225",
+                  "value" : [ "-", "10" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Abs",
+          "localId" : "230",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Negate",
+            "localId" : "224",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "226",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "225",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Zero",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "Zero", ": " ]
+            }, {
+              "r" : "239",
+              "s" : [ {
+                "r" : "235",
+                "value" : [ "Abs", "(", "0", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Abs",
+          "localId" : "239",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "240",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "235",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "243",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "AbsMinInteger",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "243",
+            "s" : [ {
+              "value" : [ "", "define ", "AbsMinInteger", ": " ]
+            }, {
+              "r" : "249",
+              "s" : [ {
+                "value" : [ "Abs", "(" ]
+              }, {
+                "r" : "245",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "244",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Abs",
+          "localId" : "249",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "250",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "MinValue",
+            "localId" : "245",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "253",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "AbsNegTenLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "253",
+            "s" : [ {
+              "value" : [ "", "define ", "AbsNegTenLong", ": " ]
+            }, {
+              "r" : "260",
+              "s" : [ {
+                "value" : [ "Abs", "(" ]
+              }, {
+                "r" : "254",
+                "s" : [ {
+                  "r" : "255",
+                  "value" : [ "-", "10L" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Abs",
+          "localId" : "260",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "261",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Negate",
+            "localId" : "254",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "256",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "255",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "AbsMinLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "264",
+            "s" : [ {
+              "value" : [ "", "define ", "AbsMinLong", ": " ]
+            }, {
+              "r" : "270",
+              "s" : [ {
+                "value" : [ "Abs", "(" ]
+              }, {
+                "r" : "266",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "265",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Abs",
+          "localId" : "270",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "271",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "MinValue",
+            "localId" : "266",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Round
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define Up: Round(4.56)
+define Up_percent: Round(4.56,1)
+define Down: Round(4.49)
+define Down_percent: Round(4.43,1)
+*/
+
+module.exports['Round'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "244",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "Up",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "Up", ": " ]
+            }, {
+              "r" : "219",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "Round", "(", "4.56", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Round",
+          "localId" : "219",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "220",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "4.56",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "223",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "Up_percent",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "223",
+            "s" : [ {
+              "value" : [ "", "define ", "Up_percent", ": " ]
+            }, {
+              "r" : "230",
+              "s" : [ {
+                "r" : "224",
+                "value" : [ "Round", "(", "4.56", ",", "1", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Round",
+          "localId" : "230",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "232",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "224",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "4.56",
+            "annotation" : [ ]
+          },
+          "precision" : {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "235",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "Down",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "235",
+            "s" : [ {
+              "value" : [ "", "define ", "Down", ": " ]
+            }, {
+              "r" : "240",
+              "s" : [ {
+                "r" : "236",
+                "value" : [ "Round", "(", "4.49", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Round",
+          "localId" : "240",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "241",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "236",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "4.49",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "244",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "Down_percent",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "244",
+            "s" : [ {
+              "value" : [ "", "define ", "Down_percent", ": " ]
+            }, {
+              "r" : "251",
+              "s" : [ {
+                "r" : "245",
+                "value" : [ "Round", "(", "4.43", ",", "1", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Round",
+          "localId" : "251",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "252",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "253",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "245",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "4.43",
+            "annotation" : [ ]
+          },
+          "precision" : {
+            "type" : "Literal",
+            "localId" : "246",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Ln
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define ln: Ln(4)
+define LnFourLong: Ln(4L)
+*/
+
+module.exports['Ln'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "229",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "ln",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "ln", ": " ]
+            }, {
+              "r" : "222",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "Ln", "(", "4", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Ln",
+          "localId" : "222",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "226",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ToDecimal",
+            "localId" : "224",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "225",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "229",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "LnFourLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "229",
+            "s" : [ {
+              "value" : [ "", "define ", "LnFourLong", ": " ]
+            }, {
+              "r" : "237",
+              "s" : [ {
+                "r" : "230",
+                "value" : [ "Ln", "(", "4L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Ln",
+          "localId" : "237",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "241",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ToDecimal",
+            "localId" : "239",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "240",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "230",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Log
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define log: Log(10,10000)
+define logLong: Log(10L,10000L)
+*/
+
+module.exports['Log'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "238",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "log",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "log", ": " ]
+            }, {
+              "r" : "227",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "Log", "(", "10", ",", "10000", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Log",
+          "localId" : "227",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "234",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "229",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "230",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "232",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "233",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10000",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "238",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "logLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "238",
+            "s" : [ {
+              "value" : [ "", "define ", "logLong", ": " ]
+            }, {
+              "r" : "251",
+              "s" : [ {
+                "r" : "239",
+                "value" : [ "Log", "(", "10L", ",", "10000L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Log",
+          "localId" : "251",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "258",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "259",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "253",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "254",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "256",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "257",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10000",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* Successor
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define Is: successor of 2
+define Ls: successor of 2L
+define Rs: successor of 2.2
+define ofr: successor of 2147483647
+define y_date: successor of DateTime(2015)
+define ym_date: successor of DateTime(2015,01)
+define ymd_date: successor of DateTime(2015,01,01)
+define ymdh_date: successor of DateTime(2015,01,01,0)
+define ymdhm_date: successor of DateTime(2015,01,01,0,0)
+define ymdhms_date: successor of DateTime(2015,01,01,0,0,0)
+define ymdhmsm_date: successor of  DateTime(2015,01,01,0,0,0,0)
+define max_date: successor of DateTime(9999,12,31,23,59,59,999)
+*/
+
+module.exports['Successor'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "378",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Is",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "Is", ": " ]
+            }, {
+              "r" : "216",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "successor of ", "2" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "216",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "217",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "220",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "Ls",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "220",
+            "s" : [ {
+              "value" : [ "", "define ", "Ls", ": " ]
+            }, {
+              "r" : "222",
+              "s" : [ {
+                "r" : "221",
+                "value" : [ "successor of ", "2L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "222",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "223",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "221",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "226",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "Rs",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "226",
+            "s" : [ {
+              "value" : [ "", "define ", "Rs", ": " ]
+            }, {
+              "r" : "228",
+              "s" : [ {
+                "r" : "227",
+                "value" : [ "successor of ", "2.2" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "228",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "229",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "227",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "2.2",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "232",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "ofr",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "232",
+            "s" : [ {
+              "value" : [ "", "define ", "ofr", ": " ]
+            }, {
+              "r" : "234",
+              "s" : [ {
+                "r" : "233",
+                "value" : [ "successor of ", "2147483647" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "234",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "233",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2147483647",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "238",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "y_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "238",
+            "s" : [ {
+              "value" : [ "", "define ", "y_date", ": " ]
+            }, {
+              "r" : "245",
+              "s" : [ {
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "243",
+                "s" : [ {
+                  "r" : "239",
+                  "value" : [ "DateTime", "(", "2015", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "245",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "246",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "243",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "244",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "249",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ym_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "249",
+            "s" : [ {
+              "value" : [ "", "define ", "ym_date", ": " ]
+            }, {
+              "r" : "259",
+              "s" : [ {
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "256",
+                "s" : [ {
+                  "r" : "250",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "259",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "260",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "256",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "257",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "258",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "250",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "251",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "263",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ymd_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "263",
+            "s" : [ {
+              "value" : [ "", "define ", "ymd_date", ": " ]
+            }, {
+              "r" : "276",
+              "s" : [ {
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "272",
+                "s" : [ {
+                  "r" : "264",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "276",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "277",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "272",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "273",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "274",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "275",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "264",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "265",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "280",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ymdh_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "280",
+            "s" : [ {
+              "value" : [ "", "define ", "ymdh_date", ": " ]
+            }, {
+              "r" : "296",
+              "s" : [ {
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "291",
+                "s" : [ {
+                  "r" : "281",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "296",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "297",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "291",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "292",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "293",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "294",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "295",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "281",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "282",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "283",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "300",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ymdhm_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "300",
+            "s" : [ {
+              "value" : [ "", "define ", "ymdhm_date", ": " ]
+            }, {
+              "r" : "319",
+              "s" : [ {
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "313",
+                "s" : [ {
+                  "r" : "301",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "319",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "320",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "313",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "314",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "315",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "316",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "318",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "301",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "302",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "303",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "304",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "323",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ymdhms_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "323",
+            "s" : [ {
+              "value" : [ "", "define ", "ymdhms_date", ": " ]
+            }, {
+              "r" : "345",
+              "s" : [ {
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "338",
+                "s" : [ {
+                  "r" : "324",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ",", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "345",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "346",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "338",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "339",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "340",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "341",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "342",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "343",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "344",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "324",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "325",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "326",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "327",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "349",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ymdhmsm_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "349",
+            "s" : [ {
+              "value" : [ "", "define ", "ymdhmsm_date", ": " ]
+            }, {
+              "r" : "374",
+              "s" : [ {
+                "value" : [ "successor of  " ]
+              }, {
+                "r" : "366",
+                "s" : [ {
+                  "r" : "350",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ",", "0", ",", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "374",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "375",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "366",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "367",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "368",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "369",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "370",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "372",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "350",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "351",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "352",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "353",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "354",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "355",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "356",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "378",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "max_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "378",
+            "s" : [ {
+              "value" : [ "", "define ", "max_date", ": " ]
+            }, {
+              "r" : "403",
+              "s" : [ {
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "395",
+                "s" : [ {
+                  "r" : "379",
+                  "value" : [ "DateTime", "(", "9999", ",", "12", ",", "31", ",", "23", ",", "59", ",", "59", ",", "999", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "403",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "404",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "395",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "396",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "397",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "398",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "399",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "400",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "401",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "402",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "379",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9999",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "380",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "381",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "31",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "23",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "59",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "384",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "59",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "385",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "999",
+              "annotation" : [ ]
+            }
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Predecessor
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define Is: predecessor of 2
+define Ls: predecessor of 2L
+define Rs: predecessor of 2.2
+define ufr: predecessor of -2147483648
+define y_date: predecessor of DateTime(2015)
+define ym_date: predecessor of DateTime(2015,01)
+define ymd_date: predecessor of DateTime(2015,01,01)
+define ymdh_date: predecessor of DateTime(2015,01,01,0)
+define ymdhm_date: predecessor of DateTime(2015,01,01,0,0)
+define ymdhms_date: predecessor of DateTime(2015,01,01,0,0,0)
+define ymdhmsm_date: predecessor of DateTime(2015,01,01,0,0,0,0)
+define min_date: predecessor of DateTime(0001,01,01,0,0,0,0)
+*/
+
+module.exports['Predecessor'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "380",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Is",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "Is", ": " ]
+            }, {
+              "r" : "216",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "predecessor of ", "2" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "216",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "217",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "220",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "Ls",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "220",
+            "s" : [ {
+              "value" : [ "", "define ", "Ls", ": " ]
+            }, {
+              "r" : "222",
+              "s" : [ {
+                "r" : "221",
+                "value" : [ "predecessor of ", "2L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "222",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "223",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "221",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "226",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "Rs",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "226",
+            "s" : [ {
+              "value" : [ "", "define ", "Rs", ": " ]
+            }, {
+              "r" : "228",
+              "s" : [ {
+                "r" : "227",
+                "value" : [ "predecessor of ", "2.2" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "228",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "229",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "227",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "2.2",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "232",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "ufr",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "232",
+            "s" : [ {
+              "value" : [ "", "define ", "ufr", ": " ]
+            }, {
+              "r" : "236",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "233",
+                "s" : [ {
+                  "r" : "234",
+                  "value" : [ "-", "2147483648" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "236",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "237",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Negate",
+            "localId" : "233",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "235",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2147483648",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "240",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "y_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "240",
+            "s" : [ {
+              "value" : [ "", "define ", "y_date", ": " ]
+            }, {
+              "r" : "247",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "245",
+                "s" : [ {
+                  "r" : "241",
+                  "value" : [ "DateTime", "(", "2015", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "247",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "248",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "245",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "246",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "251",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ym_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "251",
+            "s" : [ {
+              "value" : [ "", "define ", "ym_date", ": " ]
+            }, {
+              "r" : "261",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "258",
+                "s" : [ {
+                  "r" : "252",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "261",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "262",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "258",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "259",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "260",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "253",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "265",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ymd_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "265",
+            "s" : [ {
+              "value" : [ "", "define ", "ymd_date", ": " ]
+            }, {
+              "r" : "278",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "274",
+                "s" : [ {
+                  "r" : "266",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "278",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "279",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "274",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "275",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "276",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "277",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "267",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "268",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "282",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ymdh_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "282",
+            "s" : [ {
+              "value" : [ "", "define ", "ymdh_date", ": " ]
+            }, {
+              "r" : "298",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "293",
+                "s" : [ {
+                  "r" : "283",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "298",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "299",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "293",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "294",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "295",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "296",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "297",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "283",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "285",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "286",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "302",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ymdhm_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "302",
+            "s" : [ {
+              "value" : [ "", "define ", "ymdhm_date", ": " ]
+            }, {
+              "r" : "321",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "315",
+                "s" : [ {
+                  "r" : "303",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "321",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "322",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "315",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "316",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "318",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "319",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "320",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "303",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "304",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "307",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "325",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ymdhms_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "325",
+            "s" : [ {
+              "value" : [ "", "define ", "ymdhms_date", ": " ]
+            }, {
+              "r" : "347",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "340",
+                "s" : [ {
+                  "r" : "326",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ",", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "347",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "348",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "340",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "341",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "342",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "343",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "344",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "345",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "346",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "326",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "327",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "330",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "331",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "351",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ymdhmsm_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "351",
+            "s" : [ {
+              "value" : [ "", "define ", "ymdhmsm_date", ": " ]
+            }, {
+              "r" : "376",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "368",
+                "s" : [ {
+                  "r" : "352",
+                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ",", "0", ",", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "376",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "377",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "368",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "369",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "370",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "372",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "374",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "375",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "352",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "353",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "354",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "355",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "356",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "357",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "358",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "380",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "min_date",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "380",
+            "s" : [ {
+              "value" : [ "", "define ", "min_date", ": " ]
+            }, {
+              "r" : "405",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "397",
+                "s" : [ {
+                  "r" : "381",
+                  "value" : [ "DateTime", "(", "0001", ",", "01", ",", "01", ",", "0", ",", "0", ",", "0", ",", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "405",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "406",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "397",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "398",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "399",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "400",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "401",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "402",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "403",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "404",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "381",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0001",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "01",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "384",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "385",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "386",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "387",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Quantity
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+
+define days_10: 10 days
+define QL10Days: Quantity{value: 10, unit: 'days'}
+define QL10Min : Quantity{value: 10, unit: 'min' }
+define Jan1_2000: DateTime(2000, 1, 1)
+define add_q_q : days_10 + QL10Days
+define add_d_q : Jan1_2000 + days_10
+define sub_q_q : days_10 - QL10Days
+define sub_d_q : Jan1_2000 - days_10
+define add_q_q_diff : QL10Days + QL10Min
+define sub_q_q_diff : QL10Days - QL10Min
+define div_q_d : days_10 / 2
+define div_q_q : days_10 / QL10Days
+define mul_q_d : days_10 * 2
+define mul_d_q : 2 * QL10Days
+define mul_q_q : 2 'm' * 10 'm'
+define mul_q_q_diff : 2 'm' * 10 '/d'
+define neg : - days_10
+define abs : Abs(neg)
+define MultiplyUcum: (5 'm' * 25 'km') = 125000 'm2'
+define DivideUcum: (20 'm2' / 5 'm') = 4 'm'
+define AddUcum: (5 'm' + 5 'km') = 5005 'm'
+define SubtractUcum: (25 'km' - 5 'm') = 24995 'm'
+*/
+
+module.exports['Quantity'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "411",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "days_10",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "days_10", ": " ]
+            }, {
+              "r" : "215",
+              "s" : [ {
+                "value" : [ "10 ", "days" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Quantity",
+          "localId" : "215",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "value" : 10,
+          "unit" : "days",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "218",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QL10Days",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "218",
+            "s" : [ {
+              "value" : [ "", "define ", "QL10Days", ": " ]
+            }, {
+              "r" : "219",
+              "s" : [ {
+                "value" : [ "Quantity", "{" ]
+              }, {
+                "s" : [ {
+                  "r" : "221",
+                  "value" : [ "value", ": ", "10" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "s" : [ {
+                  "value" : [ "unit", ": " ]
+                }, {
+                  "r" : "225",
+                  "s" : [ {
+                    "value" : [ "'days'" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ "}" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Instance",
+          "localId" : "219",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "element" : [ {
+            "name" : "value",
+            "value" : {
+              "type" : "ToDecimal",
+              "localId" : "223",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "221",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "name" : "unit",
+            "value" : {
+              "type" : "Literal",
+              "localId" : "225",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "days",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "229",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QL10Min",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "229",
+            "s" : [ {
+              "value" : [ "", "define ", "QL10Min", " : " ]
+            }, {
+              "r" : "230",
+              "s" : [ {
+                "value" : [ "Quantity", "{" ]
+              }, {
+                "s" : [ {
+                  "r" : "232",
+                  "value" : [ "value", ": ", "10" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "s" : [ {
+                  "value" : [ "unit", ": " ]
+                }, {
+                  "r" : "236",
+                  "s" : [ {
+                    "value" : [ "'min'" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ " }" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Instance",
+          "localId" : "230",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "element" : [ {
+            "name" : "value",
+            "value" : {
+              "type" : "ToDecimal",
+              "localId" : "234",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "235",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "232",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "name" : "unit",
+            "value" : {
+              "type" : "Literal",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "min",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "240",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "Jan1_2000",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "240",
+            "s" : [ {
+              "value" : [ "", "define ", "Jan1_2000", ": " ]
+            }, {
+              "r" : "249",
+              "s" : [ {
+                "r" : "241",
+                "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "DateTime",
+          "localId" : "249",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "250",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "252",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "year" : {
+            "type" : "Literal",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2000",
+            "annotation" : [ ]
+          },
+          "month" : {
+            "type" : "Literal",
+            "localId" : "242",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          },
+          "day" : {
+            "type" : "Literal",
+            "localId" : "243",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "255",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "add_q_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "255",
+            "s" : [ {
+              "value" : [ "", "define ", "add_q_q", " : " ]
+            }, {
+              "r" : "256",
+              "s" : [ {
+                "r" : "257",
+                "s" : [ {
+                  "value" : [ "days_10" ]
+                } ]
+              }, {
+                "value" : [ " + " ]
+              }, {
+                "r" : "258",
+                "s" : [ {
+                  "value" : [ "QL10Days" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Add",
+          "localId" : "256",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "259",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "260",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "257",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "days_10",
+            "annotation" : [ ]
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "258",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "QL10Days",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "263",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "add_d_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "263",
+            "s" : [ {
+              "value" : [ "", "define ", "add_d_q", " : " ]
+            }, {
+              "r" : "264",
+              "s" : [ {
+                "r" : "265",
+                "s" : [ {
+                  "value" : [ "Jan1_2000" ]
+                } ]
+              }, {
+                "value" : [ " + " ]
+              }, {
+                "r" : "266",
+                "s" : [ {
+                  "value" : [ "days_10" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Add",
+          "localId" : "264",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "267",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "268",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "265",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "name" : "Jan1_2000",
+            "annotation" : [ ]
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "266",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "days_10",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "271",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "sub_q_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "271",
+            "s" : [ {
+              "value" : [ "", "define ", "sub_q_q", " : " ]
+            }, {
+              "r" : "272",
+              "s" : [ {
+                "r" : "273",
+                "s" : [ {
+                  "value" : [ "days_10" ]
+                } ]
+              }, {
+                "value" : [ " - " ]
+              }, {
+                "r" : "274",
+                "s" : [ {
+                  "value" : [ "QL10Days" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Subtract",
+          "localId" : "272",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "275",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "276",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "273",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "days_10",
+            "annotation" : [ ]
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "274",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "QL10Days",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "279",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "sub_d_q",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "219",
+            "r" : "279",
             "s" : [ {
-              "value" : [ "", "define ", "MaxDecimal", ": " ]
+              "value" : [ "", "define ", "sub_d_q", " : " ]
             }, {
-              "r" : "221",
+              "r" : "280",
               "s" : [ {
-                "value" : [ "maximum", " " ]
+                "r" : "281",
+                "s" : [ {
+                  "value" : [ "Jan1_2000" ]
+                } ]
               }, {
-                "r" : "220",
+                "value" : [ " - " ]
+              }, {
+                "r" : "282",
                 "s" : [ {
-                  "value" : [ "Decimal" ]
+                  "value" : [ "days_10" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MaxValue",
-          "localId" : "221",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-          "annotation" : [ ]
+          "type" : "Subtract",
+          "localId" : "280",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "283",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "284",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "281",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "name" : "Jan1_2000",
+            "annotation" : [ ]
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "282",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "days_10",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "287",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "add_q_q_diff",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "287",
+            "s" : [ {
+              "value" : [ "", "define ", "add_q_q_diff", " : " ]
+            }, {
+              "r" : "288",
+              "s" : [ {
+                "r" : "289",
+                "s" : [ {
+                  "value" : [ "QL10Days" ]
+                } ]
+              }, {
+                "value" : [ " + " ]
+              }, {
+                "r" : "290",
+                "s" : [ {
+                  "value" : [ "QL10Min" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Add",
+          "localId" : "288",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "291",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "292",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "289",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "QL10Days",
+            "annotation" : [ ]
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "290",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "QL10Min",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "295",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "sub_q_q_diff",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "295",
+            "s" : [ {
+              "value" : [ "", "define ", "sub_q_q_diff", " : " ]
+            }, {
+              "r" : "296",
+              "s" : [ {
+                "r" : "297",
+                "s" : [ {
+                  "value" : [ "QL10Days" ]
+                } ]
+              }, {
+                "value" : [ " - " ]
+              }, {
+                "r" : "298",
+                "s" : [ {
+                  "value" : [ "QL10Min" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Subtract",
+          "localId" : "296",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "299",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "300",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "297",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "QL10Days",
+            "annotation" : [ ]
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "298",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "QL10Min",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "303",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "div_q_d",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "303",
+            "s" : [ {
+              "value" : [ "", "define ", "div_q_d", " : " ]
+            }, {
+              "r" : "304",
+              "s" : [ {
+                "r" : "305",
+                "s" : [ {
+                  "value" : [ "days_10" ]
+                } ]
+              }, {
+                "r" : "306",
+                "value" : [ " / ", "2" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Divide",
+          "localId" : "304",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "310",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "311",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "305",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "days_10",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToQuantity",
+            "localId" : "308",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "309",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "224",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "MaxDateTime",
+        "localId" : "314",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "div_q_q",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "224",
+            "r" : "314",
             "s" : [ {
-              "value" : [ "", "define ", "MaxDateTime", ": " ]
+              "value" : [ "", "define ", "div_q_q", " : " ]
             }, {
-              "r" : "226",
+              "r" : "315",
               "s" : [ {
-                "value" : [ "maximum", " " ]
+                "r" : "316",
+                "s" : [ {
+                  "value" : [ "days_10" ]
+                } ]
               }, {
-                "r" : "225",
+                "value" : [ " / " ]
+              }, {
+                "r" : "317",
                 "s" : [ {
-                  "value" : [ "DateTime" ]
+                  "value" : [ "QL10Days" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MaxValue",
-          "localId" : "226",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ]
+          "type" : "Divide",
+          "localId" : "315",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "318",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "319",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "316",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "days_10",
+            "annotation" : [ ]
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "317",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "QL10Days",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "229",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "MaxTime",
+        "localId" : "322",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "mul_q_d",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "229",
+            "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "MaxTime", ": " ]
+              "value" : [ "", "define ", "mul_q_d", " : " ]
             }, {
-              "r" : "231",
+              "r" : "323",
               "s" : [ {
-                "value" : [ "maximum", " " ]
-              }, {
-                "r" : "230",
+                "r" : "324",
                 "s" : [ {
-                  "value" : [ "Time" ]
+                  "value" : [ "days_10" ]
                 } ]
+              }, {
+                "r" : "325",
+                "value" : [ " * ", "2" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MaxValue",
-          "localId" : "231",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Time",
-          "annotation" : [ ]
+          "type" : "Multiply",
+          "localId" : "323",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "329",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "330",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "324",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "days_10",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToQuantity",
+            "localId" : "327",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "328",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "325",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "234",
+        "localId" : "333",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "MaxWrongType",
+        "name" : "mul_d_q",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "333",
             "s" : [ {
-              "value" : [ "", "define ", "MaxWrongType", ": " ]
+              "value" : [ "", "define ", "mul_d_q", " : " ]
             }, {
-              "r" : "236",
+              "r" : "334",
               "s" : [ {
-                "value" : [ "maximum", " " ]
+                "r" : "335",
+                "value" : [ "2", " * " ]
               }, {
-                "r" : "235",
+                "r" : "336",
                 "s" : [ {
-                  "value" : [ "Quantity" ]
+                  "value" : [ "QL10Days" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MaxValue",
-          "localId" : "236",
+          "type" : "Multiply",
+          "localId" : "334",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "annotation" : [ ]
-        }
-      } ]
-    }
-  }
-}
-
-/* TruncatedDivide
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define Trunc: 10 div 3
-define Even: 9 div 3
-*/
-
-module.exports['TruncatedDivide'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "222",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "340",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "341",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToQuantity",
+            "localId" : "338",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "339",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "335",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "336",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "QL10Days",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Trunc",
+        "localId" : "344",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "mul_q_q",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "344",
             "s" : [ {
-              "value" : [ "", "define ", "Trunc", ": " ]
+              "value" : [ "", "define ", "mul_q_q", " : " ]
             }, {
-              "r" : "215",
+              "r" : "345",
               "s" : [ {
-                "r" : "216",
-                "value" : [ "10", " div ", "3" ]
+                "r" : "346",
+                "s" : [ {
+                  "value" : [ "2 ", "'m'" ]
+                } ]
+              }, {
+                "value" : [ " * " ]
+              }, {
+                "r" : "347",
+                "s" : [ {
+                  "value" : [ "10 ", "'m'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "TruncatedDivide",
-          "localId" : "215",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Multiply",
+          "localId" : "345",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "218",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "348",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "219",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "349",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Literal",
-            "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "10",
+            "type" : "Quantity",
+            "localId" : "346",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 2,
+            "unit" : "m",
             "annotation" : [ ]
           }, {
-            "type" : "Literal",
-            "localId" : "217",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "3",
+            "type" : "Quantity",
+            "localId" : "347",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 10,
+            "unit" : "m",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "222",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Even",
+        "localId" : "352",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "mul_q_q_diff",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "222",
+            "r" : "352",
             "s" : [ {
-              "value" : [ "", "define ", "Even", ": " ]
+              "value" : [ "", "define ", "mul_q_q_diff", " : " ]
             }, {
-              "r" : "223",
+              "r" : "353",
               "s" : [ {
-                "r" : "224",
-                "value" : [ "9", " div ", "3" ]
+                "r" : "354",
+                "s" : [ {
+                  "value" : [ "2 ", "'m'" ]
+                } ]
+              }, {
+                "value" : [ " * " ]
+              }, {
+                "r" : "355",
+                "s" : [ {
+                  "value" : [ "10 ", "'/d'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "TruncatedDivide",
-          "localId" : "223",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Multiply",
+          "localId" : "353",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "226",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "356",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "227",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "357",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Literal",
-            "localId" : "224",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "9",
+            "type" : "Quantity",
+            "localId" : "354",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 2,
+            "unit" : "m",
             "annotation" : [ ]
           }, {
-            "type" : "Literal",
-            "localId" : "225",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "3",
+            "type" : "Quantity",
+            "localId" : "355",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 10,
+            "unit" : "/d",
             "annotation" : [ ]
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Modulo
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define Mod: 3 mod 2
-*/
-
-module.exports['Modulo'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "214",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "360",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "neg",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "360",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "neg", " : " ]
             }, {
+              "r" : "361",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "- " ]
+              }, {
+                "r" : "362",
+                "s" : [ {
+                  "value" : [ "days_10" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Negate",
+          "localId" : "361",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "363",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ExpressionRef",
+            "localId" : "362",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "days_10",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "366",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "abs",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "366",
+            "s" : [ {
+              "value" : [ "", "define ", "abs", " : " ]
+            }, {
+              "r" : "371",
+              "s" : [ {
+                "value" : [ "Abs", "(" ]
+              }, {
+                "r" : "367",
+                "s" : [ {
+                  "value" : [ "neg" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Abs",
+          "localId" : "371",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
-          "signature" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "372",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
           "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "type" : "ExpressionRef",
+            "localId" : "367",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "neg",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Mod",
+        "localId" : "375",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MultiplyUcum",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "375",
             "s" : [ {
-              "value" : [ "", "define ", "Mod", ": " ]
+              "value" : [ "", "define ", "MultiplyUcum", ": " ]
             }, {
-              "r" : "215",
+              "r" : "376",
               "s" : [ {
-                "r" : "216",
-                "value" : [ "3", " mod ", "2" ]
+                "r" : "377",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "377",
+                  "s" : [ {
+                    "r" : "378",
+                    "s" : [ {
+                      "value" : [ "5 ", "'m'" ]
+                    } ]
+                  }, {
+                    "value" : [ " * " ]
+                  }, {
+                    "r" : "379",
+                    "s" : [ {
+                      "value" : [ "25 ", "'km'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "382",
+                "s" : [ {
+                  "value" : [ "125000 ", "'m2'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Modulo",
-          "localId" : "215",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Equal",
+          "localId" : "376",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "218",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "383",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "219",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "384",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Literal",
-            "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "3",
-            "annotation" : [ ]
+            "type" : "Multiply",
+            "localId" : "377",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "380",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "381",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "Quantity",
+              "localId" : "378",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "m",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "379",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 25,
+              "unit" : "km",
+              "annotation" : [ ]
+            } ]
           }, {
-            "type" : "Literal",
-            "localId" : "217",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "2",
+            "type" : "Quantity",
+            "localId" : "382",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 125000,
+            "unit" : "m2",
             "annotation" : [ ]
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Ceiling
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define Ceil: Ceiling(10.1)
-define Even: Ceiling(10)
-*/
-
-module.exports['Ceiling'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "223",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "387",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DivideUcum",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "387",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "DivideUcum", ": " ]
             }, {
+              "r" : "388",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "389",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "389",
+                  "s" : [ {
+                    "r" : "390",
+                    "s" : [ {
+                      "value" : [ "20 ", "'m2'" ]
+                    } ]
+                  }, {
+                    "value" : [ " / " ]
+                  }, {
+                    "r" : "391",
+                    "s" : [ {
+                      "value" : [ "5 ", "'m'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "394",
+                "s" : [ {
+                  "value" : [ "4 ", "'m'" ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Equal",
+          "localId" : "388",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "395",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "396",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Divide",
+            "localId" : "389",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "392",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "393",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "Quantity",
+              "localId" : "390",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 20,
+              "unit" : "m2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "391",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "m",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "394",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 4,
+            "unit" : "m",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Ceil",
+        "localId" : "399",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AddUcum",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "399",
             "s" : [ {
-              "value" : [ "", "define ", "Ceil", ": " ]
+              "value" : [ "", "define ", "AddUcum", ": " ]
             }, {
-              "r" : "219",
+              "r" : "400",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "Ceiling", "(", "10.1", ")" ]
+                "r" : "401",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "401",
+                  "s" : [ {
+                    "r" : "402",
+                    "s" : [ {
+                      "value" : [ "5 ", "'m'" ]
+                    } ]
+                  }, {
+                    "value" : [ " + " ]
+                  }, {
+                    "r" : "403",
+                    "s" : [ {
+                      "value" : [ "5 ", "'km'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "406",
+                "s" : [ {
+                  "value" : [ "5005 ", "'m'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Ceiling",
-          "localId" : "219",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Equal",
+          "localId" : "400",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "220",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "407",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "408",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "10.1",
+          "operand" : [ {
+            "type" : "Add",
+            "localId" : "401",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "404",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "405",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "Quantity",
+              "localId" : "402",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "m",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "km",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "406",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 5005,
+            "unit" : "m",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "223",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Even",
+        "localId" : "411",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "SubtractUcum",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "223",
+            "r" : "411",
             "s" : [ {
-              "value" : [ "", "define ", "Even", ": " ]
+              "value" : [ "", "define ", "SubtractUcum", ": " ]
             }, {
-              "r" : "231",
+              "r" : "412",
               "s" : [ {
-                "r" : "224",
-                "value" : [ "Ceiling", "(", "10", ")" ]
+                "r" : "413",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "413",
+                  "s" : [ {
+                    "r" : "414",
+                    "s" : [ {
+                      "value" : [ "25 ", "'km'" ]
+                    } ]
+                  }, {
+                    "value" : [ " - " ]
+                  }, {
+                    "r" : "415",
+                    "s" : [ {
+                      "value" : [ "5 ", "'m'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "418",
+                "s" : [ {
+                  "value" : [ "24995 ", "'m'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Ceiling",
-          "localId" : "231",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Equal",
+          "localId" : "412",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "235",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "419",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "420",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "ToDecimal",
-            "localId" : "233",
+          "operand" : [ {
+            "type" : "Subtract",
+            "localId" : "413",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "234",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "416",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "417",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "224",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+            "operand" : [ {
+              "type" : "Quantity",
+              "localId" : "414",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 25,
+              "unit" : "km",
               "annotation" : [ ]
-            }
-          }
+            }, {
+              "type" : "Quantity",
+              "localId" : "415",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "m",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "418",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 24995,
+            "unit" : "m",
+            "annotation" : [ ]
+          } ]
         }
       } ]
     }
   }
 }
 
-/* Floor
+/* OutOfBounds
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define flr: Floor(10.1)
-define Even: Floor(10)
+define IntegerAddOverflow: maximum Integer + 1
+define IntegerAddUnderflow: minimum Integer + -1
+define IntegerAddNearOverflow: maximum Integer + 0
+define IntegerAddNearUnderflow: minimum Integer + 0
+define IntegerSubtractOverflow: maximum Integer - -1
+define IntegerSubtractUnderflow: minimum Integer - 1
+define IntegerSubtractNearOverflow: maximum Integer - 0
+define IntegerSubtractNearUnderflow: minimum Integer - 0
+define IntegerMultiplyOverflow: maximum Integer * 2
+define IntegerMultiplyUnderflow: minimum Integer * 2
+define IntegerMultiplyNearOverflow: maximum Integer * 1
+define IntegerMultiplyNearUnderflow: minimum Integer * 1
+// NOTE: Integer division results in decimal, so it must overflow/underflow decimal
+define IntegerDivideOverflow: maximum Integer / 0.00000000001
+define IntegerDivideUnderflow: minimum Integer / 0.00000000001
+define IntegerDivideNearOverflow: maximum Integer / 0.00000025
+define IntegerDivideNearUnderflow: minimum Integer / 0.00000025
+define IntegerDivideByZero: 1 / 0
+define IntegerPowerOverflow: (maximum Integer)^3
+define IntegerPowerUnderflow: (minimum Integer)^3
+define IntegerPowerNearOverflow: (maximum Integer)^1
+define IntegerPowerNearUnderflow: (minimum Integer)^1
+define IntegerSuccessorOverflow: successor of maximum Integer
+define IntegerPredecessorUnderflow: predecessor of minimum Integer
+define IntegerSuccessorNearOverflow: successor of (maximum Integer - 1)
+define IntegerPredecessorNearUnderflow: predecessor of (minimum Integer + 1)
+
+define LongAddOverflow: maximum Long + 1L
+define LongAddUnderflow: minimum Long + -1L
+define LongAddNearOverflow: maximum Long + 0L
+define LongAddNearUnderflow: minimum Long + 0L
+define LongSubtractOverflow: maximum Long - -1L
+define LongSubtractUnderflow: minimum Long - 1L
+define LongSubtractNearOverflow: maximum Long - 0L
+define LongSubtractNearUnderflow: minimum Long - 0L
+define LongMultiplyOverflow: maximum Long * 2L
+define LongMultiplyUnderflow: minimum Long * 2L
+define LongMultiplyNearOverflow: maximum Long * 1L
+define LongMultiplyNearUnderflow: minimum Long * 1L
+// NOTE: Long division results in decimal, so it must overflow/underflow decimal
+define LongDivideOverflow: maximum Long / 0.05
+define LongDivideUnderflow: minimum Long / 0.05
+define LongDivideNearOverflow: maximum Long / 1024L
+define LongDivideNearUnderflow: minimum Long / 1024L
+define LongDivideByZero: 1L / 0L
+define LongPowerOverflow: (maximum Long)^3L
+define LongPowerUnderflow: (minimum Long)^3L
+define LongPowerNearOverflow: (maximum Long)^1L
+define LongPowerNearUnderflow: (minimum Long)^1L
+define LongSuccessorOverflow: successor of maximum Long
+define LongPredecessorUnderflow: predecessor of minimum Long
+define LongSuccessorNearOverflow: successor of (maximum Long - 1L)
+define LongPredecessorNearUnderflow: predecessor of (minimum Long + 1L)
+
+// NOTE: Due to JS Number imprecision, we need to exceed min/max by 10000 for it to actually produce a different number
+define DecimalAddOverflow: maximum Decimal + 10000.0
+define DecimalAddUnderflow: minimum Decimal + -10000.0
+define DecimalAddNearOverflow: maximum Decimal + 0.0
+define DecimalAddNearUnderflow: minimum Decimal + 0.0
+define DecimalSubtractOverflow: maximum Decimal - -10000.0
+define DecimalSubtractUnderflow: minimum Decimal - 10000.0
+define DecimalSubtractNearOverflow: maximum Decimal - 0.0
+define DecimalSubtractNearUnderflow: minimum Decimal - 0.0
+define DecimalMultiplyOverflow: maximum Decimal * 2
+define DecimalMultiplyUnderflow: minimum Decimal * 2
+define DecimalMultiplyNearOverflow: maximum Decimal * 1
+define DecimalMultiplyNearUnderflow: minimum Decimal * 1
+define DecimalDivideOverflow: maximum Decimal / 0.5
+define DecimalDivideUnderflow: minimum Decimal / 0.5
+define DecimalDivideNearOverflow: maximum Decimal / 1.0
+define DecimalDivideNearUnderflow: minimum Decimal / 1.0
+define DecimalDivideByZero: 1.0 / 0
+define DecimalPowerOverflow: (maximum Decimal)^2
+define DecimalPowerUnderflow: (minimum Decimal)^3
+define DecimalPowerNearOverflow: (maximum Decimal)^1
+define DecimalPowerNearUnderflow: (minimum Decimal)^1
+define DecimalSuccessorOverflow: successor of maximum Decimal
+define DecimalPredecessorUnderflow: predecessor of minimum Decimal
+define DecimalSuccessorNearOverflow: successor of (maximum Decimal - 0.00000001)
+define DecimalPredecessorNearUnderflow: predecessor of (minimum Decimal + 0.00000001)
+
+define MaxQuantity: Quantity { value: maximum Decimal, unit: 'mm' }
+define MinQuantity: Quantity { value: minimum Decimal, unit: 'mm' }
+// NOTE: Due to JS Number imprecision, we need to exceed min/max by 10000 for it to actually produce a different number
+define QuantityAddOverflow: MaxQuantity + 10000.0 'mm'
+define QuantityAddUnderflow: MinQuantity + (-10000.0 'mm')
+define QuantityAddNearOverflow: MaxQuantity + 0.0 'mm'
+define QuantityAddNearUnderflow: MinQuantity + 0.0 'mm'
+define QuantitySubtractOverflow: MaxQuantity - (-10000 'mm')
+define QuantitySubtractUnderflow: MinQuantity - 10000 'mm'
+define QuantitySubtractNearOverflow: MaxQuantity - 0.0 'mm'
+define QuantitySubtractNearUnderflow: MinQuantity - 0.0 'mm'
+define QuantityMultiplyOverflow: MaxQuantity * 2 'mm'
+define QuantityMultiplyUnderflow: MinQuantity * 2 'mm'
+define QuantityMultiplyNearOverflow: MaxQuantity * 1 'mm'
+define QuantityMultiplyNearUnderflow: MinQuantity * 1 'mm'
+define QuantityDivideOverflow: MaxQuantity / 0.5 'mm'
+define QuantityDivideUnderflow: MinQuantity / 0.5 'mm'
+define QuantityDivideNearOverflow: MaxQuantity / 1 'mm'
+define QuantityDivideNearUnderflow: MinQuantity / 1 'mm'
+define QuantityDivideByZero: 1.0 'mm' / 0 'mm'
+define QuantitySuccessorOverflow: successor of MaxQuantity
+define QuantityPredecessorUnderflow: predecessor of MinQuantity
+define QuantitySuccessorNearOverflow: successor of Quantity { value: maximum Decimal - 0.00000001, unit: 'mm' }
+define QuantityPredecessorNearUnderflow: predecessor of Quantity { value: minimum Decimal + 0.00000001, unit: 'mm' }
+
+define DateTimeAddOverflow: maximum DateTime + 1 day
+define DateTimeAddUnderflow: minimum DateTime + (-1 day)
+define DateTimeAddNearOverflow: maximum DateTime + 0 days
+define DateTimeAddNearUnderflow: minimum DateTime + 0 days
+define DateTimeSubtractOverflow: maximum DateTime - (-1 day)
+define DateTimeSubtractUnderflow: minimum DateTime - 1 day
+define DateTimeSubtractNearOverflow: maximum DateTime - 0 days
+define DateTimeSubtractNearUnderflow: minimum DateTime - 0 days
+define DateTimeSuccessorOverflow: successor of maximum DateTime
+define DateTimePredecessorUnderflow: predecessor of minimum DateTime
+define DateTimeSuccessorNearOverflow: successor of (maximum DateTime - 1 millisecond)
+define DateTimePredecessorNearUnderflow: predecessor of (minimum DateTime + 1 millisecond)
+
+define DateAddOverflow: maximum Date + 1 day
+define DateAddUnderflow: minimum Date + (-1 day)
+define DateAddNearOverflow: maximum Date + 0 days
+define DateAddNearUnderflow: minimum Date + 0 days
+define DateSubtractOverflow: maximum Date - (-1 day)
+define DateSubtractUnderflow: minimum Date - 1 day
+define DateSubtractNearOverflow: maximum Date - 0 days
+define DateSubtractNearUnderflow: minimum Date - 0 days
+define DateSuccessorOverflow: successor of maximum Date
+define DatePredecessorUnderflow: predecessor of minimum Date
+define DateSuccessorNearOverflow: successor of (maximum Date - 1 day)
+define DatePredecessorNearUnderflow: predecessor of (minimum Date + 1 day)
+
+define TimeAddOverflow: maximum Time + 1 second
+define TimeAddUnderflow: minimum Time + (-1 second)
+define TimeAddNearOverflow: maximum Time + 0 seconds
+define TimeAddNearUnderflow: minimum Time + 0 seconds
+define TimeSubtractOverflow: maximum Time - (-1 second)
+define TimeSubtractUnderflow: minimum Time - 1 second
+define TimeSubtractNearOverflow: maximum Time - 0 seconds
+define TimeSubtractNearUnderflow: minimum Time - 0 seconds
+define TimeSuccessorOverflow: successor of maximum Time
+define TimePredecessorUnderflow: predecessor of minimum Time
+define TimeSuccessorNearOverflow: successor of (maximum Time - 1 millisecond)
+define TimePredecessorNearUnderflow: predecessor of (minimum Time + 1 millisecond)
+
+define ExpOverflow: Exp(maximum Decimal)
 */
 
-module.exports['Floor'] = {
+module.exports['OutOfBounds'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -5447,7 +13331,7 @@ module.exports['Floor'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "223",
+        "r" : "1503",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -5522,7 +13406,7 @@ module.exports['Floor'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "flr",
+        "name" : "IntegerAddOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -5531,40 +13415,61 @@ module.exports['Floor'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "flr", ": " ]
+              "value" : [ "", "define ", "IntegerAddOverflow", ": " ]
             }, {
-              "r" : "219",
+              "r" : "215",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "Floor", "(", "10.1", ")" ]
+                "r" : "217",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "216",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "218",
+                "value" : [ " + ", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Floor",
-          "localId" : "219",
+          "type" : "Add",
+          "localId" : "215",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "219",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "NamedTypeSpecifier",
             "localId" : "220",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "217",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "10.1",
+            "localId" : "218",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
         "localId" : "223",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Even",
+        "name" : "IntegerAddUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -5573,1350 +13478,1399 @@ module.exports['Floor'] = {
           "s" : {
             "r" : "223",
             "s" : [ {
-              "value" : [ "", "define ", "Even", ": " ]
+              "value" : [ "", "define ", "IntegerAddUnderflow", ": " ]
             }, {
-              "r" : "231",
+              "r" : "224",
               "s" : [ {
-                "r" : "224",
-                "value" : [ "Floor", "(", "10", ")" ]
+                "r" : "226",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "225",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ " + " ]
+              }, {
+                "r" : "227",
+                "s" : [ {
+                  "r" : "228",
+                  "value" : [ "-", "1" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Floor",
-          "localId" : "231",
+          "type" : "Add",
+          "localId" : "224",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "235",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "230",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "ToDecimal",
-            "localId" : "233",
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "226",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "Negate",
+            "localId" : "227",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "234",
+              "localId" : "229",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "224",
+              "localId" : "228",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "1",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Truncate
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define Trunc: Truncate(10.1)
-define Even: Truncate(10)
-*/
-
-module.exports['Truncate'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "223",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerAddNearOverflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "234",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "IntegerAddNearOverflow", ": " ]
             }, {
+              "r" : "235",
               "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+                "r" : "237",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "236",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "238",
+                "value" : [ " + ", "0" ]
+              } ]
+            } ]
+          }
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Add",
+          "localId" : "235",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "239",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "240",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "237",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "238",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "243",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Trunc",
+        "name" : "IntegerAddNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "243",
             "s" : [ {
-              "value" : [ "", "define ", "Trunc", ": " ]
+              "value" : [ "", "define ", "IntegerAddNearUnderflow", ": " ]
             }, {
-              "r" : "219",
+              "r" : "244",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "Truncate", "(", "10.1", ")" ]
+                "r" : "246",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "245",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "247",
+                "value" : [ " + ", "0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Truncate",
-          "localId" : "219",
+          "type" : "Add",
+          "localId" : "244",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "220",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "248",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "249",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "246",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "10.1",
+            "localId" : "247",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "223",
+        "localId" : "252",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Even",
+        "name" : "IntegerSubtractOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "223",
+            "r" : "252",
             "s" : [ {
-              "value" : [ "", "define ", "Even", ": " ]
+              "value" : [ "", "define ", "IntegerSubtractOverflow", ": " ]
             }, {
-              "r" : "231",
+              "r" : "253",
               "s" : [ {
-                "r" : "224",
-                "value" : [ "Truncate", "(", "10", ")" ]
+                "r" : "255",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "254",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ " - " ]
+              }, {
+                "r" : "256",
+                "s" : [ {
+                  "r" : "257",
+                  "value" : [ "-", "1" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Truncate",
-          "localId" : "231",
+          "type" : "Subtract",
+          "localId" : "253",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "235",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "259",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "260",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "ToDecimal",
-            "localId" : "233",
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "Negate",
+            "localId" : "256",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "234",
+              "localId" : "258",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "224",
+              "localId" : "257",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "1",
               "annotation" : [ ]
             }
-          }
-        }
-      } ]
-    }
-  }
-}
-
-/* Abs
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define Pos: Abs(10)
-define Neg: Abs(-10)
-define Zero: Abs(0)
-*/
-
-module.exports['Abs'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "234",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "263",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Pos",
+        "name" : "IntegerSubtractUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "263",
             "s" : [ {
-              "value" : [ "", "define ", "Pos", ": " ]
+              "value" : [ "", "define ", "IntegerSubtractUnderflow", ": " ]
             }, {
-              "r" : "219",
+              "r" : "264",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "Abs", "(", "10", ")" ]
+                "r" : "266",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "265",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "267",
+                "value" : [ " - ", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Abs",
-          "localId" : "219",
+          "type" : "Subtract",
+          "localId" : "264",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "220",
+            "localId" : "268",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "269",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "266",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "215",
+            "localId" : "267",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "10",
+            "value" : "1",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "223",
+        "localId" : "272",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Neg",
+        "name" : "IntegerSubtractNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "223",
+            "r" : "272",
             "s" : [ {
-              "value" : [ "", "define ", "Neg", ": " ]
+              "value" : [ "", "define ", "IntegerSubtractNearOverflow", ": " ]
             }, {
-              "r" : "230",
+              "r" : "273",
               "s" : [ {
-                "value" : [ "Abs", "(" ]
-              }, {
-                "r" : "224",
+                "r" : "275",
                 "s" : [ {
-                  "r" : "225",
-                  "value" : [ "-", "10" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "274",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "276",
+                "value" : [ " - ", "0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Abs",
-          "localId" : "230",
+          "type" : "Subtract",
+          "localId" : "273",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "231",
+            "localId" : "277",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "278",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "Negate",
-            "localId" : "224",
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "275",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "226",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "225",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          }
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "276",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "234",
+        "localId" : "281",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Zero",
+        "name" : "IntegerSubtractNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "281",
             "s" : [ {
-              "value" : [ "", "define ", "Zero", ": " ]
+              "value" : [ "", "define ", "IntegerSubtractNearUnderflow", ": " ]
             }, {
-              "r" : "239",
+              "r" : "282",
               "s" : [ {
-                "r" : "235",
-                "value" : [ "Abs", "(", "0", ")" ]
+                "r" : "284",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "283",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "285",
+                "value" : [ " - ", "0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Abs",
-          "localId" : "239",
+          "type" : "Subtract",
+          "localId" : "282",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "240",
+            "localId" : "286",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "287",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "284",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "235",
+            "localId" : "285",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "0",
             "annotation" : [ ]
-          }
+          } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Round
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define Up: Round(4.56)
-define Up_percent: Round(4.56,1)
-define Down: Round(4.49)
-define Down_percent: Round(4.43,1)
-*/
-
-module.exports['Round'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "244",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "290",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerMultiplyOverflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "290",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "IntegerMultiplyOverflow", ": " ]
             }, {
+              "r" : "291",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "293",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "292",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "294",
+                "value" : [ " * ", "2" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Multiply",
+          "localId" : "291",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "295",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "296",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "293",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "294",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "Up",
+        "localId" : "299",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerMultiplyUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "299",
             "s" : [ {
-              "value" : [ "", "define ", "Up", ": " ]
+              "value" : [ "", "define ", "IntegerMultiplyUnderflow", ": " ]
             }, {
-              "r" : "219",
+              "r" : "300",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "Round", "(", "4.56", ")" ]
+                "r" : "302",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "301",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "303",
+                "value" : [ " * ", "2" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Round",
-          "localId" : "219",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Multiply",
+          "localId" : "300",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "220",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "304",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "305",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "302",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "4.56",
+            "localId" : "303",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "223",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "Up_percent",
+        "localId" : "308",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerMultiplyNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "223",
+            "r" : "308",
             "s" : [ {
-              "value" : [ "", "define ", "Up_percent", ": " ]
+              "value" : [ "", "define ", "IntegerMultiplyNearOverflow", ": " ]
             }, {
-              "r" : "230",
+              "r" : "309",
               "s" : [ {
-                "r" : "224",
-                "value" : [ "Round", "(", "4.56", ",", "1", ")" ]
+                "r" : "311",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "310",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "312",
+                "value" : [ " * ", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Round",
-          "localId" : "230",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Multiply",
+          "localId" : "309",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "231",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "313",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "232",
+            "localId" : "314",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "Literal",
-            "localId" : "224",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "4.56",
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "311",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
-          },
-          "precision" : {
+          }, {
             "type" : "Literal",
-            "localId" : "225",
+            "localId" : "312",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "1",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "235",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "Down",
+        "localId" : "317",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerMultiplyNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "235",
+            "r" : "317",
             "s" : [ {
-              "value" : [ "", "define ", "Down", ": " ]
+              "value" : [ "", "define ", "IntegerMultiplyNearUnderflow", ": " ]
             }, {
-              "r" : "240",
+              "r" : "318",
               "s" : [ {
-                "r" : "236",
-                "value" : [ "Round", "(", "4.49", ")" ]
+                "r" : "320",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "319",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "321",
+                "value" : [ " * ", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Round",
-          "localId" : "240",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Multiply",
+          "localId" : "318",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "241",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "322",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "323",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "320",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "236",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "4.49",
+            "localId" : "321",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "244",
+        "localId" : "326",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "Down_percent",
+        "name" : "IntegerDivideOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "244",
+            "r" : "326",
             "s" : [ {
-              "value" : [ "", "define ", "Down_percent", ": " ]
+              "value" : [ "// NOTE: Integer division results in decimal, so it must overflow/underflow decimal\n", "define ", "IntegerDivideOverflow", ": " ]
             }, {
-              "r" : "251",
+              "r" : "327",
               "s" : [ {
-                "r" : "245",
-                "value" : [ "Round", "(", "4.43", ",", "1", ")" ]
+                "r" : "329",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "328",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "330",
+                "value" : [ " / ", "0.00000000001" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Round",
-          "localId" : "251",
+          "type" : "Divide",
+          "localId" : "327",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "252",
+            "localId" : "334",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "253",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          } ],
-          "operand" : {
-            "type" : "Literal",
-            "localId" : "245",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "4.43",
-            "annotation" : [ ]
-          },
-          "precision" : {
-            "type" : "Literal",
-            "localId" : "246",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "1",
-            "annotation" : [ ]
-          }
-        }
-      } ]
-    }
-  }
-}
-
-/* Ln
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define ln: Ln(4)
-*/
-
-module.exports['Ln'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "214",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
+            "localId" : "335",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "332",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "333",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "MaxValue",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "330",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.00000000001",
+            "annotation" : [ ]
+          } ]
+        }
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "338",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "IntegerDivideUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "338",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "IntegerDivideUnderflow", ": " ]
             }, {
+              "r" : "339",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "341",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "340",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "342",
+                "value" : [ " / ", "0.00000000001" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Divide",
+          "localId" : "339",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "346",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "347",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "344",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "345",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "MinValue",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "342",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.00000000001",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "350",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "ln",
+        "name" : "IntegerDivideNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "350",
             "s" : [ {
-              "value" : [ "", "define ", "ln", ": " ]
+              "value" : [ "", "define ", "IntegerDivideNearOverflow", ": " ]
             }, {
-              "r" : "222",
+              "r" : "351",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "Ln", "(", "4", ")" ]
+                "r" : "353",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "352",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "354",
+                "value" : [ " / ", "0.00000025" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Ln",
-          "localId" : "222",
+          "type" : "Divide",
+          "localId" : "351",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "226",
+            "localId" : "358",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "359",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "ToDecimal",
-            "localId" : "224",
+            "localId" : "356",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "225",
+              "localId" : "357",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
-              "type" : "Literal",
-              "localId" : "215",
+              "type" : "MaxValue",
+              "localId" : "353",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
               "annotation" : [ ]
             }
-          }
+          }, {
+            "type" : "Literal",
+            "localId" : "354",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.00000025",
+            "annotation" : [ ]
+          } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Log
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define log: Log(10,10000)
-*/
-
-module.exports['Log'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "214",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "362",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "IntegerDivideNearUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "362",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "IntegerDivideNearUnderflow", ": " ]
             }, {
+              "r" : "363",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "365",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "364",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "366",
+                "value" : [ " / ", "0.00000025" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Divide",
+          "localId" : "363",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "370",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "371",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "368",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "369",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "MinValue",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "366",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.00000025",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "374",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "log",
+        "name" : "IntegerDivideByZero",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "374",
             "s" : [ {
-              "value" : [ "", "define ", "log", ": " ]
+              "value" : [ "", "define ", "IntegerDivideByZero", ": " ]
             }, {
-              "r" : "227",
+              "r" : "375",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "Log", "(", "10", ",", "10000", ")" ]
+                "r" : "376",
+                "value" : [ "1", " / ", "0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Log",
-          "localId" : "227",
+          "type" : "Divide",
+          "localId" : "375",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "234",
+            "localId" : "384",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "235",
+            "localId" : "385",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToDecimal",
-            "localId" : "229",
+            "localId" : "379",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "230",
+              "localId" : "380",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "215",
+              "localId" : "376",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "1",
               "annotation" : [ ]
             }
           }, {
             "type" : "ToDecimal",
-            "localId" : "232",
+            "localId" : "382",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "233",
+              "localId" : "383",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "216",
+              "localId" : "377",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10000",
+              "value" : "0",
               "annotation" : [ ]
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Successor
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define Is: successor of 2
-define Rs: successor of 2.2
-define ofr: successor of 2147483647
-define y_date: successor of DateTime(2015)
-define ym_date: successor of DateTime(2015,01)
-define ymd_date: successor of DateTime(2015,01,01)
-define ymdh_date: successor of DateTime(2015,01,01,0)
-define ymdhm_date: successor of DateTime(2015,01,01,0,0)
-define ymdhms_date: successor of DateTime(2015,01,01,0,0,0)
-define ymdhmsm_date: successor of  DateTime(2015,01,01,0,0,0,0)
-define max_date: successor of DateTime(9999,12,31,23,59,59,999)
-*/
-
-module.exports['Successor'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "372",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "388",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerPowerOverflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "388",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "IntegerPowerOverflow", ": " ]
             }, {
+              "r" : "389",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "391",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "391",
+                  "s" : [ {
+                    "value" : [ "maximum", " " ]
+                  }, {
+                    "r" : "390",
+                    "s" : [ {
+                      "value" : [ "Integer" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "392",
+                "value" : [ "^", "3" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Power",
+          "localId" : "389",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "393",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "394",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "391",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "392",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "3",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "397",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Is",
+        "name" : "IntegerPowerUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "397",
             "s" : [ {
-              "value" : [ "", "define ", "Is", ": " ]
+              "value" : [ "", "define ", "IntegerPowerUnderflow", ": " ]
             }, {
-              "r" : "216",
+              "r" : "398",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "successor of ", "2" ]
+                "r" : "400",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "400",
+                  "s" : [ {
+                    "value" : [ "minimum", " " ]
+                  }, {
+                    "r" : "399",
+                    "s" : [ {
+                      "value" : [ "Integer" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "401",
+                "value" : [ "^", "3" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "216",
+          "type" : "Power",
+          "localId" : "398",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "217",
+            "localId" : "402",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "403",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "400",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "215",
+            "localId" : "401",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "2",
+            "value" : "3",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "220",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "Rs",
+        "localId" : "406",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerPowerNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "220",
+            "r" : "406",
             "s" : [ {
-              "value" : [ "", "define ", "Rs", ": " ]
+              "value" : [ "", "define ", "IntegerPowerNearOverflow", ": " ]
             }, {
-              "r" : "222",
+              "r" : "407",
               "s" : [ {
-                "r" : "221",
-                "value" : [ "successor of ", "2.2" ]
+                "r" : "409",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "409",
+                  "s" : [ {
+                    "value" : [ "maximum", " " ]
+                  }, {
+                    "r" : "408",
+                    "s" : [ {
+                      "value" : [ "Integer" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "410",
+                "value" : [ "^", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "222",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Power",
+          "localId" : "407",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "223",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "411",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "412",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "409",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "221",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "2.2",
+            "localId" : "410",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "226",
+        "localId" : "415",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "ofr",
+        "name" : "IntegerPowerNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "226",
+            "r" : "415",
             "s" : [ {
-              "value" : [ "", "define ", "ofr", ": " ]
+              "value" : [ "", "define ", "IntegerPowerNearUnderflow", ": " ]
             }, {
-              "r" : "228",
+              "r" : "416",
               "s" : [ {
-                "r" : "227",
-                "value" : [ "successor of ", "2147483647" ]
+                "r" : "418",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "418",
+                  "s" : [ {
+                    "value" : [ "minimum", " " ]
+                  }, {
+                    "r" : "417",
+                    "s" : [ {
+                      "value" : [ "Integer" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "419",
+                "value" : [ "^", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "228",
+          "type" : "Power",
+          "localId" : "416",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "229",
+            "localId" : "420",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "421",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "418",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "227",
+            "localId" : "419",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "2147483647",
+            "value" : "1",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "232",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "y_date",
+        "localId" : "424",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerSuccessorOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "232",
+            "r" : "424",
             "s" : [ {
-              "value" : [ "", "define ", "y_date", ": " ]
+              "value" : [ "", "define ", "IntegerSuccessorOverflow", ": " ]
             }, {
-              "r" : "239",
+              "r" : "427",
               "s" : [ {
                 "value" : [ "successor of " ]
               }, {
-                "r" : "237",
+                "r" : "426",
                 "s" : [ {
-                  "r" : "233",
-                  "value" : [ "DateTime", "(", "2015", ")" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "425",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
                 } ]
               } ]
             } ]
@@ -6924,130 +14878,112 @@ module.exports['Successor'] = {
         } ],
         "expression" : {
           "type" : "Successor",
-          "localId" : "239",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "localId" : "427",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "240",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "428",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "DateTime",
-            "localId" : "237",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "238",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "233",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            }
+            "type" : "MaxValue",
+            "localId" : "426",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "243",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ym_date",
+        "localId" : "431",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerPredecessorUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "243",
+            "r" : "431",
             "s" : [ {
-              "value" : [ "", "define ", "ym_date", ": " ]
+              "value" : [ "", "define ", "IntegerPredecessorUnderflow", ": " ]
             }, {
-              "r" : "253",
+              "r" : "434",
               "s" : [ {
-                "value" : [ "successor of " ]
+                "value" : [ "predecessor of " ]
               }, {
-                "r" : "250",
+                "r" : "433",
                 "s" : [ {
-                  "r" : "244",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ")" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "432",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "253",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Predecessor",
+          "localId" : "434",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "254",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "435",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "DateTime",
-            "localId" : "250",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "251",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "252",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "244",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "245",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            }
+            "type" : "MinValue",
+            "localId" : "433",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "257",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ymd_date",
+        "localId" : "438",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerSuccessorNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "257",
+            "r" : "438",
             "s" : [ {
-              "value" : [ "", "define ", "ymd_date", ": " ]
+              "value" : [ "", "define ", "IntegerSuccessorNearOverflow", ": " ]
             }, {
-              "r" : "270",
+              "r" : "445",
               "s" : [ {
                 "value" : [ "successor of " ]
               }, {
-                "r" : "266",
+                "r" : "439",
                 "s" : [ {
-                  "r" : "258",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ")" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "439",
+                  "s" : [ {
+                    "r" : "441",
+                    "s" : [ {
+                      "value" : [ "maximum", " " ]
+                    }, {
+                      "r" : "440",
+                      "s" : [ {
+                        "value" : [ "Integer" ]
+                      } ]
+                    } ]
+                  }, {
+                    "r" : "442",
+                    "value" : [ " - ", "1" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -7055,2260 +14991,2173 @@ module.exports['Successor'] = {
         } ],
         "expression" : {
           "type" : "Successor",
-          "localId" : "270",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "localId" : "445",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "271",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "446",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "DateTime",
-            "localId" : "266",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Subtract",
+            "localId" : "439",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "267",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "268",
+              "localId" : "443",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "269",
+              "localId" : "444",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "258",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "259",
+            } ],
+            "operand" : [ {
+              "type" : "MaxValue",
+              "localId" : "441",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
               "annotation" : [ ]
-            },
-            "day" : {
+            }, {
               "type" : "Literal",
-              "localId" : "260",
+              "localId" : "442",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
+              "value" : "1",
               "annotation" : [ ]
-            }
+            } ]
           }
         }
       }, {
-        "localId" : "274",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ymdh_date",
+        "localId" : "449",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntegerPredecessorNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "274",
+            "r" : "449",
             "s" : [ {
-              "value" : [ "", "define ", "ymdh_date", ": " ]
+              "value" : [ "", "define ", "IntegerPredecessorNearUnderflow", ": " ]
             }, {
-              "r" : "290",
+              "r" : "456",
               "s" : [ {
-                "value" : [ "successor of " ]
+                "value" : [ "predecessor of " ]
               }, {
-                "r" : "285",
+                "r" : "450",
                 "s" : [ {
-                  "r" : "275",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ")" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "450",
+                  "s" : [ {
+                    "r" : "452",
+                    "s" : [ {
+                      "value" : [ "minimum", " " ]
+                    }, {
+                      "r" : "451",
+                      "s" : [ {
+                        "value" : [ "Integer" ]
+                      } ]
+                    } ]
+                  }, {
+                    "r" : "453",
+                    "value" : [ " + ", "1" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "290",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Predecessor",
+          "localId" : "456",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "291",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "457",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "DateTime",
-            "localId" : "285",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Add",
+            "localId" : "450",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "286",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "287",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "288",
+              "localId" : "454",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "289",
+              "localId" : "455",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "276",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "277",
+            "operand" : [ {
+              "type" : "MinValue",
+              "localId" : "452",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
               "annotation" : [ ]
-            },
-            "hour" : {
+            }, {
               "type" : "Literal",
-              "localId" : "278",
+              "localId" : "453",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "1",
               "annotation" : [ ]
-            }
+            } ]
           }
         }
       }, {
-        "localId" : "294",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ymdhm_date",
+        "localId" : "460",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongAddOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "294",
+            "r" : "460",
             "s" : [ {
-              "value" : [ "", "define ", "ymdhm_date", ": " ]
+              "value" : [ "", "define ", "LongAddOverflow", ": " ]
             }, {
-              "r" : "313",
+              "r" : "461",
               "s" : [ {
-                "value" : [ "successor of " ]
+                "r" : "463",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "462",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "464",
+                "value" : [ " + ", "1L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Add",
+          "localId" : "461",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "465",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "466",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "463",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "464",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "469",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongAddUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "469",
+            "s" : [ {
+              "value" : [ "", "define ", "LongAddUnderflow", ": " ]
+            }, {
+              "r" : "470",
+              "s" : [ {
+                "r" : "472",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "471",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
               }, {
-                "r" : "307",
+                "value" : [ " + " ]
+              }, {
+                "r" : "473",
                 "s" : [ {
-                  "r" : "295",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ")" ]
+                  "r" : "474",
+                  "value" : [ "-", "1L" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "313",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Add",
+          "localId" : "470",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "314",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "476",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "477",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "307",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "472",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Negate",
+            "localId" : "473",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "308",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "309",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "310",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "311",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "312",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "475",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "295",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "298",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "299",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "474",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             }
+          } ]
+        }
+      }, {
+        "localId" : "480",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongAddNearOverflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "480",
+            "s" : [ {
+              "value" : [ "", "define ", "LongAddNearOverflow", ": " ]
+            }, {
+              "r" : "481",
+              "s" : [ {
+                "r" : "483",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "482",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "484",
+                "value" : [ " + ", "0L" ]
+              } ]
+            } ]
           }
+        } ],
+        "expression" : {
+          "type" : "Add",
+          "localId" : "481",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "485",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "486",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "483",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "484",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "317",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ymdhms_date",
+        "localId" : "489",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongAddNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "317",
+            "r" : "489",
             "s" : [ {
-              "value" : [ "", "define ", "ymdhms_date", ": " ]
+              "value" : [ "", "define ", "LongAddNearUnderflow", ": " ]
             }, {
-              "r" : "339",
+              "r" : "490",
               "s" : [ {
-                "value" : [ "successor of " ]
-              }, {
-                "r" : "332",
+                "r" : "492",
                 "s" : [ {
-                  "r" : "318",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ",", "0", ")" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "491",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "493",
+                "value" : [ " + ", "0L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "339",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Add",
+          "localId" : "490",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "340",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "494",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "495",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "332",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "333",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "334",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "335",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "336",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "337",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "338",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "318",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "319",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "320",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "321",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "322",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "323",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          }
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "492",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "493",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "343",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ymdhmsm_date",
+        "localId" : "498",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongSubtractOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "343",
+            "r" : "498",
             "s" : [ {
-              "value" : [ "", "define ", "ymdhmsm_date", ": " ]
+              "value" : [ "", "define ", "LongSubtractOverflow", ": " ]
             }, {
-              "r" : "368",
+              "r" : "499",
               "s" : [ {
-                "value" : [ "successor of  " ]
+                "r" : "501",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "500",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ " - " ]
               }, {
-                "r" : "360",
+                "r" : "502",
                 "s" : [ {
-                  "r" : "344",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ",", "0", ",", "0", ")" ]
+                  "r" : "503",
+                  "value" : [ "-", "1L" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "368",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Subtract",
+          "localId" : "499",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "369",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "505",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "506",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "360",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "501",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Negate",
+            "localId" : "502",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "361",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "362",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "363",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "364",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "365",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "366",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "367",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "504",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "344",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "345",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "346",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "347",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "348",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "349",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "350",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "503",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             }
+          } ]
+        }
+      }, {
+        "localId" : "509",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongSubtractUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "509",
+            "s" : [ {
+              "value" : [ "", "define ", "LongSubtractUnderflow", ": " ]
+            }, {
+              "r" : "510",
+              "s" : [ {
+                "r" : "512",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "511",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "513",
+                "value" : [ " - ", "1L" ]
+              } ]
+            } ]
           }
+        } ],
+        "expression" : {
+          "type" : "Subtract",
+          "localId" : "510",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "514",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "515",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "512",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "513",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "372",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "max_date",
+        "localId" : "518",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongSubtractNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "372",
+            "r" : "518",
             "s" : [ {
-              "value" : [ "", "define ", "max_date", ": " ]
+              "value" : [ "", "define ", "LongSubtractNearOverflow", ": " ]
             }, {
-              "r" : "397",
+              "r" : "519",
               "s" : [ {
-                "value" : [ "successor of " ]
-              }, {
-                "r" : "389",
+                "r" : "521",
                 "s" : [ {
-                  "r" : "373",
-                  "value" : [ "DateTime", "(", "9999", ",", "12", ",", "31", ",", "23", ",", "59", ",", "59", ",", "999", ")" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "520",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "522",
+                "value" : [ " - ", "0L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "397",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Subtract",
+          "localId" : "519",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "398",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "523",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "524",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "389",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "390",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "391",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "392",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "393",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "394",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "395",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "396",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "373",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9999",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "374",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "375",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "31",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "376",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "377",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "378",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "379",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "999",
-              "annotation" : [ ]
-            }
-          }
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "521",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "522",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
+          } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Predecessor
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define Is: predecessor of 2
-define Rs: predecessor of 2.2
-define ufr: predecessor of -2147483648
-define y_date: predecessor of DateTime(2015)
-define ym_date: predecessor of DateTime(2015,01)
-define ymd_date: predecessor of DateTime(2015,01,01)
-define ymdh_date: predecessor of DateTime(2015,01,01,0)
-define ymdhm_date: predecessor of DateTime(2015,01,01,0,0)
-define ymdhms_date: predecessor of DateTime(2015,01,01,0,0,0)
-define ymdhmsm_date: predecessor of DateTime(2015,01,01,0,0,0,0)
-define min_date: predecessor of DateTime(0001,01,01,0,0,0,0)
-*/
-
-module.exports['Predecessor'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "374",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "527",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongSubtractNearUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "527",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "LongSubtractNearUnderflow", ": " ]
             }, {
+              "r" : "528",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "530",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "529",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "531",
+                "value" : [ " - ", "0L" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Subtract",
+          "localId" : "528",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "532",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "533",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "530",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "531",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Is",
+        "localId" : "536",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongMultiplyOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "536",
             "s" : [ {
-              "value" : [ "", "define ", "Is", ": " ]
+              "value" : [ "", "define ", "LongMultiplyOverflow", ": " ]
             }, {
-              "r" : "216",
+              "r" : "537",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "predecessor of ", "2" ]
+                "r" : "539",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "538",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "540",
+                "value" : [ " * ", "2L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "216",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Multiply",
+          "localId" : "537",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "217",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "541",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "542",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "539",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "540",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "2",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "220",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "Rs",
+        "localId" : "545",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongMultiplyUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "220",
+            "r" : "545",
             "s" : [ {
-              "value" : [ "", "define ", "Rs", ": " ]
+              "value" : [ "", "define ", "LongMultiplyUnderflow", ": " ]
             }, {
-              "r" : "222",
+              "r" : "546",
               "s" : [ {
-                "r" : "221",
-                "value" : [ "predecessor of ", "2.2" ]
+                "r" : "548",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "547",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
+              }, {
+                "r" : "549",
+                "value" : [ " * ", "2L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "222",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Multiply",
+          "localId" : "546",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "223",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "550",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "551",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
-          "operand" : {
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "548",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
             "type" : "Literal",
-            "localId" : "221",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "2.2",
+            "localId" : "549",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "226",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "ufr",
+        "localId" : "554",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongMultiplyNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "226",
+            "r" : "554",
             "s" : [ {
-              "value" : [ "", "define ", "ufr", ": " ]
+              "value" : [ "", "define ", "LongMultiplyNearOverflow", ": " ]
             }, {
-              "r" : "230",
+              "r" : "555",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "227",
+                "r" : "557",
                 "s" : [ {
-                  "r" : "228",
-                  "value" : [ "-", "2147483648" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "556",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "558",
+                "value" : [ " * ", "1L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "230",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Multiply",
+          "localId" : "555",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "231",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "559",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "560",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "Negate",
-            "localId" : "227",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "228",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2147483648",
-              "annotation" : [ ]
-            }
-          }
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "557",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "558",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "234",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "y_date",
+        "localId" : "563",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongMultiplyNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "563",
             "s" : [ {
-              "value" : [ "", "define ", "y_date", ": " ]
+              "value" : [ "", "define ", "LongMultiplyNearUnderflow", ": " ]
             }, {
-              "r" : "241",
+              "r" : "564",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "239",
+                "r" : "566",
                 "s" : [ {
-                  "r" : "235",
-                  "value" : [ "DateTime", "(", "2015", ")" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "565",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "567",
+                "value" : [ " * ", "1L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "241",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Multiply",
+          "localId" : "564",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "242",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "568",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "569",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "239",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "240",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "235",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            }
-          }
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "566",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "567",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "245",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ym_date",
+        "localId" : "572",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "LongDivideOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "245",
+            "r" : "572",
             "s" : [ {
-              "value" : [ "", "define ", "ym_date", ": " ]
+              "value" : [ "// NOTE: Long division results in decimal, so it must overflow/underflow decimal\n", "define ", "LongDivideOverflow", ": " ]
             }, {
-              "r" : "255",
+              "r" : "573",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "252",
+                "r" : "575",
                 "s" : [ {
-                  "r" : "246",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ")" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "574",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "576",
+                "value" : [ " / ", "0.05" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "255",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Divide",
+          "localId" : "573",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "256",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "580",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "581",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "252",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "578",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "253",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "254",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "579",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "246",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "247",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
+            "operand" : {
+              "type" : "MaxValue",
+              "localId" : "575",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
-          }
+          }, {
+            "type" : "Literal",
+            "localId" : "576",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.05",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "259",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ymd_date",
+        "localId" : "584",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "LongDivideUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "259",
+            "r" : "584",
             "s" : [ {
-              "value" : [ "", "define ", "ymd_date", ": " ]
+              "value" : [ "", "define ", "LongDivideUnderflow", ": " ]
             }, {
-              "r" : "272",
+              "r" : "585",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "268",
+                "r" : "587",
                 "s" : [ {
-                  "r" : "260",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ")" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "586",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "588",
+                "value" : [ " / ", "0.05" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "272",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Divide",
+          "localId" : "585",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "273",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "592",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "593",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "268",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "590",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "269",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "270",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "271",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "591",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "260",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "261",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "262",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
+            "operand" : {
+              "type" : "MinValue",
+              "localId" : "587",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
-          }
+          }, {
+            "type" : "Literal",
+            "localId" : "588",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.05",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "276",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ymdh_date",
+        "localId" : "596",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "LongDivideNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "276",
+            "r" : "596",
             "s" : [ {
-              "value" : [ "", "define ", "ymdh_date", ": " ]
+              "value" : [ "", "define ", "LongDivideNearOverflow", ": " ]
             }, {
-              "r" : "292",
+              "r" : "597",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "287",
+                "r" : "599",
                 "s" : [ {
-                  "r" : "277",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ")" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "598",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "600",
+                "value" : [ " / ", "1024L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "292",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Divide",
+          "localId" : "597",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "293",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "607",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "608",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "287",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "602",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "288",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "289",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "603",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "290",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            } ],
+            "operand" : {
+              "type" : "MaxValue",
+              "localId" : "599",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
-            }, {
+            }
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "605",
+            "annotation" : [ ],
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "291",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "606",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "277",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "278",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "279",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "hour" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "280",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "600",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1024",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "296",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ymdhm_date",
+        "localId" : "611",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "LongDivideNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "296",
+            "r" : "611",
             "s" : [ {
-              "value" : [ "", "define ", "ymdhm_date", ": " ]
+              "value" : [ "", "define ", "LongDivideNearUnderflow", ": " ]
             }, {
-              "r" : "315",
+              "r" : "612",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "309",
+                "r" : "614",
                 "s" : [ {
-                  "r" : "297",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ")" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "613",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "615",
+                "value" : [ " / ", "1024L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "315",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Divide",
+          "localId" : "612",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "316",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "622",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "623",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "309",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "617",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "310",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "311",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "312",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "313",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "314",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "618",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "298",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "299",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
+            "operand" : {
+              "type" : "MinValue",
+              "localId" : "614",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "300",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+            }
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "620",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "621",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
-            },
-            "minute" : {
+            } ],
+            "operand" : {
               "type" : "Literal",
-              "localId" : "301",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "615",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1024",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "319",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ymdhms_date",
+        "localId" : "626",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "LongDivideByZero",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "319",
+            "r" : "626",
             "s" : [ {
-              "value" : [ "", "define ", "ymdhms_date", ": " ]
+              "value" : [ "", "define ", "LongDivideByZero", ": " ]
             }, {
-              "r" : "341",
+              "r" : "627",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "334",
-                "s" : [ {
-                  "r" : "320",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ",", "0", ")" ]
-                } ]
+                "r" : "628",
+                "value" : [ "1L", " / ", "0L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "341",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Divide",
+          "localId" : "627",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "342",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "636",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "637",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "334",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "operand" : [ {
+            "type" : "ToDecimal",
+            "localId" : "631",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "335",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "336",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "337",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "338",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "339",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "340",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "632",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "320",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "321",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "322",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "hour" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "323",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "628",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "324",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+            }
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "634",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "635",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
-            },
-            "second" : {
+            } ],
+            "operand" : {
               "type" : "Literal",
-              "localId" : "325",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "629",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "345",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ymdhmsm_date",
+        "localId" : "640",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongPowerOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "345",
+            "r" : "640",
             "s" : [ {
-              "value" : [ "", "define ", "ymdhmsm_date", ": " ]
+              "value" : [ "", "define ", "LongPowerOverflow", ": " ]
             }, {
-              "r" : "370",
+              "r" : "641",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "362",
+                "r" : "643",
                 "s" : [ {
-                  "r" : "346",
-                  "value" : [ "DateTime", "(", "2015", ",", "01", ",", "01", ",", "0", ",", "0", ",", "0", ",", "0", ")" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "643",
+                  "s" : [ {
+                    "value" : [ "maximum", " " ]
+                  }, {
+                    "r" : "642",
+                    "s" : [ {
+                      "value" : [ "Long" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
+              }, {
+                "r" : "644",
+                "value" : [ "^", "3L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "370",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Power",
+          "localId" : "641",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "371",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "645",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "646",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "362",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "363",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "364",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "365",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "366",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "367",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "368",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "369",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "346",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "347",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "348",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "349",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "350",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "351",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "352",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "643",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "644",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "649",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongPowerUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "649",
+            "s" : [ {
+              "value" : [ "", "define ", "LongPowerUnderflow", ": " ]
+            }, {
+              "r" : "650",
+              "s" : [ {
+                "r" : "652",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "652",
+                  "s" : [ {
+                    "value" : [ "minimum", " " ]
+                  }, {
+                    "r" : "651",
+                    "s" : [ {
+                      "value" : [ "Long" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "653",
+                "value" : [ "^", "3L" ]
+              } ]
+            } ]
           }
+        } ],
+        "expression" : {
+          "type" : "Power",
+          "localId" : "650",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "654",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "655",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "652",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "653",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "374",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "min_date",
+        "localId" : "658",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongPowerNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "374",
+            "r" : "658",
             "s" : [ {
-              "value" : [ "", "define ", "min_date", ": " ]
+              "value" : [ "", "define ", "LongPowerNearOverflow", ": " ]
             }, {
-              "r" : "399",
+              "r" : "659",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "391",
+                "r" : "661",
                 "s" : [ {
-                  "r" : "375",
-                  "value" : [ "DateTime", "(", "0001", ",", "01", ",", "01", ",", "0", ",", "0", ",", "0", ",", "0", ")" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "661",
+                  "s" : [ {
+                    "value" : [ "maximum", " " ]
+                  }, {
+                    "r" : "660",
+                    "s" : [ {
+                      "value" : [ "Long" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
+              }, {
+                "r" : "662",
+                "value" : [ "^", "1L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "399",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Power",
+          "localId" : "659",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "400",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "663",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "664",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "DateTime",
-            "localId" : "391",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "392",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "393",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "394",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "395",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "396",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "397",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "398",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "375",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0001",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "376",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "377",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "01",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "378",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "379",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "380",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "381",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          }
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "661",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "662",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "667",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongPowerNearUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "667",
+            "s" : [ {
+              "value" : [ "", "define ", "LongPowerNearUnderflow", ": " ]
+            }, {
+              "r" : "668",
+              "s" : [ {
+                "r" : "670",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "670",
+                  "s" : [ {
+                    "value" : [ "minimum", " " ]
+                  }, {
+                    "r" : "669",
+                    "s" : [ {
+                      "value" : [ "Long" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "671",
+                "value" : [ "^", "1L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Power",
+          "localId" : "668",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "672",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "673",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "670",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "671",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Quantity
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-
-define days_10: 10 days
-define QL10Days: Quantity{value: 10, unit: 'days'}
-define QL10Min : Quantity{value: 10, unit: 'min' }
-define Jan1_2000: DateTime(2000, 1, 1)
-define add_q_q : days_10 + QL10Days
-define add_d_q : Jan1_2000 + days_10
-define sub_q_q : days_10 - QL10Days
-define sub_d_q : Jan1_2000 - days_10
-define add_q_q_diff : QL10Days + QL10Min
-define sub_q_q_diff : QL10Days - QL10Min
-define div_q_d : days_10 / 2
-define div_q_q : days_10 / QL10Days
-define mul_q_d : days_10 * 2
-define mul_d_q : 2 * QL10Days
-define mul_q_q : 2 'm' * 10 'm'
-define mul_q_q_diff : 2 'm' * 10 '/d'
-define neg : - days_10
-define abs : Abs(neg)
-define MultiplyUcum: (5 'm' * 25 'km') = 125000 'm2'
-define DivideUcum: (20 'm2' / 5 'm') = 4 'm'
-define AddUcum: (5 'm' + 5 'km') = 5005 'm'
-define SubtractUcum: (25 'km' - 5 'm') = 24995 'm'
-*/
-
-module.exports['Quantity'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "411",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "676",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongSuccessorOverflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "676",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "LongSuccessorOverflow", ": " ]
             }, {
+              "r" : "679",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "678",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "677",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Successor",
+          "localId" : "679",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
-          "signature" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "680",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
           "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "type" : "MaxValue",
+            "localId" : "678",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "days_10",
+        "localId" : "683",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongPredecessorUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "683",
             "s" : [ {
-              "value" : [ "", "define ", "days_10", ": " ]
+              "value" : [ "", "define ", "LongPredecessorUnderflow", ": " ]
             }, {
-              "r" : "215",
+              "r" : "686",
               "s" : [ {
-                "value" : [ "10 ", "days" ]
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "685",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "684",
+                  "s" : [ {
+                    "value" : [ "Long" ]
+                  } ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Quantity",
-          "localId" : "215",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "value" : 10,
-          "unit" : "days",
-          "annotation" : [ ]
+          "type" : "Predecessor",
+          "localId" : "686",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "687",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "MinValue",
+            "localId" : "685",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
         }
       }, {
-        "localId" : "218",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QL10Days",
+        "localId" : "690",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongSuccessorNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "218",
+            "r" : "690",
             "s" : [ {
-              "value" : [ "", "define ", "QL10Days", ": " ]
+              "value" : [ "", "define ", "LongSuccessorNearOverflow", ": " ]
             }, {
-              "r" : "219",
+              "r" : "697",
               "s" : [ {
-                "value" : [ "Quantity", "{" ]
+                "value" : [ "successor of " ]
               }, {
+                "r" : "691",
                 "s" : [ {
-                  "r" : "221",
-                  "value" : [ "value", ": ", "10" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "691",
+                  "s" : [ {
+                    "r" : "693",
+                    "s" : [ {
+                      "value" : [ "maximum", " " ]
+                    }, {
+                      "r" : "692",
+                      "s" : [ {
+                        "value" : [ "Long" ]
+                      } ]
+                    } ]
+                  }, {
+                    "r" : "694",
+                    "value" : [ " - ", "1L" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "697",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "698",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Subtract",
+            "localId" : "691",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "695",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "696",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "MaxValue",
+              "localId" : "693",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "694",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "701",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongPredecessorNearUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "701",
+            "s" : [ {
+              "value" : [ "", "define ", "LongPredecessorNearUnderflow", ": " ]
+            }, {
+              "r" : "708",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
               }, {
-                "value" : [ ", " ]
-              }, {
+                "r" : "702",
                 "s" : [ {
-                  "value" : [ "unit", ": " ]
+                  "value" : [ "(" ]
                 }, {
-                  "r" : "225",
+                  "r" : "702",
                   "s" : [ {
-                    "value" : [ "'days'" ]
+                    "r" : "704",
+                    "s" : [ {
+                      "value" : [ "minimum", " " ]
+                    }, {
+                      "r" : "703",
+                      "s" : [ {
+                        "value" : [ "Long" ]
+                      } ]
+                    } ]
+                  }, {
+                    "r" : "705",
+                    "value" : [ " + ", "1L" ]
                   } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
-              }, {
-                "value" : [ "}" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Instance",
-          "localId" : "219",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Predecessor",
+          "localId" : "708",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
-          "element" : [ {
-            "name" : "value",
-            "value" : {
-              "type" : "ToDecimal",
-              "localId" : "223",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "224",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "221",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "name" : "unit",
-            "value" : {
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "709",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Add",
+            "localId" : "702",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "706",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "707",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "MinValue",
+              "localId" : "704",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }, {
               "type" : "Literal",
-              "localId" : "225",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "days",
+              "localId" : "705",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
-            }
-          } ]
+            } ]
+          }
         }
       }, {
-        "localId" : "229",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QL10Min",
+        "localId" : "712",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalAddOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "229",
+            "r" : "712",
             "s" : [ {
-              "value" : [ "", "define ", "QL10Min", " : " ]
+              "value" : [ "// NOTE: Due to JS Number imprecision, we need to exceed min/max by 10000 for it to actually produce a different number\n", "define ", "DecimalAddOverflow", ": " ]
             }, {
-              "r" : "230",
+              "r" : "713",
               "s" : [ {
-                "value" : [ "Quantity", "{" ]
-              }, {
-                "s" : [ {
-                  "r" : "232",
-                  "value" : [ "value", ": ", "10" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
+                "r" : "715",
                 "s" : [ {
-                  "value" : [ "unit", ": " ]
+                  "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "236",
+                  "r" : "714",
                   "s" : [ {
-                    "value" : [ "'min'" ]
+                    "value" : [ "Decimal" ]
                   } ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "r" : "716",
+                "value" : [ " + ", "10000.0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Instance",
-          "localId" : "230",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Add",
+          "localId" : "713",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
-          "element" : [ {
-            "name" : "value",
-            "value" : {
-              "type" : "ToDecimal",
-              "localId" : "234",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "235",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "232",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              }
-            }
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "717",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
           }, {
-            "name" : "unit",
-            "value" : {
-              "type" : "Literal",
-              "localId" : "236",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "min",
-              "annotation" : [ ]
-            }
+            "type" : "NamedTypeSpecifier",
+            "localId" : "718",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "715",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "716",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "10000.0",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "240",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "Jan1_2000",
+        "localId" : "721",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalAddUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "240",
+            "r" : "721",
             "s" : [ {
-              "value" : [ "", "define ", "Jan1_2000", ": " ]
+              "value" : [ "", "define ", "DecimalAddUnderflow", ": " ]
             }, {
-              "r" : "249",
+              "r" : "722",
               "s" : [ {
-                "r" : "241",
-                "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ")" ]
+                "r" : "724",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "723",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ " + " ]
+              }, {
+                "r" : "725",
+                "s" : [ {
+                  "r" : "726",
+                  "value" : [ "-", "10000.0" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "DateTime",
-          "localId" : "249",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Add",
+          "localId" : "722",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "250",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "251",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "728",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "252",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "729",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
-          "year" : {
-            "type" : "Literal",
-            "localId" : "241",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "2000",
-            "annotation" : [ ]
-          },
-          "month" : {
-            "type" : "Literal",
-            "localId" : "242",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "1",
-            "annotation" : [ ]
-          },
-          "day" : {
-            "type" : "Literal",
-            "localId" : "243",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "1",
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "724",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
-          }
+          }, {
+            "type" : "Negate",
+            "localId" : "725",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "727",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "726",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "10000.0",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "255",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "add_q_q",
+        "localId" : "732",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalAddNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "255",
+            "r" : "732",
             "s" : [ {
-              "value" : [ "", "define ", "add_q_q", " : " ]
+              "value" : [ "", "define ", "DecimalAddNearOverflow", ": " ]
             }, {
-              "r" : "256",
+              "r" : "733",
               "s" : [ {
-                "r" : "257",
+                "r" : "735",
                 "s" : [ {
-                  "value" : [ "days_10" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "734",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ " + " ]
-              }, {
-                "r" : "258",
-                "s" : [ {
-                  "value" : [ "QL10Days" ]
-                } ]
+                "r" : "736",
+                "value" : [ " + ", "0.0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Add",
-          "localId" : "256",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "733",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "259",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "737",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "260",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "738",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "257",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "days_10",
+            "type" : "MaxValue",
+            "localId" : "735",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "258",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "QL10Days",
+            "type" : "Literal",
+            "localId" : "736",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.0",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "263",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "add_d_q",
+        "localId" : "741",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalAddNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "263",
+            "r" : "741",
             "s" : [ {
-              "value" : [ "", "define ", "add_d_q", " : " ]
+              "value" : [ "", "define ", "DecimalAddNearUnderflow", ": " ]
             }, {
-              "r" : "264",
+              "r" : "742",
               "s" : [ {
-                "r" : "265",
+                "r" : "744",
                 "s" : [ {
-                  "value" : [ "Jan1_2000" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "743",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ " + " ]
-              }, {
-                "r" : "266",
-                "s" : [ {
-                  "value" : [ "days_10" ]
-                } ]
+                "r" : "745",
+                "value" : [ " + ", "0.0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Add",
-          "localId" : "264",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "localId" : "742",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "267",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "746",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "268",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "747",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "265",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "name" : "Jan1_2000",
+            "type" : "MinValue",
+            "localId" : "744",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "266",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "days_10",
+            "type" : "Literal",
+            "localId" : "745",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.0",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "271",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "sub_q_q",
+        "localId" : "750",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalSubtractOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "271",
+            "r" : "750",
             "s" : [ {
-              "value" : [ "", "define ", "sub_q_q", " : " ]
+              "value" : [ "", "define ", "DecimalSubtractOverflow", ": " ]
             }, {
-              "r" : "272",
+              "r" : "751",
               "s" : [ {
-                "r" : "273",
+                "r" : "753",
                 "s" : [ {
-                  "value" : [ "days_10" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "752",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
                 "value" : [ " - " ]
               }, {
-                "r" : "274",
+                "r" : "754",
                 "s" : [ {
-                  "value" : [ "QL10Days" ]
+                  "r" : "755",
+                  "value" : [ "-", "10000.0" ]
                 } ]
               } ]
             } ]
@@ -9316,279 +17165,303 @@ module.exports['Quantity'] = {
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "272",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "751",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "275",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "757",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "276",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "758",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "273",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "days_10",
+            "type" : "MaxValue",
+            "localId" : "753",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "274",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "QL10Days",
-            "annotation" : [ ]
+            "type" : "Negate",
+            "localId" : "754",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "756",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "755",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "10000.0",
+              "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "279",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "sub_d_q",
+        "localId" : "761",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalSubtractUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "279",
+            "r" : "761",
             "s" : [ {
-              "value" : [ "", "define ", "sub_d_q", " : " ]
+              "value" : [ "", "define ", "DecimalSubtractUnderflow", ": " ]
             }, {
-              "r" : "280",
+              "r" : "762",
               "s" : [ {
-                "r" : "281",
+                "r" : "764",
                 "s" : [ {
-                  "value" : [ "Jan1_2000" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "763",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ " - " ]
-              }, {
-                "r" : "282",
-                "s" : [ {
-                  "value" : [ "days_10" ]
-                } ]
+                "r" : "765",
+                "value" : [ " - ", "10000.0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "280",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "localId" : "762",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "283",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "766",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "284",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "767",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "281",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "name" : "Jan1_2000",
+            "type" : "MinValue",
+            "localId" : "764",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "282",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "days_10",
+            "type" : "Literal",
+            "localId" : "765",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "10000.0",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "287",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "add_q_q_diff",
+        "localId" : "770",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalSubtractNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "287",
+            "r" : "770",
             "s" : [ {
-              "value" : [ "", "define ", "add_q_q_diff", " : " ]
+              "value" : [ "", "define ", "DecimalSubtractNearOverflow", ": " ]
             }, {
-              "r" : "288",
+              "r" : "771",
               "s" : [ {
-                "r" : "289",
+                "r" : "773",
                 "s" : [ {
-                  "value" : [ "QL10Days" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "772",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ " + " ]
-              }, {
-                "r" : "290",
-                "s" : [ {
-                  "value" : [ "QL10Min" ]
-                } ]
+                "r" : "774",
+                "value" : [ " - ", "0.0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Add",
-          "localId" : "288",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Subtract",
+          "localId" : "771",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "291",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "775",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "292",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "776",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "289",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "QL10Days",
+            "type" : "MaxValue",
+            "localId" : "773",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "290",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "QL10Min",
+            "type" : "Literal",
+            "localId" : "774",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.0",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "295",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "sub_q_q_diff",
+        "localId" : "779",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalSubtractNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "295",
+            "r" : "779",
             "s" : [ {
-              "value" : [ "", "define ", "sub_q_q_diff", " : " ]
+              "value" : [ "", "define ", "DecimalSubtractNearUnderflow", ": " ]
             }, {
-              "r" : "296",
+              "r" : "780",
               "s" : [ {
-                "r" : "297",
+                "r" : "782",
                 "s" : [ {
-                  "value" : [ "QL10Days" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "781",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ " - " ]
-              }, {
-                "r" : "298",
-                "s" : [ {
-                  "value" : [ "QL10Min" ]
-                } ]
+                "r" : "783",
+                "value" : [ " - ", "0.0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "296",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "780",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "299",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "784",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "300",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "785",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "297",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "QL10Days",
+            "type" : "MinValue",
+            "localId" : "782",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "298",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "QL10Min",
+            "type" : "Literal",
+            "localId" : "783",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.0",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "303",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "div_q_d",
+        "localId" : "788",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalMultiplyOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "303",
+            "r" : "788",
             "s" : [ {
-              "value" : [ "", "define ", "div_q_d", " : " ]
+              "value" : [ "", "define ", "DecimalMultiplyOverflow", ": " ]
             }, {
-              "r" : "304",
+              "r" : "789",
               "s" : [ {
-                "r" : "305",
+                "r" : "791",
                 "s" : [ {
-                  "value" : [ "days_10" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "790",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
-                "r" : "306",
-                "value" : [ " / ", "2" ]
+                "r" : "792",
+                "value" : [ " * ", "2" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Divide",
-          "localId" : "304",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Multiply",
+          "localId" : "789",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "310",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "796",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "311",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "797",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "305",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "days_10",
+            "type" : "MaxValue",
+            "localId" : "791",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "ToQuantity",
-            "localId" : "308",
+            "type" : "ToDecimal",
+            "localId" : "794",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "309",
+              "localId" : "795",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "306",
+              "localId" : "792",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -9597,2402 +17470,2296 @@ module.exports['Quantity'] = {
           } ]
         }
       }, {
-        "localId" : "314",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "div_q_q",
+        "localId" : "800",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalMultiplyUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "314",
+            "r" : "800",
             "s" : [ {
-              "value" : [ "", "define ", "div_q_q", " : " ]
+              "value" : [ "", "define ", "DecimalMultiplyUnderflow", ": " ]
             }, {
-              "r" : "315",
+              "r" : "801",
               "s" : [ {
-                "r" : "316",
-                "s" : [ {
-                  "value" : [ "days_10" ]
-                } ]
-              }, {
-                "value" : [ " / " ]
-              }, {
-                "r" : "317",
+                "r" : "803",
                 "s" : [ {
-                  "value" : [ "QL10Days" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "802",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "804",
+                "value" : [ " * ", "2" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Divide",
-          "localId" : "315",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Multiply",
+          "localId" : "801",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "318",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "808",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "319",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "809",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "316",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "days_10",
+            "type" : "MinValue",
+            "localId" : "803",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "317",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "QL10Days",
-            "annotation" : [ ]
+            "type" : "ToDecimal",
+            "localId" : "806",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "807",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "804",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "322",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "mul_q_d",
+        "localId" : "812",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalMultiplyNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "322",
+            "r" : "812",
             "s" : [ {
-              "value" : [ "", "define ", "mul_q_d", " : " ]
+              "value" : [ "", "define ", "DecimalMultiplyNearOverflow", ": " ]
             }, {
-              "r" : "323",
+              "r" : "813",
               "s" : [ {
-                "r" : "324",
+                "r" : "815",
                 "s" : [ {
-                  "value" : [ "days_10" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "814",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
-                "r" : "325",
-                "value" : [ " * ", "2" ]
+                "r" : "816",
+                "value" : [ " * ", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Multiply",
-          "localId" : "323",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "813",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "329",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "820",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "330",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "821",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "324",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "days_10",
+            "type" : "MaxValue",
+            "localId" : "815",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "ToQuantity",
-            "localId" : "327",
+            "type" : "ToDecimal",
+            "localId" : "818",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "328",
+              "localId" : "819",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "325",
+              "localId" : "816",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "333",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "mul_d_q",
+        "localId" : "824",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalMultiplyNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "333",
+            "r" : "824",
             "s" : [ {
-              "value" : [ "", "define ", "mul_d_q", " : " ]
+              "value" : [ "", "define ", "DecimalMultiplyNearUnderflow", ": " ]
             }, {
-              "r" : "334",
+              "r" : "825",
               "s" : [ {
-                "r" : "335",
-                "value" : [ "2", " * " ]
-              }, {
-                "r" : "336",
+                "r" : "827",
                 "s" : [ {
-                  "value" : [ "QL10Days" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "826",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "828",
+                "value" : [ " * ", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Multiply",
-          "localId" : "334",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "825",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "340",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "832",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "341",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "833",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ToQuantity",
-            "localId" : "338",
+            "type" : "MinValue",
+            "localId" : "827",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "830",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "339",
+              "localId" : "831",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "335",
+              "localId" : "828",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "336",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "QL10Days",
-            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "344",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "mul_q_q",
+        "localId" : "836",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalDivideOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "344",
+            "r" : "836",
             "s" : [ {
-              "value" : [ "", "define ", "mul_q_q", " : " ]
+              "value" : [ "", "define ", "DecimalDivideOverflow", ": " ]
             }, {
-              "r" : "345",
+              "r" : "837",
               "s" : [ {
-                "r" : "346",
+                "r" : "839",
                 "s" : [ {
-                  "value" : [ "2 ", "'m'" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "838",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ " * " ]
-              }, {
-                "r" : "347",
-                "s" : [ {
-                  "value" : [ "10 ", "'m'" ]
-                } ]
+                "r" : "840",
+                "value" : [ " / ", "0.5" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Multiply",
-          "localId" : "345",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Divide",
+          "localId" : "837",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "348",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "841",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "349",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "842",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Quantity",
-            "localId" : "346",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 2,
-            "unit" : "m",
+            "type" : "MaxValue",
+            "localId" : "839",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "Quantity",
-            "localId" : "347",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 10,
-            "unit" : "m",
+            "type" : "Literal",
+            "localId" : "840",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.5",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "352",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "mul_q_q_diff",
+        "localId" : "845",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalDivideUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "352",
+            "r" : "845",
             "s" : [ {
-              "value" : [ "", "define ", "mul_q_q_diff", " : " ]
+              "value" : [ "", "define ", "DecimalDivideUnderflow", ": " ]
             }, {
-              "r" : "353",
+              "r" : "846",
               "s" : [ {
-                "r" : "354",
+                "r" : "848",
                 "s" : [ {
-                  "value" : [ "2 ", "'m'" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "847",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ " * " ]
-              }, {
-                "r" : "355",
-                "s" : [ {
-                  "value" : [ "10 ", "'/d'" ]
-                } ]
+                "r" : "849",
+                "value" : [ " / ", "0.5" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Multiply",
-          "localId" : "353",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Divide",
+          "localId" : "846",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "356",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "850",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "357",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "851",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Quantity",
-            "localId" : "354",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 2,
-            "unit" : "m",
+            "type" : "MinValue",
+            "localId" : "848",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
-            "type" : "Quantity",
-            "localId" : "355",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 10,
-            "unit" : "/d",
+            "type" : "Literal",
+            "localId" : "849",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.5",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "360",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "neg",
+        "localId" : "854",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalDivideNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "360",
+            "r" : "854",
             "s" : [ {
-              "value" : [ "", "define ", "neg", " : " ]
+              "value" : [ "", "define ", "DecimalDivideNearOverflow", ": " ]
             }, {
-              "r" : "361",
+              "r" : "855",
               "s" : [ {
-                "value" : [ "- " ]
-              }, {
-                "r" : "362",
+                "r" : "857",
                 "s" : [ {
-                  "value" : [ "days_10" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "856",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
+              }, {
+                "r" : "858",
+                "value" : [ " / ", "1.0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Negate",
-          "localId" : "361",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Divide",
+          "localId" : "855",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "363",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "859",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "860",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "857",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
-          } ],
-          "operand" : {
-            "type" : "ExpressionRef",
-            "localId" : "362",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "days_10",
+          }, {
+            "type" : "Literal",
+            "localId" : "858",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "1.0",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "366",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "abs",
+        "localId" : "863",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalDivideNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "366",
+            "r" : "863",
             "s" : [ {
-              "value" : [ "", "define ", "abs", " : " ]
+              "value" : [ "", "define ", "DecimalDivideNearUnderflow", ": " ]
             }, {
-              "r" : "371",
+              "r" : "864",
               "s" : [ {
-                "value" : [ "Abs", "(" ]
-              }, {
-                "r" : "367",
+                "r" : "866",
                 "s" : [ {
-                  "value" : [ "neg" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "865",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "867",
+                "value" : [ " / ", "1.0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Abs",
-          "localId" : "371",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Divide",
+          "localId" : "864",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "372",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "868",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "869",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "ExpressionRef",
-            "localId" : "367",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "neg",
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "866",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
-          }
+          }, {
+            "type" : "Literal",
+            "localId" : "867",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "1.0",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "375",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MultiplyUcum",
+        "localId" : "872",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalDivideByZero",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "375",
+            "r" : "872",
             "s" : [ {
-              "value" : [ "", "define ", "MultiplyUcum", ": " ]
+              "value" : [ "", "define ", "DecimalDivideByZero", ": " ]
             }, {
-              "r" : "376",
+              "r" : "873",
               "s" : [ {
-                "r" : "377",
-                "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "377",
-                  "s" : [ {
-                    "r" : "378",
-                    "s" : [ {
-                      "value" : [ "5 ", "'m'" ]
-                    } ]
-                  }, {
-                    "value" : [ " * " ]
-                  }, {
-                    "r" : "379",
-                    "s" : [ {
-                      "value" : [ "25 ", "'km'" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "value" : [ " ", "=", " " ]
-              }, {
-                "r" : "382",
-                "s" : [ {
-                  "value" : [ "125000 ", "'m2'" ]
-                } ]
+                "r" : "874",
+                "value" : [ "1.0", " / ", "0" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Equal",
-          "localId" : "376",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Divide",
+          "localId" : "873",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "383",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "879",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "384",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "880",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Multiply",
-            "localId" : "377",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Literal",
+            "localId" : "874",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "1.0",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "877",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "380",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "381",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "878",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "operand" : [ {
-              "type" : "Quantity",
-              "localId" : "378",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "m",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "379",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 25,
-              "unit" : "km",
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "875",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
-            } ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "382",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 125000,
-            "unit" : "m2",
-            "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "387",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DivideUcum",
+        "localId" : "883",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalPowerOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "387",
+            "r" : "883",
             "s" : [ {
-              "value" : [ "", "define ", "DivideUcum", ": " ]
+              "value" : [ "", "define ", "DecimalPowerOverflow", ": " ]
             }, {
-              "r" : "388",
+              "r" : "884",
               "s" : [ {
-                "r" : "389",
+                "r" : "886",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "389",
+                  "r" : "886",
                   "s" : [ {
-                    "r" : "390",
-                    "s" : [ {
-                      "value" : [ "20 ", "'m2'" ]
-                    } ]
-                  }, {
-                    "value" : [ " / " ]
+                    "value" : [ "maximum", " " ]
                   }, {
-                    "r" : "391",
+                    "r" : "885",
                     "s" : [ {
-                      "value" : [ "5 ", "'m'" ]
+                      "value" : [ "Decimal" ]
                     } ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "value" : [ " ", "=", " " ]
-              }, {
-                "r" : "394",
-                "s" : [ {
-                  "value" : [ "4 ", "'m'" ]
-                } ]
+                "r" : "887",
+                "value" : [ "^", "2" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Equal",
-          "localId" : "388",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Power",
+          "localId" : "884",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "395",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "891",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "396",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "892",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Divide",
-            "localId" : "389",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "MaxValue",
+            "localId" : "886",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "889",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "392",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "393",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "890",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "operand" : [ {
-              "type" : "Quantity",
-              "localId" : "390",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 20,
-              "unit" : "m2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "391",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "m",
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "887",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
               "annotation" : [ ]
-            } ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "394",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 4,
-            "unit" : "m",
-            "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "399",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AddUcum",
+        "localId" : "895",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalPowerUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "399",
+            "r" : "895",
             "s" : [ {
-              "value" : [ "", "define ", "AddUcum", ": " ]
+              "value" : [ "", "define ", "DecimalPowerUnderflow", ": " ]
             }, {
-              "r" : "400",
+              "r" : "896",
               "s" : [ {
-                "r" : "401",
+                "r" : "898",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "401",
+                  "r" : "898",
                   "s" : [ {
-                    "r" : "402",
-                    "s" : [ {
-                      "value" : [ "5 ", "'m'" ]
-                    } ]
-                  }, {
-                    "value" : [ " + " ]
+                    "value" : [ "minimum", " " ]
                   }, {
-                    "r" : "403",
+                    "r" : "897",
                     "s" : [ {
-                      "value" : [ "5 ", "'km'" ]
+                      "value" : [ "Decimal" ]
                     } ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "value" : [ " ", "=", " " ]
-              }, {
-                "r" : "406",
-                "s" : [ {
-                  "value" : [ "5005 ", "'m'" ]
-                } ]
+                "r" : "899",
+                "value" : [ "^", "3" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Equal",
-          "localId" : "400",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Power",
+          "localId" : "896",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "407",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "903",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "408",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "904",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Add",
-            "localId" : "401",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "MinValue",
+            "localId" : "898",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "901",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "404",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "405",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "902",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "operand" : [ {
-              "type" : "Quantity",
-              "localId" : "402",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "m",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "403",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "km",
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "899",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
               "annotation" : [ ]
-            } ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "406",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 5005,
-            "unit" : "m",
-            "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "411",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "SubtractUcum",
+        "localId" : "907",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalPowerNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "411",
+            "r" : "907",
             "s" : [ {
-              "value" : [ "", "define ", "SubtractUcum", ": " ]
+              "value" : [ "", "define ", "DecimalPowerNearOverflow", ": " ]
             }, {
-              "r" : "412",
+              "r" : "908",
               "s" : [ {
-                "r" : "413",
+                "r" : "910",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "413",
+                  "r" : "910",
                   "s" : [ {
-                    "r" : "414",
-                    "s" : [ {
-                      "value" : [ "25 ", "'km'" ]
-                    } ]
-                  }, {
-                    "value" : [ " - " ]
+                    "value" : [ "maximum", " " ]
                   }, {
-                    "r" : "415",
+                    "r" : "909",
                     "s" : [ {
-                      "value" : [ "5 ", "'m'" ]
+                      "value" : [ "Decimal" ]
                     } ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "value" : [ " ", "=", " " ]
-              }, {
-                "r" : "418",
-                "s" : [ {
-                  "value" : [ "24995 ", "'m'" ]
-                } ]
+                "r" : "911",
+                "value" : [ "^", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Equal",
-          "localId" : "412",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Power",
+          "localId" : "908",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "419",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "915",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "420",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "916",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Subtract",
-            "localId" : "413",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "MaxValue",
+            "localId" : "910",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "913",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "416",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "417",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "914",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "operand" : [ {
-              "type" : "Quantity",
-              "localId" : "414",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 25,
-              "unit" : "km",
-              "annotation" : [ ]
-            }, {
-              "type" : "Quantity",
-              "localId" : "415",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "m",
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "911",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
-            } ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "418",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 24995,
-            "unit" : "m",
-            "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "919",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalPowerNearUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "919",
+            "s" : [ {
+              "value" : [ "", "define ", "DecimalPowerNearUnderflow", ": " ]
+            }, {
+              "r" : "920",
+              "s" : [ {
+                "r" : "922",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "922",
+                  "s" : [ {
+                    "value" : [ "minimum", " " ]
+                  }, {
+                    "r" : "921",
+                    "s" : [ {
+                      "value" : [ "Decimal" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "923",
+                "value" : [ "^", "1" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Power",
+          "localId" : "920",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "927",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "928",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "922",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          }, {
+            "type" : "ToDecimal",
+            "localId" : "925",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "926",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "923",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* OutOfBounds
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define IntegerAddOverflow: maximum Integer + 1
-define IntegerAddUnderflow: minimum Integer + -1
-define IntegerSubtractOverflow: maximum Integer - -1
-define IntegerSubtractUnderflow: minimum Integer - 1
-define IntegerMultiplyOverflow: maximum Integer * 2
-define IntegerMultiplyUnderflow: minimum Integer * -2
-define IntegerDivideOverflow: maximum Integer / (0.5)
-define IntegerDivideUnderflow: minimum Integer / (-0.5)
-define IntegerDivideByZero: 1 / 0
-define IntegerPowerOverflow: (maximum Integer)^3
-define IntegerPowerUnderflow: (minimum Integer)^3
-define IntegerSuccessorOverflow: successor of maximum Integer
-define IntegerPredecessorUnderflow: predecessor of minimum Integer
-
-define DecimalAddOverflow: maximum Decimal + 1.0
-define DecimalAddUnderflow: minimum Decimal + -1.0
-define DecimalSubtractOverflow: maximum Decimal - -1.0
-define DecimalSubtractUnderflow: minimum Decimal - 1.0
-define DecimalMultiplyOverflow: maximum Decimal * 2
-define DecimalMultiplyUnderflow: minimum Decimal * -2
-define DecimalDivideOverflow: maximum Decimal / (0.5)
-define DecimalDivideUnderflow: minimum Decimal / (-0.5)
-define DecimalDivideByZero: 1.0 / 0
-define DecimalPowerOverflow: (maximum Decimal)^2
-define DecimalPowerUnderflow: (minimum Decimal)^3
-define DecimalSuccessorOverflow: successor of maximum Decimal
-define DecimalPredecessorUnderflow: predecessor of minimum Decimal
-
-define MaxQuantity: Quantity { value: maximum Decimal, unit: 'mm' }
-define MinQuantity: Quantity { value: minimum Decimal, unit: 'mm' }
-define QuantityAddOverflow: MaxQuantity + 1.0 'mm'
-define QuantityAddUnderflow: MinQuantity + (-1.0 'mm')
-define QuantitySubtractOverflow: MaxQuantity - (-1 'mm')
-define QuantitySubtractUnderflow: MinQuantity - 1 'mm'
-define QuantityMultiplyOverflow: MaxQuantity * 2 'mm'
-define QuantityMultiplyUnderflow: MinQuantity * 2 'mm'
-define QuantityDivideOverflow: MaxQuantity / 0.5 'mm'
-define QuantityDivideUnderflow: MinQuantity / (-0.5 'mm')
-define QuantityDivideByZero: 1.0 'mm' / 0 'mm'
-define QuantitySuccessorOverflow: successor of MaxQuantity
-define QuantityPredecessorUnderflow: predecessor of MinQuantity
-
-define DateTimeAddOverflow: maximum DateTime + 1 day
-define DateTimeAddUnderflow: minimum DateTime + (-1 day)
-define DateTimeSubtractOverflow: maximum DateTime - (-1 day)
-define DateTimeSubtractUnderflow: minimum DateTime - 1 day
-define DateTimeSuccessorOverflow: successor of maximum DateTime
-define DateTimePredecessorUnderflow: predecessor of minimum DateTime
-
-define DateAddOverflow: maximum Date + 1 day
-define DateAddUnderflow: minimum Date + (-1 day)
-define DateSubtractOverflow: maximum Date - (-1 day)
-define DateSubtractUnderflow: minimum Date - 1 day
-define DateSuccessorOverflow: successor of maximum Date
-define DatePredecessorUnderflow: predecessor of minimum Date
-
-define TimeAddOverflow: maximum Time + 1 second
-define TimeAddUnderflow: minimum Time + (-1 second)
-define TimeSubtractOverflow: maximum Time - (-1 second)
-define TimeSubtractUnderflow: minimum Time - 1 second
-define TimeSuccessorOverflow: successor of maximum Time
-define TimePredecessorUnderflow: predecessor of minimum Time
-
-define ExpOverflow: Exp(maximum Decimal)
-*/
-
-module.exports['OutOfBounds'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "751",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "931",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalSuccessorOverflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "931",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "DecimalSuccessorOverflow", ": " ]
             }, {
+              "r" : "934",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "933",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "932",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Successor",
+          "localId" : "934",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
-          "signature" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "935",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
           "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "type" : "MaxValue",
+            "localId" : "933",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerAddOverflow",
+        "localId" : "938",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalPredecessorUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "938",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerAddOverflow", ": " ]
+              "value" : [ "", "define ", "DecimalPredecessorUnderflow", ": " ]
             }, {
-              "r" : "215",
+              "r" : "941",
               "s" : [ {
-                "r" : "217",
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "940",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
+                  "value" : [ "minimum", " " ]
                 }, {
-                  "r" : "216",
+                  "r" : "939",
                   "s" : [ {
-                    "value" : [ "Integer" ]
+                    "value" : [ "Decimal" ]
                   } ]
                 } ]
-              }, {
-                "r" : "218",
-                "value" : [ " + ", "1" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Add",
-          "localId" : "215",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Predecessor",
+          "localId" : "941",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "219",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "220",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "942",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "217",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }, {
-            "type" : "Literal",
-            "localId" : "218",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "1",
+          "operand" : {
+            "type" : "MinValue",
+            "localId" : "940",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
-          } ]
+          }
         }
       }, {
-        "localId" : "223",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerAddUnderflow",
+        "localId" : "945",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalSuccessorNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "223",
+            "r" : "945",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerAddUnderflow", ": " ]
+              "value" : [ "", "define ", "DecimalSuccessorNearOverflow", ": " ]
             }, {
-              "r" : "224",
+              "r" : "952",
               "s" : [ {
-                "r" : "226",
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "946",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
+                  "value" : [ "(" ]
                 }, {
-                  "r" : "225",
+                  "r" : "946",
                   "s" : [ {
-                    "value" : [ "Integer" ]
+                    "r" : "948",
+                    "s" : [ {
+                      "value" : [ "maximum", " " ]
+                    }, {
+                      "r" : "947",
+                      "s" : [ {
+                        "value" : [ "Decimal" ]
+                      } ]
+                    } ]
+                  }, {
+                    "r" : "949",
+                    "value" : [ " - ", "0.00000001" ]
                   } ]
-                } ]
-              }, {
-                "value" : [ " + " ]
-              }, {
-                "r" : "227",
-                "s" : [ {
-                  "r" : "228",
-                  "value" : [ "-", "1" ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Add",
-          "localId" : "224",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Successor",
+          "localId" : "952",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "230",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "953",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
-          }, {
+          } ],
+          "operand" : {
+            "type" : "Subtract",
+            "localId" : "946",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "950",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "951",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "MaxValue",
+              "localId" : "948",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "949",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.00000001",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "956",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalPredecessorNearUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "956",
+            "s" : [ {
+              "value" : [ "", "define ", "DecimalPredecessorNearUnderflow", ": " ]
+            }, {
+              "r" : "963",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "957",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "957",
+                  "s" : [ {
+                    "r" : "959",
+                    "s" : [ {
+                      "value" : [ "minimum", " " ]
+                    }, {
+                      "r" : "958",
+                      "s" : [ {
+                        "value" : [ "Decimal" ]
+                      } ]
+                    } ]
+                  }, {
+                    "r" : "960",
+                    "value" : [ " + ", "0.00000001" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "963",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "231",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "964",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "226",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }, {
-            "type" : "Negate",
-            "localId" : "227",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "operand" : {
+            "type" : "Add",
+            "localId" : "957",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "961",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "962",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
-            "operand" : {
+            "operand" : [ {
+              "type" : "MinValue",
+              "localId" : "959",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }, {
               "type" : "Literal",
-              "localId" : "228",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "localId" : "960",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.00000001",
               "annotation" : [ ]
-            }
-          } ]
+            } ]
+          }
         }
       }, {
-        "localId" : "234",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerSubtractOverflow",
+        "localId" : "967",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "MaxQuantity",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "967",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerSubtractOverflow", ": " ]
+              "value" : [ "", "define ", "MaxQuantity", ": " ]
             }, {
-              "r" : "235",
+              "r" : "968",
               "s" : [ {
-                "r" : "237",
+                "value" : [ "Quantity", " { " ]
+              }, {
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
+                  "value" : [ "value", ": " ]
                 }, {
-                  "r" : "236",
+                  "r" : "971",
                   "s" : [ {
-                    "value" : [ "Integer" ]
+                    "value" : [ "maximum", " " ]
+                  }, {
+                    "r" : "970",
+                    "s" : [ {
+                      "value" : [ "Decimal" ]
+                    } ]
                   } ]
                 } ]
               }, {
-                "value" : [ " - " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "238",
                 "s" : [ {
-                  "r" : "239",
-                  "value" : [ "-", "1" ]
+                  "value" : [ "unit", ": " ]
+                }, {
+                  "r" : "972",
+                  "s" : [ {
+                    "value" : [ "'mm'" ]
+                  } ]
                 } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Subtract",
-          "localId" : "235",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Instance",
+          "localId" : "968",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "241",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "242",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "237",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }, {
-            "type" : "Negate",
-            "localId" : "238",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "240",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+          "element" : [ {
+            "name" : "value",
+            "value" : {
+              "type" : "MaxValue",
+              "localId" : "971",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
-            } ],
-            "operand" : {
+            }
+          }, {
+            "name" : "unit",
+            "value" : {
               "type" : "Literal",
-              "localId" : "239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "localId" : "972",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "mm",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "245",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerSubtractUnderflow",
+        "localId" : "976",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "MinQuantity",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "245",
+            "r" : "976",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerSubtractUnderflow", ": " ]
+              "value" : [ "", "define ", "MinQuantity", ": " ]
             }, {
-              "r" : "246",
+              "r" : "977",
               "s" : [ {
-                "r" : "248",
+                "value" : [ "Quantity", " { " ]
+              }, {
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
+                  "value" : [ "value", ": " ]
                 }, {
-                  "r" : "247",
+                  "r" : "980",
                   "s" : [ {
-                    "value" : [ "Integer" ]
+                    "value" : [ "minimum", " " ]
+                  }, {
+                    "r" : "979",
+                    "s" : [ {
+                      "value" : [ "Decimal" ]
+                    } ]
                   } ]
                 } ]
               }, {
-                "r" : "249",
-                "value" : [ " - ", "1" ]
+                "value" : [ ", " ]
+              }, {
+                "s" : [ {
+                  "value" : [ "unit", ": " ]
+                }, {
+                  "r" : "981",
+                  "s" : [ {
+                    "value" : [ "'mm'" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Subtract",
-          "localId" : "246",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Instance",
+          "localId" : "977",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "250",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "251",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "248",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
+          "element" : [ {
+            "name" : "value",
+            "value" : {
+              "type" : "MinValue",
+              "localId" : "980",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
           }, {
-            "type" : "Literal",
-            "localId" : "249",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "1",
-            "annotation" : [ ]
+            "name" : "unit",
+            "value" : {
+              "type" : "Literal",
+              "localId" : "981",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "mm",
+              "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "254",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerMultiplyOverflow",
+        "localId" : "985",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityAddOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "254",
+            "r" : "985",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerMultiplyOverflow", ": " ]
+              "value" : [ "// NOTE: Due to JS Number imprecision, we need to exceed min/max by 10000 for it to actually produce a different number\n", "define ", "QuantityAddOverflow", ": " ]
             }, {
-              "r" : "255",
+              "r" : "986",
               "s" : [ {
-                "r" : "257",
+                "r" : "987",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
-                }, {
-                  "r" : "256",
-                  "s" : [ {
-                    "value" : [ "Integer" ]
-                  } ]
+                  "value" : [ "MaxQuantity" ]
                 } ]
               }, {
-                "r" : "258",
-                "value" : [ " * ", "2" ]
+                "value" : [ " + " ]
+              }, {
+                "r" : "988",
+                "s" : [ {
+                  "value" : [ "10000.0 ", "'mm'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Multiply",
-          "localId" : "255",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Add",
+          "localId" : "986",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "259",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "989",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "260",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "990",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "257",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "type" : "ExpressionRef",
+            "localId" : "987",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MaxQuantity",
             "annotation" : [ ]
           }, {
-            "type" : "Literal",
-            "localId" : "258",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "2",
+            "type" : "Quantity",
+            "localId" : "988",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 10000.0,
+            "unit" : "mm",
             "annotation" : [ ]
           } ]
-        }
-      }, {
-        "localId" : "263",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerMultiplyUnderflow",
+        }
+      }, {
+        "localId" : "993",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityAddUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "263",
+            "r" : "993",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerMultiplyUnderflow", ": " ]
+              "value" : [ "", "define ", "QuantityAddUnderflow", ": " ]
             }, {
-              "r" : "264",
+              "r" : "994",
               "s" : [ {
-                "r" : "266",
+                "r" : "995",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
-                }, {
-                  "r" : "265",
-                  "s" : [ {
-                    "value" : [ "Integer" ]
-                  } ]
+                  "value" : [ "MinQuantity" ]
                 } ]
               }, {
-                "value" : [ " * " ]
+                "value" : [ " + " ]
               }, {
-                "r" : "267",
+                "r" : "996",
                 "s" : [ {
-                  "r" : "268",
-                  "value" : [ "-", "2" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "996",
+                  "s" : [ {
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "997",
+                    "s" : [ {
+                      "value" : [ "10000.0 ", "'mm'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Multiply",
-          "localId" : "264",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Add",
+          "localId" : "994",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "270",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "999",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "271",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "1000",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "266",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "type" : "ExpressionRef",
+            "localId" : "995",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MinQuantity",
             "annotation" : [ ]
           }, {
             "type" : "Negate",
-            "localId" : "267",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "996",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "269",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "998",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : {
-              "type" : "Literal",
-              "localId" : "268",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "type" : "Quantity",
+              "localId" : "997",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 10000.0,
+              "unit" : "mm",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "274",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "IntegerDivideOverflow",
+        "localId" : "1003",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityAddNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "274",
+            "r" : "1003",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerDivideOverflow", ": " ]
+              "value" : [ "", "define ", "QuantityAddNearOverflow", ": " ]
             }, {
-              "r" : "275",
+              "r" : "1004",
               "s" : [ {
-                "r" : "277",
+                "r" : "1005",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
-                }, {
-                  "r" : "276",
-                  "s" : [ {
-                    "value" : [ "Integer" ]
-                  } ]
+                  "value" : [ "MaxQuantity" ]
                 } ]
               }, {
-                "value" : [ " / " ]
+                "value" : [ " + " ]
               }, {
-                "r" : "278",
+                "r" : "1006",
                 "s" : [ {
-                  "r" : "278",
-                  "value" : [ "(", "0.5", ")" ]
+                  "value" : [ "0.0 ", "'mm'" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Divide",
-          "localId" : "275",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Add",
+          "localId" : "1004",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "282",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1007",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "283",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1008",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ToDecimal",
-            "localId" : "280",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "281",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "MaxValue",
-              "localId" : "277",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
+            "type" : "ExpressionRef",
+            "localId" : "1005",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MaxQuantity",
+            "annotation" : [ ]
           }, {
-            "type" : "Literal",
-            "localId" : "278",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "0.5",
+            "type" : "Quantity",
+            "localId" : "1006",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 0.0,
+            "unit" : "mm",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "286",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "IntegerDivideUnderflow",
+        "localId" : "1011",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityAddNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "286",
+            "r" : "1011",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerDivideUnderflow", ": " ]
+              "value" : [ "", "define ", "QuantityAddNearUnderflow", ": " ]
             }, {
-              "r" : "287",
+              "r" : "1012",
               "s" : [ {
-                "r" : "289",
+                "r" : "1013",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
-                }, {
-                  "r" : "288",
-                  "s" : [ {
-                    "value" : [ "Integer" ]
-                  } ]
+                  "value" : [ "MinQuantity" ]
                 } ]
               }, {
-                "value" : [ " / " ]
+                "value" : [ " + " ]
               }, {
-                "r" : "290",
+                "r" : "1014",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "290",
-                  "s" : [ {
-                    "r" : "291",
-                    "value" : [ "-", "0.5" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "0.0 ", "'mm'" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Divide",
-          "localId" : "287",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Add",
+          "localId" : "1012",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "296",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1015",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "297",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1016",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ToDecimal",
-            "localId" : "294",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "295",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "MinValue",
-              "localId" : "289",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
+            "type" : "ExpressionRef",
+            "localId" : "1013",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MinQuantity",
+            "annotation" : [ ]
           }, {
-            "type" : "Negate",
-            "localId" : "290",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "292",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "291",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.5",
-              "annotation" : [ ]
-            }
+            "type" : "Quantity",
+            "localId" : "1014",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 0.0,
+            "unit" : "mm",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "300",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "IntegerDivideByZero",
+        "localId" : "1019",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantitySubtractOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "300",
+            "r" : "1019",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerDivideByZero", ": " ]
+              "value" : [ "", "define ", "QuantitySubtractOverflow", ": " ]
             }, {
-              "r" : "301",
+              "r" : "1020",
               "s" : [ {
-                "r" : "302",
-                "value" : [ "1", " / ", "0" ]
+                "r" : "1021",
+                "s" : [ {
+                  "value" : [ "MaxQuantity" ]
+                } ]
+              }, {
+                "value" : [ " - " ]
+              }, {
+                "r" : "1022",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "1022",
+                  "s" : [ {
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "1023",
+                    "s" : [ {
+                      "value" : [ "10000 ", "'mm'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Divide",
-          "localId" : "301",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Subtract",
+          "localId" : "1020",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "310",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1025",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "311",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1026",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ToDecimal",
-            "localId" : "305",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "306",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "302",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }
+            "type" : "ExpressionRef",
+            "localId" : "1021",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MaxQuantity",
+            "annotation" : [ ]
           }, {
-            "type" : "ToDecimal",
-            "localId" : "308",
+            "type" : "Negate",
+            "localId" : "1022",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "309",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1024",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : {
-              "type" : "Literal",
-              "localId" : "303",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "type" : "Quantity",
+              "localId" : "1023",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 10000,
+              "unit" : "mm",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "314",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerPowerOverflow",
+        "localId" : "1029",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantitySubtractUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "314",
+            "r" : "1029",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerPowerOverflow", ": " ]
+              "value" : [ "", "define ", "QuantitySubtractUnderflow", ": " ]
             }, {
-              "r" : "315",
+              "r" : "1030",
               "s" : [ {
-                "r" : "317",
+                "r" : "1031",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "317",
-                  "s" : [ {
-                    "value" : [ "maximum", " " ]
-                  }, {
-                    "r" : "316",
-                    "s" : [ {
-                      "value" : [ "Integer" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "MinQuantity" ]
                 } ]
               }, {
-                "r" : "318",
-                "value" : [ "^", "3" ]
+                "value" : [ " - " ]
+              }, {
+                "r" : "1032",
+                "s" : [ {
+                  "value" : [ "10000 ", "'mm'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Power",
-          "localId" : "315",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Subtract",
+          "localId" : "1030",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "319",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "1033",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "320",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "1034",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "317",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "type" : "ExpressionRef",
+            "localId" : "1031",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MinQuantity",
             "annotation" : [ ]
           }, {
-            "type" : "Literal",
-            "localId" : "318",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "3",
+            "type" : "Quantity",
+            "localId" : "1032",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 10000,
+            "unit" : "mm",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "323",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerPowerUnderflow",
+        "localId" : "1037",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantitySubtractNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "323",
+            "r" : "1037",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerPowerUnderflow", ": " ]
+              "value" : [ "", "define ", "QuantitySubtractNearOverflow", ": " ]
             }, {
-              "r" : "324",
+              "r" : "1038",
               "s" : [ {
-                "r" : "326",
+                "r" : "1039",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "326",
-                  "s" : [ {
-                    "value" : [ "minimum", " " ]
-                  }, {
-                    "r" : "325",
-                    "s" : [ {
-                      "value" : [ "Integer" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "MaxQuantity" ]
                 } ]
               }, {
-                "r" : "327",
-                "value" : [ "^", "3" ]
+                "value" : [ " - " ]
+              }, {
+                "r" : "1040",
+                "s" : [ {
+                  "value" : [ "0.0 ", "'mm'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Power",
-          "localId" : "324",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Subtract",
+          "localId" : "1038",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "328",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "1041",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "329",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "1042",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "326",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "type" : "ExpressionRef",
+            "localId" : "1039",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MaxQuantity",
             "annotation" : [ ]
           }, {
-            "type" : "Literal",
-            "localId" : "327",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "3",
+            "type" : "Quantity",
+            "localId" : "1040",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 0.0,
+            "unit" : "mm",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "332",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerSuccessorOverflow",
+        "localId" : "1045",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantitySubtractNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "332",
+            "r" : "1045",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerSuccessorOverflow", ": " ]
+              "value" : [ "", "define ", "QuantitySubtractNearUnderflow", ": " ]
             }, {
-              "r" : "335",
+              "r" : "1046",
               "s" : [ {
-                "value" : [ "successor of " ]
+                "r" : "1047",
+                "s" : [ {
+                  "value" : [ "MinQuantity" ]
+                } ]
+              }, {
+                "value" : [ " - " ]
               }, {
-                "r" : "334",
+                "r" : "1048",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
-                }, {
-                  "r" : "333",
-                  "s" : [ {
-                    "value" : [ "Integer" ]
-                  } ]
+                  "value" : [ "0.0 ", "'mm'" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "335",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Subtract",
+          "localId" : "1046",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "336",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "1049",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1050",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "MaxValue",
-            "localId" : "334",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1047",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MinQuantity",
             "annotation" : [ ]
-          }
+          }, {
+            "type" : "Quantity",
+            "localId" : "1048",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 0.0,
+            "unit" : "mm",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "339",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntegerPredecessorUnderflow",
+        "localId" : "1053",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityMultiplyOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "339",
+            "r" : "1053",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerPredecessorUnderflow", ": " ]
+              "value" : [ "", "define ", "QuantityMultiplyOverflow", ": " ]
             }, {
-              "r" : "342",
+              "r" : "1054",
               "s" : [ {
-                "value" : [ "predecessor of " ]
+                "r" : "1055",
+                "s" : [ {
+                  "value" : [ "MaxQuantity" ]
+                } ]
               }, {
-                "r" : "341",
+                "value" : [ " * " ]
+              }, {
+                "r" : "1056",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
-                }, {
-                  "r" : "340",
-                  "s" : [ {
-                    "value" : [ "Integer" ]
-                  } ]
+                  "value" : [ "2 ", "'mm'" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "342",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Multiply",
+          "localId" : "1054",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "343",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "1057",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1058",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "MinValue",
-            "localId" : "341",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1055",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MaxQuantity",
             "annotation" : [ ]
-          }
+          }, {
+            "type" : "Quantity",
+            "localId" : "1056",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 2,
+            "unit" : "mm",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "346",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalAddOverflow",
+        "localId" : "1061",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityMultiplyUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "346",
+            "r" : "1061",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalAddOverflow", ": " ]
+              "value" : [ "", "define ", "QuantityMultiplyUnderflow", ": " ]
             }, {
-              "r" : "347",
+              "r" : "1062",
               "s" : [ {
-                "r" : "349",
+                "r" : "1063",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
-                }, {
-                  "r" : "348",
-                  "s" : [ {
-                    "value" : [ "Decimal" ]
-                  } ]
+                  "value" : [ "MinQuantity" ]
                 } ]
               }, {
-                "r" : "350",
-                "value" : [ " + ", "1.0" ]
+                "value" : [ " * " ]
+              }, {
+                "r" : "1064",
+                "s" : [ {
+                  "value" : [ "2 ", "'mm'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Add",
-          "localId" : "347",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Multiply",
+          "localId" : "1062",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "351",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1065",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "352",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1066",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "349",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "type" : "ExpressionRef",
+            "localId" : "1063",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MinQuantity",
             "annotation" : [ ]
           }, {
-            "type" : "Literal",
-            "localId" : "350",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "1.0",
+            "type" : "Quantity",
+            "localId" : "1064",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 2,
+            "unit" : "mm",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "355",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalAddUnderflow",
+        "localId" : "1069",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityMultiplyNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "355",
+            "r" : "1069",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalAddUnderflow", ": " ]
+              "value" : [ "", "define ", "QuantityMultiplyNearOverflow", ": " ]
             }, {
-              "r" : "356",
-              "s" : [ {
-                "r" : "358",
-                "s" : [ {
-                  "value" : [ "minimum", " " ]
-                }, {
-                  "r" : "357",
-                  "s" : [ {
-                    "value" : [ "Decimal" ]
-                  } ]
+              "r" : "1070",
+              "s" : [ {
+                "r" : "1071",
+                "s" : [ {
+                  "value" : [ "MaxQuantity" ]
                 } ]
               }, {
-                "value" : [ " + " ]
+                "value" : [ " * " ]
               }, {
-                "r" : "359",
+                "r" : "1072",
                 "s" : [ {
-                  "r" : "360",
-                  "value" : [ "-", "1.0" ]
+                  "value" : [ "1 ", "'mm'" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Add",
-          "localId" : "356",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Multiply",
+          "localId" : "1070",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "362",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1073",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "363",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1074",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "358",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "type" : "ExpressionRef",
+            "localId" : "1071",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MaxQuantity",
             "annotation" : [ ]
           }, {
-            "type" : "Negate",
-            "localId" : "359",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "361",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "360",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
-              "annotation" : [ ]
-            }
+            "type" : "Quantity",
+            "localId" : "1072",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "mm",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "366",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalSubtractOverflow",
+        "localId" : "1077",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityMultiplyNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "366",
+            "r" : "1077",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalSubtractOverflow", ": " ]
+              "value" : [ "", "define ", "QuantityMultiplyNearUnderflow", ": " ]
             }, {
-              "r" : "367",
+              "r" : "1078",
               "s" : [ {
-                "r" : "369",
+                "r" : "1079",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
-                }, {
-                  "r" : "368",
-                  "s" : [ {
-                    "value" : [ "Decimal" ]
-                  } ]
+                  "value" : [ "MinQuantity" ]
                 } ]
               }, {
-                "value" : [ " - " ]
+                "value" : [ " * " ]
               }, {
-                "r" : "370",
+                "r" : "1080",
                 "s" : [ {
-                  "r" : "371",
-                  "value" : [ "-", "1.0" ]
+                  "value" : [ "1 ", "'mm'" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Subtract",
-          "localId" : "367",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Multiply",
+          "localId" : "1078",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "373",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1081",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "374",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1082",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "369",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "type" : "ExpressionRef",
+            "localId" : "1079",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MinQuantity",
             "annotation" : [ ]
           }, {
-            "type" : "Negate",
-            "localId" : "370",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "372",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "371",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
-              "annotation" : [ ]
-            }
+            "type" : "Quantity",
+            "localId" : "1080",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "mm",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "377",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalSubtractUnderflow",
+        "localId" : "1085",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityDivideOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "377",
+            "r" : "1085",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalSubtractUnderflow", ": " ]
+              "value" : [ "", "define ", "QuantityDivideOverflow", ": " ]
             }, {
-              "r" : "378",
+              "r" : "1086",
               "s" : [ {
-                "r" : "380",
+                "r" : "1087",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
-                }, {
-                  "r" : "379",
-                  "s" : [ {
-                    "value" : [ "Decimal" ]
-                  } ]
+                  "value" : [ "MaxQuantity" ]
                 } ]
               }, {
-                "r" : "381",
-                "value" : [ " - ", "1.0" ]
+                "value" : [ " / " ]
+              }, {
+                "r" : "1088",
+                "s" : [ {
+                  "value" : [ "0.5 ", "'mm'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Subtract",
-          "localId" : "378",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Divide",
+          "localId" : "1086",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "382",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1089",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "383",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1090",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "380",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "type" : "ExpressionRef",
+            "localId" : "1087",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MaxQuantity",
             "annotation" : [ ]
           }, {
-            "type" : "Literal",
-            "localId" : "381",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "1.0",
+            "type" : "Quantity",
+            "localId" : "1088",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 0.5,
+            "unit" : "mm",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "386",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalMultiplyOverflow",
+        "localId" : "1093",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityDivideUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "386",
+            "r" : "1093",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalMultiplyOverflow", ": " ]
+              "value" : [ "", "define ", "QuantityDivideUnderflow", ": " ]
             }, {
-              "r" : "387",
+              "r" : "1094",
               "s" : [ {
-                "r" : "389",
+                "r" : "1095",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
-                }, {
-                  "r" : "388",
-                  "s" : [ {
-                    "value" : [ "Decimal" ]
-                  } ]
+                  "value" : [ "MinQuantity" ]
                 } ]
               }, {
-                "r" : "390",
-                "value" : [ " * ", "2" ]
+                "value" : [ " / " ]
+              }, {
+                "r" : "1096",
+                "s" : [ {
+                  "value" : [ "0.5 ", "'mm'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Multiply",
-          "localId" : "387",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Divide",
+          "localId" : "1094",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "394",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1097",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "395",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1098",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "389",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "type" : "ExpressionRef",
+            "localId" : "1095",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MinQuantity",
             "annotation" : [ ]
           }, {
-            "type" : "ToDecimal",
-            "localId" : "392",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "393",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "390",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }
+            "type" : "Quantity",
+            "localId" : "1096",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 0.5,
+            "unit" : "mm",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "398",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalMultiplyUnderflow",
+        "localId" : "1101",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityDivideNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "398",
+            "r" : "1101",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalMultiplyUnderflow", ": " ]
+              "value" : [ "", "define ", "QuantityDivideNearOverflow", ": " ]
             }, {
-              "r" : "399",
+              "r" : "1102",
               "s" : [ {
-                "r" : "401",
+                "r" : "1103",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
-                }, {
-                  "r" : "400",
-                  "s" : [ {
-                    "value" : [ "Decimal" ]
-                  } ]
+                  "value" : [ "MaxQuantity" ]
                 } ]
               }, {
-                "value" : [ " * " ]
+                "value" : [ " / " ]
               }, {
-                "r" : "402",
+                "r" : "1104",
                 "s" : [ {
-                  "r" : "403",
-                  "value" : [ "-", "2" ]
+                  "value" : [ "1 ", "'mm'" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Multiply",
-          "localId" : "399",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Divide",
+          "localId" : "1102",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "408",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "409",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "401",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1105",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
-            "type" : "ToDecimal",
-            "localId" : "406",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "407",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Negate",
-              "localId" : "402",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "404",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "403",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              }
-            }
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1106",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1103",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MaxQuantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "1104",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "mm",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "412",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalDivideOverflow",
+        "localId" : "1109",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityDivideNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "412",
+            "r" : "1109",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalDivideOverflow", ": " ]
+              "value" : [ "", "define ", "QuantityDivideNearUnderflow", ": " ]
             }, {
-              "r" : "413",
+              "r" : "1110",
               "s" : [ {
-                "r" : "415",
+                "r" : "1111",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
-                }, {
-                  "r" : "414",
-                  "s" : [ {
-                    "value" : [ "Decimal" ]
-                  } ]
+                  "value" : [ "MinQuantity" ]
                 } ]
               }, {
                 "value" : [ " / " ]
               }, {
-                "r" : "416",
+                "r" : "1112",
                 "s" : [ {
-                  "r" : "416",
-                  "value" : [ "(", "0.5", ")" ]
+                  "value" : [ "1 ", "'mm'" ]
                 } ]
               } ]
             } ]
@@ -12000,74 +19767,61 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Divide",
-          "localId" : "413",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "localId" : "1110",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "417",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1113",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "418",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1114",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "415",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "type" : "ExpressionRef",
+            "localId" : "1111",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MinQuantity",
             "annotation" : [ ]
           }, {
-            "type" : "Literal",
-            "localId" : "416",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "0.5",
+            "type" : "Quantity",
+            "localId" : "1112",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "mm",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "421",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalDivideUnderflow",
+        "localId" : "1117",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityDivideByZero",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "421",
+            "r" : "1117",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalDivideUnderflow", ": " ]
+              "value" : [ "", "define ", "QuantityDivideByZero", ": " ]
             }, {
-              "r" : "422",
+              "r" : "1118",
               "s" : [ {
-                "r" : "424",
+                "r" : "1119",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
-                }, {
-                  "r" : "423",
-                  "s" : [ {
-                    "value" : [ "Decimal" ]
-                  } ]
+                  "value" : [ "1.0 ", "'mm'" ]
                 } ]
               }, {
                 "value" : [ " / " ]
               }, {
-                "r" : "425",
+                "r" : "1120",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "425",
-                  "s" : [ {
-                    "r" : "426",
-                    "value" : [ "-", "0.5" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "0 ", "'mm'" ]
                 } ]
               } ]
             } ]
@@ -12075,550 +19829,626 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Divide",
-          "localId" : "422",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "localId" : "1118",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "428",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1121",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "429",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1122",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "424",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "type" : "Quantity",
+            "localId" : "1119",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1.0,
+            "unit" : "mm",
             "annotation" : [ ]
           }, {
-            "type" : "Negate",
-            "localId" : "425",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "427",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "426",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.5",
-              "annotation" : [ ]
-            }
+            "type" : "Quantity",
+            "localId" : "1120",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 0,
+            "unit" : "mm",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "432",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalDivideByZero",
+        "localId" : "1125",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantitySuccessorOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "432",
+            "r" : "1125",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalDivideByZero", ": " ]
+              "value" : [ "", "define ", "QuantitySuccessorOverflow", ": " ]
             }, {
-              "r" : "433",
+              "r" : "1127",
               "s" : [ {
-                "r" : "434",
-                "value" : [ "1.0", " / ", "0" ]
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "1126",
+                "s" : [ {
+                  "value" : [ "MaxQuantity" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Divide",
-          "localId" : "433",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Successor",
+          "localId" : "1127",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "439",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "440",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1128",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "Literal",
-            "localId" : "434",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "1.0",
+          "operand" : {
+            "type" : "ExpressionRef",
+            "localId" : "1126",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MaxQuantity",
             "annotation" : [ ]
-          }, {
-            "type" : "ToDecimal",
-            "localId" : "437",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "438",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "435",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          } ]
+          }
         }
       }, {
-        "localId" : "443",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalPowerOverflow",
+        "localId" : "1131",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityPredecessorUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "443",
+            "r" : "1131",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalPowerOverflow", ": " ]
+              "value" : [ "", "define ", "QuantityPredecessorUnderflow", ": " ]
             }, {
-              "r" : "444",
+              "r" : "1133",
               "s" : [ {
-                "r" : "446",
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "1132",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "446",
-                  "s" : [ {
-                    "value" : [ "maximum", " " ]
-                  }, {
-                    "r" : "445",
-                    "s" : [ {
-                      "value" : [ "Decimal" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "MinQuantity" ]
                 } ]
-              }, {
-                "r" : "447",
-                "value" : [ "^", "2" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Power",
-          "localId" : "444",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Predecessor",
+          "localId" : "1133",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "451",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "452",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1134",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "446",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "operand" : {
+            "type" : "ExpressionRef",
+            "localId" : "1132",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "MinQuantity",
             "annotation" : [ ]
-          }, {
-            "type" : "ToDecimal",
-            "localId" : "449",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "450",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "447",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }
-          } ]
+          }
         }
       }, {
-        "localId" : "455",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalPowerUnderflow",
+        "localId" : "1137",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantitySuccessorNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "455",
+            "r" : "1137",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalPowerUnderflow", ": " ]
+              "value" : [ "", "define ", "QuantitySuccessorNearOverflow", ": " ]
             }, {
-              "r" : "456",
+              "r" : "1148",
               "s" : [ {
-                "r" : "458",
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "1138",
                 "s" : [ {
-                  "value" : [ "(" ]
+                  "value" : [ "Quantity", " { " ]
                 }, {
-                  "r" : "458",
                   "s" : [ {
-                    "value" : [ "minimum", " " ]
+                    "value" : [ "value", ": " ]
                   }, {
-                    "r" : "457",
+                    "r" : "1140",
                     "s" : [ {
-                      "value" : [ "Decimal" ]
+                      "r" : "1142",
+                      "s" : [ {
+                        "value" : [ "maximum", " " ]
+                      }, {
+                        "r" : "1141",
+                        "s" : [ {
+                          "value" : [ "Decimal" ]
+                        } ]
+                      } ]
+                    }, {
+                      "r" : "1143",
+                      "value" : [ " - ", "0.00000001" ]
                     } ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ ", " ]
+                }, {
+                  "s" : [ {
+                    "value" : [ "unit", ": " ]
+                  }, {
+                    "r" : "1146",
+                    "s" : [ {
+                      "value" : [ "'mm'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
-              }, {
-                "r" : "459",
-                "value" : [ "^", "3" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Power",
-          "localId" : "456",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Successor",
+          "localId" : "1148",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "463",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "464",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1149",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "458",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ]
-          }, {
-            "type" : "ToDecimal",
-            "localId" : "461",
+          "operand" : {
+            "type" : "Instance",
+            "localId" : "1138",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "462",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "459",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }
-          } ]
+            "element" : [ {
+              "name" : "value",
+              "value" : {
+                "type" : "Subtract",
+                "localId" : "1140",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1144",
+                  "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1145",
+                  "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "annotation" : [ ]
+                } ],
+                "operand" : [ {
+                  "type" : "MaxValue",
+                  "localId" : "1142",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "1143",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.00000001",
+                  "annotation" : [ ]
+                } ]
+              }
+            }, {
+              "name" : "unit",
+              "value" : {
+                "type" : "Literal",
+                "localId" : "1146",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "mm",
+                "annotation" : [ ]
+              }
+            } ]
+          }
         }
       }, {
-        "localId" : "467",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalSuccessorOverflow",
+        "localId" : "1152",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "QuantityPredecessorNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "467",
+            "r" : "1152",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalSuccessorOverflow", ": " ]
+              "value" : [ "", "define ", "QuantityPredecessorNearUnderflow", ": " ]
             }, {
-              "r" : "470",
+              "r" : "1163",
               "s" : [ {
-                "value" : [ "successor of " ]
+                "value" : [ "predecessor of " ]
               }, {
-                "r" : "469",
+                "r" : "1153",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
+                  "value" : [ "Quantity", " { " ]
                 }, {
-                  "r" : "468",
                   "s" : [ {
-                    "value" : [ "Decimal" ]
+                    "value" : [ "value", ": " ]
+                  }, {
+                    "r" : "1155",
+                    "s" : [ {
+                      "r" : "1157",
+                      "s" : [ {
+                        "value" : [ "minimum", " " ]
+                      }, {
+                        "r" : "1156",
+                        "s" : [ {
+                          "value" : [ "Decimal" ]
+                        } ]
+                      } ]
+                    }, {
+                      "r" : "1158",
+                      "value" : [ " + ", "0.00000001" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "s" : [ {
+                    "value" : [ "unit", ": " ]
+                  }, {
+                    "r" : "1161",
+                    "s" : [ {
+                      "value" : [ "'mm'" ]
+                    } ]
                   } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "470",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Predecessor",
+          "localId" : "1163",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "471",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1164",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "MaxValue",
-            "localId" : "469",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "annotation" : [ ]
+            "type" : "Instance",
+            "localId" : "1153",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ],
+            "element" : [ {
+              "name" : "value",
+              "value" : {
+                "type" : "Add",
+                "localId" : "1155",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1159",
+                  "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1160",
+                  "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "annotation" : [ ]
+                } ],
+                "operand" : [ {
+                  "type" : "MinValue",
+                  "localId" : "1157",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "Literal",
+                  "localId" : "1158",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.00000001",
+                  "annotation" : [ ]
+                } ]
+              }
+            }, {
+              "name" : "unit",
+              "value" : {
+                "type" : "Literal",
+                "localId" : "1161",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "mm",
+                "annotation" : [ ]
+              }
+            } ]
           }
         }
       }, {
-        "localId" : "474",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalPredecessorUnderflow",
+        "localId" : "1167",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeAddOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "474",
+            "r" : "1167",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalPredecessorUnderflow", ": " ]
+              "value" : [ "", "define ", "DateTimeAddOverflow", ": " ]
             }, {
-              "r" : "477",
+              "r" : "1168",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "476",
+                "r" : "1170",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
+                  "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "475",
+                  "r" : "1169",
                   "s" : [ {
-                    "value" : [ "Decimal" ]
+                    "value" : [ "DateTime" ]
                   } ]
                 } ]
+              }, {
+                "value" : [ " + " ]
+              }, {
+                "r" : "1171",
+                "s" : [ {
+                  "value" : [ "1 ", "day" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "477",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Add",
+          "localId" : "1168",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "478",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "1172",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1173",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "MinValue",
-            "localId" : "476",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "1170",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
-          }
+          }, {
+            "type" : "Quantity",
+            "localId" : "1171",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "day",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "481",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "MaxQuantity",
+        "localId" : "1176",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeAddUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "481",
+            "r" : "1176",
             "s" : [ {
-              "value" : [ "", "define ", "MaxQuantity", ": " ]
+              "value" : [ "", "define ", "DateTimeAddUnderflow", ": " ]
             }, {
-              "r" : "482",
+              "r" : "1177",
               "s" : [ {
-                "value" : [ "Quantity", " { " ]
-              }, {
+                "r" : "1179",
                 "s" : [ {
-                  "value" : [ "value", ": " ]
+                  "value" : [ "minimum", " " ]
                 }, {
-                  "r" : "485",
+                  "r" : "1178",
                   "s" : [ {
-                    "value" : [ "maximum", " " ]
-                  }, {
-                    "r" : "484",
-                    "s" : [ {
-                      "value" : [ "Decimal" ]
-                    } ]
+                    "value" : [ "DateTime" ]
                   } ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "value" : [ " + " ]
               }, {
+                "r" : "1180",
                 "s" : [ {
-                  "value" : [ "unit", ": " ]
+                  "value" : [ "(" ]
                 }, {
-                  "r" : "486",
+                  "r" : "1180",
                   "s" : [ {
-                    "value" : [ "'mm'" ]
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "1181",
+                    "s" : [ {
+                      "value" : [ "1 ", "day" ]
+                    } ]
                   } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
-              }, {
-                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Instance",
-          "localId" : "482",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Add",
+          "localId" : "1177",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
-          "element" : [ {
-            "name" : "value",
-            "value" : {
-              "type" : "MaxValue",
-              "localId" : "485",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1183",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
           }, {
-            "name" : "unit",
-            "value" : {
-              "type" : "Literal",
-              "localId" : "486",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "mm",
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1184",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "1179",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "Negate",
+            "localId" : "1180",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1182",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Quantity",
+              "localId" : "1181",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "day",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "490",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "MinQuantity",
+        "localId" : "1187",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeAddNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "490",
+            "r" : "1187",
             "s" : [ {
-              "value" : [ "", "define ", "MinQuantity", ": " ]
+              "value" : [ "", "define ", "DateTimeAddNearOverflow", ": " ]
             }, {
-              "r" : "491",
+              "r" : "1188",
               "s" : [ {
-                "value" : [ "Quantity", " { " ]
-              }, {
+                "r" : "1190",
                 "s" : [ {
-                  "value" : [ "value", ": " ]
+                  "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "494",
+                  "r" : "1189",
                   "s" : [ {
-                    "value" : [ "minimum", " " ]
-                  }, {
-                    "r" : "493",
-                    "s" : [ {
-                      "value" : [ "Decimal" ]
-                    } ]
+                    "value" : [ "DateTime" ]
                   } ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "value" : [ " + " ]
               }, {
+                "r" : "1191",
                 "s" : [ {
-                  "value" : [ "unit", ": " ]
-                }, {
-                  "r" : "495",
-                  "s" : [ {
-                    "value" : [ "'mm'" ]
-                  } ]
+                  "value" : [ "0 ", "days" ]
                 } ]
-              }, {
-                "value" : [ " }" ]
               } ]
             } ]
           }
-        } ],
-        "expression" : {
-          "type" : "Instance",
-          "localId" : "491",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+        } ],
+        "expression" : {
+          "type" : "Add",
+          "localId" : "1188",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
-          "element" : [ {
-            "name" : "value",
-            "value" : {
-              "type" : "MinValue",
-              "localId" : "494",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1192",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
           }, {
-            "name" : "unit",
-            "value" : {
-              "type" : "Literal",
-              "localId" : "495",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "mm",
-              "annotation" : [ ]
-            }
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1193",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "1190",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "1191",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 0,
+            "unit" : "days",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "499",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantityAddOverflow",
+        "localId" : "1196",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeAddNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "499",
+            "r" : "1196",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityAddOverflow", ": " ]
+              "value" : [ "", "define ", "DateTimeAddNearUnderflow", ": " ]
             }, {
-              "r" : "500",
+              "r" : "1197",
               "s" : [ {
-                "r" : "501",
+                "r" : "1199",
                 "s" : [ {
-                  "value" : [ "MaxQuantity" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "1198",
+                  "s" : [ {
+                    "value" : [ "DateTime" ]
+                  } ]
                 } ]
               }, {
                 "value" : [ " + " ]
               }, {
-                "r" : "502",
+                "r" : "1200",
                 "s" : [ {
-                  "value" : [ "1.0 ", "'mm'" ]
+                  "value" : [ "0 ", "days" ]
                 } ]
               } ]
             } ]
@@ -12626,69 +20456,74 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Add",
-          "localId" : "500",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "1197",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "503",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "1201",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "504",
+            "localId" : "1202",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "501",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "MaxQuantity",
+            "type" : "MinValue",
+            "localId" : "1199",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "502",
+            "localId" : "1200",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1.0,
-            "unit" : "mm",
+            "value" : 0,
+            "unit" : "days",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "507",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantityAddUnderflow",
+        "localId" : "1205",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeSubtractOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "507",
+            "r" : "1205",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityAddUnderflow", ": " ]
+              "value" : [ "", "define ", "DateTimeSubtractOverflow", ": " ]
             }, {
-              "r" : "508",
+              "r" : "1206",
               "s" : [ {
-                "r" : "509",
+                "r" : "1208",
                 "s" : [ {
-                  "value" : [ "MinQuantity" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "1207",
+                  "s" : [ {
+                    "value" : [ "DateTime" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ " + " ]
+                "value" : [ " - " ]
               }, {
-                "r" : "510",
+                "r" : "1209",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "510",
+                  "r" : "1209",
                   "s" : [ {
                     "value" : [ "-" ]
                   }, {
-                    "r" : "511",
+                    "r" : "1210",
                     "s" : [ {
-                      "value" : [ "1.0 ", "'mm'" ]
+                      "value" : [ "1 ", "day" ]
                     } ]
                   } ]
                 }, {
@@ -12699,86 +20534,79 @@ module.exports['OutOfBounds'] = {
           }
         } ],
         "expression" : {
-          "type" : "Add",
-          "localId" : "508",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Subtract",
+          "localId" : "1206",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "513",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "1212",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "514",
+            "localId" : "1213",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "509",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "MinQuantity",
+            "type" : "MaxValue",
+            "localId" : "1208",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "Negate",
-            "localId" : "510",
+            "localId" : "1209",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "512",
+              "localId" : "1211",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Quantity",
-              "localId" : "511",
+              "localId" : "1210",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1.0,
-              "unit" : "mm",
+              "value" : 1,
+              "unit" : "day",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "517",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantitySubtractOverflow",
+        "localId" : "1216",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeSubtractUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "517",
+            "r" : "1216",
             "s" : [ {
-              "value" : [ "", "define ", "QuantitySubtractOverflow", ": " ]
+              "value" : [ "", "define ", "DateTimeSubtractUnderflow", ": " ]
             }, {
-              "r" : "518",
+              "r" : "1217",
               "s" : [ {
-                "r" : "519",
+                "r" : "1219",
                 "s" : [ {
-                  "value" : [ "MaxQuantity" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "1218",
+                  "s" : [ {
+                    "value" : [ "DateTime" ]
+                  } ]
                 } ]
               }, {
                 "value" : [ " - " ]
               }, {
-                "r" : "520",
+                "r" : "1220",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "520",
-                  "s" : [ {
-                    "value" : [ "-" ]
-                  }, {
-                    "r" : "521",
-                    "s" : [ {
-                      "value" : [ "1 ", "'mm'" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "1 ", "day" ]
                 } ]
               } ]
             } ]
@@ -12786,73 +20614,66 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "518",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "1217",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "523",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "1221",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "524",
+            "localId" : "1222",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "519",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "MaxQuantity",
+            "type" : "MinValue",
+            "localId" : "1219",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
-            "type" : "Negate",
-            "localId" : "520",
+            "type" : "Quantity",
+            "localId" : "1220",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "522",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Quantity",
-              "localId" : "521",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mm",
-              "annotation" : [ ]
-            }
+            "value" : 1,
+            "unit" : "day",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "527",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantitySubtractUnderflow",
+        "localId" : "1225",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeSubtractNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "527",
+            "r" : "1225",
             "s" : [ {
-              "value" : [ "", "define ", "QuantitySubtractUnderflow", ": " ]
+              "value" : [ "", "define ", "DateTimeSubtractNearOverflow", ": " ]
             }, {
-              "r" : "528",
+              "r" : "1226",
               "s" : [ {
-                "r" : "529",
+                "r" : "1228",
                 "s" : [ {
-                  "value" : [ "MinQuantity" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "1227",
+                  "s" : [ {
+                    "value" : [ "DateTime" ]
+                  } ]
                 } ]
               }, {
                 "value" : [ " - " ]
               }, {
-                "r" : "530",
+                "r" : "1229",
                 "s" : [ {
-                  "value" : [ "1 ", "'mm'" ]
+                  "value" : [ "0 ", "days" ]
                 } ]
               } ]
             } ]
@@ -12860,255 +20681,332 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "528",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "localId" : "1226",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "531",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "1230",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "532",
+            "localId" : "1231",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "529",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "MinQuantity",
+            "type" : "MaxValue",
+            "localId" : "1228",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "530",
+            "localId" : "1229",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "mm",
+            "value" : 0,
+            "unit" : "days",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "535",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantityMultiplyOverflow",
+        "localId" : "1234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeSubtractNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "535",
+            "r" : "1234",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityMultiplyOverflow", ": " ]
+              "value" : [ "", "define ", "DateTimeSubtractNearUnderflow", ": " ]
             }, {
-              "r" : "536",
+              "r" : "1235",
               "s" : [ {
-                "r" : "537",
+                "r" : "1237",
                 "s" : [ {
-                  "value" : [ "MaxQuantity" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "1236",
+                  "s" : [ {
+                    "value" : [ "DateTime" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ " * " ]
+                "value" : [ " - " ]
               }, {
-                "r" : "538",
+                "r" : "1238",
                 "s" : [ {
-                  "value" : [ "2 ", "'mm'" ]
+                  "value" : [ "0 ", "days" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Multiply",
-          "localId" : "536",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Subtract",
+          "localId" : "1235",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "539",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "1239",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "540",
+            "localId" : "1240",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "537",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "MaxQuantity",
+            "type" : "MinValue",
+            "localId" : "1237",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "538",
+            "localId" : "1238",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 2,
-            "unit" : "mm",
+            "value" : 0,
+            "unit" : "days",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "543",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantityMultiplyUnderflow",
+        "localId" : "1243",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeSuccessorOverflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1243",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTimeSuccessorOverflow", ": " ]
+            }, {
+              "r" : "1246",
+              "s" : [ {
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "1245",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "1244",
+                  "s" : [ {
+                    "value" : [ "DateTime" ]
+                  } ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "1246",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1247",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "MaxValue",
+            "localId" : "1245",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "1250",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimePredecessorUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "543",
+            "r" : "1250",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityMultiplyUnderflow", ": " ]
+              "value" : [ "", "define ", "DateTimePredecessorUnderflow", ": " ]
             }, {
-              "r" : "544",
+              "r" : "1253",
               "s" : [ {
-                "r" : "545",
-                "s" : [ {
-                  "value" : [ "MinQuantity" ]
-                } ]
-              }, {
-                "value" : [ " * " ]
+                "value" : [ "predecessor of " ]
               }, {
-                "r" : "546",
+                "r" : "1252",
                 "s" : [ {
-                  "value" : [ "2 ", "'mm'" ]
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "1251",
+                  "s" : [ {
+                    "value" : [ "DateTime" ]
+                  } ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Multiply",
-          "localId" : "544",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Predecessor",
+          "localId" : "1253",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "547",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "548",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "1254",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "545",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "MinQuantity",
-            "annotation" : [ ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "546",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 2,
-            "unit" : "mm",
+          "operand" : {
+            "type" : "MinValue",
+            "localId" : "1252",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
-          } ]
+          }
         }
       }, {
-        "localId" : "551",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantityDivideOverflow",
+        "localId" : "1257",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimeSuccessorNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "551",
+            "r" : "1257",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityDivideOverflow", ": " ]
+              "value" : [ "", "define ", "DateTimeSuccessorNearOverflow", ": " ]
             }, {
-              "r" : "552",
+              "r" : "1264",
               "s" : [ {
-                "r" : "553",
-                "s" : [ {
-                  "value" : [ "MaxQuantity" ]
-                } ]
-              }, {
-                "value" : [ " / " ]
+                "value" : [ "successor of " ]
               }, {
-                "r" : "554",
+                "r" : "1258",
                 "s" : [ {
-                  "value" : [ "0.5 ", "'mm'" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "1258",
+                  "s" : [ {
+                    "r" : "1260",
+                    "s" : [ {
+                      "value" : [ "maximum", " " ]
+                    }, {
+                      "r" : "1259",
+                      "s" : [ {
+                        "value" : [ "DateTime" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ " - " ]
+                  }, {
+                    "r" : "1261",
+                    "s" : [ {
+                      "value" : [ "1 ", "millisecond" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Divide",
-          "localId" : "552",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Successor",
+          "localId" : "1264",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "555",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "556",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "1265",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "553",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "MaxQuantity",
-            "annotation" : [ ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "554",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 0.5,
-            "unit" : "mm",
-            "annotation" : [ ]
-          } ]
+          "operand" : {
+            "type" : "Subtract",
+            "localId" : "1258",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1262",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1263",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "MaxValue",
+              "localId" : "1260",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "1261",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "millisecond",
+              "annotation" : [ ]
+            } ]
+          }
         }
       }, {
-        "localId" : "559",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantityDivideUnderflow",
+        "localId" : "1268",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "DateTimePredecessorNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "559",
+            "r" : "1268",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityDivideUnderflow", ": " ]
+              "value" : [ "", "define ", "DateTimePredecessorNearUnderflow", ": " ]
             }, {
-              "r" : "560",
+              "r" : "1275",
               "s" : [ {
-                "r" : "561",
-                "s" : [ {
-                  "value" : [ "MinQuantity" ]
-                } ]
-              }, {
-                "value" : [ " / " ]
+                "value" : [ "predecessor of " ]
               }, {
-                "r" : "562",
+                "r" : "1269",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "562",
+                  "r" : "1269",
                   "s" : [ {
-                    "value" : [ "-" ]
+                    "r" : "1271",
+                    "s" : [ {
+                      "value" : [ "minimum", " " ]
+                    }, {
+                      "r" : "1270",
+                      "s" : [ {
+                        "value" : [ "DateTime" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ " + " ]
                   }, {
-                    "r" : "563",
+                    "r" : "1272",
                     "s" : [ {
-                      "value" : [ "0.5 ", "'mm'" ]
+                      "value" : [ "1 ", "millisecond" ]
                     } ]
                   } ]
                 }, {
@@ -13119,232 +21017,304 @@ module.exports['OutOfBounds'] = {
           }
         } ],
         "expression" : {
-          "type" : "Divide",
-          "localId" : "560",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Predecessor",
+          "localId" : "1275",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "565",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "566",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "1276",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "561",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "MinQuantity",
-            "annotation" : [ ]
-          }, {
-            "type" : "Negate",
-            "localId" : "562",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "operand" : {
+            "type" : "Add",
+            "localId" : "1269",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "564",
+              "localId" : "1273",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1274",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
-            "operand" : {
+            "operand" : [ {
+              "type" : "MinValue",
+              "localId" : "1271",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }, {
               "type" : "Quantity",
-              "localId" : "563",
+              "localId" : "1272",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 0.5,
-              "unit" : "mm",
+              "value" : 1,
+              "unit" : "millisecond",
               "annotation" : [ ]
-            }
-          } ]
+            } ]
+          }
         }
       }, {
-        "localId" : "569",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantityDivideByZero",
+        "localId" : "1279",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateAddOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "569",
+            "r" : "1279",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityDivideByZero", ": " ]
+              "value" : [ "", "define ", "DateAddOverflow", ": " ]
             }, {
-              "r" : "570",
+              "r" : "1280",
               "s" : [ {
-                "r" : "571",
+                "r" : "1282",
                 "s" : [ {
-                  "value" : [ "1.0 ", "'mm'" ]
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "1281",
+                  "s" : [ {
+                    "value" : [ "Date" ]
+                  } ]
                 } ]
               }, {
-                "value" : [ " / " ]
+                "value" : [ " + " ]
               }, {
-                "r" : "572",
+                "r" : "1283",
                 "s" : [ {
-                  "value" : [ "0 ", "'mm'" ]
+                  "value" : [ "1 ", "day" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Divide",
-          "localId" : "570",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Add",
+          "localId" : "1280",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "573",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "1284",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "574",
+            "localId" : "1285",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Quantity",
-            "localId" : "571",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1.0,
-            "unit" : "mm",
+            "type" : "MaxValue",
+            "localId" : "1282",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "572",
+            "localId" : "1283",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 0,
-            "unit" : "mm",
+            "value" : 1,
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "577",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantitySuccessorOverflow",
+        "localId" : "1288",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateAddUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "577",
+            "r" : "1288",
             "s" : [ {
-              "value" : [ "", "define ", "QuantitySuccessorOverflow", ": " ]
+              "value" : [ "", "define ", "DateAddUnderflow", ": " ]
             }, {
-              "r" : "579",
+              "r" : "1289",
               "s" : [ {
-                "value" : [ "successor of " ]
+                "r" : "1291",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "1290",
+                  "s" : [ {
+                    "value" : [ "Date" ]
+                  } ]
+                } ]
               }, {
-                "r" : "578",
+                "value" : [ " + " ]
+              }, {
+                "r" : "1292",
                 "s" : [ {
-                  "value" : [ "MaxQuantity" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "1292",
+                  "s" : [ {
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "1293",
+                    "s" : [ {
+                      "value" : [ "1 ", "day" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "579",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Add",
+          "localId" : "1289",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "580",
+            "localId" : "1295",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1296",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "ExpressionRef",
-            "localId" : "578",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "MaxQuantity",
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "1291",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
-          }
+          }, {
+            "type" : "Negate",
+            "localId" : "1292",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1294",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Quantity",
+              "localId" : "1293",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "day",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "583",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "QuantityPredecessorUnderflow",
+        "localId" : "1299",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateAddNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "583",
+            "r" : "1299",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityPredecessorUnderflow", ": " ]
+              "value" : [ "", "define ", "DateAddNearOverflow", ": " ]
             }, {
-              "r" : "585",
+              "r" : "1300",
               "s" : [ {
-                "value" : [ "predecessor of " ]
+                "r" : "1302",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
+                }, {
+                  "r" : "1301",
+                  "s" : [ {
+                    "value" : [ "Date" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ " + " ]
               }, {
-                "r" : "584",
+                "r" : "1303",
                 "s" : [ {
-                  "value" : [ "MinQuantity" ]
+                  "value" : [ "0 ", "days" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "585",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Add",
+          "localId" : "1300",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "586",
+            "localId" : "1304",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1305",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "ExpressionRef",
-            "localId" : "584",
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "1302",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "1303",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "name" : "MinQuantity",
+            "value" : 0,
+            "unit" : "days",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "589",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "DateTimeAddOverflow",
+        "localId" : "1308",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateAddNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "589",
+            "r" : "1308",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeAddOverflow", ": " ]
+              "value" : [ "", "define ", "DateAddNearUnderflow", ": " ]
             }, {
-              "r" : "590",
+              "r" : "1309",
               "s" : [ {
-                "r" : "592",
+                "r" : "1311",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
+                  "value" : [ "minimum", " " ]
                 }, {
-                  "r" : "591",
+                  "r" : "1310",
                   "s" : [ {
-                    "value" : [ "DateTime" ]
+                    "value" : [ "Date" ]
                   } ]
                 } ]
               }, {
                 "value" : [ " + " ]
               }, {
-                "r" : "593",
+                "r" : "1312",
                 "s" : [ {
-                  "value" : [ "1 ", "day" ]
+                  "value" : [ "0 ", "days" ]
                 } ]
               } ]
             } ]
@@ -13352,72 +21322,72 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Add",
-          "localId" : "590",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "localId" : "1309",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "594",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "1313",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "595",
+            "localId" : "1314",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "592",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "MinValue",
+            "localId" : "1311",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "593",
+            "localId" : "1312",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "day",
+            "value" : 0,
+            "unit" : "days",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "598",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "DateTimeAddUnderflow",
+        "localId" : "1317",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateSubtractOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "598",
+            "r" : "1317",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeAddUnderflow", ": " ]
+              "value" : [ "", "define ", "DateSubtractOverflow", ": " ]
             }, {
-              "r" : "599",
+              "r" : "1318",
               "s" : [ {
-                "r" : "601",
+                "r" : "1320",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
+                  "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "600",
+                  "r" : "1319",
                   "s" : [ {
-                    "value" : [ "DateTime" ]
+                    "value" : [ "Date" ]
                   } ]
                 } ]
               }, {
-                "value" : [ " + " ]
+                "value" : [ " - " ]
               }, {
-                "r" : "602",
+                "r" : "1321",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "602",
+                  "r" : "1321",
                   "s" : [ {
                     "value" : [ "-" ]
                   }, {
-                    "r" : "603",
+                    "r" : "1322",
                     "s" : [ {
                       "value" : [ "1 ", "day" ]
                     } ]
@@ -13430,41 +21400,41 @@ module.exports['OutOfBounds'] = {
           }
         } ],
         "expression" : {
-          "type" : "Add",
-          "localId" : "599",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Subtract",
+          "localId" : "1318",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "605",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "1324",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "606",
+            "localId" : "1325",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "601",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "MaxValue",
+            "localId" : "1320",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }, {
             "type" : "Negate",
-            "localId" : "602",
+            "localId" : "1321",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "604",
+              "localId" : "1323",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Quantity",
-              "localId" : "603",
+              "localId" : "1322",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "day",
@@ -13473,48 +21443,36 @@ module.exports['OutOfBounds'] = {
           } ]
         }
       }, {
-        "localId" : "609",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "DateTimeSubtractOverflow",
+        "localId" : "1328",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateSubtractUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "609",
+            "r" : "1328",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeSubtractOverflow", ": " ]
+              "value" : [ "", "define ", "DateSubtractUnderflow", ": " ]
             }, {
-              "r" : "610",
+              "r" : "1329",
               "s" : [ {
-                "r" : "612",
+                "r" : "1331",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
+                  "value" : [ "minimum", " " ]
                 }, {
-                  "r" : "611",
+                  "r" : "1330",
                   "s" : [ {
-                    "value" : [ "DateTime" ]
+                    "value" : [ "Date" ]
                   } ]
                 } ]
               }, {
                 "value" : [ " - " ]
               }, {
-                "r" : "613",
+                "r" : "1332",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "613",
-                  "s" : [ {
-                    "value" : [ "-" ]
-                  }, {
-                    "r" : "614",
-                    "s" : [ {
-                      "value" : [ "1 ", "day" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "1 ", "day" ]
                 } ]
               } ]
             } ]
@@ -13522,78 +21480,66 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "610",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "localId" : "1329",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "616",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "1333",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "617",
+            "localId" : "1334",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "612",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "MinValue",
+            "localId" : "1331",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }, {
-            "type" : "Negate",
-            "localId" : "613",
+            "type" : "Quantity",
+            "localId" : "1332",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "615",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Quantity",
-              "localId" : "614",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "day",
-              "annotation" : [ ]
-            }
+            "value" : 1,
+            "unit" : "day",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "620",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "DateTimeSubtractUnderflow",
+        "localId" : "1337",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateSubtractNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "620",
+            "r" : "1337",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeSubtractUnderflow", ": " ]
+              "value" : [ "", "define ", "DateSubtractNearOverflow", ": " ]
             }, {
-              "r" : "621",
+              "r" : "1338",
               "s" : [ {
-                "r" : "623",
+                "r" : "1340",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
+                  "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "622",
+                  "r" : "1339",
                   "s" : [ {
-                    "value" : [ "DateTime" ]
+                    "value" : [ "Date" ]
                   } ]
                 } ]
               }, {
                 "value" : [ " - " ]
               }, {
-                "r" : "624",
+                "r" : "1341",
                 "s" : [ {
-                  "value" : [ "1 ", "day" ]
+                  "value" : [ "0 ", "days" ]
                 } ]
               } ]
             } ]
@@ -13601,110 +21547,127 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "621",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "localId" : "1338",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "625",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "1342",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "626",
+            "localId" : "1343",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "623",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "MaxValue",
+            "localId" : "1340",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "624",
+            "localId" : "1341",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "day",
+            "value" : 0,
+            "unit" : "days",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "629",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "DateTimeSuccessorOverflow",
+        "localId" : "1346",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateSubtractNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "629",
+            "r" : "1346",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeSuccessorOverflow", ": " ]
+              "value" : [ "", "define ", "DateSubtractNearUnderflow", ": " ]
             }, {
-              "r" : "632",
+              "r" : "1347",
               "s" : [ {
-                "value" : [ "successor of " ]
-              }, {
-                "r" : "631",
+                "r" : "1349",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
+                  "value" : [ "minimum", " " ]
                 }, {
-                  "r" : "630",
+                  "r" : "1348",
                   "s" : [ {
-                    "value" : [ "DateTime" ]
+                    "value" : [ "Date" ]
                   } ]
                 } ]
+              }, {
+                "value" : [ " - " ]
+              }, {
+                "r" : "1350",
+                "s" : [ {
+                  "value" : [ "0 ", "days" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "632",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Subtract",
+          "localId" : "1347",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "633",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "1351",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1352",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "MaxValue",
-            "localId" : "631",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "1349",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
-          }
+          }, {
+            "type" : "Quantity",
+            "localId" : "1350",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 0,
+            "unit" : "days",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "636",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "DateTimePredecessorUnderflow",
+        "localId" : "1355",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "DateSuccessorOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "636",
+            "r" : "1355",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimePredecessorUnderflow", ": " ]
+              "value" : [ "", "define ", "DateSuccessorOverflow", ": " ]
             }, {
-              "r" : "639",
+              "r" : "1358",
               "s" : [ {
-                "value" : [ "predecessor of " ]
+                "value" : [ "successor of " ]
               }, {
-                "r" : "638",
+                "r" : "1357",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
+                  "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "637",
+                  "r" : "1356",
                   "s" : [ {
-                    "value" : [ "DateTime" ]
+                    "value" : [ "Date" ]
                   } ]
                 } ]
               } ]
@@ -13712,128 +21675,111 @@ module.exports['OutOfBounds'] = {
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "639",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Successor",
+          "localId" : "1358",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "640",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "1359",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "MinValue",
-            "localId" : "638",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "valueType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "MaxValue",
+            "localId" : "1357",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "643",
+        "localId" : "1362",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "DateAddOverflow",
+        "name" : "DatePredecessorUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "643",
+            "r" : "1362",
             "s" : [ {
-              "value" : [ "", "define ", "DateAddOverflow", ": " ]
+              "value" : [ "", "define ", "DatePredecessorUnderflow", ": " ]
             }, {
-              "r" : "644",
+              "r" : "1365",
               "s" : [ {
-                "r" : "646",
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "1364",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
+                  "value" : [ "minimum", " " ]
                 }, {
-                  "r" : "645",
+                  "r" : "1363",
                   "s" : [ {
                     "value" : [ "Date" ]
                   } ]
                 } ]
-              }, {
-                "value" : [ " + " ]
-              }, {
-                "r" : "647",
-                "s" : [ {
-                  "value" : [ "1 ", "day" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Add",
-          "localId" : "644",
+          "type" : "Predecessor",
+          "localId" : "1365",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "648",
+            "localId" : "1366",
             "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "649",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "646",
+          "operand" : {
+            "type" : "MinValue",
+            "localId" : "1364",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
             "valueType" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "647",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "day",
-            "annotation" : [ ]
-          } ]
+          }
         }
       }, {
-        "localId" : "652",
+        "localId" : "1369",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "DateAddUnderflow",
+        "name" : "DateSuccessorNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "652",
+            "r" : "1369",
             "s" : [ {
-              "value" : [ "", "define ", "DateAddUnderflow", ": " ]
+              "value" : [ "", "define ", "DateSuccessorNearOverflow", ": " ]
             }, {
-              "r" : "653",
+              "r" : "1376",
               "s" : [ {
-                "r" : "655",
-                "s" : [ {
-                  "value" : [ "minimum", " " ]
-                }, {
-                  "r" : "654",
-                  "s" : [ {
-                    "value" : [ "Date" ]
-                  } ]
-                } ]
-              }, {
-                "value" : [ " + " ]
+                "value" : [ "successor of " ]
               }, {
-                "r" : "656",
+                "r" : "1370",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "656",
+                  "r" : "1370",
                   "s" : [ {
-                    "value" : [ "-" ]
+                    "r" : "1372",
+                    "s" : [ {
+                      "value" : [ "maximum", " " ]
+                    }, {
+                      "r" : "1371",
+                      "s" : [ {
+                        "value" : [ "Date" ]
+                      } ]
+                    } ]
                   }, {
-                    "r" : "657",
+                    "value" : [ " - " ]
+                  }, {
+                    "r" : "1373",
                     "s" : [ {
                       "value" : [ "1 ", "day" ]
                     } ]
@@ -13846,85 +21792,85 @@ module.exports['OutOfBounds'] = {
           }
         } ],
         "expression" : {
-          "type" : "Add",
-          "localId" : "653",
+          "type" : "Successor",
+          "localId" : "1376",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "659",
+            "localId" : "1377",
             "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "660",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "655",
+          "operand" : {
+            "type" : "Subtract",
+            "localId" : "1370",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ]
-          }, {
-            "type" : "Negate",
-            "localId" : "656",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "658",
+              "localId" : "1374",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1375",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
-            "operand" : {
+            "operand" : [ {
+              "type" : "MaxValue",
+              "localId" : "1372",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }, {
               "type" : "Quantity",
-              "localId" : "657",
+              "localId" : "1373",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "day",
               "annotation" : [ ]
-            }
-          } ]
+            } ]
+          }
         }
       }, {
-        "localId" : "663",
+        "localId" : "1380",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "DateSubtractOverflow",
+        "name" : "DatePredecessorNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "663",
+            "r" : "1380",
             "s" : [ {
-              "value" : [ "", "define ", "DateSubtractOverflow", ": " ]
+              "value" : [ "", "define ", "DatePredecessorNearUnderflow", ": " ]
             }, {
-              "r" : "664",
+              "r" : "1387",
               "s" : [ {
-                "r" : "666",
-                "s" : [ {
-                  "value" : [ "maximum", " " ]
-                }, {
-                  "r" : "665",
-                  "s" : [ {
-                    "value" : [ "Date" ]
-                  } ]
-                } ]
-              }, {
-                "value" : [ " - " ]
+                "value" : [ "predecessor of " ]
               }, {
-                "r" : "667",
+                "r" : "1381",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "667",
+                  "r" : "1381",
                   "s" : [ {
-                    "value" : [ "-" ]
+                    "r" : "1383",
+                    "s" : [ {
+                      "value" : [ "minimum", " " ]
+                    }, {
+                      "r" : "1382",
+                      "s" : [ {
+                        "value" : [ "Date" ]
+                      } ]
+                    } ]
                   }, {
-                    "r" : "668",
+                    "value" : [ " + " ]
+                  }, {
+                    "r" : "1384",
                     "s" : [ {
                       "value" : [ "1 ", "day" ]
                     } ]
@@ -13937,236 +21883,294 @@ module.exports['OutOfBounds'] = {
           }
         } ],
         "expression" : {
-          "type" : "Subtract",
-          "localId" : "664",
+          "type" : "Predecessor",
+          "localId" : "1387",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "670",
+            "localId" : "1388",
             "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "671",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "666",
+          "operand" : {
+            "type" : "Add",
+            "localId" : "1381",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ]
-          }, {
-            "type" : "Negate",
-            "localId" : "667",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "669",
+              "localId" : "1385",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1386",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
-            "operand" : {
+            "operand" : [ {
+              "type" : "MinValue",
+              "localId" : "1383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }, {
               "type" : "Quantity",
-              "localId" : "668",
+              "localId" : "1384",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "day",
               "annotation" : [ ]
-            }
-          } ]
+            } ]
+          }
         }
       }, {
-        "localId" : "674",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "DateSubtractUnderflow",
+        "localId" : "1391",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeAddOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "674",
+            "r" : "1391",
             "s" : [ {
-              "value" : [ "", "define ", "DateSubtractUnderflow", ": " ]
+              "value" : [ "", "define ", "TimeAddOverflow", ": " ]
             }, {
-              "r" : "675",
+              "r" : "1392",
               "s" : [ {
-                "r" : "677",
+                "r" : "1394",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
+                  "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "676",
+                  "r" : "1393",
                   "s" : [ {
-                    "value" : [ "Date" ]
+                    "value" : [ "Time" ]
                   } ]
                 } ]
               }, {
-                "value" : [ " - " ]
+                "value" : [ " + " ]
               }, {
-                "r" : "678",
+                "r" : "1395",
                 "s" : [ {
-                  "value" : [ "1 ", "day" ]
+                  "value" : [ "1 ", "second" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Subtract",
-          "localId" : "675",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "Add",
+          "localId" : "1392",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "679",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "localId" : "1396",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "680",
+            "localId" : "1397",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "677",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "MaxValue",
+            "localId" : "1394",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "678",
+            "localId" : "1395",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
-            "unit" : "day",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "683",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "DateSuccessorOverflow",
+        "localId" : "1400",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeAddUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "683",
+            "r" : "1400",
             "s" : [ {
-              "value" : [ "", "define ", "DateSuccessorOverflow", ": " ]
+              "value" : [ "", "define ", "TimeAddUnderflow", ": " ]
             }, {
-              "r" : "686",
+              "r" : "1401",
               "s" : [ {
-                "value" : [ "successor of " ]
+                "r" : "1403",
+                "s" : [ {
+                  "value" : [ "minimum", " " ]
+                }, {
+                  "r" : "1402",
+                  "s" : [ {
+                    "value" : [ "Time" ]
+                  } ]
+                } ]
               }, {
-                "r" : "685",
+                "value" : [ " + " ]
+              }, {
+                "r" : "1404",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
+                  "value" : [ "(" ]
                 }, {
-                  "r" : "684",
+                  "r" : "1404",
                   "s" : [ {
-                    "value" : [ "Date" ]
+                    "value" : [ "-" ]
+                  }, {
+                    "r" : "1405",
+                    "s" : [ {
+                      "value" : [ "1 ", "second" ]
+                    } ]
                   } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Successor",
-          "localId" : "686",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "Add",
+          "localId" : "1401",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "687",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "localId" : "1407",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1408",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "MaxValue",
-            "localId" : "685",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "1403",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
-          }
+          }, {
+            "type" : "Negate",
+            "localId" : "1404",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1406",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Quantity",
+              "localId" : "1405",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "second",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "690",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "DatePredecessorUnderflow",
+        "localId" : "1411",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeAddNearOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "690",
+            "r" : "1411",
             "s" : [ {
-              "value" : [ "", "define ", "DatePredecessorUnderflow", ": " ]
+              "value" : [ "", "define ", "TimeAddNearOverflow", ": " ]
             }, {
-              "r" : "693",
+              "r" : "1412",
               "s" : [ {
-                "value" : [ "predecessor of " ]
-              }, {
-                "r" : "692",
+                "r" : "1414",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
+                  "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "691",
+                  "r" : "1413",
                   "s" : [ {
-                    "value" : [ "Date" ]
+                    "value" : [ "Time" ]
                   } ]
                 } ]
+              }, {
+                "value" : [ " + " ]
+              }, {
+                "r" : "1415",
+                "s" : [ {
+                  "value" : [ "0 ", "seconds" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Predecessor",
-          "localId" : "693",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "Add",
+          "localId" : "1412",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "694",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "localId" : "1416",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1417",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
-          "operand" : {
-            "type" : "MinValue",
-            "localId" : "692",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Date",
+          "operand" : [ {
+            "type" : "MaxValue",
+            "localId" : "1414",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "1415",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 0,
+            "unit" : "seconds",
             "annotation" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "697",
+        "localId" : "1420",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimeAddOverflow",
+        "name" : "TimeAddNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "697",
+            "r" : "1420",
             "s" : [ {
-              "value" : [ "", "define ", "TimeAddOverflow", ": " ]
+              "value" : [ "", "define ", "TimeAddNearUnderflow", ": " ]
             }, {
-              "r" : "698",
+              "r" : "1421",
               "s" : [ {
-                "r" : "700",
+                "r" : "1423",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
+                  "value" : [ "minimum", " " ]
                 }, {
-                  "r" : "699",
+                  "r" : "1422",
                   "s" : [ {
                     "value" : [ "Time" ]
                   } ]
@@ -14174,9 +22178,9 @@ module.exports['OutOfBounds'] = {
               }, {
                 "value" : [ " + " ]
               }, {
-                "r" : "701",
+                "r" : "1424",
                 "s" : [ {
-                  "value" : [ "1 ", "second" ]
+                  "value" : [ "0 ", "seconds" ]
                 } ]
               } ]
             } ]
@@ -14184,72 +22188,72 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Add",
-          "localId" : "698",
+          "localId" : "1421",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "702",
+            "localId" : "1425",
             "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "703",
+            "localId" : "1426",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MaxValue",
-            "localId" : "700",
+            "type" : "MinValue",
+            "localId" : "1423",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "valueType" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "701",
+            "localId" : "1424",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "second",
+            "value" : 0,
+            "unit" : "seconds",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "706",
+        "localId" : "1429",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimeAddUnderflow",
+        "name" : "TimeSubtractOverflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "706",
+            "r" : "1429",
             "s" : [ {
-              "value" : [ "", "define ", "TimeAddUnderflow", ": " ]
+              "value" : [ "", "define ", "TimeSubtractOverflow", ": " ]
             }, {
-              "r" : "707",
+              "r" : "1430",
               "s" : [ {
-                "r" : "709",
+                "r" : "1432",
                 "s" : [ {
-                  "value" : [ "minimum", " " ]
+                  "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "708",
+                  "r" : "1431",
                   "s" : [ {
                     "value" : [ "Time" ]
                   } ]
                 } ]
               }, {
-                "value" : [ " + " ]
+                "value" : [ " - " ]
               }, {
-                "r" : "710",
+                "r" : "1433",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "710",
+                  "r" : "1433",
                   "s" : [ {
                     "value" : [ "-" ]
                   }, {
-                    "r" : "711",
+                    "r" : "1434",
                     "s" : [ {
                       "value" : [ "1 ", "second" ]
                     } ]
@@ -14262,41 +22266,41 @@ module.exports['OutOfBounds'] = {
           }
         } ],
         "expression" : {
-          "type" : "Add",
-          "localId" : "707",
+          "type" : "Subtract",
+          "localId" : "1430",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "713",
+            "localId" : "1436",
             "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "714",
+            "localId" : "1437",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "MinValue",
-            "localId" : "709",
+            "type" : "MaxValue",
+            "localId" : "1432",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "valueType" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
             "type" : "Negate",
-            "localId" : "710",
+            "localId" : "1433",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "712",
+              "localId" : "1435",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Quantity",
-              "localId" : "711",
+              "localId" : "1434",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "second",
@@ -14305,26 +22309,26 @@ module.exports['OutOfBounds'] = {
           } ]
         }
       }, {
-        "localId" : "717",
+        "localId" : "1440",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimeSubtractOverflow",
+        "name" : "TimeSubtractUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "717",
+            "r" : "1440",
             "s" : [ {
-              "value" : [ "", "define ", "TimeSubtractOverflow", ": " ]
+              "value" : [ "", "define ", "TimeSubtractUnderflow", ": " ]
             }, {
-              "r" : "718",
+              "r" : "1441",
               "s" : [ {
-                "r" : "720",
+                "r" : "1443",
                 "s" : [ {
-                  "value" : [ "maximum", " " ]
+                  "value" : [ "minimum", " " ]
                 }, {
-                  "r" : "719",
+                  "r" : "1442",
                   "s" : [ {
                     "value" : [ "Time" ]
                   } ]
@@ -14332,21 +22336,76 @@ module.exports['OutOfBounds'] = {
               }, {
                 "value" : [ " - " ]
               }, {
-                "r" : "721",
+                "r" : "1444",
                 "s" : [ {
-                  "value" : [ "(" ]
+                  "value" : [ "1 ", "second" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Subtract",
+          "localId" : "1441",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1445",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1446",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "MinValue",
+            "localId" : "1443",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "1444",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "second",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1449",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeSubtractNearOverflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1449",
+            "s" : [ {
+              "value" : [ "", "define ", "TimeSubtractNearOverflow", ": " ]
+            }, {
+              "r" : "1450",
+              "s" : [ {
+                "r" : "1452",
+                "s" : [ {
+                  "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "721",
+                  "r" : "1451",
                   "s" : [ {
-                    "value" : [ "-" ]
-                  }, {
-                    "r" : "722",
-                    "s" : [ {
-                      "value" : [ "1 ", "second" ]
-                    } ]
+                    "value" : [ "Time" ]
                   } ]
-                }, {
-                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " - " ]
+              }, {
+                "r" : "1453",
+                "s" : [ {
+                  "value" : [ "0 ", "seconds" ]
                 } ]
               } ]
             } ]
@@ -14354,68 +22413,56 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "718",
+          "localId" : "1450",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "724",
+            "localId" : "1454",
             "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "725",
+            "localId" : "1455",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "MaxValue",
-            "localId" : "720",
+            "localId" : "1452",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "valueType" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
-            "type" : "Negate",
-            "localId" : "721",
+            "type" : "Quantity",
+            "localId" : "1453",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "723",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Quantity",
-              "localId" : "722",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "second",
-              "annotation" : [ ]
-            }
+            "value" : 0,
+            "unit" : "seconds",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "728",
+        "localId" : "1458",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimeSubtractUnderflow",
+        "name" : "TimeSubtractNearUnderflow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "728",
+            "r" : "1458",
             "s" : [ {
-              "value" : [ "", "define ", "TimeSubtractUnderflow", ": " ]
+              "value" : [ "", "define ", "TimeSubtractNearUnderflow", ": " ]
             }, {
-              "r" : "729",
+              "r" : "1459",
               "s" : [ {
-                "r" : "731",
+                "r" : "1461",
                 "s" : [ {
                   "value" : [ "minimum", " " ]
                 }, {
-                  "r" : "730",
+                  "r" : "1460",
                   "s" : [ {
                     "value" : [ "Time" ]
                   } ]
@@ -14423,9 +22470,9 @@ module.exports['OutOfBounds'] = {
               }, {
                 "value" : [ " - " ]
               }, {
-                "r" : "732",
+                "r" : "1462",
                 "s" : [ {
-                  "value" : [ "1 ", "second" ]
+                  "value" : [ "0 ", "seconds" ]
                 } ]
               } ]
             } ]
@@ -14433,37 +22480,37 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Subtract",
-          "localId" : "729",
+          "localId" : "1459",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "733",
+            "localId" : "1463",
             "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "734",
+            "localId" : "1464",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "MinValue",
-            "localId" : "731",
+            "localId" : "1461",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "valueType" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "732",
+            "localId" : "1462",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "second",
+            "value" : 0,
+            "unit" : "seconds",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "737",
+        "localId" : "1467",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
         "name" : "TimeSuccessorOverflow",
         "context" : "Patient",
@@ -14472,19 +22519,19 @@ module.exports['OutOfBounds'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "737",
+            "r" : "1467",
             "s" : [ {
               "value" : [ "", "define ", "TimeSuccessorOverflow", ": " ]
             }, {
-              "r" : "740",
+              "r" : "1470",
               "s" : [ {
                 "value" : [ "successor of " ]
               }, {
-                "r" : "739",
+                "r" : "1469",
                 "s" : [ {
                   "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "738",
+                  "r" : "1468",
                   "s" : [ {
                     "value" : [ "Time" ]
                   } ]
@@ -14495,25 +22542,25 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Successor",
-          "localId" : "740",
+          "localId" : "1470",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "741",
+            "localId" : "1471",
             "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "MaxValue",
-            "localId" : "739",
+            "localId" : "1469",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "valueType" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "744",
+        "localId" : "1474",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
         "name" : "TimePredecessorUnderflow",
         "context" : "Patient",
@@ -14522,19 +22569,19 @@ module.exports['OutOfBounds'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "744",
+            "r" : "1474",
             "s" : [ {
               "value" : [ "", "define ", "TimePredecessorUnderflow", ": " ]
             }, {
-              "r" : "747",
+              "r" : "1477",
               "s" : [ {
                 "value" : [ "predecessor of " ]
               }, {
-                "r" : "746",
+                "r" : "1476",
                 "s" : [ {
                   "value" : [ "minimum", " " ]
                 }, {
-                  "r" : "745",
+                  "r" : "1475",
                   "s" : [ {
                     "value" : [ "Time" ]
                   } ]
@@ -14545,25 +22592,207 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Predecessor",
-          "localId" : "747",
+          "localId" : "1477",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "748",
+            "localId" : "1478",
             "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "MinValue",
-            "localId" : "746",
+            "localId" : "1476",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "valueType" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "751",
+        "localId" : "1481",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeSuccessorNearOverflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1481",
+            "s" : [ {
+              "value" : [ "", "define ", "TimeSuccessorNearOverflow", ": " ]
+            }, {
+              "r" : "1488",
+              "s" : [ {
+                "value" : [ "successor of " ]
+              }, {
+                "r" : "1482",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "1482",
+                  "s" : [ {
+                    "r" : "1484",
+                    "s" : [ {
+                      "value" : [ "maximum", " " ]
+                    }, {
+                      "r" : "1483",
+                      "s" : [ {
+                        "value" : [ "Time" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ " - " ]
+                  }, {
+                    "r" : "1485",
+                    "s" : [ {
+                      "value" : [ "1 ", "millisecond" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Successor",
+          "localId" : "1488",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1489",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Subtract",
+            "localId" : "1482",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1486",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1487",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "MaxValue",
+              "localId" : "1484",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Time",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "1485",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "millisecond",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "1492",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimePredecessorNearUnderflow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1492",
+            "s" : [ {
+              "value" : [ "", "define ", "TimePredecessorNearUnderflow", ": " ]
+            }, {
+              "r" : "1499",
+              "s" : [ {
+                "value" : [ "predecessor of " ]
+              }, {
+                "r" : "1493",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "1493",
+                  "s" : [ {
+                    "r" : "1495",
+                    "s" : [ {
+                      "value" : [ "minimum", " " ]
+                    }, {
+                      "r" : "1494",
+                      "s" : [ {
+                        "value" : [ "Time" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ " + " ]
+                  }, {
+                    "r" : "1496",
+                    "s" : [ {
+                      "value" : [ "1 ", "millisecond" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Predecessor",
+          "localId" : "1499",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1500",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Add",
+            "localId" : "1493",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1497",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1498",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "MinValue",
+              "localId" : "1495",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Time",
+              "annotation" : [ ]
+            }, {
+              "type" : "Quantity",
+              "localId" : "1496",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "millisecond",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "1503",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
         "name" : "ExpOverflow",
         "context" : "Patient",
@@ -14572,19 +22801,19 @@ module.exports['OutOfBounds'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "751",
+            "r" : "1503",
             "s" : [ {
               "value" : [ "", "define ", "ExpOverflow", ": " ]
             }, {
-              "r" : "757",
+              "r" : "1509",
               "s" : [ {
                 "value" : [ "Exp", "(" ]
               }, {
-                "r" : "753",
+                "r" : "1505",
                 "s" : [ {
                   "value" : [ "maximum", " " ]
                 }, {
-                  "r" : "752",
+                  "r" : "1504",
                   "s" : [ {
                     "value" : [ "Decimal" ]
                   } ]
@@ -14597,18 +22826,18 @@ module.exports['OutOfBounds'] = {
         } ],
         "expression" : {
           "type" : "Exp",
-          "localId" : "757",
+          "localId" : "1509",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "758",
+            "localId" : "1510",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "MaxValue",
-            "localId" : "753",
+            "localId" : "1505",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
             "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
diff --git a/test/elm/comparison/comparison-test.ts b/test/elm/comparison/comparison-test.ts
index dc74904dd..344552fc9 100644
--- a/test/elm/comparison/comparison-test.ts
+++ b/test/elm/comparison/comparison-test.ts
@@ -23,6 +23,18 @@ describe('Equal', () => {
     (await this.aLtB_Int.exec(this.ctx)).should.be.false();
   });
 
+  it('should be false for 5L = 4L', async function () {
+    (await this.aGtB_Long.exec(this.ctx)).should.be.false();
+  });
+
+  it('should be true for 5L = 5L', async function () {
+    (await this.aEqB_Long.exec(this.ctx)).should.be.true();
+  });
+
+  it('should be false for 5L = 6L', async function () {
+    (await this.aLtB_Long.exec(this.ctx)).should.be.false();
+  });
+
   it('should identify equal/unequal tuples', async function () {
     (await this.eqTuples.exec(this.ctx)).should.be.true();
     (await this.uneqTuples.exec(this.ctx)).should.be.false();
@@ -169,6 +181,18 @@ describe('NotEqual', () => {
     (await this.aLtB_Int.exec(this.ctx)).should.be.true();
   });
 
+  it('should be true for 5L <> 4L', async function () {
+    (await this.aGtB_Long.exec(this.ctx)).should.be.true();
+  });
+
+  it('should be false for 5L <> 5L', async function () {
+    (await this.aEqB_Long.exec(this.ctx)).should.be.false();
+  });
+
+  it('should be true for 5L <> 6L', async function () {
+    (await this.aLtB_Long.exec(this.ctx)).should.be.true();
+  });
+
   it('should identify equal/unequal tuples', async function () {
     (await this.eqTuples.exec(this.ctx)).should.be.false();
     (await this.uneqTuples.exec(this.ctx)).should.be.true();
@@ -297,8 +321,7 @@ describe('Equivalent', () => {
     (await this.aDefined_BNull.exec(this.ctx)).should.be.false();
   });
 
-  it.skip('should be true for null ~ null', async function () {
-    // Skipping because of cql-to-elm issue that will be fixed in 1.4
+  it('should be true for null ~ null', async function () {
     (await this.aNull_BNull.exec(this.ctx)).should.be.true();
   });
 
@@ -306,6 +329,14 @@ describe('Equivalent', () => {
     (await this.aDefined_BDefined.exec(this.ctx)).should.be.true();
   });
 
+  it('should be true for 5L ~ 5L', async function () {
+    (await this.eqLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should be false for 5L ~ 6L', async function () {
+    (await this.uneqLong.exec(this.ctx)).should.be.false();
+  });
+
   it('should be true for FOO ~ foo', async function () {
     (await this.caseInsensitiveStrings.exec(this.ctx)).should.be.true();
   });
@@ -442,10 +473,18 @@ describe('Equivalent', () => {
       (await this.differentOrderLists.exec(this.ctx)).should.be.false();
     });
 
+    it('should return false for lists with same long elements in different order', async function () {
+      (await this.differentOrderListsLong.exec(this.ctx)).should.be.false();
+    });
+
     it('should return true for lists with same elements in same order', async function () {
       (await this.sameLists.exec(this.ctx)).should.be.true();
     });
 
+    it('should return true for lists with same long elements in same order', async function () {
+      (await this.sameListsLong.exec(this.ctx)).should.be.true();
+    });
+
     it('should return true for lists with same elements in same order including nulls', async function () {
       (await this.sameListsNull.exec(this.ctx)).should.be.true();
     });
@@ -577,6 +616,18 @@ describe('Less', () => {
     (await this.aLtB_Int.exec(this.ctx)).should.be.true();
   });
 
+  it('should be false for 5L < 4L', async function () {
+    (await this.aGtB_Long.exec(this.ctx)).should.be.false();
+  });
+
+  it('should be false for 5L < 5L', async function () {
+    (await this.aEqB_Long.exec(this.ctx)).should.be.false();
+  });
+
+  it('should be true for 5L < 6L', async function () {
+    (await this.aLtB_Long.exec(this.ctx)).should.be.true();
+  });
+
   it('should be false for 5 m < 4 m', async function () {
     (await this.aGtB_Quantity.exec(this.ctx)).should.be.false();
   });
@@ -631,6 +682,18 @@ describe('LessOrEqual', () => {
     (await this.aLtB_Int.exec(this.ctx)).should.be.true();
   });
 
+  it('should be false for 5L <= 4L', async function () {
+    (await this.aGtB_Long.exec(this.ctx)).should.be.false();
+  });
+
+  it('should be true for 5L <= 5L', async function () {
+    (await this.aEqB_Long.exec(this.ctx)).should.be.true();
+  });
+
+  it('should be true for 5L <= 6L', async function () {
+    (await this.aLtB_Long.exec(this.ctx)).should.be.true();
+  });
+
   it('should be true for 5 m <= 4 m', async function () {
     (await this.aGtB_Quantity.exec(this.ctx)).should.be.false();
   });
@@ -685,6 +748,18 @@ describe('Greater', () => {
     (await this.aLtB_Int.exec(this.ctx)).should.be.false();
   });
 
+  it('should be true for 5L > 4L', async function () {
+    (await this.aGtB_Long.exec(this.ctx)).should.be.true();
+  });
+
+  it('should be false for 5L > 5L', async function () {
+    (await this.aEqB_Long.exec(this.ctx)).should.be.false();
+  });
+
+  it('should be false for 5L > 6L', async function () {
+    (await this.aLtB_Long.exec(this.ctx)).should.be.false();
+  });
+
   it('should be true for 5 m > 4 m', async function () {
     (await this.aGtB_Quantity.exec(this.ctx)).should.be.true();
   });
@@ -739,6 +814,18 @@ describe('GreaterOrEqual', () => {
     (await this.aLtB_Int.exec(this.ctx)).should.be.false();
   });
 
+  it('should be true for 5L >= 4L', async function () {
+    (await this.aGtB_Long.exec(this.ctx)).should.be.true();
+  });
+
+  it('should be true for 5L >= 5L', async function () {
+    (await this.aEqB_Long.exec(this.ctx)).should.be.true();
+  });
+
+  it('should be false for 5L >= 6L', async function () {
+    (await this.aLtB_Long.exec(this.ctx)).should.be.false();
+  });
+
   it('should be true for 5 m >= 4 m', async function () {
     (await this.aGtB_Quantity.exec(this.ctx)).should.be.true();
   });
diff --git a/test/elm/comparison/data.cql b/test/elm/comparison/data.cql
index b59f7237d..d4d2dfe67 100644
--- a/test/elm/comparison/data.cql
+++ b/test/elm/comparison/data.cql
@@ -2,6 +2,9 @@
 define AGtB_Int: 5 = 4
 define AEqB_Int: 5 = 5
 define ALtB_Int: 5 = 6
+define AGtB_Long: 5L = 4L
+define AEqB_Long: 5L = 5L
+define ALtB_Long: 5L = 6L
 define EqTuples: Tuple{a: 1, b: Tuple{c: 1}} = Tuple{a: 1, b: Tuple{c: 1}}
 define UneqTuples: Tuple{a: 1, b: Tuple{c: 1}} = Tuple{a: 1, b: Tuple{c: -1}}
 define EqTuplesWithNullFields: Tuple{a: 'Hello', b: null} = Tuple{a: 'Hello', b: null}
@@ -44,6 +47,9 @@ define UneqRatios: 10 'mg' : 2 'dL' = 15 'mg' : 4 'dL'
 define AGtB_Int: 5 != 4
 define AEqB_Int: 5 != 5
 define ALtB_Int: 5 != 6
+define AGtB_Long: 5L != 4L
+define AEqB_Long: 5L != 5L
+define ALtB_Long: 5L != 6L
 define EqTuples: Tuple{a: 1, b: Tuple{c: 1}} != Tuple{a: 1, b: Tuple{c: 1}}
 define UneqTuples: Tuple{a: 1, b: Tuple{c: 1}} != Tuple{a: 1, b: Tuple{c: -1}}
 define EqTuplesWithNullFields: Tuple{a: 'Hello', b: null} != Tuple{a: 'Hello', b: null}
@@ -90,11 +96,12 @@ valueset "UnknownSame": '1.2.3.4.5.6.7.8.9'
 valueset "Known": '2.16.840.1.113883.3.560.100.1' version '20121025'
 valueset "KnownSameCodes": '2.16.840.1.113883.3.560.100.1' version '20131025'
 valueset "KnownDifferentCodes": '2.16.840.1.113883.3.560.100.1' version '20141025'
-
 define ANull_BDefined: null ~ 4
 define ADefined_BNull: 5 ~ null
 define ANull_BNull: (null as String) ~ (null as String)
 define ADefined_BDefined: 3 ~ 3
+define EqLong: 5L ~ 5L
+define UneqLong: 5L ~ 6L
 define CaseInsensitiveStrings: 'FOO' ~ 'foo'
 define WhiteSpaceTabTrue: 'foo bar' ~ 'foo\tbar'
 define WhiteSpaceTabReturnTrue: 'foo\tbar' ~ 'foo\nbar'
@@ -106,7 +113,7 @@ define UneqRatios: 10 'mg' : 2 'dL' ~ 15 'mg' : 4 'dL'
 define UneqRatioTypes: 10 'mg' : 2 'dL' ~ DateTime(2000, 3, 13, 2, 4, 23)
 
 // define EmptyTuples: { : } ~ { : } // TODO: We don't seem to support this format
-define SameTuples: Tuple{a: 'a', b: 'b'} ~ Tuple{a: 'a', b: 'b'}
+define SameTuples: Tuple{a: 'a', b: 'b', z: 9L } ~ Tuple{a: 'a', b: 'b', z: 9L }
 define SameTuplesNull: Tuple{a: null} ~ Tuple{a : null}
 define DifferentTuples: Tuple{a: 'a', b: 'b'} ~ Tuple{a: 'x', b: 'b'}
 define SameNestedTuples: Tuple{a: 'a', b: Tuple{c: 'c'}} ~ Tuple{a: 'a', b: Tuple{c: 'c'}}
@@ -116,7 +123,9 @@ define EmptyLists: { } ~ { }
 define DifferentTypesLists: {'1', '2', '3'} ~ {1, 2, 3}
 define DifferentLengthLists: {'a'} ~ {'a', 'a'}
 define DifferentOrderLists: {'a', 'b'} ~ {'b', 'a'}
+define DifferentOrderListsLong: {1L, 5L, 10L} ~ {5L, 1L, 10L}
 define SameLists: {'a', 'b', 'c'} ~ {'a', 'b', 'c'}
+define SameListsLong: {1L, 5L, 10L} ~ {1L, 5L, 10L}
 define SameListsNull: {null, null, null} ~ {null, null, null}
 define SameNestedLists: {{'a','d'}, {'b', 'c'}} ~ {{'a','d'}, {'b', 'c'}}
 define SameNestedListsNull: {null, {null, null}} ~ {null, {null, null}}
@@ -168,6 +177,9 @@ define DateTimeAndDateUncertainFalse: DateTime(2000, 3, 13, 2, 4, 23) ~ Date(200
 define AGtB_Int: 5 < 4
 define AEqB_Int: 5 < 5
 define ALtB_Int: 5 < 6
+define AGtB_Long: 5L < 4L
+define AEqB_Long: 5L < 5L
+define ALtB_Long: 5L < 6L
 define AGtB_Quantity: 5 'm' < 4 'm'
 define AEqB_Quantity: 5 'm' < 5 'm'
 define ALtB_Quantity: 5 'm' < 6 'm'
@@ -182,6 +194,9 @@ define ALtB_Quantity_incompatible: 5 'Cel' < 40 'm'
 define AGtB_Int: 5 <= 4
 define AEqB_Int: 5 <= 5
 define ALtB_Int: 5 <= 6
+define AGtB_Long: 5L <= 4L
+define AEqB_Long: 5L <= 5L
+define ALtB_Long: 5L <= 6L
 define AGtB_Quantity: 5 'm' <= 4 'm'
 define AEqB_Quantity: 5 'm' <= 5 'm'
 define ALtB_Quantity: 5 'm' <= 6 'm'
@@ -197,6 +212,9 @@ define ALtB_Quantity_incompatible: 5 'Cel' <= 40 'm'
 define AGtB_Int: 5 > 4
 define AEqB_Int: 5 > 5
 define ALtB_Int: 5 > 6
+define AGtB_Long: 5L > 4L
+define AEqB_Long: 5L > 5L
+define ALtB_Long: 5L > 6L
 define AGtB_Quantity: 5 'm' > 4 'm'
 define AEqB_Quantity: 5 'm' > 5 'm'
 define ALtB_Quantity: 5 'm' > 6 'm'
@@ -211,6 +229,9 @@ define ALtB_Quantity_incompatible: 5 'Cel' > 40 'm'
 define AGtB_Int: 5 >= 4
 define AEqB_Int: 5 >= 5
 define ALtB_Int: 5 >= 6
+define AGtB_Long: 5L >= 4L
+define AEqB_Long: 5L >= 5L
+define ALtB_Long: 5L >= 6L
 define AGtB_Quantity: 5 'm' >= 4 'm'
 define AEqB_Quantity: 5 'm' >= 5 'm'
 define ALtB_Quantity: 5 'm' >= 6 'm'
diff --git a/test/elm/comparison/data.js b/test/elm/comparison/data.js
index 3c5b1d4e1..d5e543e20 100644
--- a/test/elm/comparison/data.js
+++ b/test/elm/comparison/data.js
@@ -15,6 +15,9 @@ context Patient
 define AGtB_Int: 5 = 4
 define AEqB_Int: 5 = 5
 define ALtB_Int: 5 = 6
+define AGtB_Long: 5L = 4L
+define AEqB_Long: 5L = 5L
+define ALtB_Long: 5L = 6L
 define EqTuples: Tuple{a: 1, b: Tuple{c: 1}} = Tuple{a: 1, b: Tuple{c: 1}}
 define UneqTuples: Tuple{a: 1, b: Tuple{c: 1}} = Tuple{a: 1, b: Tuple{c: -1}}
 define EqTuplesWithNullFields: Tuple{a: 'Hello', b: null} = Tuple{a: 'Hello', b: null}
@@ -66,7 +69,7 @@ module.exports['Equal'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "1359",
+        "r" : "1383",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -303,7 +306,7 @@ module.exports['Equal'] = {
       }, {
         "localId" : "238",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqTuples",
+        "name" : "AGtB_Long",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -312,16 +315,178 @@ module.exports['Equal'] = {
           "s" : {
             "r" : "238",
             "s" : [ {
-              "value" : [ "", "define ", "EqTuples", ": " ]
+              "value" : [ "", "define ", "AGtB_Long", ": " ]
             }, {
               "r" : "239",
               "s" : [ {
                 "r" : "240",
+                "value" : [ "5L", " ", "=", " ", "4L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "239",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "242",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "243",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "240",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "4",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "246",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AEqB_Long",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "246",
+            "s" : [ {
+              "value" : [ "", "define ", "AEqB_Long", ": " ]
+            }, {
+              "r" : "247",
+              "s" : [ {
+                "r" : "248",
+                "value" : [ "5L", " ", "=", " ", "5L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "247",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "250",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "248",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "249",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "254",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ALtB_Long",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "254",
+            "s" : [ {
+              "value" : [ "", "define ", "ALtB_Long", ": " ]
+            }, {
+              "r" : "255",
+              "s" : [ {
+                "r" : "256",
+                "value" : [ "5L", " ", "=", " ", "6L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "255",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "258",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "259",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "256",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "257",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "6",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "262",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqTuples",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "262",
+            "s" : [ {
+              "value" : [ "", "define ", "EqTuples", ": " ]
+            }, {
+              "r" : "263",
+              "s" : [ {
+                "r" : "264",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "241",
+                    "r" : "265",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -330,12 +495,12 @@ module.exports['Equal'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "242",
+                    "r" : "266",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
-                        "r" : "243",
+                        "r" : "267",
                         "value" : [ "c", ": ", "1" ]
                       } ]
                     }, {
@@ -348,12 +513,12 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "254",
+                "r" : "278",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "255",
+                    "r" : "279",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -362,12 +527,12 @@ module.exports['Equal'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "256",
+                    "r" : "280",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
-                        "r" : "257",
+                        "r" : "281",
                         "value" : [ "c", ": ", "1" ]
                       } ]
                     }, {
@@ -383,38 +548,38 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "239",
+          "localId" : "263",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "268",
+            "localId" : "292",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "269",
+              "localId" : "293",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "270",
+                "localId" : "294",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "271",
+              "localId" : "295",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "272",
+                "localId" : "296",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "273",
+                  "localId" : "297",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "274",
+                    "localId" : "298",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -423,33 +588,33 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "275",
+            "localId" : "299",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "276",
+              "localId" : "300",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "277",
+                "localId" : "301",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "278",
+              "localId" : "302",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "279",
+                "localId" : "303",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "280",
+                  "localId" : "304",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "281",
+                    "localId" : "305",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -459,37 +624,37 @@ module.exports['Equal'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "240",
+            "localId" : "264",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "247",
+              "localId" : "271",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "248",
+                "localId" : "272",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "249",
+                  "localId" : "273",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "250",
+                "localId" : "274",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "251",
+                  "localId" : "275",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "252",
+                    "localId" : "276",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "253",
+                      "localId" : "277",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -501,7 +666,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "241",
+                "localId" : "265",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -511,19 +676,19 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Tuple",
-                "localId" : "242",
+                "localId" : "266",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "244",
+                  "localId" : "268",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "245",
+                    "localId" : "269",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "246",
+                      "localId" : "270",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -533,7 +698,7 @@ module.exports['Equal'] = {
                   "name" : "c",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "243",
+                    "localId" : "267",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "1",
@@ -544,37 +709,37 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "254",
+            "localId" : "278",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "261",
+              "localId" : "285",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "262",
+                "localId" : "286",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "263",
+                  "localId" : "287",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "264",
+                "localId" : "288",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "265",
+                  "localId" : "289",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "266",
+                    "localId" : "290",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "267",
+                      "localId" : "291",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -586,7 +751,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "255",
+                "localId" : "279",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -596,19 +761,19 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Tuple",
-                "localId" : "256",
+                "localId" : "280",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "258",
+                  "localId" : "282",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "259",
+                    "localId" : "283",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "260",
+                      "localId" : "284",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -618,7 +783,7 @@ module.exports['Equal'] = {
                   "name" : "c",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "257",
+                    "localId" : "281",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "1",
@@ -630,7 +795,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "284",
+        "localId" : "308",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqTuples",
         "context" : "Patient",
@@ -639,18 +804,18 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "284",
+            "r" : "308",
             "s" : [ {
               "value" : [ "", "define ", "UneqTuples", ": " ]
             }, {
-              "r" : "285",
+              "r" : "309",
               "s" : [ {
-                "r" : "286",
+                "r" : "310",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "287",
+                    "r" : "311",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -659,12 +824,12 @@ module.exports['Equal'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "288",
+                    "r" : "312",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
-                        "r" : "289",
+                        "r" : "313",
                         "value" : [ "c", ": ", "1" ]
                       } ]
                     }, {
@@ -677,12 +842,12 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "300",
+                "r" : "324",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "301",
+                    "r" : "325",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -691,16 +856,16 @@ module.exports['Equal'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "302",
+                    "r" : "326",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
                         "value" : [ "c", ": " ]
                       }, {
-                        "r" : "303",
+                        "r" : "327",
                         "s" : [ {
-                          "r" : "304",
+                          "r" : "328",
                           "value" : [ "-", "1" ]
                         } ]
                       } ]
@@ -717,38 +882,38 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "285",
+          "localId" : "309",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "316",
+            "localId" : "340",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "317",
+              "localId" : "341",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "318",
+                "localId" : "342",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "319",
+              "localId" : "343",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "320",
+                "localId" : "344",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "321",
+                  "localId" : "345",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "322",
+                    "localId" : "346",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -757,33 +922,33 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "323",
+            "localId" : "347",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "324",
+              "localId" : "348",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "325",
+                "localId" : "349",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "326",
+              "localId" : "350",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "327",
+                "localId" : "351",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "328",
+                  "localId" : "352",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "329",
+                    "localId" : "353",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -793,37 +958,37 @@ module.exports['Equal'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "286",
+            "localId" : "310",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "293",
+              "localId" : "317",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "294",
+                "localId" : "318",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "295",
+                  "localId" : "319",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "296",
+                "localId" : "320",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "297",
+                  "localId" : "321",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "298",
+                    "localId" : "322",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "299",
+                      "localId" : "323",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -835,7 +1000,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "287",
+                "localId" : "311",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -845,19 +1010,19 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Tuple",
-                "localId" : "288",
+                "localId" : "312",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "290",
+                  "localId" : "314",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "291",
+                    "localId" : "315",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "292",
+                      "localId" : "316",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -867,7 +1032,7 @@ module.exports['Equal'] = {
                   "name" : "c",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "289",
+                    "localId" : "313",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "1",
@@ -878,37 +1043,37 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "300",
+            "localId" : "324",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "309",
+              "localId" : "333",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "310",
+                "localId" : "334",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "311",
+                  "localId" : "335",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "312",
+                "localId" : "336",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "313",
+                  "localId" : "337",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "314",
+                    "localId" : "338",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "315",
+                      "localId" : "339",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -920,7 +1085,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "301",
+                "localId" : "325",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -930,19 +1095,19 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Tuple",
-                "localId" : "302",
+                "localId" : "326",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "306",
+                  "localId" : "330",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "307",
+                    "localId" : "331",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "308",
+                      "localId" : "332",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -952,18 +1117,18 @@ module.exports['Equal'] = {
                   "name" : "c",
                   "value" : {
                     "type" : "Negate",
-                    "localId" : "303",
+                    "localId" : "327",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ],
                     "signature" : [ {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "305",
+                      "localId" : "329",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     } ],
                     "operand" : {
                       "type" : "Literal",
-                      "localId" : "304",
+                      "localId" : "328",
                       "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                       "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                       "value" : "1",
@@ -976,7 +1141,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "332",
+        "localId" : "356",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqTuplesWithNullFields",
         "context" : "Patient",
@@ -985,20 +1150,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "332",
+            "r" : "356",
             "s" : [ {
               "value" : [ "", "define ", "EqTuplesWithNullFields", ": " ]
             }, {
-              "r" : "333",
+              "r" : "357",
               "s" : [ {
-                "r" : "334",
+                "r" : "358",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "335",
+                    "r" : "359",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -1007,7 +1172,7 @@ module.exports['Equal'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "337",
+                    "r" : "361",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -1016,14 +1181,14 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "343",
+                "r" : "367",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "344",
+                    "r" : "368",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -1032,7 +1197,7 @@ module.exports['Equal'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "346",
+                    "r" : "370",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -1044,55 +1209,55 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "333",
+          "localId" : "357",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "352",
+            "localId" : "376",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "353",
+              "localId" : "377",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "354",
+                "localId" : "378",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "355",
+              "localId" : "379",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "356",
+                "localId" : "380",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "357",
+            "localId" : "381",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "358",
+              "localId" : "382",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "359",
+                "localId" : "383",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "360",
+              "localId" : "384",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "361",
+                "localId" : "385",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -1100,29 +1265,29 @@ module.exports['Equal'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "334",
+            "localId" : "358",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "338",
+              "localId" : "362",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "339",
+                "localId" : "363",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "340",
+                  "localId" : "364",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "341",
+                "localId" : "365",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "342",
+                  "localId" : "366",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -1132,7 +1297,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "335",
+                "localId" : "359",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Hello",
@@ -1142,36 +1307,36 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Null",
-                "localId" : "337",
+                "localId" : "361",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "343",
+            "localId" : "367",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "347",
+              "localId" : "371",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "348",
+                "localId" : "372",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "349",
+                  "localId" : "373",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "350",
+                "localId" : "374",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "351",
+                  "localId" : "375",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -1181,7 +1346,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "344",
+                "localId" : "368",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Hello",
@@ -1191,7 +1356,7 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Null",
-                "localId" : "346",
+                "localId" : "370",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -1199,7 +1364,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "364",
+        "localId" : "388",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqTuplesWithNullFields",
         "context" : "Patient",
@@ -1208,20 +1373,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "364",
+            "r" : "388",
             "s" : [ {
               "value" : [ "", "define ", "UneqTuplesWithNullFields", ": " ]
             }, {
-              "r" : "365",
+              "r" : "389",
               "s" : [ {
-                "r" : "366",
+                "r" : "390",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "367",
+                    "r" : "391",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -1230,7 +1395,7 @@ module.exports['Equal'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "369",
+                    "r" : "393",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -1239,14 +1404,14 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "375",
+                "r" : "399",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "376",
+                    "r" : "400",
                     "s" : [ {
                       "value" : [ "'Goodbye'" ]
                     } ]
@@ -1255,7 +1420,7 @@ module.exports['Equal'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "378",
+                    "r" : "402",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -1267,55 +1432,55 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "365",
+          "localId" : "389",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "384",
+            "localId" : "408",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "385",
+              "localId" : "409",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "386",
+                "localId" : "410",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "387",
+              "localId" : "411",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "388",
+                "localId" : "412",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "389",
+            "localId" : "413",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "390",
+              "localId" : "414",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "391",
+                "localId" : "415",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "392",
+              "localId" : "416",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "393",
+                "localId" : "417",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -1323,29 +1488,29 @@ module.exports['Equal'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "366",
+            "localId" : "390",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "370",
+              "localId" : "394",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "371",
+                "localId" : "395",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "372",
+                  "localId" : "396",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "373",
+                "localId" : "397",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "374",
+                  "localId" : "398",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -1355,7 +1520,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "367",
+                "localId" : "391",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Hello",
@@ -1365,36 +1530,36 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Null",
-                "localId" : "369",
+                "localId" : "393",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "375",
+            "localId" : "399",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "379",
+              "localId" : "403",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "380",
+                "localId" : "404",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "381",
+                  "localId" : "405",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "382",
+                "localId" : "406",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "383",
+                  "localId" : "407",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -1404,7 +1569,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "376",
+                "localId" : "400",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Goodbye",
@@ -1414,7 +1579,7 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Null",
-                "localId" : "378",
+                "localId" : "402",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -1422,7 +1587,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "396",
+        "localId" : "420",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UncertTuplesWithNullFieldOnOne",
         "context" : "Patient",
@@ -1431,20 +1596,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "396",
+            "r" : "420",
             "s" : [ {
               "value" : [ "", "define ", "UncertTuplesWithNullFieldOnOne", ": " ]
             }, {
-              "r" : "397",
+              "r" : "421",
               "s" : [ {
-                "r" : "398",
+                "r" : "422",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "399",
+                    "r" : "423",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -1453,7 +1618,7 @@ module.exports['Equal'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "401",
+                    "r" : "425",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -1462,14 +1627,14 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "407",
+                "r" : "431",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "408",
+                    "r" : "432",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -1480,7 +1645,7 @@ module.exports['Equal'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "410",
+                    "r" : "434",
                     "s" : [ {
                       "value" : [ "'null'" ]
                     } ]
@@ -1494,55 +1659,55 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "397",
+          "localId" : "421",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "417",
+            "localId" : "441",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "418",
+              "localId" : "442",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "419",
+                "localId" : "443",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "420",
+              "localId" : "444",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "421",
+                "localId" : "445",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "422",
+            "localId" : "446",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "423",
+              "localId" : "447",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "424",
+                "localId" : "448",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "425",
+              "localId" : "449",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "426",
+                "localId" : "450",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -1550,29 +1715,29 @@ module.exports['Equal'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "398",
+            "localId" : "422",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "402",
+              "localId" : "426",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "403",
+                "localId" : "427",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "404",
+                  "localId" : "428",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "405",
+                "localId" : "429",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "406",
+                  "localId" : "430",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -1582,7 +1747,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "399",
+                "localId" : "423",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Hello",
@@ -1592,36 +1757,36 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Null",
-                "localId" : "401",
+                "localId" : "425",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "407",
+            "localId" : "431",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "412",
+              "localId" : "436",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "413",
+                "localId" : "437",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "414",
+                  "localId" : "438",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "415",
+                "localId" : "439",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "416",
+                  "localId" : "440",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -1631,7 +1796,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "408",
+                "localId" : "432",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Hello",
@@ -1641,7 +1806,7 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "410",
+                "localId" : "434",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "null",
@@ -1651,7 +1816,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "429",
+        "localId" : "453",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UncertTuplesWithNullFieldOnFirstOne",
         "context" : "Patient",
@@ -1660,18 +1825,18 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "429",
+            "r" : "453",
             "s" : [ {
               "value" : [ "", "define ", "UncertTuplesWithNullFieldOnFirstOne", ": " ]
             }, {
-              "r" : "430",
+              "r" : "454",
               "s" : [ {
-                "r" : "431",
+                "r" : "455",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "432",
+                    "r" : "456",
                     "value" : [ "a", ": ", "null" ]
                   } ]
                 }, {
@@ -1680,7 +1845,7 @@ module.exports['Equal'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "433",
+                    "r" : "457",
                     "s" : [ {
                       "value" : [ "'Goodbye'" ]
                     } ]
@@ -1691,14 +1856,14 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "440",
+                "r" : "464",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "441",
+                    "r" : "465",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -1709,7 +1874,7 @@ module.exports['Equal'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "443",
+                    "r" : "467",
                     "s" : [ {
                       "value" : [ "'Goodbye'" ]
                     } ]
@@ -1723,55 +1888,55 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "430",
+          "localId" : "454",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "450",
+            "localId" : "474",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "451",
+              "localId" : "475",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "452",
+                "localId" : "476",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "453",
+              "localId" : "477",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "454",
+                "localId" : "478",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "455",
+            "localId" : "479",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "456",
+              "localId" : "480",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "457",
+                "localId" : "481",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "458",
+              "localId" : "482",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "459",
+                "localId" : "483",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -1779,29 +1944,29 @@ module.exports['Equal'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "431",
+            "localId" : "455",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "435",
+              "localId" : "459",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "436",
+                "localId" : "460",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "437",
+                  "localId" : "461",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "438",
+                "localId" : "462",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "439",
+                  "localId" : "463",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -1811,7 +1976,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Null",
-                "localId" : "432",
+                "localId" : "456",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -1819,7 +1984,7 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "433",
+                "localId" : "457",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Goodbye",
@@ -1828,29 +1993,29 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "440",
+            "localId" : "464",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "445",
+              "localId" : "469",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "446",
+                "localId" : "470",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "447",
+                  "localId" : "471",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "448",
+                "localId" : "472",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "449",
+                  "localId" : "473",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -1860,7 +2025,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "441",
+                "localId" : "465",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Hello",
@@ -1870,7 +2035,7 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "443",
+                "localId" : "467",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Goodbye",
@@ -1880,7 +2045,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "462",
+        "localId" : "486",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqTuplesWithNullFieldOnOne",
         "context" : "Patient",
@@ -1889,20 +2054,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "462",
+            "r" : "486",
             "s" : [ {
               "value" : [ "", "define ", "UneqTuplesWithNullFieldOnOne", ": " ]
             }, {
-              "r" : "463",
+              "r" : "487",
               "s" : [ {
-                "r" : "464",
+                "r" : "488",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "465",
+                    "r" : "489",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -1911,7 +2076,7 @@ module.exports['Equal'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "467",
+                    "r" : "491",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -1920,14 +2085,14 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "473",
+                "r" : "497",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "474",
+                    "r" : "498",
                     "s" : [ {
                       "value" : [ "'Goodbye'" ]
                     } ]
@@ -1938,7 +2103,7 @@ module.exports['Equal'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "476",
+                    "r" : "500",
                     "s" : [ {
                       "value" : [ "'null'" ]
                     } ]
@@ -1952,55 +2117,55 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "463",
+          "localId" : "487",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "483",
+            "localId" : "507",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "484",
+              "localId" : "508",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "485",
+                "localId" : "509",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "486",
+              "localId" : "510",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "487",
+                "localId" : "511",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "488",
+            "localId" : "512",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "489",
+              "localId" : "513",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "490",
+                "localId" : "514",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "491",
+              "localId" : "515",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "492",
+                "localId" : "516",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -2008,29 +2173,29 @@ module.exports['Equal'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "464",
+            "localId" : "488",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "468",
+              "localId" : "492",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "469",
+                "localId" : "493",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "470",
+                  "localId" : "494",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "471",
+                "localId" : "495",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "472",
+                  "localId" : "496",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -2040,7 +2205,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "465",
+                "localId" : "489",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Hello",
@@ -2050,36 +2215,36 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Null",
-                "localId" : "467",
+                "localId" : "491",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "473",
+            "localId" : "497",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "478",
+              "localId" : "502",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "479",
+                "localId" : "503",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "480",
+                  "localId" : "504",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "481",
+                "localId" : "505",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "482",
+                  "localId" : "506",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -2089,7 +2254,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "474",
+                "localId" : "498",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Goodbye",
@@ -2099,7 +2264,7 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "476",
+                "localId" : "500",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "null",
@@ -2109,7 +2274,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "495",
+        "localId" : "519",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqTuplesWithNullFieldOnFirstOne",
         "context" : "Patient",
@@ -2118,18 +2283,18 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "495",
+            "r" : "519",
             "s" : [ {
               "value" : [ "", "define ", "UneqTuplesWithNullFieldOnFirstOne", ": " ]
             }, {
-              "r" : "496",
+              "r" : "520",
               "s" : [ {
-                "r" : "497",
+                "r" : "521",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "498",
+                    "r" : "522",
                     "value" : [ "a", ": ", "null" ]
                   } ]
                 }, {
@@ -2138,7 +2303,7 @@ module.exports['Equal'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "499",
+                    "r" : "523",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -2149,14 +2314,14 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "506",
+                "r" : "530",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "507",
+                    "r" : "531",
                     "s" : [ {
                       "value" : [ "'null'" ]
                     } ]
@@ -2167,7 +2332,7 @@ module.exports['Equal'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "509",
+                    "r" : "533",
                     "s" : [ {
                       "value" : [ "'Goodbye'" ]
                     } ]
@@ -2181,55 +2346,55 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "496",
+          "localId" : "520",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "516",
+            "localId" : "540",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "517",
+              "localId" : "541",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "518",
+                "localId" : "542",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "519",
+              "localId" : "543",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "520",
+                "localId" : "544",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "521",
+            "localId" : "545",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "522",
+              "localId" : "546",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "523",
+                "localId" : "547",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "524",
+              "localId" : "548",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "525",
+                "localId" : "549",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -2237,29 +2402,29 @@ module.exports['Equal'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "497",
+            "localId" : "521",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "501",
+              "localId" : "525",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "502",
+                "localId" : "526",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "503",
+                  "localId" : "527",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "504",
+                "localId" : "528",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "505",
+                  "localId" : "529",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -2269,7 +2434,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Null",
-                "localId" : "498",
+                "localId" : "522",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -2277,7 +2442,7 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "499",
+                "localId" : "523",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Hello",
@@ -2286,29 +2451,29 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "506",
+            "localId" : "530",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "511",
+              "localId" : "535",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "512",
+                "localId" : "536",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "513",
+                  "localId" : "537",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "514",
+                "localId" : "538",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "515",
+                  "localId" : "539",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -2318,7 +2483,7 @@ module.exports['Equal'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "507",
+                "localId" : "531",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "null",
@@ -2328,7 +2493,7 @@ module.exports['Equal'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "509",
+                "localId" : "533",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "Goodbye",
@@ -2338,7 +2503,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "528",
+        "localId" : "552",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimes",
         "context" : "Patient",
@@ -2347,20 +2512,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "528",
+            "r" : "552",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimes", ": " ]
             }, {
-              "r" : "529",
+              "r" : "553",
               "s" : [ {
-                "r" : "548",
+                "r" : "572",
                 "s" : [ {
-                  "r" : "530",
+                  "r" : "554",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "537",
+                  "r" : "561",
                   "s" : [ {
-                    "r" : "537",
+                    "r" : "561",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -2369,14 +2534,14 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "575",
+                "r" : "599",
                 "s" : [ {
-                  "r" : "557",
+                  "r" : "581",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "564",
+                  "r" : "588",
                   "s" : [ {
-                    "r" : "564",
+                    "r" : "588",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -2388,69 +2553,69 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "529",
+          "localId" : "553",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "584",
+            "localId" : "608",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "585",
+            "localId" : "609",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "548",
+            "localId" : "572",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "549",
+              "localId" : "573",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "550",
+              "localId" : "574",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "551",
+              "localId" : "575",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "552",
+              "localId" : "576",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "553",
+              "localId" : "577",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "554",
+              "localId" : "578",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "555",
+              "localId" : "579",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "556",
+              "localId" : "580",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "530",
+              "localId" : "554",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -2458,7 +2623,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "531",
+              "localId" : "555",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -2466,7 +2631,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "532",
+              "localId" : "556",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -2474,7 +2639,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "533",
+              "localId" : "557",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -2482,7 +2647,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "534",
+              "localId" : "558",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -2490,7 +2655,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "535",
+              "localId" : "559",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -2498,7 +2663,7 @@ module.exports['Equal'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "536",
+              "localId" : "560",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -2506,7 +2671,7 @@ module.exports['Equal'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "537",
+              "localId" : "561",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -2514,53 +2679,53 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "575",
+            "localId" : "599",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "576",
+              "localId" : "600",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "577",
+              "localId" : "601",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "578",
+              "localId" : "602",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "579",
+              "localId" : "603",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "580",
+              "localId" : "604",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "581",
+              "localId" : "605",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "582",
+              "localId" : "606",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "583",
+              "localId" : "607",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "557",
+              "localId" : "581",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -2568,7 +2733,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "558",
+              "localId" : "582",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -2576,7 +2741,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "559",
+              "localId" : "583",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -2584,7 +2749,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "560",
+              "localId" : "584",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -2592,7 +2757,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "561",
+              "localId" : "585",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -2600,7 +2765,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "562",
+              "localId" : "586",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -2608,7 +2773,7 @@ module.exports['Equal'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "563",
+              "localId" : "587",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -2616,7 +2781,7 @@ module.exports['Equal'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "564",
+              "localId" : "588",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -2625,7 +2790,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "588",
+        "localId" : "612",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimes",
         "context" : "Patient",
@@ -2634,20 +2799,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "588",
+            "r" : "612",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimes", ": " ]
             }, {
-              "r" : "589",
+              "r" : "613",
               "s" : [ {
-                "r" : "608",
+                "r" : "632",
                 "s" : [ {
-                  "r" : "590",
+                  "r" : "614",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "597",
+                  "r" : "621",
                   "s" : [ {
-                    "r" : "597",
+                    "r" : "621",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -2656,14 +2821,14 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "635",
+                "r" : "659",
                 "s" : [ {
-                  "r" : "617",
+                  "r" : "641",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "201", ", " ]
                 }, {
-                  "r" : "624",
+                  "r" : "648",
                   "s" : [ {
-                    "r" : "624",
+                    "r" : "648",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -2675,69 +2840,69 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "589",
+          "localId" : "613",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "644",
+            "localId" : "668",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "645",
+            "localId" : "669",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "608",
+            "localId" : "632",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "609",
+              "localId" : "633",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "610",
+              "localId" : "634",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "611",
+              "localId" : "635",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "612",
+              "localId" : "636",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "613",
+              "localId" : "637",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "614",
+              "localId" : "638",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "615",
+              "localId" : "639",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "616",
+              "localId" : "640",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "590",
+              "localId" : "614",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -2745,7 +2910,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "591",
+              "localId" : "615",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -2753,7 +2918,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "592",
+              "localId" : "616",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -2761,7 +2926,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "593",
+              "localId" : "617",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -2769,7 +2934,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "594",
+              "localId" : "618",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -2777,7 +2942,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "595",
+              "localId" : "619",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -2785,7 +2950,7 @@ module.exports['Equal'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "596",
+              "localId" : "620",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -2793,7 +2958,7 @@ module.exports['Equal'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "597",
+              "localId" : "621",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -2801,53 +2966,53 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "635",
+            "localId" : "659",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "636",
+              "localId" : "660",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "637",
+              "localId" : "661",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "638",
+              "localId" : "662",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "639",
+              "localId" : "663",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "640",
+              "localId" : "664",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "641",
+              "localId" : "665",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "642",
+              "localId" : "666",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "643",
+              "localId" : "667",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "617",
+              "localId" : "641",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -2855,7 +3020,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "618",
+              "localId" : "642",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -2863,7 +3028,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "619",
+              "localId" : "643",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -2871,7 +3036,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "620",
+              "localId" : "644",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -2879,7 +3044,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "621",
+              "localId" : "645",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -2887,7 +3052,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "622",
+              "localId" : "646",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -2895,7 +3060,7 @@ module.exports['Equal'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "623",
+              "localId" : "647",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "201",
@@ -2903,7 +3068,7 @@ module.exports['Equal'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "624",
+              "localId" : "648",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -2912,7 +3077,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "648",
+        "localId" : "672",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesTZ",
         "context" : "Patient",
@@ -2921,20 +3086,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "648",
+            "r" : "672",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesTZ", ": " ]
             }, {
-              "r" : "649",
+              "r" : "673",
               "s" : [ {
-                "r" : "668",
+                "r" : "692",
                 "s" : [ {
-                  "r" : "650",
+                  "r" : "674",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "23", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "657",
+                  "r" : "681",
                   "s" : [ {
-                    "r" : "657",
+                    "r" : "681",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -2943,14 +3108,14 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "695",
+                "r" : "719",
                 "s" : [ {
-                  "r" : "677",
+                  "r" : "701",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "16", ", ", "2", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "684",
+                  "r" : "708",
                   "s" : [ {
-                    "r" : "684",
+                    "r" : "708",
                     "value" : [ "+", "4.0" ]
                   } ]
                 }, {
@@ -2962,69 +3127,69 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "649",
+          "localId" : "673",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "704",
+            "localId" : "728",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "705",
+            "localId" : "729",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "668",
+            "localId" : "692",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "669",
+              "localId" : "693",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "670",
+              "localId" : "694",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "671",
+              "localId" : "695",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "672",
+              "localId" : "696",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "673",
+              "localId" : "697",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "674",
+              "localId" : "698",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "675",
+              "localId" : "699",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "676",
+              "localId" : "700",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "650",
+              "localId" : "674",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -3032,7 +3197,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "651",
+              "localId" : "675",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -3040,7 +3205,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "652",
+              "localId" : "676",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -3048,7 +3213,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "653",
+              "localId" : "677",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -3056,7 +3221,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "654",
+              "localId" : "678",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -3064,7 +3229,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "655",
+              "localId" : "679",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -3072,7 +3237,7 @@ module.exports['Equal'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "656",
+              "localId" : "680",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -3080,7 +3245,7 @@ module.exports['Equal'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "657",
+              "localId" : "681",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -3088,53 +3253,53 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "695",
+            "localId" : "719",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "696",
+              "localId" : "720",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "697",
+              "localId" : "721",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "698",
+              "localId" : "722",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "699",
+              "localId" : "723",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "700",
+              "localId" : "724",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "701",
+              "localId" : "725",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "702",
+              "localId" : "726",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "703",
+              "localId" : "727",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "677",
+              "localId" : "701",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -3142,7 +3307,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "678",
+              "localId" : "702",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -3150,7 +3315,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "679",
+              "localId" : "703",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "16",
@@ -3158,7 +3323,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "680",
+              "localId" : "704",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -3166,7 +3331,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "681",
+              "localId" : "705",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -3174,7 +3339,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "682",
+              "localId" : "706",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -3182,7 +3347,7 @@ module.exports['Equal'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "683",
+              "localId" : "707",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -3190,7 +3355,7 @@ module.exports['Equal'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "684",
+              "localId" : "708",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "4.0",
@@ -3199,7 +3364,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "708",
+        "localId" : "732",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimesTZ",
         "context" : "Patient",
@@ -3208,20 +3373,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "708",
+            "r" : "732",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimesTZ", ": " ]
             }, {
-              "r" : "709",
+              "r" : "733",
               "s" : [ {
-                "r" : "728",
+                "r" : "752",
                 "s" : [ {
-                  "r" : "710",
+                  "r" : "734",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "717",
+                  "r" : "741",
                   "s" : [ {
-                    "r" : "717",
+                    "r" : "741",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -3230,14 +3395,14 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "755",
+                "r" : "779",
                 "s" : [ {
-                  "r" : "737",
+                  "r" : "761",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "744",
+                  "r" : "768",
                   "s" : [ {
-                    "r" : "744",
+                    "r" : "768",
                     "value" : [ "+", "2.0" ]
                   } ]
                 }, {
@@ -3249,69 +3414,69 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "709",
+          "localId" : "733",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "764",
+            "localId" : "788",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "765",
+            "localId" : "789",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "728",
+            "localId" : "752",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "729",
+              "localId" : "753",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "730",
+              "localId" : "754",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "731",
+              "localId" : "755",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "732",
+              "localId" : "756",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "733",
+              "localId" : "757",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "734",
+              "localId" : "758",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "735",
+              "localId" : "759",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "736",
+              "localId" : "760",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "710",
+              "localId" : "734",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -3319,7 +3484,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "711",
+              "localId" : "735",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -3327,7 +3492,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "712",
+              "localId" : "736",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -3335,7 +3500,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "713",
+              "localId" : "737",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -3343,7 +3508,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "714",
+              "localId" : "738",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -3351,7 +3516,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "715",
+              "localId" : "739",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -3359,7 +3524,7 @@ module.exports['Equal'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "716",
+              "localId" : "740",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -3367,7 +3532,7 @@ module.exports['Equal'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "717",
+              "localId" : "741",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -3375,53 +3540,53 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "755",
+            "localId" : "779",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "756",
+              "localId" : "780",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "757",
+              "localId" : "781",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "758",
+              "localId" : "782",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "759",
+              "localId" : "783",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "760",
+              "localId" : "784",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "761",
+              "localId" : "785",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "762",
+              "localId" : "786",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "763",
+              "localId" : "787",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "737",
+              "localId" : "761",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -3429,7 +3594,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "738",
+              "localId" : "762",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -3437,7 +3602,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "739",
+              "localId" : "763",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -3445,7 +3610,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "740",
+              "localId" : "764",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -3453,7 +3618,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "741",
+              "localId" : "765",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -3461,7 +3626,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "742",
+              "localId" : "766",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -3469,7 +3634,7 @@ module.exports['Equal'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "743",
+              "localId" : "767",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -3477,7 +3642,7 @@ module.exports['Equal'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "744",
+              "localId" : "768",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "2.0",
@@ -3486,7 +3651,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "768",
+        "localId" : "792",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesNullMs",
         "context" : "Patient",
@@ -3495,23 +3660,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "768",
+            "r" : "792",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesNullMs", ": " ]
             }, {
-              "r" : "769",
+              "r" : "793",
               "s" : [ {
-                "r" : "786",
+                "r" : "810",
                 "s" : [ {
-                  "r" : "770",
+                  "r" : "794",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "808",
+                "r" : "832",
                 "s" : [ {
-                  "r" : "794",
+                  "r" : "818",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ")" ]
                 } ]
               } ]
@@ -3520,64 +3685,64 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "769",
+          "localId" : "793",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "815",
+            "localId" : "839",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "816",
+            "localId" : "840",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "786",
+            "localId" : "810",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "787",
+              "localId" : "811",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "788",
+              "localId" : "812",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "789",
+              "localId" : "813",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "790",
+              "localId" : "814",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "791",
+              "localId" : "815",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "792",
+              "localId" : "816",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "793",
+              "localId" : "817",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "770",
+              "localId" : "794",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -3585,7 +3750,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "771",
+              "localId" : "795",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -3593,7 +3758,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "772",
+              "localId" : "796",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -3601,7 +3766,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "773",
+              "localId" : "797",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -3609,7 +3774,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "774",
+              "localId" : "798",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -3617,7 +3782,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "775",
+              "localId" : "799",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -3625,7 +3790,7 @@ module.exports['Equal'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "776",
+              "localId" : "800",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -3633,43 +3798,43 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "808",
+            "localId" : "832",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "809",
+              "localId" : "833",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "810",
+              "localId" : "834",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "811",
+              "localId" : "835",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "812",
+              "localId" : "836",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "813",
+              "localId" : "837",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "814",
+              "localId" : "838",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "794",
+              "localId" : "818",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -3677,7 +3842,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "795",
+              "localId" : "819",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -3685,7 +3850,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "796",
+              "localId" : "820",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -3693,7 +3858,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "797",
+              "localId" : "821",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -3701,7 +3866,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "798",
+              "localId" : "822",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -3709,7 +3874,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "799",
+              "localId" : "823",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -3718,7 +3883,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "819",
+        "localId" : "843",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesNullOtherMs",
         "context" : "Patient",
@@ -3727,23 +3892,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "819",
+            "r" : "843",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesNullOtherMs", ": " ]
             }, {
-              "r" : "820",
+              "r" : "844",
               "s" : [ {
-                "r" : "835",
+                "r" : "859",
                 "s" : [ {
-                  "r" : "821",
+                  "r" : "845",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "858",
+                "r" : "882",
                 "s" : [ {
-                  "r" : "842",
+                  "r" : "866",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "0", ")" ]
                 } ]
               } ]
@@ -3752,59 +3917,59 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "820",
+          "localId" : "844",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "866",
+            "localId" : "890",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "867",
+            "localId" : "891",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "835",
+            "localId" : "859",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "836",
+              "localId" : "860",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "837",
+              "localId" : "861",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "838",
+              "localId" : "862",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "839",
+              "localId" : "863",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "840",
+              "localId" : "864",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "841",
+              "localId" : "865",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "821",
+              "localId" : "845",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -3812,7 +3977,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "822",
+              "localId" : "846",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -3820,7 +3985,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "823",
+              "localId" : "847",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -3828,7 +3993,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "824",
+              "localId" : "848",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -3836,7 +4001,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "825",
+              "localId" : "849",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -3844,7 +4009,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "826",
+              "localId" : "850",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -3852,48 +4017,48 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "858",
+            "localId" : "882",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "859",
+              "localId" : "883",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "860",
+              "localId" : "884",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "861",
+              "localId" : "885",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "862",
+              "localId" : "886",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "863",
+              "localId" : "887",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "864",
+              "localId" : "888",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "865",
+              "localId" : "889",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "842",
+              "localId" : "866",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -3901,7 +4066,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "843",
+              "localId" : "867",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -3909,7 +4074,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "844",
+              "localId" : "868",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -3917,7 +4082,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "845",
+              "localId" : "869",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -3925,7 +4090,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "846",
+              "localId" : "870",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -3933,7 +4098,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "847",
+              "localId" : "871",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -3941,7 +4106,7 @@ module.exports['Equal'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "848",
+              "localId" : "872",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -3950,7 +4115,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "870",
+        "localId" : "894",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesOnlyDate",
         "context" : "Patient",
@@ -3959,23 +4124,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "870",
+            "r" : "894",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesOnlyDate", ": " ]
             }, {
-              "r" : "871",
+              "r" : "895",
               "s" : [ {
-                "r" : "880",
+                "r" : "904",
                 "s" : [ {
-                  "r" : "872",
+                  "r" : "896",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "892",
+                "r" : "916",
                 "s" : [ {
-                  "r" : "884",
+                  "r" : "908",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               } ]
@@ -3984,44 +4149,44 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "871",
+          "localId" : "895",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "896",
+            "localId" : "920",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "897",
+            "localId" : "921",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "880",
+            "localId" : "904",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "881",
+              "localId" : "905",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "882",
+              "localId" : "906",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "883",
+              "localId" : "907",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "872",
+              "localId" : "896",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4029,7 +4194,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "873",
+              "localId" : "897",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -4037,7 +4202,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "874",
+              "localId" : "898",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -4045,28 +4210,28 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "892",
+            "localId" : "916",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "893",
+              "localId" : "917",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "894",
+              "localId" : "918",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "895",
+              "localId" : "919",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "884",
+              "localId" : "908",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4074,7 +4239,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "885",
+              "localId" : "909",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -4082,7 +4247,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "886",
+              "localId" : "910",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -4091,7 +4256,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "900",
+        "localId" : "924",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimesOnlyDate",
         "context" : "Patient",
@@ -4100,23 +4265,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "900",
+            "r" : "924",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimesOnlyDate", ": " ]
             }, {
-              "r" : "901",
+              "r" : "925",
               "s" : [ {
-                "r" : "910",
+                "r" : "934",
                 "s" : [ {
-                  "r" : "902",
+                  "r" : "926",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "14", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "922",
+                "r" : "946",
                 "s" : [ {
-                  "r" : "914",
+                  "r" : "938",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               } ]
@@ -4125,44 +4290,44 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "901",
+          "localId" : "925",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "926",
+            "localId" : "950",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "927",
+            "localId" : "951",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "910",
+            "localId" : "934",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "911",
+              "localId" : "935",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "912",
+              "localId" : "936",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "913",
+              "localId" : "937",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "902",
+              "localId" : "926",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4170,7 +4335,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "903",
+              "localId" : "927",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -4178,7 +4343,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "904",
+              "localId" : "928",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "14",
@@ -4186,28 +4351,28 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "922",
+            "localId" : "946",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "923",
+              "localId" : "947",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "924",
+              "localId" : "948",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "925",
+              "localId" : "949",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "914",
+              "localId" : "938",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4215,7 +4380,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "915",
+              "localId" : "939",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -4223,7 +4388,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "916",
+              "localId" : "940",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -4232,7 +4397,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "930",
+        "localId" : "954",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PossiblyEqDateTimesOnlyDateOnOne",
         "context" : "Patient",
@@ -4241,23 +4406,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "930",
+            "r" : "954",
             "s" : [ {
               "value" : [ "", "define ", "PossiblyEqDateTimesOnlyDateOnOne", ": " ]
             }, {
-              "r" : "931",
+              "r" : "955",
               "s" : [ {
-                "r" : "940",
+                "r" : "964",
                 "s" : [ {
-                  "r" : "932",
+                  "r" : "956",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "958",
+                "r" : "982",
                 "s" : [ {
-                  "r" : "944",
+                  "r" : "968",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ", ", "13", ", ", "43", ", ", "32", ")" ]
                 } ]
               } ]
@@ -4266,44 +4431,44 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "931",
+          "localId" : "955",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "965",
+            "localId" : "989",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "966",
+            "localId" : "990",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "940",
+            "localId" : "964",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "941",
+              "localId" : "965",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "942",
+              "localId" : "966",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "943",
+              "localId" : "967",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "932",
+              "localId" : "956",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4311,7 +4476,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "933",
+              "localId" : "957",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -4319,7 +4484,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "934",
+              "localId" : "958",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -4327,43 +4492,43 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "958",
+            "localId" : "982",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "959",
+              "localId" : "983",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "960",
+              "localId" : "984",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "961",
+              "localId" : "985",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "962",
+              "localId" : "986",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "963",
+              "localId" : "987",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "964",
+              "localId" : "988",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "944",
+              "localId" : "968",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4371,7 +4536,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "945",
+              "localId" : "969",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -4379,7 +4544,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "946",
+              "localId" : "970",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -4387,7 +4552,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "947",
+              "localId" : "971",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -4395,7 +4560,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "948",
+              "localId" : "972",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "43",
@@ -4403,7 +4568,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "949",
+              "localId" : "973",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "32",
@@ -4412,7 +4577,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "969",
+        "localId" : "993",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimesOnlyDateOnOne",
         "context" : "Patient",
@@ -4421,23 +4586,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "969",
+            "r" : "993",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimesOnlyDateOnOne", ": " ]
             }, {
-              "r" : "970",
+              "r" : "994",
               "s" : [ {
-                "r" : "985",
+                "r" : "1009",
                 "s" : [ {
-                  "r" : "971",
+                  "r" : "995",
                   "value" : [ "DateTime", "(", "2000", ", ", "4", ", ", "13", ", ", "12", ", ", "43", ", ", "32", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1000",
+                "r" : "1024",
                 "s" : [ {
-                  "r" : "992",
+                  "r" : "1016",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -4446,59 +4611,59 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "970",
+          "localId" : "994",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1004",
+            "localId" : "1028",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1005",
+            "localId" : "1029",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "985",
+            "localId" : "1009",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "986",
+              "localId" : "1010",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "987",
+              "localId" : "1011",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "988",
+              "localId" : "1012",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "989",
+              "localId" : "1013",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "990",
+              "localId" : "1014",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "991",
+              "localId" : "1015",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "971",
+              "localId" : "995",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4506,7 +4671,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "972",
+              "localId" : "996",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -4514,7 +4679,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "973",
+              "localId" : "997",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -4522,7 +4687,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "974",
+              "localId" : "998",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -4530,7 +4695,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "975",
+              "localId" : "999",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "43",
@@ -4538,7 +4703,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "976",
+              "localId" : "1000",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "32",
@@ -4546,28 +4711,28 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1000",
+            "localId" : "1024",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1001",
+              "localId" : "1025",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1002",
+              "localId" : "1026",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1003",
+              "localId" : "1027",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "992",
+              "localId" : "1016",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4575,7 +4740,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "993",
+              "localId" : "1017",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -4583,7 +4748,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "994",
+              "localId" : "1018",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -4592,7 +4757,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1008",
+        "localId" : "1032",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PossiblyEqualDateTimes",
         "context" : "Patient",
@@ -4601,23 +4766,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1008",
+            "r" : "1032",
             "s" : [ {
               "value" : [ "", "define ", "PossiblyEqualDateTimes", ": " ]
             }, {
-              "r" : "1009",
+              "r" : "1033",
               "s" : [ {
-                "r" : "1018",
+                "r" : "1042",
                 "s" : [ {
-                  "r" : "1010",
+                  "r" : "1034",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1026",
+                "r" : "1050",
                 "s" : [ {
-                  "r" : "1022",
+                  "r" : "1046",
                   "value" : [ "DateTime", "(", "2000", ")" ]
                 } ]
               } ]
@@ -4626,44 +4791,44 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1009",
+          "localId" : "1033",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1028",
+            "localId" : "1052",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1029",
+            "localId" : "1053",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1018",
+            "localId" : "1042",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1019",
+              "localId" : "1043",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1020",
+              "localId" : "1044",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1021",
+              "localId" : "1045",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1010",
+              "localId" : "1034",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4671,7 +4836,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1011",
+              "localId" : "1035",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -4679,7 +4844,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1012",
+              "localId" : "1036",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -4687,18 +4852,18 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1026",
+            "localId" : "1050",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1027",
+              "localId" : "1051",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1022",
+              "localId" : "1046",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4707,7 +4872,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1032",
+        "localId" : "1056",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpossiblyEqualDateTimes",
         "context" : "Patient",
@@ -4716,23 +4881,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1032",
+            "r" : "1056",
             "s" : [ {
               "value" : [ "", "define ", "ImpossiblyEqualDateTimes", ": " ]
             }, {
-              "r" : "1033",
+              "r" : "1057",
               "s" : [ {
-                "r" : "1042",
+                "r" : "1066",
                 "s" : [ {
-                  "r" : "1034",
+                  "r" : "1058",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1052",
+                "r" : "1076",
                 "s" : [ {
-                  "r" : "1046",
+                  "r" : "1070",
                   "value" : [ "DateTime", "(", "2000", ", ", "4", ")" ]
                 } ]
               } ]
@@ -4741,44 +4906,44 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1033",
+          "localId" : "1057",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1055",
+            "localId" : "1079",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1056",
+            "localId" : "1080",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1042",
+            "localId" : "1066",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1043",
+              "localId" : "1067",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1044",
+              "localId" : "1068",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1045",
+              "localId" : "1069",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1034",
+              "localId" : "1058",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4786,7 +4951,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1035",
+              "localId" : "1059",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -4794,7 +4959,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1036",
+              "localId" : "1060",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -4802,23 +4967,23 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1052",
+            "localId" : "1076",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1053",
+              "localId" : "1077",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1054",
+              "localId" : "1078",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1046",
+              "localId" : "1070",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4826,7 +4991,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1047",
+              "localId" : "1071",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -4835,7 +5000,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1059",
+        "localId" : "1083",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateAndDateTimeTrue",
         "context" : "Patient",
@@ -4844,23 +5009,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1059",
+            "r" : "1083",
             "s" : [ {
               "value" : [ "", "define ", "DateAndDateTimeTrue", ": " ]
             }, {
-              "r" : "1060",
+              "r" : "1084",
               "s" : [ {
-                "r" : "1069",
+                "r" : "1093",
                 "s" : [ {
-                  "r" : "1061",
+                  "r" : "1085",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1081",
+                "r" : "1105",
                 "s" : [ {
-                  "r" : "1073",
+                  "r" : "1097",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -4869,54 +5034,54 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1060",
+          "localId" : "1084",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1088",
+            "localId" : "1112",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1089",
+            "localId" : "1113",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToDateTime",
-            "localId" : "1086",
+            "localId" : "1110",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1087",
+              "localId" : "1111",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1069",
+              "localId" : "1093",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1070",
+                "localId" : "1094",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1071",
+                "localId" : "1095",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1072",
+                "localId" : "1096",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1061",
+                "localId" : "1085",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -4924,7 +5089,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1062",
+                "localId" : "1086",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -4932,7 +5097,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1063",
+                "localId" : "1087",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -4941,28 +5106,28 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1081",
+            "localId" : "1105",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1082",
+              "localId" : "1106",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1083",
+              "localId" : "1107",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1084",
+              "localId" : "1108",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1073",
+              "localId" : "1097",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -4970,7 +5135,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1074",
+              "localId" : "1098",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -4978,7 +5143,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1075",
+              "localId" : "1099",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -4987,7 +5152,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1092",
+        "localId" : "1116",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateAndDateTimeNotEqual",
         "context" : "Patient",
@@ -4996,23 +5161,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1092",
+            "r" : "1116",
             "s" : [ {
               "value" : [ "", "define ", "DateAndDateTimeNotEqual", ": " ]
             }, {
-              "r" : "1093",
+              "r" : "1117",
               "s" : [ {
-                "r" : "1102",
+                "r" : "1126",
                 "s" : [ {
-                  "r" : "1094",
+                  "r" : "1118",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1114",
+                "r" : "1138",
                 "s" : [ {
-                  "r" : "1106",
+                  "r" : "1130",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "12", ")" ]
                 } ]
               } ]
@@ -5021,54 +5186,54 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1093",
+          "localId" : "1117",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1121",
+            "localId" : "1145",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1122",
+            "localId" : "1146",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToDateTime",
-            "localId" : "1119",
+            "localId" : "1143",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1120",
+              "localId" : "1144",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1102",
+              "localId" : "1126",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1103",
+                "localId" : "1127",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1104",
+                "localId" : "1128",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1105",
+                "localId" : "1129",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1094",
+                "localId" : "1118",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -5076,7 +5241,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1095",
+                "localId" : "1119",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -5084,7 +5249,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1096",
+                "localId" : "1120",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -5093,28 +5258,28 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1114",
+            "localId" : "1138",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1115",
+              "localId" : "1139",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1116",
+              "localId" : "1140",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1117",
+              "localId" : "1141",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1106",
+              "localId" : "1130",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -5122,7 +5287,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1107",
+              "localId" : "1131",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -5130,7 +5295,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1108",
+              "localId" : "1132",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -5139,7 +5304,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1125",
+        "localId" : "1149",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateAndDateTimeUncertainNull",
         "context" : "Patient",
@@ -5148,23 +5313,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1125",
+            "r" : "1149",
             "s" : [ {
               "value" : [ "", "define ", "DateAndDateTimeUncertainNull", ": " ]
             }, {
-              "r" : "1126",
+              "r" : "1150",
               "s" : [ {
-                "r" : "1135",
+                "r" : "1159",
                 "s" : [ {
-                  "r" : "1127",
+                  "r" : "1151",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1153",
+                "r" : "1177",
                 "s" : [ {
-                  "r" : "1139",
+                  "r" : "1163",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ", ", "2", ", ", "4", ", ", "23", ")" ]
                 } ]
               } ]
@@ -5173,54 +5338,54 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1126",
+          "localId" : "1150",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1163",
+            "localId" : "1187",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1164",
+            "localId" : "1188",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToDateTime",
-            "localId" : "1161",
+            "localId" : "1185",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1162",
+              "localId" : "1186",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1135",
+              "localId" : "1159",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1136",
+                "localId" : "1160",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1137",
+                "localId" : "1161",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1138",
+                "localId" : "1162",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1127",
+                "localId" : "1151",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -5228,7 +5393,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1128",
+                "localId" : "1152",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -5236,7 +5401,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1129",
+                "localId" : "1153",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -5245,43 +5410,43 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1153",
+            "localId" : "1177",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1154",
+              "localId" : "1178",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1155",
+              "localId" : "1179",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1156",
+              "localId" : "1180",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1157",
+              "localId" : "1181",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1158",
+              "localId" : "1182",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1159",
+              "localId" : "1183",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1139",
+              "localId" : "1163",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -5289,7 +5454,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1140",
+              "localId" : "1164",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -5297,7 +5462,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1141",
+              "localId" : "1165",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -5305,7 +5470,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1142",
+              "localId" : "1166",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -5313,7 +5478,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1143",
+              "localId" : "1167",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -5321,7 +5486,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1144",
+              "localId" : "1168",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -5330,7 +5495,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1167",
+        "localId" : "1191",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateTimeAndDateTrue",
         "context" : "Patient",
@@ -5339,23 +5504,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1167",
+            "r" : "1191",
             "s" : [ {
               "value" : [ "", "define ", "DateTimeAndDateTrue", ": " ]
             }, {
-              "r" : "1168",
+              "r" : "1192",
               "s" : [ {
-                "r" : "1177",
+                "r" : "1201",
                 "s" : [ {
-                  "r" : "1169",
+                  "r" : "1193",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1189",
+                "r" : "1213",
                 "s" : [ {
-                  "r" : "1181",
+                  "r" : "1205",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -5364,44 +5529,44 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1168",
+          "localId" : "1192",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1196",
+            "localId" : "1220",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1197",
+            "localId" : "1221",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1177",
+            "localId" : "1201",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1178",
+              "localId" : "1202",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1179",
+              "localId" : "1203",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1180",
+              "localId" : "1204",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1169",
+              "localId" : "1193",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -5409,7 +5574,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1170",
+              "localId" : "1194",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -5417,7 +5582,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1171",
+              "localId" : "1195",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -5425,38 +5590,38 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "ToDateTime",
-            "localId" : "1194",
+            "localId" : "1218",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1195",
+              "localId" : "1219",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1189",
+              "localId" : "1213",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1190",
+                "localId" : "1214",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1191",
+                "localId" : "1215",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1192",
+                "localId" : "1216",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1181",
+                "localId" : "1205",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -5464,7 +5629,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1182",
+                "localId" : "1206",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -5472,7 +5637,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1183",
+                "localId" : "1207",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -5482,7 +5647,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1200",
+        "localId" : "1224",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateTimeAndDateNotEqual",
         "context" : "Patient",
@@ -5491,23 +5656,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1200",
+            "r" : "1224",
             "s" : [ {
               "value" : [ "", "define ", "DateTimeAndDateNotEqual", ": " ]
             }, {
-              "r" : "1201",
+              "r" : "1225",
               "s" : [ {
-                "r" : "1210",
+                "r" : "1234",
                 "s" : [ {
-                  "r" : "1202",
+                  "r" : "1226",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "12", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1222",
+                "r" : "1246",
                 "s" : [ {
-                  "r" : "1214",
+                  "r" : "1238",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -5516,44 +5681,44 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1201",
+          "localId" : "1225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1229",
+            "localId" : "1253",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1230",
+            "localId" : "1254",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1210",
+            "localId" : "1234",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1211",
+              "localId" : "1235",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1212",
+              "localId" : "1236",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1213",
+              "localId" : "1237",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1202",
+              "localId" : "1226",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -5561,7 +5726,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1203",
+              "localId" : "1227",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -5569,7 +5734,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1204",
+              "localId" : "1228",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -5577,38 +5742,38 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "ToDateTime",
-            "localId" : "1227",
+            "localId" : "1251",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1228",
+              "localId" : "1252",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1222",
+              "localId" : "1246",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1223",
+                "localId" : "1247",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1224",
+                "localId" : "1248",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1225",
+                "localId" : "1249",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1214",
+                "localId" : "1238",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -5616,7 +5781,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1215",
+                "localId" : "1239",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -5624,7 +5789,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1216",
+                "localId" : "1240",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -5634,7 +5799,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1233",
+        "localId" : "1257",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateTimeAndDateUncertainNull",
         "context" : "Patient",
@@ -5643,23 +5808,23 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1233",
+            "r" : "1257",
             "s" : [ {
               "value" : [ "", "define ", "DateTimeAndDateUncertainNull", ": " ]
             }, {
-              "r" : "1234",
+              "r" : "1258",
               "s" : [ {
-                "r" : "1249",
+                "r" : "1273",
                 "s" : [ {
-                  "r" : "1235",
+                  "r" : "1259",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ", ", "2", ", ", "4", ", ", "23", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1264",
+                "r" : "1288",
                 "s" : [ {
-                  "r" : "1256",
+                  "r" : "1280",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -5668,59 +5833,59 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1234",
+          "localId" : "1258",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1271",
+            "localId" : "1295",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1272",
+            "localId" : "1296",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1249",
+            "localId" : "1273",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1250",
+              "localId" : "1274",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1251",
+              "localId" : "1275",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1252",
+              "localId" : "1276",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1253",
+              "localId" : "1277",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1254",
+              "localId" : "1278",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1255",
+              "localId" : "1279",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1235",
+              "localId" : "1259",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -5728,7 +5893,7 @@ module.exports['Equal'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1236",
+              "localId" : "1260",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -5736,7 +5901,7 @@ module.exports['Equal'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1237",
+              "localId" : "1261",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -5744,7 +5909,7 @@ module.exports['Equal'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1238",
+              "localId" : "1262",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -5752,7 +5917,7 @@ module.exports['Equal'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1239",
+              "localId" : "1263",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -5760,7 +5925,7 @@ module.exports['Equal'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1240",
+              "localId" : "1264",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -5768,38 +5933,38 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "ToDateTime",
-            "localId" : "1269",
+            "localId" : "1293",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1270",
+              "localId" : "1294",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1264",
+              "localId" : "1288",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1265",
+                "localId" : "1289",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1266",
+                "localId" : "1290",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1267",
+                "localId" : "1291",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1256",
+                "localId" : "1280",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -5807,7 +5972,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1257",
+                "localId" : "1281",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -5815,7 +5980,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1258",
+                "localId" : "1282",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -5825,7 +5990,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1275",
+        "localId" : "1299",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity",
         "context" : "Patient",
@@ -5834,20 +5999,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1275",
+            "r" : "1299",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity", ": " ]
             }, {
-              "r" : "1276",
+              "r" : "1300",
               "s" : [ {
-                "r" : "1277",
+                "r" : "1301",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1278",
+                "r" : "1302",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -5857,30 +6022,30 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1276",
+          "localId" : "1300",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1279",
+            "localId" : "1303",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1280",
+            "localId" : "1304",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "1277",
+            "localId" : "1301",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "1278",
+            "localId" : "1302",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -5888,7 +6053,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1283",
+        "localId" : "1307",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity",
         "context" : "Patient",
@@ -5897,20 +6062,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1283",
+            "r" : "1307",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity", ": " ]
             }, {
-              "r" : "1284",
+              "r" : "1308",
               "s" : [ {
-                "r" : "1285",
+                "r" : "1309",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1286",
+                "r" : "1310",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -5920,30 +6085,30 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1284",
+          "localId" : "1308",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1287",
+            "localId" : "1311",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1288",
+            "localId" : "1312",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "1285",
+            "localId" : "1309",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "1286",
+            "localId" : "1310",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
@@ -5951,7 +6116,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1291",
+        "localId" : "1315",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity",
         "context" : "Patient",
@@ -5960,20 +6125,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1291",
+            "r" : "1315",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity", ": " ]
             }, {
-              "r" : "1292",
+              "r" : "1316",
               "s" : [ {
-                "r" : "1293",
+                "r" : "1317",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1294",
+                "r" : "1318",
                 "s" : [ {
                   "value" : [ "6 ", "'m'" ]
                 } ]
@@ -5983,30 +6148,30 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1292",
+          "localId" : "1316",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1295",
+            "localId" : "1319",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1296",
+            "localId" : "1320",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "1293",
+            "localId" : "1317",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "1294",
+            "localId" : "1318",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 6,
             "unit" : "m",
@@ -6014,7 +6179,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1299",
+        "localId" : "1323",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_diff",
         "context" : "Patient",
@@ -6023,20 +6188,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1299",
+            "r" : "1323",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_diff", ": " ]
             }, {
-              "r" : "1300",
+              "r" : "1324",
               "s" : [ {
-                "r" : "1301",
+                "r" : "1325",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1302",
+                "r" : "1326",
                 "s" : [ {
                   "value" : [ "5 ", "'cm'" ]
                 } ]
@@ -6046,30 +6211,30 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1300",
+          "localId" : "1324",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1303",
+            "localId" : "1327",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1304",
+            "localId" : "1328",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "1301",
+            "localId" : "1325",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "1302",
+            "localId" : "1326",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "cm",
@@ -6077,7 +6242,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1307",
+        "localId" : "1331",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_diff",
         "context" : "Patient",
@@ -6086,20 +6251,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1307",
+            "r" : "1331",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_diff", ": " ]
             }, {
-              "r" : "1308",
+              "r" : "1332",
               "s" : [ {
-                "r" : "1309",
+                "r" : "1333",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1310",
+                "r" : "1334",
                 "s" : [ {
                   "value" : [ "500 ", "'cm'" ]
                 } ]
@@ -6109,30 +6274,30 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1308",
+          "localId" : "1332",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1311",
+            "localId" : "1335",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1312",
+            "localId" : "1336",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "1309",
+            "localId" : "1333",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "1310",
+            "localId" : "1334",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 500,
             "unit" : "cm",
@@ -6140,7 +6305,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1315",
+        "localId" : "1339",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_diff",
         "context" : "Patient",
@@ -6149,20 +6314,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1315",
+            "r" : "1339",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_diff", ": " ]
             }, {
-              "r" : "1316",
+              "r" : "1340",
               "s" : [ {
-                "r" : "1317",
+                "r" : "1341",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1318",
+                "r" : "1342",
                 "s" : [ {
                   "value" : [ "5 ", "'km'" ]
                 } ]
@@ -6172,30 +6337,30 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1316",
+          "localId" : "1340",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1319",
+            "localId" : "1343",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1320",
+            "localId" : "1344",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "1317",
+            "localId" : "1341",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "1318",
+            "localId" : "1342",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "km",
@@ -6203,7 +6368,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1323",
+        "localId" : "1347",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_incompatible",
         "context" : "Patient",
@@ -6212,20 +6377,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1323",
+            "r" : "1347",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "1324",
+              "r" : "1348",
               "s" : [ {
-                "r" : "1325",
+                "r" : "1349",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1326",
+                "r" : "1350",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -6235,30 +6400,30 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1324",
+          "localId" : "1348",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1327",
+            "localId" : "1351",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1328",
+            "localId" : "1352",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "1325",
+            "localId" : "1349",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "1326",
+            "localId" : "1350",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -6266,7 +6431,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1331",
+        "localId" : "1355",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_incompatible",
         "context" : "Patient",
@@ -6275,20 +6440,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1331",
+            "r" : "1355",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "1332",
+              "r" : "1356",
               "s" : [ {
-                "r" : "1333",
+                "r" : "1357",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1334",
+                "r" : "1358",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -6298,30 +6463,30 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1332",
+          "localId" : "1356",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1335",
+            "localId" : "1359",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1336",
+            "localId" : "1360",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "1333",
+            "localId" : "1357",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "1334",
+            "localId" : "1358",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
@@ -6329,7 +6494,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1339",
+        "localId" : "1363",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_incompatible",
         "context" : "Patient",
@@ -6338,20 +6503,20 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1339",
+            "r" : "1363",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "1340",
+              "r" : "1364",
               "s" : [ {
-                "r" : "1341",
+                "r" : "1365",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1342",
+                "r" : "1366",
                 "s" : [ {
                   "value" : [ "40 ", "'m'" ]
                 } ]
@@ -6361,30 +6526,30 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1340",
+          "localId" : "1364",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1343",
+            "localId" : "1367",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1344",
+            "localId" : "1368",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "1341",
+            "localId" : "1365",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "1342",
+            "localId" : "1366",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 40,
             "unit" : "m",
@@ -6392,7 +6557,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1347",
+        "localId" : "1371",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqRatios",
         "context" : "Patient",
@@ -6401,22 +6566,22 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1347",
+            "r" : "1371",
             "s" : [ {
               "value" : [ "", "define ", "EqRatios", ": " ]
             }, {
-              "r" : "1348",
+              "r" : "1372",
               "s" : [ {
-                "r" : "1351",
+                "r" : "1375",
                 "s" : [ {
-                  "r" : "1349",
+                  "r" : "1373",
                   "s" : [ {
                     "value" : [ "10 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ " : " ]
                 }, {
-                  "r" : "1350",
+                  "r" : "1374",
                   "s" : [ {
                     "value" : [ "2 ", "'dL'" ]
                   } ]
@@ -6424,16 +6589,16 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1354",
+                "r" : "1378",
                 "s" : [ {
-                  "r" : "1352",
+                  "r" : "1376",
                   "s" : [ {
                     "value" : [ "15 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ " : " ]
                 }, {
-                  "r" : "1353",
+                  "r" : "1377",
                   "s" : [ {
                     "value" : [ "3 ", "'dL'" ]
                   } ]
@@ -6444,34 +6609,34 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1348",
+          "localId" : "1372",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1355",
+            "localId" : "1379",
             "name" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1356",
+            "localId" : "1380",
             "name" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Ratio",
-            "localId" : "1351",
+            "localId" : "1375",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ],
             "numerator" : {
-              "localId" : "1349",
+              "localId" : "1373",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 10,
               "unit" : "mg",
               "annotation" : [ ]
             },
             "denominator" : {
-              "localId" : "1350",
+              "localId" : "1374",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "dL",
@@ -6479,18 +6644,18 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "Ratio",
-            "localId" : "1354",
+            "localId" : "1378",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ],
             "numerator" : {
-              "localId" : "1352",
+              "localId" : "1376",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 15,
               "unit" : "mg",
               "annotation" : [ ]
             },
             "denominator" : {
-              "localId" : "1353",
+              "localId" : "1377",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 3,
               "unit" : "dL",
@@ -6499,7 +6664,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "1359",
+        "localId" : "1383",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqRatios",
         "context" : "Patient",
@@ -6508,22 +6673,22 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1359",
+            "r" : "1383",
             "s" : [ {
               "value" : [ "", "define ", "UneqRatios", ": " ]
             }, {
-              "r" : "1360",
+              "r" : "1384",
               "s" : [ {
-                "r" : "1363",
+                "r" : "1387",
                 "s" : [ {
-                  "r" : "1361",
+                  "r" : "1385",
                   "s" : [ {
                     "value" : [ "10 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ " : " ]
                 }, {
-                  "r" : "1362",
+                  "r" : "1386",
                   "s" : [ {
                     "value" : [ "2 ", "'dL'" ]
                   } ]
@@ -6531,16 +6696,16 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "1366",
+                "r" : "1390",
                 "s" : [ {
-                  "r" : "1364",
+                  "r" : "1388",
                   "s" : [ {
                     "value" : [ "15 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ " : " ]
                 }, {
-                  "r" : "1365",
+                  "r" : "1389",
                   "s" : [ {
                     "value" : [ "4 ", "'dL'" ]
                   } ]
@@ -6551,34 +6716,34 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "1360",
+          "localId" : "1384",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1367",
+            "localId" : "1391",
             "name" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1368",
+            "localId" : "1392",
             "name" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Ratio",
-            "localId" : "1363",
+            "localId" : "1387",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ],
             "numerator" : {
-              "localId" : "1361",
+              "localId" : "1385",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 10,
               "unit" : "mg",
               "annotation" : [ ]
             },
             "denominator" : {
-              "localId" : "1362",
+              "localId" : "1386",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "dL",
@@ -6586,18 +6751,18 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "Ratio",
-            "localId" : "1366",
+            "localId" : "1390",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ],
             "numerator" : {
-              "localId" : "1364",
+              "localId" : "1388",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 15,
               "unit" : "mg",
               "annotation" : [ ]
             },
             "denominator" : {
-              "localId" : "1365",
+              "localId" : "1389",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "dL",
@@ -6617,6 +6782,9 @@ context Patient
 define AGtB_Int: 5 != 4
 define AEqB_Int: 5 != 5
 define ALtB_Int: 5 != 6
+define AGtB_Long: 5L != 4L
+define AEqB_Long: 5L != 5L
+define ALtB_Long: 5L != 6L
 define EqTuples: Tuple{a: 1, b: Tuple{c: 1}} != Tuple{a: 1, b: Tuple{c: 1}}
 define UneqTuples: Tuple{a: 1, b: Tuple{c: 1}} != Tuple{a: 1, b: Tuple{c: -1}}
 define EqTuplesWithNullFields: Tuple{a: 'Hello', b: null} != Tuple{a: 'Hello', b: null}
@@ -6663,7 +6831,7 @@ module.exports['NotEqual'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "1308",
+        "r" : "1338",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -6936,7 +7104,7 @@ module.exports['NotEqual'] = {
       }, {
         "localId" : "244",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqTuples",
+        "name" : "AGtB_Long",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -6945,16 +7113,214 @@ module.exports['NotEqual'] = {
           "s" : {
             "r" : "244",
             "s" : [ {
-              "value" : [ "", "define ", "EqTuples", ": " ]
+              "value" : [ "", "define ", "AGtB_Long", ": " ]
             }, {
-              "r" : "288",
+              "r" : "250",
               "s" : [ {
                 "r" : "246",
+                "value" : [ "5L", " ", "!=", " ", "4L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "245",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "248",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "249",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "Literal",
+              "localId" : "246",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "247",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "254",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AEqB_Long",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "254",
+            "s" : [ {
+              "value" : [ "", "define ", "AEqB_Long", ": " ]
+            }, {
+              "r" : "260",
+              "s" : [ {
+                "r" : "256",
+                "value" : [ "5L", " ", "!=", " ", "5L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "260",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "261",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "258",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "259",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "Literal",
+              "localId" : "256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "257",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ALtB_Long",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "264",
+            "s" : [ {
+              "value" : [ "", "define ", "ALtB_Long", ": " ]
+            }, {
+              "r" : "270",
+              "s" : [ {
+                "r" : "266",
+                "value" : [ "5L", " ", "!=", " ", "6L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "270",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "271",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "265",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "268",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "269",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : [ {
+              "type" : "Literal",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "267",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "274",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqTuples",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "274",
+            "s" : [ {
+              "value" : [ "", "define ", "EqTuples", ": " ]
+            }, {
+              "r" : "318",
+              "s" : [ {
+                "r" : "276",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "247",
+                    "r" : "277",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -6963,12 +7329,12 @@ module.exports['NotEqual'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "248",
+                    "r" : "278",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
-                        "r" : "249",
+                        "r" : "279",
                         "value" : [ "c", ": ", "1" ]
                       } ]
                     }, {
@@ -6981,12 +7347,12 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "260",
+                "r" : "290",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "261",
+                    "r" : "291",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -6995,12 +7361,12 @@ module.exports['NotEqual'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "262",
+                    "r" : "292",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
-                        "r" : "263",
+                        "r" : "293",
                         "value" : [ "c", ": ", "1" ]
                       } ]
                     }, {
@@ -7016,49 +7382,49 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "288",
+          "localId" : "318",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "289",
+            "localId" : "319",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "245",
+            "localId" : "275",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "TupleTypeSpecifier",
-              "localId" : "274",
+              "localId" : "304",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "275",
+                "localId" : "305",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "276",
+                  "localId" : "306",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "277",
+                "localId" : "307",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "278",
+                  "localId" : "308",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "279",
+                    "localId" : "309",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "280",
+                      "localId" : "310",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -7067,33 +7433,33 @@ module.exports['NotEqual'] = {
               } ]
             }, {
               "type" : "TupleTypeSpecifier",
-              "localId" : "281",
+              "localId" : "311",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "282",
+                "localId" : "312",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "283",
+                  "localId" : "313",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "284",
+                "localId" : "314",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "285",
+                  "localId" : "315",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "286",
+                    "localId" : "316",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "287",
+                      "localId" : "317",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -7103,37 +7469,37 @@ module.exports['NotEqual'] = {
             } ],
             "operand" : [ {
               "type" : "Tuple",
-              "localId" : "246",
+              "localId" : "276",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "253",
+                "localId" : "283",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "254",
+                  "localId" : "284",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "255",
+                    "localId" : "285",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "256",
+                  "localId" : "286",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "257",
+                    "localId" : "287",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "258",
+                      "localId" : "288",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "259",
+                        "localId" : "289",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -7145,7 +7511,7 @@ module.exports['NotEqual'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "247",
+                  "localId" : "277",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7155,19 +7521,19 @@ module.exports['NotEqual'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Tuple",
-                  "localId" : "248",
+                  "localId" : "278",
                   "annotation" : [ ],
                   "resultTypeSpecifier" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "250",
+                    "localId" : "280",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "251",
+                      "localId" : "281",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "252",
+                        "localId" : "282",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -7177,7 +7543,7 @@ module.exports['NotEqual'] = {
                     "name" : "c",
                     "value" : {
                       "type" : "Literal",
-                      "localId" : "249",
+                      "localId" : "279",
                       "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                       "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                       "value" : "1",
@@ -7188,37 +7554,37 @@ module.exports['NotEqual'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "260",
+              "localId" : "290",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "267",
+                "localId" : "297",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "268",
+                  "localId" : "298",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "269",
+                    "localId" : "299",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "270",
+                  "localId" : "300",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "271",
+                    "localId" : "301",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "272",
+                      "localId" : "302",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "273",
+                        "localId" : "303",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -7230,7 +7596,7 @@ module.exports['NotEqual'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "261",
+                  "localId" : "291",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7240,19 +7606,19 @@ module.exports['NotEqual'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Tuple",
-                  "localId" : "262",
+                  "localId" : "292",
                   "annotation" : [ ],
                   "resultTypeSpecifier" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "264",
+                    "localId" : "294",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "265",
+                      "localId" : "295",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "266",
+                        "localId" : "296",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -7262,7 +7628,7 @@ module.exports['NotEqual'] = {
                     "name" : "c",
                     "value" : {
                       "type" : "Literal",
-                      "localId" : "263",
+                      "localId" : "293",
                       "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                       "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                       "value" : "1",
@@ -7275,7 +7641,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "292",
+        "localId" : "322",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqTuples",
         "context" : "Patient",
@@ -7284,18 +7650,18 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "292",
+            "r" : "322",
             "s" : [ {
               "value" : [ "", "define ", "UneqTuples", ": " ]
             }, {
-              "r" : "338",
+              "r" : "368",
               "s" : [ {
-                "r" : "294",
+                "r" : "324",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "295",
+                    "r" : "325",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -7304,12 +7670,12 @@ module.exports['NotEqual'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "296",
+                    "r" : "326",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
-                        "r" : "297",
+                        "r" : "327",
                         "value" : [ "c", ": ", "1" ]
                       } ]
                     }, {
@@ -7322,12 +7688,12 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "308",
+                "r" : "338",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "309",
+                    "r" : "339",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -7336,16 +7702,16 @@ module.exports['NotEqual'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "310",
+                    "r" : "340",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
                         "value" : [ "c", ": " ]
                       }, {
-                        "r" : "311",
+                        "r" : "341",
                         "s" : [ {
-                          "r" : "312",
+                          "r" : "342",
                           "value" : [ "-", "1" ]
                         } ]
                       } ]
@@ -7362,49 +7728,49 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "338",
+          "localId" : "368",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "339",
+            "localId" : "369",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "293",
+            "localId" : "323",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "TupleTypeSpecifier",
-              "localId" : "324",
+              "localId" : "354",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "325",
+                "localId" : "355",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "326",
+                  "localId" : "356",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "327",
+                "localId" : "357",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "328",
+                  "localId" : "358",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "329",
+                    "localId" : "359",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "330",
+                      "localId" : "360",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -7413,33 +7779,33 @@ module.exports['NotEqual'] = {
               } ]
             }, {
               "type" : "TupleTypeSpecifier",
-              "localId" : "331",
+              "localId" : "361",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "332",
+                "localId" : "362",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "333",
+                  "localId" : "363",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "334",
+                "localId" : "364",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "335",
+                  "localId" : "365",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "336",
+                    "localId" : "366",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "337",
+                      "localId" : "367",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -7449,37 +7815,37 @@ module.exports['NotEqual'] = {
             } ],
             "operand" : [ {
               "type" : "Tuple",
-              "localId" : "294",
+              "localId" : "324",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "301",
+                "localId" : "331",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "302",
+                  "localId" : "332",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "303",
+                    "localId" : "333",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "304",
+                  "localId" : "334",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "305",
+                    "localId" : "335",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "306",
+                      "localId" : "336",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "307",
+                        "localId" : "337",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -7491,7 +7857,7 @@ module.exports['NotEqual'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "295",
+                  "localId" : "325",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7501,19 +7867,19 @@ module.exports['NotEqual'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Tuple",
-                  "localId" : "296",
+                  "localId" : "326",
                   "annotation" : [ ],
                   "resultTypeSpecifier" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "298",
+                    "localId" : "328",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "299",
+                      "localId" : "329",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "300",
+                        "localId" : "330",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -7523,7 +7889,7 @@ module.exports['NotEqual'] = {
                     "name" : "c",
                     "value" : {
                       "type" : "Literal",
-                      "localId" : "297",
+                      "localId" : "327",
                       "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                       "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                       "value" : "1",
@@ -7534,37 +7900,37 @@ module.exports['NotEqual'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "308",
+              "localId" : "338",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "317",
+                "localId" : "347",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "318",
+                  "localId" : "348",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "319",
+                    "localId" : "349",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "320",
+                  "localId" : "350",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "321",
+                    "localId" : "351",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "322",
+                      "localId" : "352",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "323",
+                        "localId" : "353",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -7576,7 +7942,7 @@ module.exports['NotEqual'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "309",
+                  "localId" : "339",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7586,19 +7952,19 @@ module.exports['NotEqual'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Tuple",
-                  "localId" : "310",
+                  "localId" : "340",
                   "annotation" : [ ],
                   "resultTypeSpecifier" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "314",
+                    "localId" : "344",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "315",
+                      "localId" : "345",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "316",
+                        "localId" : "346",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -7608,18 +7974,18 @@ module.exports['NotEqual'] = {
                     "name" : "c",
                     "value" : {
                       "type" : "Negate",
-                      "localId" : "311",
+                      "localId" : "341",
                       "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ],
                       "signature" : [ {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "313",
+                        "localId" : "343",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       } ],
                       "operand" : {
                         "type" : "Literal",
-                        "localId" : "312",
+                        "localId" : "342",
                         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                         "value" : "1",
@@ -7633,7 +7999,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "342",
+        "localId" : "372",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqTuplesWithNullFields",
         "context" : "Patient",
@@ -7642,20 +8008,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "342",
+            "r" : "372",
             "s" : [ {
               "value" : [ "", "define ", "EqTuplesWithNullFields", ": " ]
             }, {
-              "r" : "372",
+              "r" : "402",
               "s" : [ {
-                "r" : "344",
+                "r" : "374",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "345",
+                    "r" : "375",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -7664,7 +8030,7 @@ module.exports['NotEqual'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "347",
+                    "r" : "377",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -7673,14 +8039,14 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "353",
+                "r" : "383",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "354",
+                    "r" : "384",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -7689,7 +8055,7 @@ module.exports['NotEqual'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "356",
+                    "r" : "386",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -7701,66 +8067,66 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "372",
+          "localId" : "402",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "373",
+            "localId" : "403",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "343",
+            "localId" : "373",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "TupleTypeSpecifier",
-              "localId" : "362",
+              "localId" : "392",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "363",
+                "localId" : "393",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "364",
+                  "localId" : "394",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "365",
+                "localId" : "395",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "366",
+                  "localId" : "396",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               } ]
             }, {
               "type" : "TupleTypeSpecifier",
-              "localId" : "367",
+              "localId" : "397",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "368",
+                "localId" : "398",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "369",
+                  "localId" : "399",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "370",
+                "localId" : "400",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "371",
+                  "localId" : "401",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -7768,29 +8134,29 @@ module.exports['NotEqual'] = {
             } ],
             "operand" : [ {
               "type" : "Tuple",
-              "localId" : "344",
+              "localId" : "374",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "348",
+                "localId" : "378",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "349",
+                  "localId" : "379",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "350",
+                    "localId" : "380",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "351",
+                  "localId" : "381",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "352",
+                    "localId" : "382",
                     "name" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
@@ -7800,7 +8166,7 @@ module.exports['NotEqual'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "345",
+                  "localId" : "375",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "Hello",
@@ -7810,36 +8176,36 @@ module.exports['NotEqual'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Null",
-                  "localId" : "347",
+                  "localId" : "377",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "353",
+              "localId" : "383",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "357",
+                "localId" : "387",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "358",
+                  "localId" : "388",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "359",
+                    "localId" : "389",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "360",
+                  "localId" : "390",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "361",
+                    "localId" : "391",
                     "name" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
@@ -7849,7 +8215,7 @@ module.exports['NotEqual'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "354",
+                  "localId" : "384",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "Hello",
@@ -7859,7 +8225,7 @@ module.exports['NotEqual'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Null",
-                  "localId" : "356",
+                  "localId" : "386",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -7868,7 +8234,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "376",
+        "localId" : "406",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqTuplesWithNullFields",
         "context" : "Patient",
@@ -7877,20 +8243,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "376",
+            "r" : "406",
             "s" : [ {
               "value" : [ "", "define ", "UneqTuplesWithNullFields", ": " ]
             }, {
-              "r" : "406",
+              "r" : "436",
               "s" : [ {
-                "r" : "378",
+                "r" : "408",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "379",
+                    "r" : "409",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -7899,7 +8265,7 @@ module.exports['NotEqual'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "381",
+                    "r" : "411",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -7908,14 +8274,14 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "387",
+                "r" : "417",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "388",
+                    "r" : "418",
                     "s" : [ {
                       "value" : [ "'Goodbye'" ]
                     } ]
@@ -7924,7 +8290,7 @@ module.exports['NotEqual'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "390",
+                    "r" : "420",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -7936,66 +8302,66 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "406",
+          "localId" : "436",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "407",
+            "localId" : "437",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "377",
+            "localId" : "407",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "TupleTypeSpecifier",
-              "localId" : "396",
+              "localId" : "426",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "397",
+                "localId" : "427",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "398",
+                  "localId" : "428",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "399",
+                "localId" : "429",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "400",
+                  "localId" : "430",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               } ]
             }, {
               "type" : "TupleTypeSpecifier",
-              "localId" : "401",
+              "localId" : "431",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "402",
+                "localId" : "432",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "403",
+                  "localId" : "433",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "404",
+                "localId" : "434",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "405",
+                  "localId" : "435",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -8003,29 +8369,29 @@ module.exports['NotEqual'] = {
             } ],
             "operand" : [ {
               "type" : "Tuple",
-              "localId" : "378",
+              "localId" : "408",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "382",
+                "localId" : "412",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "383",
+                  "localId" : "413",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "384",
+                    "localId" : "414",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "385",
+                  "localId" : "415",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "386",
+                    "localId" : "416",
                     "name" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
@@ -8035,7 +8401,7 @@ module.exports['NotEqual'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "379",
+                  "localId" : "409",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "Hello",
@@ -8045,36 +8411,36 @@ module.exports['NotEqual'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Null",
-                  "localId" : "381",
+                  "localId" : "411",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "387",
+              "localId" : "417",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "391",
+                "localId" : "421",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "392",
+                  "localId" : "422",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "393",
+                    "localId" : "423",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "394",
+                  "localId" : "424",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "395",
+                    "localId" : "425",
                     "name" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
@@ -8084,7 +8450,7 @@ module.exports['NotEqual'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "388",
+                  "localId" : "418",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "Goodbye",
@@ -8094,7 +8460,7 @@ module.exports['NotEqual'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Null",
-                  "localId" : "390",
+                  "localId" : "420",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -8103,7 +8469,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "410",
+        "localId" : "440",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UncertTuplesWithNullFieldOnOne",
         "context" : "Patient",
@@ -8112,20 +8478,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "410",
+            "r" : "440",
             "s" : [ {
               "value" : [ "", "define ", "UncertTuplesWithNullFieldOnOne", ": " ]
             }, {
-              "r" : "441",
+              "r" : "471",
               "s" : [ {
-                "r" : "412",
+                "r" : "442",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "413",
+                    "r" : "443",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -8134,7 +8500,7 @@ module.exports['NotEqual'] = {
                   "value" : [ ", " ]
                 }, {
                   "s" : [ {
-                    "r" : "415",
+                    "r" : "445",
                     "value" : [ "b", ": ", "null" ]
                   } ]
                 }, {
@@ -8143,14 +8509,14 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "421",
+                "r" : "451",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "422",
+                    "r" : "452",
                     "s" : [ {
                       "value" : [ "'Hello'" ]
                     } ]
@@ -8161,7 +8527,7 @@ module.exports['NotEqual'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "424",
+                    "r" : "454",
                     "s" : [ {
                       "value" : [ "'null'" ]
                     } ]
@@ -8175,66 +8541,66 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "441",
+          "localId" : "471",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "442",
+            "localId" : "472",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "411",
+            "localId" : "441",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "TupleTypeSpecifier",
-              "localId" : "431",
+              "localId" : "461",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "432",
+                "localId" : "462",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "433",
+                  "localId" : "463",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "434",
+                "localId" : "464",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "435",
+                  "localId" : "465",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               } ]
             }, {
               "type" : "TupleTypeSpecifier",
-              "localId" : "436",
+              "localId" : "466",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "437",
+                "localId" : "467",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "438",
+                  "localId" : "468",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "439",
+                "localId" : "469",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "440",
+                  "localId" : "470",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -8242,29 +8608,29 @@ module.exports['NotEqual'] = {
             } ],
             "operand" : [ {
               "type" : "Tuple",
-              "localId" : "412",
+              "localId" : "442",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "416",
+                "localId" : "446",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "417",
+                  "localId" : "447",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "418",
+                    "localId" : "448",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "419",
+                  "localId" : "449",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "420",
+                    "localId" : "450",
                     "name" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
@@ -8274,7 +8640,7 @@ module.exports['NotEqual'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "413",
+                  "localId" : "443",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "Hello",
@@ -8284,36 +8650,36 @@ module.exports['NotEqual'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Null",
-                  "localId" : "415",
+                  "localId" : "445",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "421",
+              "localId" : "451",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "426",
+                "localId" : "456",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "427",
+                  "localId" : "457",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "428",
+                    "localId" : "458",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "429",
+                  "localId" : "459",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "430",
+                    "localId" : "460",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -8323,7 +8689,7 @@ module.exports['NotEqual'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "422",
+                  "localId" : "452",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "Hello",
@@ -8333,7 +8699,7 @@ module.exports['NotEqual'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "424",
+                  "localId" : "454",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "null",
@@ -8344,7 +8710,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "445",
+        "localId" : "475",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimes",
         "context" : "Patient",
@@ -8353,20 +8719,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "445",
+            "r" : "475",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimes", ": " ]
             }, {
-              "r" : "503",
+              "r" : "533",
               "s" : [ {
-                "r" : "465",
+                "r" : "495",
                 "s" : [ {
-                  "r" : "447",
+                  "r" : "477",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "454",
+                  "r" : "484",
                   "s" : [ {
-                    "r" : "454",
+                    "r" : "484",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -8375,14 +8741,14 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "492",
+                "r" : "522",
                 "s" : [ {
-                  "r" : "474",
+                  "r" : "504",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "481",
+                  "r" : "511",
                   "s" : [ {
-                    "r" : "481",
+                    "r" : "511",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -8394,80 +8760,80 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "503",
+          "localId" : "533",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "504",
+            "localId" : "534",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "446",
+            "localId" : "476",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "501",
+              "localId" : "531",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "502",
+              "localId" : "532",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "465",
+              "localId" : "495",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "466",
+                "localId" : "496",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "467",
+                "localId" : "497",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "468",
+                "localId" : "498",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "469",
+                "localId" : "499",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "470",
+                "localId" : "500",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "471",
+                "localId" : "501",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "472",
+                "localId" : "502",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "473",
+                "localId" : "503",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "447",
+                "localId" : "477",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -8475,7 +8841,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "448",
+                "localId" : "478",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -8483,7 +8849,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "449",
+                "localId" : "479",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -8491,7 +8857,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "450",
+                "localId" : "480",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -8499,7 +8865,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "451",
+                "localId" : "481",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -8507,7 +8873,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "452",
+                "localId" : "482",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -8515,7 +8881,7 @@ module.exports['NotEqual'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "453",
+                "localId" : "483",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "200",
@@ -8523,7 +8889,7 @@ module.exports['NotEqual'] = {
               },
               "timezoneOffset" : {
                 "type" : "Literal",
-                "localId" : "454",
+                "localId" : "484",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "value" : "1.0",
@@ -8531,53 +8897,53 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "492",
+              "localId" : "522",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "493",
+                "localId" : "523",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "494",
+                "localId" : "524",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "495",
+                "localId" : "525",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "496",
+                "localId" : "526",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "497",
+                "localId" : "527",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "498",
+                "localId" : "528",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "499",
+                "localId" : "529",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "500",
+                "localId" : "530",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "474",
+                "localId" : "504",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -8585,7 +8951,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "475",
+                "localId" : "505",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -8593,7 +8959,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "476",
+                "localId" : "506",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -8601,7 +8967,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "477",
+                "localId" : "507",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -8609,7 +8975,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "478",
+                "localId" : "508",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -8617,7 +8983,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "479",
+                "localId" : "509",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -8625,7 +8991,7 @@ module.exports['NotEqual'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "480",
+                "localId" : "510",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "200",
@@ -8633,7 +8999,7 @@ module.exports['NotEqual'] = {
               },
               "timezoneOffset" : {
                 "type" : "Literal",
-                "localId" : "481",
+                "localId" : "511",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "value" : "1.0",
@@ -8643,7 +9009,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "507",
+        "localId" : "537",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimes",
         "context" : "Patient",
@@ -8652,20 +9018,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "507",
+            "r" : "537",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimes", ": " ]
             }, {
-              "r" : "565",
+              "r" : "595",
               "s" : [ {
-                "r" : "527",
+                "r" : "557",
                 "s" : [ {
-                  "r" : "509",
+                  "r" : "539",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "516",
+                  "r" : "546",
                   "s" : [ {
-                    "r" : "516",
+                    "r" : "546",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -8674,14 +9040,14 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "554",
+                "r" : "584",
                 "s" : [ {
-                  "r" : "536",
+                  "r" : "566",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "201", ", " ]
                 }, {
-                  "r" : "543",
+                  "r" : "573",
                   "s" : [ {
-                    "r" : "543",
+                    "r" : "573",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -8693,80 +9059,80 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "565",
+          "localId" : "595",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "566",
+            "localId" : "596",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "508",
+            "localId" : "538",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "563",
+              "localId" : "593",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "564",
+              "localId" : "594",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "527",
+              "localId" : "557",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "528",
+                "localId" : "558",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "529",
+                "localId" : "559",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "530",
+                "localId" : "560",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "531",
+                "localId" : "561",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "532",
+                "localId" : "562",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "533",
+                "localId" : "563",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "534",
+                "localId" : "564",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "535",
+                "localId" : "565",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "509",
+                "localId" : "539",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -8774,7 +9140,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "510",
+                "localId" : "540",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -8782,7 +9148,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "511",
+                "localId" : "541",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -8790,7 +9156,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "512",
+                "localId" : "542",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -8798,7 +9164,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "513",
+                "localId" : "543",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -8806,7 +9172,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "514",
+                "localId" : "544",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -8814,7 +9180,7 @@ module.exports['NotEqual'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "515",
+                "localId" : "545",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "200",
@@ -8822,7 +9188,7 @@ module.exports['NotEqual'] = {
               },
               "timezoneOffset" : {
                 "type" : "Literal",
-                "localId" : "516",
+                "localId" : "546",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "value" : "1.0",
@@ -8830,53 +9196,53 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "554",
+              "localId" : "584",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "555",
+                "localId" : "585",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "556",
+                "localId" : "586",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "557",
+                "localId" : "587",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "558",
+                "localId" : "588",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "559",
+                "localId" : "589",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "560",
+                "localId" : "590",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "561",
+                "localId" : "591",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "562",
+                "localId" : "592",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "536",
+                "localId" : "566",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -8884,7 +9250,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "537",
+                "localId" : "567",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -8892,7 +9258,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "538",
+                "localId" : "568",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -8900,7 +9266,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "539",
+                "localId" : "569",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -8908,7 +9274,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "540",
+                "localId" : "570",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -8916,7 +9282,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "541",
+                "localId" : "571",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -8924,7 +9290,7 @@ module.exports['NotEqual'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "542",
+                "localId" : "572",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "201",
@@ -8932,7 +9298,7 @@ module.exports['NotEqual'] = {
               },
               "timezoneOffset" : {
                 "type" : "Literal",
-                "localId" : "543",
+                "localId" : "573",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "value" : "1.0",
@@ -8942,7 +9308,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "569",
+        "localId" : "599",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesTZ",
         "context" : "Patient",
@@ -8951,20 +9317,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "569",
+            "r" : "599",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesTZ", ": " ]
             }, {
-              "r" : "627",
+              "r" : "657",
               "s" : [ {
-                "r" : "589",
+                "r" : "619",
                 "s" : [ {
-                  "r" : "571",
+                  "r" : "601",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "23", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "578",
+                  "r" : "608",
                   "s" : [ {
-                    "r" : "578",
+                    "r" : "608",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -8973,14 +9339,14 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "616",
+                "r" : "646",
                 "s" : [ {
-                  "r" : "598",
+                  "r" : "628",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "16", ", ", "2", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "605",
+                  "r" : "635",
                   "s" : [ {
-                    "r" : "605",
+                    "r" : "635",
                     "value" : [ "+", "4.0" ]
                   } ]
                 }, {
@@ -8992,80 +9358,80 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "627",
+          "localId" : "657",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "628",
+            "localId" : "658",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "570",
+            "localId" : "600",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "625",
+              "localId" : "655",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "626",
+              "localId" : "656",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "589",
+              "localId" : "619",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "590",
+                "localId" : "620",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "591",
+                "localId" : "621",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "592",
+                "localId" : "622",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "593",
+                "localId" : "623",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "594",
+                "localId" : "624",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "595",
+                "localId" : "625",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "596",
+                "localId" : "626",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "597",
+                "localId" : "627",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "571",
+                "localId" : "601",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -9073,7 +9439,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "572",
+                "localId" : "602",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -9081,7 +9447,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "573",
+                "localId" : "603",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -9089,7 +9455,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "574",
+                "localId" : "604",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "23",
@@ -9097,7 +9463,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "575",
+                "localId" : "605",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -9105,7 +9471,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "576",
+                "localId" : "606",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -9113,7 +9479,7 @@ module.exports['NotEqual'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "577",
+                "localId" : "607",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "200",
@@ -9121,7 +9487,7 @@ module.exports['NotEqual'] = {
               },
               "timezoneOffset" : {
                 "type" : "Literal",
-                "localId" : "578",
+                "localId" : "608",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "value" : "1.0",
@@ -9129,53 +9495,53 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "616",
+              "localId" : "646",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "617",
+                "localId" : "647",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "618",
+                "localId" : "648",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "619",
+                "localId" : "649",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "620",
+                "localId" : "650",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "621",
+                "localId" : "651",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "622",
+                "localId" : "652",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "623",
+                "localId" : "653",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "624",
+                "localId" : "654",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "598",
+                "localId" : "628",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -9183,7 +9549,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "599",
+                "localId" : "629",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -9191,7 +9557,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "600",
+                "localId" : "630",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "16",
@@ -9199,7 +9565,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "601",
+                "localId" : "631",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -9207,7 +9573,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "602",
+                "localId" : "632",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -9215,7 +9581,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "603",
+                "localId" : "633",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -9223,7 +9589,7 @@ module.exports['NotEqual'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "604",
+                "localId" : "634",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "200",
@@ -9231,7 +9597,7 @@ module.exports['NotEqual'] = {
               },
               "timezoneOffset" : {
                 "type" : "Literal",
-                "localId" : "605",
+                "localId" : "635",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "value" : "4.0",
@@ -9241,7 +9607,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "631",
+        "localId" : "661",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimesTZ",
         "context" : "Patient",
@@ -9250,20 +9616,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "631",
+            "r" : "661",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimesTZ", ": " ]
             }, {
-              "r" : "689",
+              "r" : "719",
               "s" : [ {
-                "r" : "651",
+                "r" : "681",
                 "s" : [ {
-                  "r" : "633",
+                  "r" : "663",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "640",
+                  "r" : "670",
                   "s" : [ {
-                    "r" : "640",
+                    "r" : "670",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -9272,14 +9638,14 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "678",
+                "r" : "708",
                 "s" : [ {
-                  "r" : "660",
+                  "r" : "690",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "667",
+                  "r" : "697",
                   "s" : [ {
-                    "r" : "667",
+                    "r" : "697",
                     "value" : [ "+", "2.0" ]
                   } ]
                 }, {
@@ -9291,80 +9657,80 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "689",
+          "localId" : "719",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "690",
+            "localId" : "720",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "632",
+            "localId" : "662",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "687",
+              "localId" : "717",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "688",
+              "localId" : "718",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "651",
+              "localId" : "681",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "652",
+                "localId" : "682",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "653",
+                "localId" : "683",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "654",
+                "localId" : "684",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "655",
+                "localId" : "685",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "656",
+                "localId" : "686",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "657",
+                "localId" : "687",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "658",
+                "localId" : "688",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "659",
+                "localId" : "689",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "633",
+                "localId" : "663",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -9372,7 +9738,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "634",
+                "localId" : "664",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -9380,7 +9746,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "635",
+                "localId" : "665",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -9388,7 +9754,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "636",
+                "localId" : "666",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -9396,7 +9762,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "637",
+                "localId" : "667",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -9404,7 +9770,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "638",
+                "localId" : "668",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -9412,7 +9778,7 @@ module.exports['NotEqual'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "639",
+                "localId" : "669",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "200",
@@ -9420,7 +9786,7 @@ module.exports['NotEqual'] = {
               },
               "timezoneOffset" : {
                 "type" : "Literal",
-                "localId" : "640",
+                "localId" : "670",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "value" : "1.0",
@@ -9428,53 +9794,53 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "678",
+              "localId" : "708",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "679",
+                "localId" : "709",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "680",
+                "localId" : "710",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "681",
+                "localId" : "711",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "682",
+                "localId" : "712",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "683",
+                "localId" : "713",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "684",
+                "localId" : "714",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "685",
+                "localId" : "715",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "686",
+                "localId" : "716",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "660",
+                "localId" : "690",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -9482,7 +9848,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "661",
+                "localId" : "691",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -9490,7 +9856,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "662",
+                "localId" : "692",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -9498,7 +9864,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "663",
+                "localId" : "693",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -9506,7 +9872,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "664",
+                "localId" : "694",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -9514,7 +9880,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "665",
+                "localId" : "695",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -9522,7 +9888,7 @@ module.exports['NotEqual'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "666",
+                "localId" : "696",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "200",
@@ -9530,7 +9896,7 @@ module.exports['NotEqual'] = {
               },
               "timezoneOffset" : {
                 "type" : "Literal",
-                "localId" : "667",
+                "localId" : "697",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "value" : "2.0",
@@ -9540,7 +9906,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "693",
+        "localId" : "723",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesNullMs",
         "context" : "Patient",
@@ -9549,23 +9915,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "693",
+            "r" : "723",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesNullMs", ": " ]
             }, {
-              "r" : "742",
+              "r" : "772",
               "s" : [ {
-                "r" : "711",
+                "r" : "741",
                 "s" : [ {
-                  "r" : "695",
+                  "r" : "725",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "733",
+                "r" : "763",
                 "s" : [ {
-                  "r" : "719",
+                  "r" : "749",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ")" ]
                 } ]
               } ]
@@ -9574,75 +9940,75 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "742",
+          "localId" : "772",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "743",
+            "localId" : "773",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "694",
+            "localId" : "724",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "740",
+              "localId" : "770",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "741",
+              "localId" : "771",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "711",
+              "localId" : "741",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "712",
+                "localId" : "742",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "713",
+                "localId" : "743",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "714",
+                "localId" : "744",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "715",
+                "localId" : "745",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "716",
+                "localId" : "746",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "717",
+                "localId" : "747",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "718",
+                "localId" : "748",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "695",
+                "localId" : "725",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -9650,7 +10016,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "696",
+                "localId" : "726",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -9658,7 +10024,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "697",
+                "localId" : "727",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -9666,7 +10032,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "698",
+                "localId" : "728",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -9674,7 +10040,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "699",
+                "localId" : "729",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -9682,7 +10048,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "700",
+                "localId" : "730",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -9690,7 +10056,7 @@ module.exports['NotEqual'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "701",
+                "localId" : "731",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -9698,43 +10064,43 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "733",
+              "localId" : "763",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "734",
+                "localId" : "764",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "735",
+                "localId" : "765",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "736",
+                "localId" : "766",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "737",
+                "localId" : "767",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "738",
+                "localId" : "768",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "739",
+                "localId" : "769",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "719",
+                "localId" : "749",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -9742,7 +10108,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "720",
+                "localId" : "750",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -9750,7 +10116,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "721",
+                "localId" : "751",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -9758,7 +10124,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "722",
+                "localId" : "752",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -9766,7 +10132,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "723",
+                "localId" : "753",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -9774,7 +10140,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "724",
+                "localId" : "754",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -9784,7 +10150,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "746",
+        "localId" : "776",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesNullOtherMs",
         "context" : "Patient",
@@ -9793,23 +10159,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "746",
+            "r" : "776",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesNullOtherMs", ": " ]
             }, {
-              "r" : "795",
+              "r" : "825",
               "s" : [ {
-                "r" : "762",
+                "r" : "792",
                 "s" : [ {
-                  "r" : "748",
+                  "r" : "778",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "785",
+                "r" : "815",
                 "s" : [ {
-                  "r" : "769",
+                  "r" : "799",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "0", ")" ]
                 } ]
               } ]
@@ -9818,70 +10184,70 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "795",
+          "localId" : "825",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "796",
+            "localId" : "826",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "747",
+            "localId" : "777",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "793",
+              "localId" : "823",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "794",
+              "localId" : "824",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "762",
+              "localId" : "792",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "763",
+                "localId" : "793",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "764",
+                "localId" : "794",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "765",
+                "localId" : "795",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
+                "localId" : "796",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "767",
+                "localId" : "797",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "768",
+                "localId" : "798",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "748",
+                "localId" : "778",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -9889,7 +10255,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "749",
+                "localId" : "779",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -9897,7 +10263,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "750",
+                "localId" : "780",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -9905,7 +10271,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "751",
+                "localId" : "781",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -9913,7 +10279,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "752",
+                "localId" : "782",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -9921,7 +10287,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "753",
+                "localId" : "783",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -9929,48 +10295,48 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "785",
+              "localId" : "815",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "786",
+                "localId" : "816",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "787",
+                "localId" : "817",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "788",
+                "localId" : "818",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "789",
+                "localId" : "819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "790",
+                "localId" : "820",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "791",
+                "localId" : "821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "792",
+                "localId" : "822",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "769",
+                "localId" : "799",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -9978,7 +10344,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "770",
+                "localId" : "800",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -9986,7 +10352,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "771",
+                "localId" : "801",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -9994,7 +10360,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "772",
+                "localId" : "802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -10002,7 +10368,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "773",
+                "localId" : "803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -10010,7 +10376,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "774",
+                "localId" : "804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "25",
@@ -10018,7 +10384,7 @@ module.exports['NotEqual'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "775",
+                "localId" : "805",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -10028,7 +10394,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "799",
+        "localId" : "829",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesOnlyDate",
         "context" : "Patient",
@@ -10037,23 +10403,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "799",
+            "r" : "829",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesOnlyDate", ": " ]
             }, {
-              "r" : "827",
+              "r" : "857",
               "s" : [ {
-                "r" : "809",
+                "r" : "839",
                 "s" : [ {
-                  "r" : "801",
+                  "r" : "831",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "821",
+                "r" : "851",
                 "s" : [ {
-                  "r" : "813",
+                  "r" : "843",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               } ]
@@ -10062,55 +10428,55 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "827",
+          "localId" : "857",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "828",
+            "localId" : "858",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "800",
+            "localId" : "830",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "825",
+              "localId" : "855",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "826",
+              "localId" : "856",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "809",
+              "localId" : "839",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "810",
+                "localId" : "840",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "811",
+                "localId" : "841",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "812",
+                "localId" : "842",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "801",
+                "localId" : "831",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10118,7 +10484,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "802",
+                "localId" : "832",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -10126,7 +10492,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "803",
+                "localId" : "833",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -10134,28 +10500,28 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "821",
+              "localId" : "851",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "822",
+                "localId" : "852",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "823",
+                "localId" : "853",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "824",
+                "localId" : "854",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "813",
+                "localId" : "843",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10163,7 +10529,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "814",
+                "localId" : "844",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -10171,7 +10537,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "815",
+                "localId" : "845",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -10181,7 +10547,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "831",
+        "localId" : "861",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimesOnlyDate",
         "context" : "Patient",
@@ -10190,23 +10556,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "831",
+            "r" : "861",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimesOnlyDate", ": " ]
             }, {
-              "r" : "859",
+              "r" : "889",
               "s" : [ {
-                "r" : "841",
+                "r" : "871",
                 "s" : [ {
-                  "r" : "833",
+                  "r" : "863",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "14", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "853",
+                "r" : "883",
                 "s" : [ {
-                  "r" : "845",
+                  "r" : "875",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               } ]
@@ -10215,55 +10581,55 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "859",
+          "localId" : "889",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "860",
+            "localId" : "890",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "832",
+            "localId" : "862",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "857",
+              "localId" : "887",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "858",
+              "localId" : "888",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "841",
+              "localId" : "871",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "842",
+                "localId" : "872",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "843",
+                "localId" : "873",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "844",
+                "localId" : "874",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "833",
+                "localId" : "863",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10271,7 +10637,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "834",
+                "localId" : "864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -10279,7 +10645,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "835",
+                "localId" : "865",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "14",
@@ -10287,28 +10653,28 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "853",
+              "localId" : "883",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "854",
+                "localId" : "884",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "855",
+                "localId" : "885",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "856",
+                "localId" : "886",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "845",
+                "localId" : "875",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10316,7 +10682,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "846",
+                "localId" : "876",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -10324,7 +10690,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "847",
+                "localId" : "877",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -10334,7 +10700,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "863",
+        "localId" : "893",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PossiblyEqDateTimesOnlyDateOnOne",
         "context" : "Patient",
@@ -10343,23 +10709,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "863",
+            "r" : "893",
             "s" : [ {
               "value" : [ "", "define ", "PossiblyEqDateTimesOnlyDateOnOne", ": " ]
             }, {
-              "r" : "900",
+              "r" : "930",
               "s" : [ {
-                "r" : "873",
+                "r" : "903",
                 "s" : [ {
-                  "r" : "865",
+                  "r" : "895",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "891",
+                "r" : "921",
                 "s" : [ {
-                  "r" : "877",
+                  "r" : "907",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ", ", "13", ", ", "43", ", ", "32", ")" ]
                 } ]
               } ]
@@ -10368,55 +10734,55 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "900",
+          "localId" : "930",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "901",
+            "localId" : "931",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "864",
+            "localId" : "894",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "898",
+              "localId" : "928",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "899",
+              "localId" : "929",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "873",
+              "localId" : "903",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "874",
+                "localId" : "904",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "875",
+                "localId" : "905",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "876",
+                "localId" : "906",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "865",
+                "localId" : "895",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10424,7 +10790,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "866",
+                "localId" : "896",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -10432,7 +10798,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "867",
+                "localId" : "897",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -10440,43 +10806,43 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "891",
+              "localId" : "921",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "892",
+                "localId" : "922",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "893",
+                "localId" : "923",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "894",
+                "localId" : "924",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "895",
+                "localId" : "925",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "896",
+                "localId" : "926",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "897",
+                "localId" : "927",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "877",
+                "localId" : "907",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10484,7 +10850,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "878",
+                "localId" : "908",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -10492,7 +10858,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "879",
+                "localId" : "909",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -10500,7 +10866,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "880",
+                "localId" : "910",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -10508,7 +10874,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "881",
+                "localId" : "911",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "43",
@@ -10516,7 +10882,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "882",
+                "localId" : "912",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "32",
@@ -10526,7 +10892,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "904",
+        "localId" : "934",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimesOnlyDateOnOne",
         "context" : "Patient",
@@ -10535,23 +10901,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "904",
+            "r" : "934",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimesOnlyDateOnOne", ": " ]
             }, {
-              "r" : "941",
+              "r" : "971",
               "s" : [ {
-                "r" : "920",
+                "r" : "950",
                 "s" : [ {
-                  "r" : "906",
+                  "r" : "936",
                   "value" : [ "DateTime", "(", "2000", ", ", "4", ", ", "13", ", ", "12", ", ", "43", ", ", "32", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "935",
+                "r" : "965",
                 "s" : [ {
-                  "r" : "927",
+                  "r" : "957",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -10560,70 +10926,70 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "941",
+          "localId" : "971",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "942",
+            "localId" : "972",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "905",
+            "localId" : "935",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "939",
+              "localId" : "969",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "940",
+              "localId" : "970",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "920",
+              "localId" : "950",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "921",
+                "localId" : "951",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "922",
+                "localId" : "952",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "923",
+                "localId" : "953",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "924",
+                "localId" : "954",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "925",
+                "localId" : "955",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "926",
+                "localId" : "956",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "906",
+                "localId" : "936",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10631,7 +10997,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "907",
+                "localId" : "937",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -10639,7 +11005,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "908",
+                "localId" : "938",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -10647,7 +11013,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "909",
+                "localId" : "939",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -10655,7 +11021,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "910",
+                "localId" : "940",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "43",
@@ -10663,7 +11029,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "911",
+                "localId" : "941",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "32",
@@ -10671,28 +11037,28 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "935",
+              "localId" : "965",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "936",
+                "localId" : "966",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "937",
+                "localId" : "967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "938",
+                "localId" : "968",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "927",
+                "localId" : "957",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10700,7 +11066,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "928",
+                "localId" : "958",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -10708,7 +11074,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "929",
+                "localId" : "959",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -10718,7 +11084,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "945",
+        "localId" : "975",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PossiblyEqualDateTimes",
         "context" : "Patient",
@@ -10727,23 +11093,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "945",
+            "r" : "975",
             "s" : [ {
               "value" : [ "", "define ", "PossiblyEqualDateTimes", ": " ]
             }, {
-              "r" : "967",
+              "r" : "997",
               "s" : [ {
-                "r" : "955",
+                "r" : "985",
                 "s" : [ {
-                  "r" : "947",
+                  "r" : "977",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "963",
+                "r" : "993",
                 "s" : [ {
-                  "r" : "959",
+                  "r" : "989",
                   "value" : [ "DateTime", "(", "2000", ")" ]
                 } ]
               } ]
@@ -10752,55 +11118,55 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "967",
+          "localId" : "997",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "968",
+            "localId" : "998",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "946",
+            "localId" : "976",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "965",
+              "localId" : "995",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "966",
+              "localId" : "996",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "955",
+              "localId" : "985",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "956",
+                "localId" : "986",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "957",
+                "localId" : "987",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "958",
+                "localId" : "988",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "947",
+                "localId" : "977",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10808,7 +11174,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "948",
+                "localId" : "978",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -10816,7 +11182,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "949",
+                "localId" : "979",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -10824,18 +11190,18 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "963",
+              "localId" : "993",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "964",
+                "localId" : "994",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "959",
+                "localId" : "989",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10845,7 +11211,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "971",
+        "localId" : "1001",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpossiblyEqualDateTimes",
         "context" : "Patient",
@@ -10854,23 +11220,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "971",
+            "r" : "1001",
             "s" : [ {
               "value" : [ "", "define ", "ImpossiblyEqualDateTimes", ": " ]
             }, {
-              "r" : "996",
+              "r" : "1026",
               "s" : [ {
-                "r" : "981",
+                "r" : "1011",
                 "s" : [ {
-                  "r" : "973",
+                  "r" : "1003",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "991",
+                "r" : "1021",
                 "s" : [ {
-                  "r" : "985",
+                  "r" : "1015",
                   "value" : [ "DateTime", "(", "2000", ", ", "4", ")" ]
                 } ]
               } ]
@@ -10879,55 +11245,55 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "996",
+          "localId" : "1026",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "997",
+            "localId" : "1027",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "972",
+            "localId" : "1002",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "994",
+              "localId" : "1024",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "995",
+              "localId" : "1025",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "981",
+              "localId" : "1011",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "982",
+                "localId" : "1012",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "983",
+                "localId" : "1013",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "984",
+                "localId" : "1014",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "973",
+                "localId" : "1003",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10935,7 +11301,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "974",
+                "localId" : "1004",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -10943,7 +11309,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "975",
+                "localId" : "1005",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "15",
@@ -10951,23 +11317,23 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "991",
+              "localId" : "1021",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "992",
+                "localId" : "1022",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "993",
+                "localId" : "1023",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "985",
+                "localId" : "1015",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -10975,7 +11341,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "986",
+                "localId" : "1016",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -10985,7 +11351,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1000",
+        "localId" : "1030",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateAndDateTimeFalse",
         "context" : "Patient",
@@ -10994,23 +11360,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1000",
+            "r" : "1030",
             "s" : [ {
               "value" : [ "", "define ", "DateAndDateTimeFalse", ": " ]
             }, {
-              "r" : "1031",
+              "r" : "1061",
               "s" : [ {
-                "r" : "1010",
+                "r" : "1040",
                 "s" : [ {
-                  "r" : "1002",
+                  "r" : "1032",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1022",
+                "r" : "1052",
                 "s" : [ {
-                  "r" : "1014",
+                  "r" : "1044",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -11019,65 +11385,65 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1031",
+          "localId" : "1061",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1032",
+            "localId" : "1062",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1001",
+            "localId" : "1031",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1029",
+              "localId" : "1059",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1030",
+              "localId" : "1060",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "ToDateTime",
-              "localId" : "1027",
+              "localId" : "1057",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1028",
+                "localId" : "1058",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Date",
-                "localId" : "1010",
+                "localId" : "1040",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1011",
+                  "localId" : "1041",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1012",
+                  "localId" : "1042",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1013",
+                  "localId" : "1043",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1002",
+                  "localId" : "1032",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2000",
@@ -11085,7 +11451,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1003",
+                  "localId" : "1033",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -11093,7 +11459,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1004",
+                  "localId" : "1034",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "13",
@@ -11102,28 +11468,28 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "1022",
+              "localId" : "1052",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1023",
+                "localId" : "1053",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1024",
+                "localId" : "1054",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1025",
+                "localId" : "1055",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1014",
+                "localId" : "1044",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -11131,7 +11497,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1015",
+                "localId" : "1045",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -11139,7 +11505,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1016",
+                "localId" : "1046",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -11149,7 +11515,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1035",
+        "localId" : "1065",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateAndDateTimeNotEqual",
         "context" : "Patient",
@@ -11158,23 +11524,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1035",
+            "r" : "1065",
             "s" : [ {
               "value" : [ "", "define ", "DateAndDateTimeNotEqual", ": " ]
             }, {
-              "r" : "1066",
+              "r" : "1096",
               "s" : [ {
-                "r" : "1045",
+                "r" : "1075",
                 "s" : [ {
-                  "r" : "1037",
+                  "r" : "1067",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1057",
+                "r" : "1087",
                 "s" : [ {
-                  "r" : "1049",
+                  "r" : "1079",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "12", ")" ]
                 } ]
               } ]
@@ -11183,65 +11549,65 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1066",
+          "localId" : "1096",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1067",
+            "localId" : "1097",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1036",
+            "localId" : "1066",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1064",
+              "localId" : "1094",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1065",
+              "localId" : "1095",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "ToDateTime",
-              "localId" : "1062",
+              "localId" : "1092",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1063",
+                "localId" : "1093",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Date",
-                "localId" : "1045",
+                "localId" : "1075",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1046",
+                  "localId" : "1076",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1047",
+                  "localId" : "1077",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1048",
+                  "localId" : "1078",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1037",
+                  "localId" : "1067",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2000",
@@ -11249,7 +11615,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1038",
+                  "localId" : "1068",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -11257,7 +11623,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1039",
+                  "localId" : "1069",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "13",
@@ -11266,28 +11632,28 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "1057",
+              "localId" : "1087",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1058",
+                "localId" : "1088",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1059",
+                "localId" : "1089",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1060",
+                "localId" : "1090",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1049",
+                "localId" : "1079",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -11295,7 +11661,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1050",
+                "localId" : "1080",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -11303,7 +11669,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1051",
+                "localId" : "1081",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -11313,7 +11679,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1070",
+        "localId" : "1100",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateAndDateTimeUncertainTrue",
         "context" : "Patient",
@@ -11322,23 +11688,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1070",
+            "r" : "1100",
             "s" : [ {
               "value" : [ "", "define ", "DateAndDateTimeUncertainTrue", ": " ]
             }, {
-              "r" : "1110",
+              "r" : "1140",
               "s" : [ {
-                "r" : "1080",
+                "r" : "1110",
                 "s" : [ {
-                  "r" : "1072",
+                  "r" : "1102",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1098",
+                "r" : "1128",
                 "s" : [ {
-                  "r" : "1084",
+                  "r" : "1114",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ", ", "2", ", ", "4", ", ", "23", ")" ]
                 } ]
               } ]
@@ -11347,65 +11713,65 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1110",
+          "localId" : "1140",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1111",
+            "localId" : "1141",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1071",
+            "localId" : "1101",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1108",
+              "localId" : "1138",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1109",
+              "localId" : "1139",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "ToDateTime",
-              "localId" : "1106",
+              "localId" : "1136",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1107",
+                "localId" : "1137",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Date",
-                "localId" : "1080",
+                "localId" : "1110",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1081",
+                  "localId" : "1111",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1082",
+                  "localId" : "1112",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1083",
+                  "localId" : "1113",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1072",
+                  "localId" : "1102",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2000",
@@ -11413,7 +11779,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1073",
+                  "localId" : "1103",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -11421,7 +11787,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1074",
+                  "localId" : "1104",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "13",
@@ -11430,43 +11796,43 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "1098",
+              "localId" : "1128",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1099",
+                "localId" : "1129",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1100",
+                "localId" : "1130",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1101",
+                "localId" : "1131",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1102",
+                "localId" : "1132",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1103",
+                "localId" : "1133",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1104",
+                "localId" : "1134",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1084",
+                "localId" : "1114",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -11474,7 +11840,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1085",
+                "localId" : "1115",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -11482,7 +11848,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1086",
+                "localId" : "1116",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -11490,7 +11856,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1087",
+                "localId" : "1117",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -11498,7 +11864,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1088",
+                "localId" : "1118",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -11506,7 +11872,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1089",
+                "localId" : "1119",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "23",
@@ -11516,7 +11882,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1114",
+        "localId" : "1144",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateTimeAndDateFalse",
         "context" : "Patient",
@@ -11525,23 +11891,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1114",
+            "r" : "1144",
             "s" : [ {
               "value" : [ "", "define ", "DateTimeAndDateFalse", ": " ]
             }, {
-              "r" : "1145",
+              "r" : "1175",
               "s" : [ {
-                "r" : "1124",
+                "r" : "1154",
                 "s" : [ {
-                  "r" : "1116",
+                  "r" : "1146",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1136",
+                "r" : "1166",
                 "s" : [ {
-                  "r" : "1128",
+                  "r" : "1158",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -11550,55 +11916,55 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1145",
+          "localId" : "1175",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1146",
+            "localId" : "1176",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1115",
+            "localId" : "1145",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1143",
+              "localId" : "1173",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1144",
+              "localId" : "1174",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "1124",
+              "localId" : "1154",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1125",
+                "localId" : "1155",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1126",
+                "localId" : "1156",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1127",
+                "localId" : "1157",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1116",
+                "localId" : "1146",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -11606,7 +11972,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1117",
+                "localId" : "1147",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -11614,7 +11980,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1118",
+                "localId" : "1148",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -11622,38 +11988,38 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "ToDateTime",
-              "localId" : "1141",
+              "localId" : "1171",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1142",
+                "localId" : "1172",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Date",
-                "localId" : "1136",
+                "localId" : "1166",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1137",
+                  "localId" : "1167",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1138",
+                  "localId" : "1168",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1139",
+                  "localId" : "1169",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1128",
+                  "localId" : "1158",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2000",
@@ -11661,7 +12027,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1129",
+                  "localId" : "1159",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -11669,7 +12035,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1130",
+                  "localId" : "1160",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "13",
@@ -11680,7 +12046,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1149",
+        "localId" : "1179",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateTimeAndDateNotEqual",
         "context" : "Patient",
@@ -11689,23 +12055,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1149",
+            "r" : "1179",
             "s" : [ {
               "value" : [ "", "define ", "DateTimeAndDateNotEqual", ": " ]
             }, {
-              "r" : "1180",
+              "r" : "1210",
               "s" : [ {
-                "r" : "1159",
+                "r" : "1189",
                 "s" : [ {
-                  "r" : "1151",
+                  "r" : "1181",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "12", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1171",
+                "r" : "1201",
                 "s" : [ {
-                  "r" : "1163",
+                  "r" : "1193",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -11714,55 +12080,55 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1180",
+          "localId" : "1210",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1181",
+            "localId" : "1211",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1150",
+            "localId" : "1180",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1178",
+              "localId" : "1208",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1179",
+              "localId" : "1209",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "1159",
+              "localId" : "1189",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1160",
+                "localId" : "1190",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1161",
+                "localId" : "1191",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1162",
+                "localId" : "1192",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1151",
+                "localId" : "1181",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -11770,7 +12136,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1152",
+                "localId" : "1182",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -11778,7 +12144,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1153",
+                "localId" : "1183",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -11786,38 +12152,38 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "ToDateTime",
-              "localId" : "1176",
+              "localId" : "1206",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1177",
+                "localId" : "1207",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Date",
-                "localId" : "1171",
+                "localId" : "1201",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1172",
+                  "localId" : "1202",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1173",
+                  "localId" : "1203",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1174",
+                  "localId" : "1204",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1163",
+                  "localId" : "1193",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2000",
@@ -11825,7 +12191,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1164",
+                  "localId" : "1194",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -11833,7 +12199,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1165",
+                  "localId" : "1195",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "13",
@@ -11844,7 +12210,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1184",
+        "localId" : "1214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateTimeAndDateUncertainNull",
         "context" : "Patient",
@@ -11853,23 +12219,23 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1184",
+            "r" : "1214",
             "s" : [ {
               "value" : [ "", "define ", "DateTimeAndDateUncertainNull", ": " ]
             }, {
-              "r" : "1224",
+              "r" : "1254",
               "s" : [ {
-                "r" : "1200",
+                "r" : "1230",
                 "s" : [ {
-                  "r" : "1186",
+                  "r" : "1216",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ", ", "2", ", ", "4", ", ", "23", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1215",
+                "r" : "1245",
                 "s" : [ {
-                  "r" : "1207",
+                  "r" : "1237",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -11878,70 +12244,70 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1224",
+          "localId" : "1254",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1225",
+            "localId" : "1255",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1185",
+            "localId" : "1215",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1222",
+              "localId" : "1252",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1223",
+              "localId" : "1253",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "DateTime",
-              "localId" : "1200",
+              "localId" : "1230",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1201",
+                "localId" : "1231",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1202",
+                "localId" : "1232",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1203",
+                "localId" : "1233",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1204",
+                "localId" : "1234",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1205",
+                "localId" : "1235",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1206",
+                "localId" : "1236",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1186",
+                "localId" : "1216",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -11949,7 +12315,7 @@ module.exports['NotEqual'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1187",
+                "localId" : "1217",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -11957,7 +12323,7 @@ module.exports['NotEqual'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1188",
+                "localId" : "1218",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -11965,7 +12331,7 @@ module.exports['NotEqual'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1189",
+                "localId" : "1219",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -11973,7 +12339,7 @@ module.exports['NotEqual'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1190",
+                "localId" : "1220",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -11981,7 +12347,7 @@ module.exports['NotEqual'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1191",
+                "localId" : "1221",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "23",
@@ -11989,38 +12355,38 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "ToDateTime",
-              "localId" : "1220",
+              "localId" : "1250",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1221",
+                "localId" : "1251",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Date",
-                "localId" : "1215",
+                "localId" : "1245",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1216",
+                  "localId" : "1246",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1217",
+                  "localId" : "1247",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1218",
+                  "localId" : "1248",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1207",
+                  "localId" : "1237",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2000",
@@ -12028,7 +12394,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1208",
+                  "localId" : "1238",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -12036,7 +12402,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1209",
+                  "localId" : "1239",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "13",
@@ -12047,7 +12413,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1228",
+        "localId" : "1258",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity",
         "context" : "Patient",
@@ -12056,20 +12422,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1228",
+            "r" : "1258",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity", ": " ]
             }, {
-              "r" : "1234",
+              "r" : "1264",
               "s" : [ {
-                "r" : "1230",
+                "r" : "1260",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1231",
+                "r" : "1261",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -12079,41 +12445,41 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1234",
+          "localId" : "1264",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1235",
+            "localId" : "1265",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1229",
+            "localId" : "1259",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1232",
+              "localId" : "1262",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1233",
+              "localId" : "1263",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "1230",
+              "localId" : "1260",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "m",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "1231",
+              "localId" : "1261",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "m",
@@ -12122,7 +12488,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1238",
+        "localId" : "1268",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity",
         "context" : "Patient",
@@ -12131,20 +12497,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1238",
+            "r" : "1268",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity", ": " ]
             }, {
-              "r" : "1244",
+              "r" : "1274",
               "s" : [ {
-                "r" : "1240",
+                "r" : "1270",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1241",
+                "r" : "1271",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -12154,41 +12520,41 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1244",
+          "localId" : "1274",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1245",
+            "localId" : "1275",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1239",
+            "localId" : "1269",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1242",
+              "localId" : "1272",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1243",
+              "localId" : "1273",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "1240",
+              "localId" : "1270",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "m",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "1241",
+              "localId" : "1271",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "m",
@@ -12197,7 +12563,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1248",
+        "localId" : "1278",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity",
         "context" : "Patient",
@@ -12206,20 +12572,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1248",
+            "r" : "1278",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity", ": " ]
             }, {
-              "r" : "1254",
+              "r" : "1284",
               "s" : [ {
-                "r" : "1250",
+                "r" : "1280",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1251",
+                "r" : "1281",
                 "s" : [ {
                   "value" : [ "6 ", "'m'" ]
                 } ]
@@ -12229,41 +12595,41 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1254",
+          "localId" : "1284",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1255",
+            "localId" : "1285",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1249",
+            "localId" : "1279",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1252",
+              "localId" : "1282",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1253",
+              "localId" : "1283",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "1250",
+              "localId" : "1280",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "m",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "1251",
+              "localId" : "1281",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 6,
               "unit" : "m",
@@ -12272,7 +12638,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1258",
+        "localId" : "1288",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_diff",
         "context" : "Patient",
@@ -12281,20 +12647,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1258",
+            "r" : "1288",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_diff", ": " ]
             }, {
-              "r" : "1264",
+              "r" : "1294",
               "s" : [ {
-                "r" : "1260",
+                "r" : "1290",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1261",
+                "r" : "1291",
                 "s" : [ {
                   "value" : [ "5 ", "'cm'" ]
                 } ]
@@ -12304,41 +12670,41 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1264",
+          "localId" : "1294",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1265",
+            "localId" : "1295",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1259",
+            "localId" : "1289",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1262",
+              "localId" : "1292",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1263",
+              "localId" : "1293",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "1260",
+              "localId" : "1290",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "m",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "1261",
+              "localId" : "1291",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "cm",
@@ -12347,7 +12713,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1268",
+        "localId" : "1298",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_diff",
         "context" : "Patient",
@@ -12356,20 +12722,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1268",
+            "r" : "1298",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_diff", ": " ]
             }, {
-              "r" : "1274",
+              "r" : "1304",
               "s" : [ {
-                "r" : "1270",
+                "r" : "1300",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1271",
+                "r" : "1301",
                 "s" : [ {
                   "value" : [ "500 ", "'cm'" ]
                 } ]
@@ -12379,41 +12745,41 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1274",
+          "localId" : "1304",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1275",
+            "localId" : "1305",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1269",
+            "localId" : "1299",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1272",
+              "localId" : "1302",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1273",
+              "localId" : "1303",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "1270",
+              "localId" : "1300",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "m",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "1271",
+              "localId" : "1301",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 500,
               "unit" : "cm",
@@ -12422,7 +12788,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1278",
+        "localId" : "1308",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_diff",
         "context" : "Patient",
@@ -12431,20 +12797,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1278",
+            "r" : "1308",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_diff", ": " ]
             }, {
-              "r" : "1284",
+              "r" : "1314",
               "s" : [ {
-                "r" : "1280",
+                "r" : "1310",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1281",
+                "r" : "1311",
                 "s" : [ {
                   "value" : [ "5 ", "'km'" ]
                 } ]
@@ -12454,41 +12820,41 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1284",
+          "localId" : "1314",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1285",
+            "localId" : "1315",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1279",
+            "localId" : "1309",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1282",
+              "localId" : "1312",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1283",
+              "localId" : "1313",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "1280",
+              "localId" : "1310",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "m",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "1281",
+              "localId" : "1311",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "km",
@@ -12497,7 +12863,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1288",
+        "localId" : "1318",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_incompatible",
         "context" : "Patient",
@@ -12506,20 +12872,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1288",
+            "r" : "1318",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "1294",
+              "r" : "1324",
               "s" : [ {
-                "r" : "1290",
+                "r" : "1320",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1291",
+                "r" : "1321",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -12529,41 +12895,41 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1294",
+          "localId" : "1324",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1295",
+            "localId" : "1325",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1289",
+            "localId" : "1319",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1292",
+              "localId" : "1322",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1293",
+              "localId" : "1323",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "1290",
+              "localId" : "1320",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "Cel",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "1291",
+              "localId" : "1321",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "m",
@@ -12572,7 +12938,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1298",
+        "localId" : "1328",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_incompatible",
         "context" : "Patient",
@@ -12581,20 +12947,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1298",
+            "r" : "1328",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "1304",
+              "r" : "1334",
               "s" : [ {
-                "r" : "1300",
+                "r" : "1330",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1301",
+                "r" : "1331",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -12604,41 +12970,41 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1304",
+          "localId" : "1334",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1305",
+            "localId" : "1335",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1299",
+            "localId" : "1329",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1302",
+              "localId" : "1332",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1303",
+              "localId" : "1333",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "1300",
+              "localId" : "1330",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "Cel",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "1301",
+              "localId" : "1331",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "m",
@@ -12647,7 +13013,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "1308",
+        "localId" : "1338",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_incompatible",
         "context" : "Patient",
@@ -12656,20 +13022,20 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1308",
+            "r" : "1338",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "1314",
+              "r" : "1344",
               "s" : [ {
-                "r" : "1310",
+                "r" : "1340",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "1311",
+                "r" : "1341",
                 "s" : [ {
                   "value" : [ "40 ", "'m'" ]
                 } ]
@@ -12679,41 +13045,41 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "1314",
+          "localId" : "1344",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1315",
+            "localId" : "1345",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "1309",
+            "localId" : "1339",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1312",
+              "localId" : "1342",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1313",
+              "localId" : "1343",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "1310",
+              "localId" : "1340",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "Cel",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "1311",
+              "localId" : "1341",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 40,
               "unit" : "m",
@@ -12742,11 +13108,12 @@ valueset "Known": '2.16.840.1.113883.3.560.100.1' version '20121025'
 valueset "KnownSameCodes": '2.16.840.1.113883.3.560.100.1' version '20131025'
 valueset "KnownDifferentCodes": '2.16.840.1.113883.3.560.100.1' version '20141025'
 context Patient
-
 define ANull_BDefined: null ~ 4
 define ADefined_BNull: 5 ~ null
 define ANull_BNull: (null as String) ~ (null as String)
 define ADefined_BDefined: 3 ~ 3
+define EqLong: 5L ~ 5L
+define UneqLong: 5L ~ 6L
 define CaseInsensitiveStrings: 'FOO' ~ 'foo'
 define WhiteSpaceTabTrue: 'foo bar' ~ 'foo\tbar'
 define WhiteSpaceTabReturnTrue: 'foo\tbar' ~ 'foo\nbar'
@@ -12758,7 +13125,7 @@ define UneqRatios: 10 'mg' : 2 'dL' ~ 15 'mg' : 4 'dL'
 define UneqRatioTypes: 10 'mg' : 2 'dL' ~ DateTime(2000, 3, 13, 2, 4, 23)
 
 // define EmptyTuples: { : } ~ { : } // TODO: We don't seem to support this format
-define SameTuples: Tuple{a: 'a', b: 'b'} ~ Tuple{a: 'a', b: 'b'}
+define SameTuples: Tuple{a: 'a', b: 'b', z: 9L } ~ Tuple{a: 'a', b: 'b', z: 9L }
 define SameTuplesNull: Tuple{a: null} ~ Tuple{a : null}
 define DifferentTuples: Tuple{a: 'a', b: 'b'} ~ Tuple{a: 'x', b: 'b'}
 define SameNestedTuples: Tuple{a: 'a', b: Tuple{c: 'c'}} ~ Tuple{a: 'a', b: Tuple{c: 'c'}}
@@ -12768,7 +13135,9 @@ define EmptyLists: { } ~ { }
 define DifferentTypesLists: {'1', '2', '3'} ~ {1, 2, 3}
 define DifferentLengthLists: {'a'} ~ {'a', 'a'}
 define DifferentOrderLists: {'a', 'b'} ~ {'b', 'a'}
+define DifferentOrderListsLong: {1L, 5L, 10L} ~ {5L, 1L, 10L}
 define SameLists: {'a', 'b', 'c'} ~ {'a', 'b', 'c'}
+define SameListsLong: {1L, 5L, 10L} ~ {1L, 5L, 10L}
 define SameListsNull: {null, null, null} ~ {null, null, null}
 define SameNestedLists: {{'a','d'}, {'b', 'c'}} ~ {{'a','d'}, {'b', 'c'}}
 define SameNestedListsNull: {null, {null, null}} ~ {null, {null, null}}
@@ -12829,9 +13198,9 @@ module.exports['Equivalent'] = {
       "type" : "CqlToElmError",
       "libraryId" : "TestSnippet",
       "libraryVersion" : "1",
-      "startLine" : 55,
+      "startLine" : 58,
       "startChar" : 37,
-      "endLine" : 55,
+      "endLine" : 58,
       "endChar" : 42,
       "message" : "List-valued expression was demoted to a singleton.",
       "errorType" : "semantic",
@@ -12840,9 +13209,9 @@ module.exports['Equivalent'] = {
       "type" : "CqlToElmError",
       "libraryId" : "TestSnippet",
       "libraryVersion" : "1",
-      "startLine" : 56,
+      "startLine" : 59,
       "startChar" : 26,
-      "endLine" : 56,
+      "endLine" : 59,
       "endChar" : 31,
       "message" : "List-valued expression was demoted to a singleton.",
       "errorType" : "semantic",
@@ -12851,7 +13220,7 @@ module.exports['Equivalent'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "1805",
+        "r" : "1871",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -13506,7 +13875,7 @@ module.exports['Equivalent'] = {
       }, {
         "localId" : "279",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "CaseInsensitiveStrings",
+        "name" : "EqLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -13515,18 +13884,126 @@ module.exports['Equivalent'] = {
           "s" : {
             "r" : "279",
             "s" : [ {
-              "value" : [ "", "define ", "CaseInsensitiveStrings", ": " ]
+              "value" : [ "", "define ", "EqLong", ": " ]
             }, {
               "r" : "280",
               "s" : [ {
                 "r" : "281",
-                "s" : [ {
-                  "value" : [ "'FOO'" ]
-                } ]
-              }, {
-                "value" : [ " ", "~", " " ]
-              }, {
-                "r" : "283",
+                "value" : [ "5L", " ", "~", " ", "5L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equivalent",
+          "localId" : "280",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "283",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "284",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "281",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "282",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "287",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UneqLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "287",
+            "s" : [ {
+              "value" : [ "", "define ", "UneqLong", ": " ]
+            }, {
+              "r" : "288",
+              "s" : [ {
+                "r" : "289",
+                "value" : [ "5L", " ", "~", " ", "6L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equivalent",
+          "localId" : "288",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "291",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "292",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "289",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "290",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "6",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "295",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "CaseInsensitiveStrings",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "295",
+            "s" : [ {
+              "value" : [ "", "define ", "CaseInsensitiveStrings", ": " ]
+            }, {
+              "r" : "296",
+              "s" : [ {
+                "r" : "297",
+                "s" : [ {
+                  "value" : [ "'FOO'" ]
+                } ]
+              }, {
+                "value" : [ " ", "~", " " ]
+              }, {
+                "r" : "299",
                 "s" : [ {
                   "value" : [ "'foo'" ]
                 } ]
@@ -13536,30 +14013,30 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "280",
+          "localId" : "296",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "285",
+            "localId" : "301",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "286",
+            "localId" : "302",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "281",
+            "localId" : "297",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "FOO",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "283",
+            "localId" : "299",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo",
@@ -13567,7 +14044,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "289",
+        "localId" : "305",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "WhiteSpaceTabTrue",
         "context" : "Patient",
@@ -13576,20 +14053,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "289",
+            "r" : "305",
             "s" : [ {
               "value" : [ "", "define ", "WhiteSpaceTabTrue", ": " ]
             }, {
-              "r" : "290",
+              "r" : "306",
               "s" : [ {
-                "r" : "291",
+                "r" : "307",
                 "s" : [ {
                   "value" : [ "'foo bar'" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "293",
+                "r" : "309",
                 "s" : [ {
                   "value" : [ "'foo\\tbar'" ]
                 } ]
@@ -13599,30 +14076,30 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "290",
+          "localId" : "306",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "295",
+            "localId" : "311",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "296",
+            "localId" : "312",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "291",
+            "localId" : "307",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo bar",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "293",
+            "localId" : "309",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo\tbar",
@@ -13630,7 +14107,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "299",
+        "localId" : "315",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "WhiteSpaceTabReturnTrue",
         "context" : "Patient",
@@ -13639,20 +14116,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "299",
+            "r" : "315",
             "s" : [ {
               "value" : [ "", "define ", "WhiteSpaceTabReturnTrue", ": " ]
             }, {
-              "r" : "300",
+              "r" : "316",
               "s" : [ {
-                "r" : "301",
+                "r" : "317",
                 "s" : [ {
                   "value" : [ "'foo\\tbar'" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "303",
+                "r" : "319",
                 "s" : [ {
                   "value" : [ "'foo\\nbar'" ]
                 } ]
@@ -13662,30 +14139,30 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "300",
+          "localId" : "316",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "305",
+            "localId" : "321",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "306",
+            "localId" : "322",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "301",
+            "localId" : "317",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo\tbar",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "303",
+            "localId" : "319",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo\nbar",
@@ -13693,7 +14170,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "309",
+        "localId" : "325",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "WhiteSpaceIncorrectSpaceFalse",
         "context" : "Patient",
@@ -13702,20 +14179,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "309",
+            "r" : "325",
             "s" : [ {
               "value" : [ "", "define ", "WhiteSpaceIncorrectSpaceFalse", ": " ]
             }, {
-              "r" : "310",
+              "r" : "326",
               "s" : [ {
-                "r" : "311",
+                "r" : "327",
                 "s" : [ {
                   "value" : [ "'foo bar'" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "313",
+                "r" : "329",
                 "s" : [ {
                   "value" : [ "'foo\\t\\tbar'" ]
                 } ]
@@ -13725,30 +14202,30 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "310",
+          "localId" : "326",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "315",
+            "localId" : "331",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "316",
+            "localId" : "332",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "311",
+            "localId" : "327",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo bar",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "313",
+            "localId" : "329",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo\t\tbar",
@@ -13756,7 +14233,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "319",
+        "localId" : "335",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "WhiteSpaceIncorrectNumberTabsFalse",
         "context" : "Patient",
@@ -13765,20 +14242,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "319",
+            "r" : "335",
             "s" : [ {
               "value" : [ "", "define ", "WhiteSpaceIncorrectNumberTabsFalse", ": " ]
             }, {
-              "r" : "320",
+              "r" : "336",
               "s" : [ {
-                "r" : "321",
+                "r" : "337",
                 "s" : [ {
                   "value" : [ "'foo\\t\\tbar'" ]
                 } ]
               }, {
                 "value" : [ " ", "~" ]
               }, {
-                "r" : "323",
+                "r" : "339",
                 "s" : [ {
                   "value" : [ "'foo\\tbar'" ]
                 } ]
@@ -13788,30 +14265,30 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "320",
+          "localId" : "336",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "325",
+            "localId" : "341",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "326",
+            "localId" : "342",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "321",
+            "localId" : "337",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo\t\tbar",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "323",
+            "localId" : "339",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo\tbar",
@@ -13819,7 +14296,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "329",
+        "localId" : "345",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "WhiteSpaceNoSpaceFalse",
         "context" : "Patient",
@@ -13828,20 +14305,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "329",
+            "r" : "345",
             "s" : [ {
               "value" : [ "", "define ", "WhiteSpaceNoSpaceFalse", ": " ]
             }, {
-              "r" : "330",
+              "r" : "346",
               "s" : [ {
-                "r" : "331",
+                "r" : "347",
                 "s" : [ {
                   "value" : [ "'foo bar'" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "333",
+                "r" : "349",
                 "s" : [ {
                   "value" : [ "'foobar'" ]
                 } ]
@@ -13851,30 +14328,30 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "330",
+          "localId" : "346",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "335",
+            "localId" : "351",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "336",
+            "localId" : "352",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "331",
+            "localId" : "347",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo bar",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "333",
+            "localId" : "349",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foobar",
@@ -13882,7 +14359,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "339",
+        "localId" : "355",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqRatios",
         "context" : "Patient",
@@ -13891,22 +14368,22 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "339",
+            "r" : "355",
             "s" : [ {
               "value" : [ "", "define ", "EqRatios", ": " ]
             }, {
-              "r" : "340",
+              "r" : "356",
               "s" : [ {
-                "r" : "343",
+                "r" : "359",
                 "s" : [ {
-                  "r" : "341",
+                  "r" : "357",
                   "s" : [ {
                     "value" : [ "10 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ " : " ]
                 }, {
-                  "r" : "342",
+                  "r" : "358",
                   "s" : [ {
                     "value" : [ "2 ", "'dL'" ]
                   } ]
@@ -13914,16 +14391,16 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "346",
+                "r" : "362",
                 "s" : [ {
-                  "r" : "344",
+                  "r" : "360",
                   "s" : [ {
                     "value" : [ "15 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ " : " ]
                 }, {
-                  "r" : "345",
+                  "r" : "361",
                   "s" : [ {
                     "value" : [ "3 ", "'dL'" ]
                   } ]
@@ -13934,34 +14411,34 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "340",
+          "localId" : "356",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "347",
+            "localId" : "363",
             "name" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "348",
+            "localId" : "364",
             "name" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Ratio",
-            "localId" : "343",
+            "localId" : "359",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ],
             "numerator" : {
-              "localId" : "341",
+              "localId" : "357",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 10,
               "unit" : "mg",
               "annotation" : [ ]
             },
             "denominator" : {
-              "localId" : "342",
+              "localId" : "358",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "dL",
@@ -13969,18 +14446,18 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "Ratio",
-            "localId" : "346",
+            "localId" : "362",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ],
             "numerator" : {
-              "localId" : "344",
+              "localId" : "360",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 15,
               "unit" : "mg",
               "annotation" : [ ]
             },
             "denominator" : {
-              "localId" : "345",
+              "localId" : "361",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 3,
               "unit" : "dL",
@@ -13989,7 +14466,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "351",
+        "localId" : "367",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqRatios",
         "context" : "Patient",
@@ -13998,22 +14475,22 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "351",
+            "r" : "367",
             "s" : [ {
               "value" : [ "", "define ", "UneqRatios", ": " ]
             }, {
-              "r" : "352",
+              "r" : "368",
               "s" : [ {
-                "r" : "355",
+                "r" : "371",
                 "s" : [ {
-                  "r" : "353",
+                  "r" : "369",
                   "s" : [ {
                     "value" : [ "10 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ " : " ]
                 }, {
-                  "r" : "354",
+                  "r" : "370",
                   "s" : [ {
                     "value" : [ "2 ", "'dL'" ]
                   } ]
@@ -14021,16 +14498,16 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "358",
+                "r" : "374",
                 "s" : [ {
-                  "r" : "356",
+                  "r" : "372",
                   "s" : [ {
                     "value" : [ "15 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ " : " ]
                 }, {
-                  "r" : "357",
+                  "r" : "373",
                   "s" : [ {
                     "value" : [ "4 ", "'dL'" ]
                   } ]
@@ -14041,34 +14518,34 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "352",
+          "localId" : "368",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "359",
+            "localId" : "375",
             "name" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "360",
+            "localId" : "376",
             "name" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Ratio",
-            "localId" : "355",
+            "localId" : "371",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ],
             "numerator" : {
-              "localId" : "353",
+              "localId" : "369",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 10,
               "unit" : "mg",
               "annotation" : [ ]
             },
             "denominator" : {
-              "localId" : "354",
+              "localId" : "370",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "dL",
@@ -14076,18 +14553,18 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "Ratio",
-            "localId" : "358",
+            "localId" : "374",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ],
             "numerator" : {
-              "localId" : "356",
+              "localId" : "372",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 15,
               "unit" : "mg",
               "annotation" : [ ]
             },
             "denominator" : {
-              "localId" : "357",
+              "localId" : "373",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "dL",
@@ -14096,7 +14573,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "363",
+        "localId" : "379",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqRatioTypes",
         "context" : "Patient",
@@ -14105,22 +14582,22 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "363",
+            "r" : "379",
             "s" : [ {
               "value" : [ "", "define ", "UneqRatioTypes", ": " ]
             }, {
-              "r" : "364",
+              "r" : "380",
               "s" : [ {
-                "r" : "367",
+                "r" : "383",
                 "s" : [ {
-                  "r" : "365",
+                  "r" : "381",
                   "s" : [ {
                     "value" : [ "10 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ " : " ]
                 }, {
-                  "r" : "366",
+                  "r" : "382",
                   "s" : [ {
                     "value" : [ "2 ", "'dL'" ]
                   } ]
@@ -14128,9 +14605,9 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "382",
+                "r" : "398",
                 "s" : [ {
-                  "r" : "368",
+                  "r" : "384",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ", ", "2", ", ", "4", ", ", "23", ")" ]
                 } ]
               } ]
@@ -14139,49 +14616,49 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "364",
+          "localId" : "380",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "391",
+            "localId" : "407",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "392",
+              "localId" : "408",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "393",
+            "localId" : "409",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "394",
+              "localId" : "410",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ToList",
-            "localId" : "389",
+            "localId" : "405",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Ratio",
-              "localId" : "367",
+              "localId" : "383",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
               "annotation" : [ ],
               "numerator" : {
-                "localId" : "365",
+                "localId" : "381",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "value" : 10,
                 "unit" : "mg",
                 "annotation" : [ ]
               },
               "denominator" : {
-                "localId" : "366",
+                "localId" : "382",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "value" : 2,
                 "unit" : "dL",
@@ -14190,48 +14667,48 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "ToList",
-            "localId" : "390",
+            "localId" : "406",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "DateTime",
-              "localId" : "382",
+              "localId" : "398",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "383",
+                "localId" : "399",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "384",
+                "localId" : "400",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "385",
+                "localId" : "401",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "386",
+                "localId" : "402",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "387",
+                "localId" : "403",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "388",
+                "localId" : "404",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "368",
+                "localId" : "384",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -14239,7 +14716,7 @@ module.exports['Equivalent'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "369",
+                "localId" : "385",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -14247,7 +14724,7 @@ module.exports['Equivalent'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "370",
+                "localId" : "386",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -14255,7 +14732,7 @@ module.exports['Equivalent'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "371",
+                "localId" : "387",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -14263,7 +14740,7 @@ module.exports['Equivalent'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "372",
+                "localId" : "388",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -14271,7 +14748,7 @@ module.exports['Equivalent'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "373",
+                "localId" : "389",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "23",
@@ -14281,7 +14758,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "397",
+        "localId" : "413",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameTuples",
         "context" : "Patient",
@@ -14290,20 +14767,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "397",
+            "r" : "413",
             "s" : [ {
               "value" : [ "// define EmptyTuples: { : } ~ { : } // TODO: We don't seem to support this format\n", "define ", "SameTuples", ": " ]
             }, {
-              "r" : "398",
+              "r" : "414",
               "s" : [ {
-                "r" : "399",
+                "r" : "415",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "400",
+                    "r" : "416",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
@@ -14314,25 +14791,32 @@ module.exports['Equivalent'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "402",
+                    "r" : "418",
                     "s" : [ {
                       "value" : [ "'b'" ]
                     } ]
                   } ]
                 }, {
-                  "value" : [ "}" ]
+                  "value" : [ ", " ]
+                }, {
+                  "s" : [ {
+                    "r" : "420",
+                    "value" : [ "z", ": ", "9L" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "409",
+                "r" : "428",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "410",
+                    "r" : "429",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
@@ -14343,13 +14827,20 @@ module.exports['Equivalent'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "412",
+                    "r" : "431",
                     "s" : [ {
                       "value" : [ "'b'" ]
                     } ]
                   } ]
                 }, {
-                  "value" : [ "}" ]
+                  "value" : [ ", " ]
+                }, {
+                  "s" : [ {
+                    "r" : "433",
+                    "value" : [ "z", ": ", "9L" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               } ]
             } ]
@@ -14357,95 +14848,125 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "398",
+          "localId" : "414",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "419",
+            "localId" : "441",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "420",
+              "localId" : "442",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "421",
+                "localId" : "443",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "422",
+              "localId" : "444",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "423",
+                "localId" : "445",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
+            }, {
+              "localId" : "446",
+              "name" : "z",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "447",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "424",
+            "localId" : "448",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "425",
+              "localId" : "449",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "426",
+                "localId" : "450",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "427",
+              "localId" : "451",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "428",
+                "localId" : "452",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
+            }, {
+              "localId" : "453",
+              "name" : "z",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "454",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             } ]
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "399",
+            "localId" : "415",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "404",
+              "localId" : "421",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "405",
+                "localId" : "422",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "406",
+                  "localId" : "423",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "407",
+                "localId" : "424",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "408",
+                  "localId" : "425",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
+              }, {
+                "localId" : "426",
+                "name" : "z",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "427",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
+                  "annotation" : [ ]
+                }
               } ]
             },
             "element" : [ {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "400",
+                "localId" : "416",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
@@ -14455,48 +14976,68 @@ module.exports['Equivalent'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "402",
+                "localId" : "418",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "b",
                 "annotation" : [ ]
               }
+            }, {
+              "name" : "z",
+              "value" : {
+                "type" : "Literal",
+                "localId" : "420",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "9",
+                "annotation" : [ ]
+              }
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "409",
+            "localId" : "428",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "414",
+              "localId" : "434",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "415",
+                "localId" : "435",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "416",
+                  "localId" : "436",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "417",
+                "localId" : "437",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "418",
+                  "localId" : "438",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
+              }, {
+                "localId" : "439",
+                "name" : "z",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "440",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
+                  "annotation" : [ ]
+                }
               } ]
             },
             "element" : [ {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "410",
+                "localId" : "429",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
@@ -14506,17 +15047,27 @@ module.exports['Equivalent'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "412",
+                "localId" : "431",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "b",
                 "annotation" : [ ]
               }
+            }, {
+              "name" : "z",
+              "value" : {
+                "type" : "Literal",
+                "localId" : "433",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "9",
+                "annotation" : [ ]
+              }
             } ]
           } ]
         }
       }, {
-        "localId" : "431",
+        "localId" : "457",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameTuplesNull",
         "context" : "Patient",
@@ -14525,18 +15076,18 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "431",
+            "r" : "457",
             "s" : [ {
               "value" : [ "", "define ", "SameTuplesNull", ": " ]
             }, {
-              "r" : "432",
+              "r" : "458",
               "s" : [ {
-                "r" : "433",
+                "r" : "459",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "434",
+                    "r" : "460",
                     "value" : [ "a", ": ", "null" ]
                   } ]
                 }, {
@@ -14545,12 +15096,12 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "438",
+                "r" : "464",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "439",
+                    "r" : "465",
                     "value" : [ "a", " : ", "null" ]
                   } ]
                 }, {
@@ -14562,35 +15113,35 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "432",
+          "localId" : "458",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "443",
+            "localId" : "469",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "444",
+              "localId" : "470",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "445",
+                "localId" : "471",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "446",
+            "localId" : "472",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "447",
+              "localId" : "473",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "448",
+                "localId" : "474",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -14598,19 +15149,19 @@ module.exports['Equivalent'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "433",
+            "localId" : "459",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "435",
+              "localId" : "461",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "436",
+                "localId" : "462",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "437",
+                  "localId" : "463",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -14620,26 +15171,26 @@ module.exports['Equivalent'] = {
               "name" : "a",
               "value" : {
                 "type" : "Null",
-                "localId" : "434",
+                "localId" : "460",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "438",
+            "localId" : "464",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "440",
+              "localId" : "466",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "441",
+                "localId" : "467",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "442",
+                  "localId" : "468",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -14649,7 +15200,7 @@ module.exports['Equivalent'] = {
               "name" : "a",
               "value" : {
                 "type" : "Null",
-                "localId" : "439",
+                "localId" : "465",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -14657,7 +15208,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "451",
+        "localId" : "477",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DifferentTuples",
         "context" : "Patient",
@@ -14666,20 +15217,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "451",
+            "r" : "477",
             "s" : [ {
               "value" : [ "", "define ", "DifferentTuples", ": " ]
             }, {
-              "r" : "452",
+              "r" : "478",
               "s" : [ {
-                "r" : "453",
+                "r" : "479",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "454",
+                    "r" : "480",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
@@ -14690,7 +15241,7 @@ module.exports['Equivalent'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "456",
+                    "r" : "482",
                     "s" : [ {
                       "value" : [ "'b'" ]
                     } ]
@@ -14701,14 +15252,14 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "463",
+                "r" : "489",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "464",
+                    "r" : "490",
                     "s" : [ {
                       "value" : [ "'x'" ]
                     } ]
@@ -14719,7 +15270,7 @@ module.exports['Equivalent'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "466",
+                    "r" : "492",
                     "s" : [ {
                       "value" : [ "'b'" ]
                     } ]
@@ -14733,55 +15284,55 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "452",
+          "localId" : "478",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "473",
+            "localId" : "499",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "474",
+              "localId" : "500",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "475",
+                "localId" : "501",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "476",
+              "localId" : "502",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "477",
+                "localId" : "503",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "478",
+            "localId" : "504",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "479",
+              "localId" : "505",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "480",
+                "localId" : "506",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "481",
+              "localId" : "507",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "482",
+                "localId" : "508",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -14789,29 +15340,29 @@ module.exports['Equivalent'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "453",
+            "localId" : "479",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "458",
+              "localId" : "484",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "459",
+                "localId" : "485",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "460",
+                  "localId" : "486",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "461",
+                "localId" : "487",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "462",
+                  "localId" : "488",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -14821,7 +15372,7 @@ module.exports['Equivalent'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "454",
+                "localId" : "480",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
@@ -14831,7 +15382,7 @@ module.exports['Equivalent'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "456",
+                "localId" : "482",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "b",
@@ -14840,29 +15391,29 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "463",
+            "localId" : "489",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "468",
+              "localId" : "494",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "469",
+                "localId" : "495",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "470",
+                  "localId" : "496",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "471",
+                "localId" : "497",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "472",
+                  "localId" : "498",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -14872,7 +15423,7 @@ module.exports['Equivalent'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "464",
+                "localId" : "490",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "x",
@@ -14882,7 +15433,7 @@ module.exports['Equivalent'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "466",
+                "localId" : "492",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "b",
@@ -14892,7 +15443,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "485",
+        "localId" : "511",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameNestedTuples",
         "context" : "Patient",
@@ -14901,20 +15452,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "485",
+            "r" : "511",
             "s" : [ {
               "value" : [ "", "define ", "SameNestedTuples", ": " ]
             }, {
-              "r" : "486",
+              "r" : "512",
               "s" : [ {
-                "r" : "487",
+                "r" : "513",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "488",
+                    "r" : "514",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
@@ -14925,14 +15476,14 @@ module.exports['Equivalent'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "490",
+                    "r" : "516",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
                         "value" : [ "c", ": " ]
                       }, {
-                        "r" : "491",
+                        "r" : "517",
                         "s" : [ {
                           "value" : [ "'c'" ]
                         } ]
@@ -14947,14 +15498,14 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "503",
+                "r" : "529",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "504",
+                    "r" : "530",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
@@ -14965,14 +15516,14 @@ module.exports['Equivalent'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "506",
+                    "r" : "532",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
                         "value" : [ "c", ": " ]
                       }, {
-                        "r" : "507",
+                        "r" : "533",
                         "s" : [ {
                           "value" : [ "'c'" ]
                         } ]
@@ -14990,38 +15541,38 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "486",
+          "localId" : "512",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "519",
+            "localId" : "545",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "520",
+              "localId" : "546",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "521",
+                "localId" : "547",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "522",
+              "localId" : "548",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "523",
+                "localId" : "549",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "524",
+                  "localId" : "550",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "525",
+                    "localId" : "551",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -15030,33 +15581,33 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "526",
+            "localId" : "552",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "527",
+              "localId" : "553",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "528",
+                "localId" : "554",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "529",
+              "localId" : "555",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "530",
+                "localId" : "556",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "531",
+                  "localId" : "557",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "532",
+                    "localId" : "558",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -15066,37 +15617,37 @@ module.exports['Equivalent'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "487",
+            "localId" : "513",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "496",
+              "localId" : "522",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "497",
+                "localId" : "523",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "498",
+                  "localId" : "524",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "499",
+                "localId" : "525",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "500",
+                  "localId" : "526",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "501",
+                    "localId" : "527",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "502",
+                      "localId" : "528",
                       "name" : "{urn:hl7-org:elm-types:r1}String",
                       "annotation" : [ ]
                     }
@@ -15108,7 +15659,7 @@ module.exports['Equivalent'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "488",
+                "localId" : "514",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
@@ -15118,19 +15669,19 @@ module.exports['Equivalent'] = {
               "name" : "b",
               "value" : {
                 "type" : "Tuple",
-                "localId" : "490",
+                "localId" : "516",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "493",
+                  "localId" : "519",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "494",
+                    "localId" : "520",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "495",
+                      "localId" : "521",
                       "name" : "{urn:hl7-org:elm-types:r1}String",
                       "annotation" : [ ]
                     }
@@ -15140,7 +15691,7 @@ module.exports['Equivalent'] = {
                   "name" : "c",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "491",
+                    "localId" : "517",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                     "valueType" : "{urn:hl7-org:elm-types:r1}String",
                     "value" : "c",
@@ -15151,37 +15702,37 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "503",
+            "localId" : "529",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "512",
+              "localId" : "538",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "513",
+                "localId" : "539",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "514",
+                  "localId" : "540",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "515",
+                "localId" : "541",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "516",
+                  "localId" : "542",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "517",
+                    "localId" : "543",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "518",
+                      "localId" : "544",
                       "name" : "{urn:hl7-org:elm-types:r1}String",
                       "annotation" : [ ]
                     }
@@ -15193,7 +15744,7 @@ module.exports['Equivalent'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "504",
+                "localId" : "530",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
@@ -15203,19 +15754,19 @@ module.exports['Equivalent'] = {
               "name" : "b",
               "value" : {
                 "type" : "Tuple",
-                "localId" : "506",
+                "localId" : "532",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "509",
+                  "localId" : "535",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "510",
+                    "localId" : "536",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "511",
+                      "localId" : "537",
                       "name" : "{urn:hl7-org:elm-types:r1}String",
                       "annotation" : [ ]
                     }
@@ -15225,7 +15776,7 @@ module.exports['Equivalent'] = {
                   "name" : "c",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "507",
+                    "localId" : "533",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                     "valueType" : "{urn:hl7-org:elm-types:r1}String",
                     "value" : "c",
@@ -15237,7 +15788,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "535",
+        "localId" : "561",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameNestedTuplesNull",
         "context" : "Patient",
@@ -15246,20 +15797,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "535",
+            "r" : "561",
             "s" : [ {
               "value" : [ "", "define ", "SameNestedTuplesNull", ": " ]
             }, {
-              "r" : "536",
+              "r" : "562",
               "s" : [ {
-                "r" : "537",
+                "r" : "563",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "538",
+                    "r" : "564",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
@@ -15270,12 +15821,12 @@ module.exports['Equivalent'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "540",
+                    "r" : "566",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
-                        "r" : "541",
+                        "r" : "567",
                         "value" : [ "c", ": ", "null" ]
                       } ]
                     }, {
@@ -15288,14 +15839,14 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "552",
+                "r" : "578",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "553",
+                    "r" : "579",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
@@ -15306,12 +15857,12 @@ module.exports['Equivalent'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "555",
+                    "r" : "581",
                     "s" : [ {
                       "value" : [ "Tuple{" ]
                     }, {
                       "s" : [ {
-                        "r" : "556",
+                        "r" : "582",
                         "value" : [ "c", ": ", "null" ]
                       } ]
                     }, {
@@ -15327,38 +15878,38 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "536",
+          "localId" : "562",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "567",
+            "localId" : "593",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "568",
+              "localId" : "594",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "569",
+                "localId" : "595",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "570",
+              "localId" : "596",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "571",
+                "localId" : "597",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "572",
+                  "localId" : "598",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "573",
+                    "localId" : "599",
                     "name" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
@@ -15367,33 +15918,33 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "574",
+            "localId" : "600",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "575",
+              "localId" : "601",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "576",
+                "localId" : "602",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "577",
+              "localId" : "603",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "578",
+                "localId" : "604",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "579",
+                  "localId" : "605",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "580",
+                    "localId" : "606",
                     "name" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
@@ -15403,37 +15954,37 @@ module.exports['Equivalent'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "537",
+            "localId" : "563",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "545",
+              "localId" : "571",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "546",
+                "localId" : "572",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "547",
+                  "localId" : "573",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "548",
+                "localId" : "574",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "549",
+                  "localId" : "575",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "550",
+                    "localId" : "576",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "551",
+                      "localId" : "577",
                       "name" : "{urn:hl7-org:elm-types:r1}Any",
                       "annotation" : [ ]
                     }
@@ -15445,7 +15996,7 @@ module.exports['Equivalent'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "538",
+                "localId" : "564",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
@@ -15455,19 +16006,19 @@ module.exports['Equivalent'] = {
               "name" : "b",
               "value" : {
                 "type" : "Tuple",
-                "localId" : "540",
+                "localId" : "566",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "542",
+                  "localId" : "568",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "543",
+                    "localId" : "569",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "544",
+                      "localId" : "570",
                       "name" : "{urn:hl7-org:elm-types:r1}Any",
                       "annotation" : [ ]
                     }
@@ -15477,7 +16028,7 @@ module.exports['Equivalent'] = {
                   "name" : "c",
                   "value" : {
                     "type" : "Null",
-                    "localId" : "541",
+                    "localId" : "567",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
@@ -15486,37 +16037,37 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "552",
+            "localId" : "578",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "560",
+              "localId" : "586",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "561",
+                "localId" : "587",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "562",
+                  "localId" : "588",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "563",
+                "localId" : "589",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "564",
+                  "localId" : "590",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "565",
+                    "localId" : "591",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "566",
+                      "localId" : "592",
                       "name" : "{urn:hl7-org:elm-types:r1}Any",
                       "annotation" : [ ]
                     }
@@ -15528,7 +16079,7 @@ module.exports['Equivalent'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "553",
+                "localId" : "579",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
@@ -15538,19 +16089,19 @@ module.exports['Equivalent'] = {
               "name" : "b",
               "value" : {
                 "type" : "Tuple",
-                "localId" : "555",
+                "localId" : "581",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "557",
+                  "localId" : "583",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "558",
+                    "localId" : "584",
                     "name" : "c",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "559",
+                      "localId" : "585",
                       "name" : "{urn:hl7-org:elm-types:r1}Any",
                       "annotation" : [ ]
                     }
@@ -15560,7 +16111,7 @@ module.exports['Equivalent'] = {
                   "name" : "c",
                   "value" : {
                     "type" : "Null",
-                    "localId" : "556",
+                    "localId" : "582",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
@@ -15570,7 +16121,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "583",
+        "localId" : "609",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EmptyLists",
         "context" : "Patient",
@@ -15579,13 +16130,13 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "583",
+            "r" : "609",
             "s" : [ {
               "value" : [ "", "define ", "EmptyLists", ": " ]
             }, {
-              "r" : "584",
+              "r" : "610",
               "s" : [ {
-                "r" : "585",
+                "r" : "611",
                 "value" : [ "{ }", " ", "~", " ", "{ }" ]
               } ]
             } ]
@@ -15593,41 +16144,41 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "584",
+          "localId" : "610",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "591",
+            "localId" : "617",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "592",
+              "localId" : "618",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "593",
+            "localId" : "619",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "594",
+              "localId" : "620",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "585",
+            "localId" : "611",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "586",
+              "localId" : "612",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "587",
+                "localId" : "613",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -15635,15 +16186,15 @@ module.exports['Equivalent'] = {
             "element" : [ ]
           }, {
             "type" : "List",
-            "localId" : "588",
+            "localId" : "614",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "589",
+              "localId" : "615",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "590",
+                "localId" : "616",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -15652,7 +16203,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "597",
+        "localId" : "623",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DifferentTypesLists",
         "context" : "Patient",
@@ -15661,31 +16212,31 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "597",
+            "r" : "623",
             "s" : [ {
               "value" : [ "", "define ", "DifferentTypesLists", ": " ]
             }, {
-              "r" : "598",
+              "r" : "624",
               "s" : [ {
-                "r" : "599",
+                "r" : "625",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "600",
+                  "r" : "626",
                   "s" : [ {
                     "value" : [ "'1'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "602",
+                  "r" : "628",
                   "s" : [ {
                     "value" : [ "'2'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "604",
+                  "r" : "630",
                   "s" : [ {
                     "value" : [ "'3'" ]
                   } ]
@@ -15695,9 +16246,9 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "608",
+                "r" : "634",
                 "s" : [ {
-                  "r" : "609",
+                  "r" : "635",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", "}" ]
                 } ]
               } ]
@@ -15706,62 +16257,62 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "598",
+          "localId" : "624",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "614",
+            "localId" : "640",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "615",
+              "localId" : "641",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "616",
+            "localId" : "642",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "617",
+              "localId" : "643",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "599",
+            "localId" : "625",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "606",
+              "localId" : "632",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "607",
+                "localId" : "633",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "600",
+              "localId" : "626",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "602",
+              "localId" : "628",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "604",
+              "localId" : "630",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "3",
@@ -15769,36 +16320,36 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "608",
+            "localId" : "634",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "612",
+              "localId" : "638",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "613",
+                "localId" : "639",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "609",
+              "localId" : "635",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "610",
+              "localId" : "636",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "611",
+              "localId" : "637",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -15807,7 +16358,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "620",
+        "localId" : "646",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DifferentLengthLists",
         "context" : "Patient",
@@ -15816,17 +16367,17 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "620",
+            "r" : "646",
             "s" : [ {
               "value" : [ "", "define ", "DifferentLengthLists", ": " ]
             }, {
-              "r" : "621",
+              "r" : "647",
               "s" : [ {
-                "r" : "622",
+                "r" : "648",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "623",
+                  "r" : "649",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
@@ -15836,18 +16387,18 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "627",
+                "r" : "653",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "628",
+                  "r" : "654",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "630",
+                  "r" : "656",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
@@ -15860,48 +16411,48 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "621",
+          "localId" : "647",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "634",
+            "localId" : "660",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "635",
+              "localId" : "661",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "636",
+            "localId" : "662",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "637",
+              "localId" : "663",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "622",
+            "localId" : "648",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "625",
+              "localId" : "651",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "626",
+                "localId" : "652",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "623",
+              "localId" : "649",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
@@ -15909,29 +16460,29 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "627",
+            "localId" : "653",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "632",
+              "localId" : "658",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "633",
+                "localId" : "659",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "628",
+              "localId" : "654",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "630",
+              "localId" : "656",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
@@ -15940,7 +16491,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "640",
+        "localId" : "666",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DifferentOrderLists",
         "context" : "Patient",
@@ -15949,24 +16500,24 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "640",
+            "r" : "666",
             "s" : [ {
               "value" : [ "", "define ", "DifferentOrderLists", ": " ]
             }, {
-              "r" : "641",
+              "r" : "667",
               "s" : [ {
-                "r" : "642",
+                "r" : "668",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "643",
+                  "r" : "669",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "645",
+                  "r" : "671",
                   "s" : [ {
                     "value" : [ "'b'" ]
                   } ]
@@ -15976,18 +16527,18 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "649",
+                "r" : "675",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "650",
+                  "r" : "676",
                   "s" : [ {
                     "value" : [ "'b'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "652",
+                  "r" : "678",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
@@ -16000,55 +16551,55 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "641",
+          "localId" : "667",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "656",
+            "localId" : "682",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "657",
+              "localId" : "683",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "658",
+            "localId" : "684",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "659",
+              "localId" : "685",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "642",
+            "localId" : "668",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "647",
+              "localId" : "673",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "648",
+                "localId" : "674",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "643",
+              "localId" : "669",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "645",
+              "localId" : "671",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
@@ -16056,29 +16607,29 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "649",
+            "localId" : "675",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "654",
+              "localId" : "680",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "655",
+                "localId" : "681",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "650",
+              "localId" : "676",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "652",
+              "localId" : "678",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
@@ -16087,73 +16638,33 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "662",
+        "localId" : "688",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "SameLists",
+        "name" : "DifferentOrderListsLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "662",
+            "r" : "688",
             "s" : [ {
-              "value" : [ "", "define ", "SameLists", ": " ]
+              "value" : [ "", "define ", "DifferentOrderListsLong", ": " ]
             }, {
-              "r" : "663",
+              "r" : "689",
               "s" : [ {
-                "r" : "664",
+                "r" : "690",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "665",
-                  "s" : [ {
-                    "value" : [ "'a'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "667",
-                  "s" : [ {
-                    "value" : [ "'b'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "669",
-                  "s" : [ {
-                    "value" : [ "'c'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "691",
+                  "value" : [ "{", "1L", ", ", "5L", ", ", "10L", "}" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "673",
+                "r" : "696",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "674",
-                  "s" : [ {
-                    "value" : [ "'a'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "676",
-                  "s" : [ {
-                    "value" : [ "'b'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "678",
-                  "s" : [ {
-                    "value" : [ "'c'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "697",
+                  "value" : [ "{", "5L", ", ", "1L", ", ", "10L", "}" ]
                 } ]
               } ]
             } ]
@@ -16161,62 +16672,237 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "663",
+          "localId" : "689",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "682",
+            "localId" : "702",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "683",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "localId" : "703",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "684",
+            "localId" : "704",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "685",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "localId" : "705",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "664",
+            "localId" : "690",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "671",
+              "localId" : "694",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "672",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "695",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "665",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "a",
+              "localId" : "691",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "667",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "b",
-              "annotation" : [ ]
+              "localId" : "692",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "669",
+              "localId" : "693",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "696",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "700",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "701",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "697",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "698",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "699",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "708",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "SameLists",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "708",
+            "s" : [ {
+              "value" : [ "", "define ", "SameLists", ": " ]
+            }, {
+              "r" : "709",
+              "s" : [ {
+                "r" : "710",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "711",
+                  "s" : [ {
+                    "value" : [ "'a'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "713",
+                  "s" : [ {
+                    "value" : [ "'b'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "715",
+                  "s" : [ {
+                    "value" : [ "'c'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ " ", "~", " " ]
+              }, {
+                "r" : "719",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "720",
+                  "s" : [ {
+                    "value" : [ "'a'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "722",
+                  "s" : [ {
+                    "value" : [ "'b'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "724",
+                  "s" : [ {
+                    "value" : [ "'c'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equivalent",
+          "localId" : "709",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "728",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "729",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "730",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "731",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "710",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "717",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "718",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "711",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "a",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "713",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "b",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "715",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "c",
@@ -16224,36 +16910,36 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "673",
+            "localId" : "719",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "680",
+              "localId" : "726",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "681",
+                "localId" : "727",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "674",
+              "localId" : "720",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "676",
+              "localId" : "722",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "678",
+              "localId" : "724",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "c",
@@ -16262,7 +16948,142 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "688",
+        "localId" : "734",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "SameListsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "734",
+            "s" : [ {
+              "value" : [ "", "define ", "SameListsLong", ": " ]
+            }, {
+              "r" : "735",
+              "s" : [ {
+                "r" : "736",
+                "s" : [ {
+                  "r" : "737",
+                  "value" : [ "{", "1L", ", ", "5L", ", ", "10L", "}" ]
+                } ]
+              }, {
+                "value" : [ " ", "~", " " ]
+              }, {
+                "r" : "742",
+                "s" : [ {
+                  "r" : "743",
+                  "value" : [ "{", "1L", ", ", "5L", ", ", "10L", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equivalent",
+          "localId" : "735",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "748",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "749",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "750",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "751",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "736",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "740",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "741",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "737",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "738",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "739",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "742",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "746",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "747",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "743",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "744",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "745",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "754",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameListsNull",
         "context" : "Patient",
@@ -16271,23 +17092,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "688",
+            "r" : "754",
             "s" : [ {
               "value" : [ "", "define ", "SameListsNull", ": " ]
             }, {
-              "r" : "689",
+              "r" : "755",
               "s" : [ {
-                "r" : "690",
+                "r" : "756",
                 "s" : [ {
-                  "r" : "691",
+                  "r" : "757",
                   "value" : [ "{", "null", ", ", "null", ", ", "null", "}" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "696",
+                "r" : "762",
                 "s" : [ {
-                  "r" : "697",
+                  "r" : "763",
                   "value" : [ "{", "null", ", ", "null", ", ", "null", "}" ]
                 } ]
               } ]
@@ -16296,96 +17117,96 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "689",
+          "localId" : "755",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "702",
+            "localId" : "768",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "703",
+              "localId" : "769",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "704",
+            "localId" : "770",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "705",
+              "localId" : "771",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "690",
+            "localId" : "756",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "694",
+              "localId" : "760",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "695",
+                "localId" : "761",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Null",
-              "localId" : "691",
+              "localId" : "757",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }, {
               "type" : "Null",
-              "localId" : "692",
+              "localId" : "758",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }, {
               "type" : "Null",
-              "localId" : "693",
+              "localId" : "759",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "696",
+            "localId" : "762",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "700",
+              "localId" : "766",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "701",
+                "localId" : "767",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Null",
-              "localId" : "697",
+              "localId" : "763",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }, {
               "type" : "Null",
-              "localId" : "698",
+              "localId" : "764",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }, {
               "type" : "Null",
-              "localId" : "699",
+              "localId" : "765",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
-        "localId" : "708",
+        "localId" : "774",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameNestedLists",
         "context" : "Patient",
@@ -16394,28 +17215,28 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "708",
+            "r" : "774",
             "s" : [ {
               "value" : [ "", "define ", "SameNestedLists", ": " ]
             }, {
-              "r" : "709",
+              "r" : "775",
               "s" : [ {
-                "r" : "710",
+                "r" : "776",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "711",
+                  "r" : "777",
                   "s" : [ {
                     "value" : [ "{" ]
                   }, {
-                    "r" : "712",
+                    "r" : "778",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
                   }, {
                     "value" : [ "," ]
                   }, {
-                    "r" : "714",
+                    "r" : "780",
                     "s" : [ {
                       "value" : [ "'d'" ]
                     } ]
@@ -16425,18 +17246,18 @@ module.exports['Equivalent'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "718",
+                  "r" : "784",
                   "s" : [ {
                     "value" : [ "{" ]
                   }, {
-                    "r" : "719",
+                    "r" : "785",
                     "s" : [ {
                       "value" : [ "'b'" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "721",
+                    "r" : "787",
                     "s" : [ {
                       "value" : [ "'c'" ]
                     } ]
@@ -16449,22 +17270,22 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "728",
+                "r" : "794",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "729",
+                  "r" : "795",
                   "s" : [ {
                     "value" : [ "{" ]
                   }, {
-                    "r" : "730",
+                    "r" : "796",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
                   }, {
                     "value" : [ "," ]
                   }, {
-                    "r" : "732",
+                    "r" : "798",
                     "s" : [ {
                       "value" : [ "'d'" ]
                     } ]
@@ -16474,18 +17295,18 @@ module.exports['Equivalent'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "736",
+                  "r" : "802",
                   "s" : [ {
                     "value" : [ "{" ]
                   }, {
-                    "r" : "737",
+                    "r" : "803",
                     "s" : [ {
                       "value" : [ "'b'" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "739",
+                    "r" : "805",
                     "s" : [ {
                       "value" : [ "'c'" ]
                     } ]
@@ -16501,35 +17322,35 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "709",
+          "localId" : "775",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "746",
+            "localId" : "812",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "747",
+              "localId" : "813",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "748",
+                "localId" : "814",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "749",
+            "localId" : "815",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "750",
+              "localId" : "816",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "751",
+                "localId" : "817",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -16537,19 +17358,19 @@ module.exports['Equivalent'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "710",
+            "localId" : "776",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "725",
+              "localId" : "791",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "726",
+                "localId" : "792",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "727",
+                  "localId" : "793",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -16557,29 +17378,29 @@ module.exports['Equivalent'] = {
             },
             "element" : [ {
               "type" : "List",
-              "localId" : "711",
+              "localId" : "777",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "716",
+                "localId" : "782",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "717",
+                  "localId" : "783",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "712",
+                "localId" : "778",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "714",
+                "localId" : "780",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "d",
@@ -16587,29 +17408,29 @@ module.exports['Equivalent'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "718",
+              "localId" : "784",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "723",
+                "localId" : "789",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "724",
+                  "localId" : "790",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "719",
+                "localId" : "785",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "b",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "721",
+                "localId" : "787",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "c",
@@ -16618,19 +17439,19 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "728",
+            "localId" : "794",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "743",
+              "localId" : "809",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "744",
+                "localId" : "810",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "745",
+                  "localId" : "811",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -16638,29 +17459,29 @@ module.exports['Equivalent'] = {
             },
             "element" : [ {
               "type" : "List",
-              "localId" : "729",
+              "localId" : "795",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "734",
+                "localId" : "800",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "735",
+                  "localId" : "801",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "730",
+                "localId" : "796",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "732",
+                "localId" : "798",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "d",
@@ -16668,29 +17489,29 @@ module.exports['Equivalent'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "736",
+              "localId" : "802",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "741",
+                "localId" : "807",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "742",
+                  "localId" : "808",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "737",
+                "localId" : "803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "b",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "739",
+                "localId" : "805",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "c",
@@ -16700,7 +17521,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "754",
+        "localId" : "820",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameNestedListsNull",
         "context" : "Patient",
@@ -16709,20 +17530,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "754",
+            "r" : "820",
             "s" : [ {
               "value" : [ "", "define ", "SameNestedListsNull", ": " ]
             }, {
-              "r" : "755",
+              "r" : "821",
               "s" : [ {
-                "r" : "756",
+                "r" : "822",
                 "s" : [ {
-                  "r" : "757",
+                  "r" : "823",
                   "value" : [ "{", "null", ", " ]
                 }, {
-                  "r" : "758",
+                  "r" : "824",
                   "s" : [ {
-                    "r" : "759",
+                    "r" : "825",
                     "value" : [ "{", "null", ", ", "null", "}" ]
                   } ]
                 }, {
@@ -16731,14 +17552,14 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "769",
+                "r" : "835",
                 "s" : [ {
-                  "r" : "770",
+                  "r" : "836",
                   "value" : [ "{", "null", ", " ]
                 }, {
-                  "r" : "771",
+                  "r" : "837",
                   "s" : [ {
-                    "r" : "772",
+                    "r" : "838",
                     "value" : [ "{", "null", ", ", "null", "}" ]
                   } ]
                 }, {
@@ -16750,35 +17571,35 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "755",
+          "localId" : "821",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "782",
+            "localId" : "848",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "783",
+              "localId" : "849",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "784",
+                "localId" : "850",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "785",
+            "localId" : "851",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "786",
+              "localId" : "852",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "787",
+                "localId" : "853",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -16786,19 +17607,19 @@ module.exports['Equivalent'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "756",
+            "localId" : "822",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "766",
+              "localId" : "832",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "767",
+                "localId" : "833",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "768",
+                  "localId" : "834",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -16806,68 +17627,68 @@ module.exports['Equivalent'] = {
             },
             "element" : [ {
               "type" : "As",
-              "localId" : "763",
+              "localId" : "829",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "757",
+                "localId" : "823",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "764",
+                "localId" : "830",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "765",
+                  "localId" : "831",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "List",
-              "localId" : "758",
+              "localId" : "824",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "761",
+                "localId" : "827",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "762",
+                  "localId" : "828",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Null",
-                "localId" : "759",
+                "localId" : "825",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }, {
                 "type" : "Null",
-                "localId" : "760",
+                "localId" : "826",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               } ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "769",
+            "localId" : "835",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "779",
+              "localId" : "845",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "780",
+                "localId" : "846",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "781",
+                  "localId" : "847",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -16875,49 +17696,49 @@ module.exports['Equivalent'] = {
             },
             "element" : [ {
               "type" : "As",
-              "localId" : "776",
+              "localId" : "842",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "770",
+                "localId" : "836",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "777",
+                "localId" : "843",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "778",
+                  "localId" : "844",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "List",
-              "localId" : "771",
+              "localId" : "837",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "774",
+                "localId" : "840",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "775",
+                  "localId" : "841",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Null",
-                "localId" : "772",
+                "localId" : "838",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }, {
                 "type" : "Null",
-                "localId" : "773",
+                "localId" : "839",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               } ]
@@ -16925,7 +17746,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "790",
+        "localId" : "856",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EmptyInterval",
         "context" : "Patient",
@@ -16934,23 +17755,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "790",
+            "r" : "856",
             "s" : [ {
               "value" : [ "", "define ", "EmptyInterval", ": " ]
             }, {
-              "r" : "791",
+              "r" : "857",
               "s" : [ {
-                "r" : "794",
+                "r" : "860",
                 "s" : [ {
-                  "r" : "792",
+                  "r" : "858",
                   "value" : [ "Interval(", "null", ", ", "null", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "799",
+                "r" : "865",
                 "s" : [ {
-                  "r" : "797",
+                  "r" : "863",
                   "value" : [ "Interval(", "null", ", ", "null", ")" ]
                 } ]
               } ]
@@ -16959,92 +17780,92 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "791",
+          "localId" : "857",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "802",
+            "localId" : "868",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "803",
+              "localId" : "869",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "804",
+            "localId" : "870",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "805",
+              "localId" : "871",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "794",
+            "localId" : "860",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "795",
+              "localId" : "861",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "796",
+                "localId" : "862",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Null",
-              "localId" : "792",
+              "localId" : "858",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Null",
-              "localId" : "793",
+              "localId" : "859",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "799",
+            "localId" : "865",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "800",
+              "localId" : "866",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "801",
+                "localId" : "867",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Null",
-              "localId" : "797",
+              "localId" : "863",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Null",
-              "localId" : "798",
+              "localId" : "864",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "808",
+        "localId" : "874",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IntervalDifferentPointTypes",
         "context" : "Patient",
@@ -17053,32 +17874,32 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "808",
+            "r" : "874",
             "s" : [ {
               "value" : [ "", "define ", "IntervalDifferentPointTypes", ":  " ]
             }, {
-              "r" : "809",
+              "r" : "875",
               "s" : [ {
-                "r" : "812",
+                "r" : "878",
                 "s" : [ {
-                  "r" : "810",
+                  "r" : "876",
                   "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "819",
+                "r" : "885",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "815",
+                  "r" : "881",
                   "s" : [ {
                     "value" : [ "'1'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "817",
+                  "r" : "883",
                   "s" : [ {
                     "value" : [ "'5'" ]
                   } ]
@@ -17091,50 +17912,50 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "809",
+          "localId" : "875",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "822",
+            "localId" : "888",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "823",
+              "localId" : "889",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "824",
+            "localId" : "890",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "825",
+              "localId" : "891",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "812",
+            "localId" : "878",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "813",
+              "localId" : "879",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "814",
+                "localId" : "880",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "810",
+              "localId" : "876",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17142,7 +17963,7 @@ module.exports['Equivalent'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "811",
+              "localId" : "877",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -17150,24 +17971,24 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "819",
+            "localId" : "885",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "820",
+              "localId" : "886",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "821",
+                "localId" : "887",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "815",
+              "localId" : "881",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "1",
@@ -17175,7 +17996,7 @@ module.exports['Equivalent'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "817",
+              "localId" : "883",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "5",
@@ -17184,7 +18005,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "828",
+        "localId" : "894",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IntervalDifferentStarts",
         "context" : "Patient",
@@ -17193,23 +18014,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "828",
+            "r" : "894",
             "s" : [ {
               "value" : [ "", "define ", "IntervalDifferentStarts", ": " ]
             }, {
-              "r" : "829",
+              "r" : "895",
               "s" : [ {
-                "r" : "832",
+                "r" : "898",
                 "s" : [ {
-                  "r" : "830",
+                  "r" : "896",
                   "value" : [ "Interval[", "1", ",", "3", "]" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "837",
+                "r" : "903",
                 "s" : [ {
-                  "r" : "835",
+                  "r" : "901",
                   "value" : [ "Interval[", "2", ",", "3", "]" ]
                 } ]
               } ]
@@ -17218,50 +18039,50 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "829",
+          "localId" : "895",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "840",
+            "localId" : "906",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "841",
+              "localId" : "907",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "842",
+            "localId" : "908",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "843",
+              "localId" : "909",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "832",
+            "localId" : "898",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "833",
+              "localId" : "899",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "834",
+                "localId" : "900",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "830",
+              "localId" : "896",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17269,7 +18090,7 @@ module.exports['Equivalent'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "831",
+              "localId" : "897",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -17277,24 +18098,24 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "837",
+            "localId" : "903",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "838",
+              "localId" : "904",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "839",
+                "localId" : "905",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "835",
+              "localId" : "901",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -17302,7 +18123,7 @@ module.exports['Equivalent'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "836",
+              "localId" : "902",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -17311,7 +18132,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "846",
+        "localId" : "912",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IntervalDifferentEndings",
         "context" : "Patient",
@@ -17320,23 +18141,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "846",
+            "r" : "912",
             "s" : [ {
               "value" : [ "", "define ", "IntervalDifferentEndings", ": " ]
             }, {
-              "r" : "847",
+              "r" : "913",
               "s" : [ {
-                "r" : "850",
+                "r" : "916",
                 "s" : [ {
-                  "r" : "848",
+                  "r" : "914",
                   "value" : [ "Interval[", "1", ",", "3", "]" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "855",
+                "r" : "921",
                 "s" : [ {
-                  "r" : "853",
+                  "r" : "919",
                   "value" : [ "Interval[", "1", ",", "4", "]" ]
                 } ]
               } ]
@@ -17345,50 +18166,50 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "847",
+          "localId" : "913",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "858",
+            "localId" : "924",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "859",
+              "localId" : "925",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "860",
+            "localId" : "926",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "861",
+              "localId" : "927",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "850",
+            "localId" : "916",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "851",
+              "localId" : "917",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "852",
+                "localId" : "918",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "848",
+              "localId" : "914",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17396,7 +18217,7 @@ module.exports['Equivalent'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "849",
+              "localId" : "915",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -17404,24 +18225,24 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "855",
+            "localId" : "921",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "856",
+              "localId" : "922",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "857",
+                "localId" : "923",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "853",
+              "localId" : "919",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17429,7 +18250,7 @@ module.exports['Equivalent'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "854",
+              "localId" : "920",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -17438,7 +18259,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "864",
+        "localId" : "930",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameIntervals",
         "context" : "Patient",
@@ -17447,23 +18268,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "864",
+            "r" : "930",
             "s" : [ {
               "value" : [ "", "define ", "SameIntervals", ": " ]
             }, {
-              "r" : "865",
+              "r" : "931",
               "s" : [ {
-                "r" : "868",
+                "r" : "934",
                 "s" : [ {
-                  "r" : "866",
+                  "r" : "932",
                   "value" : [ "Interval[", "1", ",", "3", "]" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "873",
+                "r" : "939",
                 "s" : [ {
-                  "r" : "871",
+                  "r" : "937",
                   "value" : [ "Interval[", "1", ",", "3", "]" ]
                 } ]
               } ]
@@ -17472,50 +18293,50 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "865",
+          "localId" : "931",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "876",
+            "localId" : "942",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "877",
+              "localId" : "943",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "878",
+            "localId" : "944",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "879",
+              "localId" : "945",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "868",
+            "localId" : "934",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "869",
+              "localId" : "935",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "870",
+                "localId" : "936",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "866",
+              "localId" : "932",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17523,7 +18344,7 @@ module.exports['Equivalent'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "867",
+              "localId" : "933",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -17531,24 +18352,24 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "873",
+            "localId" : "939",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "874",
+              "localId" : "940",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "875",
+                "localId" : "941",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "871",
+              "localId" : "937",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17556,7 +18377,7 @@ module.exports['Equivalent'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "872",
+              "localId" : "938",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -17565,7 +18386,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "882",
+        "localId" : "948",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "TupleAndList",
         "context" : "Patient",
@@ -17574,20 +18395,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "882",
+            "r" : "948",
             "s" : [ {
               "value" : [ "", "define ", "TupleAndList", ": " ]
             }, {
-              "r" : "883",
+              "r" : "949",
               "s" : [ {
-                "r" : "884",
+                "r" : "950",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "885",
+                    "r" : "951",
                     "s" : [ {
                       "value" : [ "'1'" ]
                     } ]
@@ -17598,11 +18419,11 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "890",
+                "r" : "956",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "891",
+                  "r" : "957",
                   "s" : [ {
                     "value" : [ "'1'" ]
                   } ]
@@ -17615,35 +18436,35 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "883",
+          "localId" : "949",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "902",
+            "localId" : "968",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "903",
+              "localId" : "969",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "904",
+                "localId" : "970",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "905",
+            "localId" : "971",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "906",
+              "localId" : "972",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "907",
+                "localId" : "973",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -17651,29 +18472,29 @@ module.exports['Equivalent'] = {
           } ],
           "operand" : [ {
             "type" : "ToList",
-            "localId" : "896",
+            "localId" : "962",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "ToList",
-              "localId" : "895",
+              "localId" : "961",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Tuple",
-                "localId" : "884",
+                "localId" : "950",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "887",
+                  "localId" : "953",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "888",
+                    "localId" : "954",
                     "name" : "a",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "889",
+                      "localId" : "955",
                       "name" : "{urn:hl7-org:elm-types:r1}String",
                       "annotation" : [ ]
                     }
@@ -17683,7 +18504,7 @@ module.exports['Equivalent'] = {
                   "name" : "a",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "885",
+                    "localId" : "951",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                     "valueType" : "{urn:hl7-org:elm-types:r1}String",
                     "value" : "1",
@@ -17694,30 +18515,30 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "Query",
-            "localId" : "897",
+            "localId" : "963",
             "annotation" : [ ],
             "source" : [ {
-              "localId" : "898",
+              "localId" : "964",
               "alias" : "X",
               "annotation" : [ ],
               "expression" : {
                 "type" : "List",
-                "localId" : "890",
+                "localId" : "956",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "ListTypeSpecifier",
-                  "localId" : "893",
+                  "localId" : "959",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "894",
+                    "localId" : "960",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 },
                 "element" : [ {
                   "type" : "Literal",
-                  "localId" : "891",
+                  "localId" : "957",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "1",
@@ -17728,17 +18549,17 @@ module.exports['Equivalent'] = {
             "let" : [ ],
             "relationship" : [ ],
             "return" : {
-              "localId" : "899",
+              "localId" : "965",
               "distinct" : false,
               "annotation" : [ ],
               "expression" : {
                 "type" : "ToList",
-                "localId" : "901",
+                "localId" : "967",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "operand" : {
                   "type" : "AliasRef",
-                  "localId" : "900",
+                  "localId" : "966",
                   "name" : "X",
                   "annotation" : [ ]
                 }
@@ -17747,7 +18568,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "910",
+        "localId" : "976",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ListAndTuple",
         "context" : "Patient",
@@ -17756,17 +18577,17 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "910",
+            "r" : "976",
             "s" : [ {
               "value" : [ "", "define ", "ListAndTuple", ": " ]
             }, {
-              "r" : "911",
+              "r" : "977",
               "s" : [ {
-                "r" : "912",
+                "r" : "978",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "913",
+                  "r" : "979",
                   "s" : [ {
                     "value" : [ "'1'" ]
                   } ]
@@ -17776,14 +18597,14 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "917",
+                "r" : "983",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "918",
+                    "r" : "984",
                     "s" : [ {
                       "value" : [ "'1'" ]
                     } ]
@@ -17797,35 +18618,35 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "911",
+          "localId" : "977",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "930",
+            "localId" : "996",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "931",
+              "localId" : "997",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "932",
+                "localId" : "998",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "933",
+            "localId" : "999",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "934",
+              "localId" : "1000",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "935",
+                "localId" : "1001",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -17833,30 +18654,30 @@ module.exports['Equivalent'] = {
           } ],
           "operand" : [ {
             "type" : "Query",
-            "localId" : "923",
+            "localId" : "989",
             "annotation" : [ ],
             "source" : [ {
-              "localId" : "924",
+              "localId" : "990",
               "alias" : "X",
               "annotation" : [ ],
               "expression" : {
                 "type" : "List",
-                "localId" : "912",
+                "localId" : "978",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "ListTypeSpecifier",
-                  "localId" : "915",
+                  "localId" : "981",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "916",
+                    "localId" : "982",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 },
                 "element" : [ {
                   "type" : "Literal",
-                  "localId" : "913",
+                  "localId" : "979",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "1",
@@ -17867,17 +18688,17 @@ module.exports['Equivalent'] = {
             "let" : [ ],
             "relationship" : [ ],
             "return" : {
-              "localId" : "925",
+              "localId" : "991",
               "distinct" : false,
               "annotation" : [ ],
               "expression" : {
                 "type" : "ToList",
-                "localId" : "927",
+                "localId" : "993",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "operand" : {
                   "type" : "AliasRef",
-                  "localId" : "926",
+                  "localId" : "992",
                   "name" : "X",
                   "annotation" : [ ]
                 }
@@ -17885,29 +18706,29 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "ToList",
-            "localId" : "929",
+            "localId" : "995",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "ToList",
-              "localId" : "928",
+              "localId" : "994",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Tuple",
-                "localId" : "917",
+                "localId" : "983",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "920",
+                  "localId" : "986",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "921",
+                    "localId" : "987",
                     "name" : "a",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "922",
+                      "localId" : "988",
                       "name" : "{urn:hl7-org:elm-types:r1}String",
                       "annotation" : [ ]
                     }
@@ -17917,7 +18738,7 @@ module.exports['Equivalent'] = {
                   "name" : "a",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "918",
+                    "localId" : "984",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                     "valueType" : "{urn:hl7-org:elm-types:r1}String",
                     "value" : "1",
@@ -17929,7 +18750,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "938",
+        "localId" : "1004",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "TupleAndNullList",
         "context" : "Patient",
@@ -17938,20 +18759,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "938",
+            "r" : "1004",
             "s" : [ {
               "value" : [ "", "define ", "TupleAndNullList", ": " ]
             }, {
-              "r" : "939",
+              "r" : "1005",
               "s" : [ {
-                "r" : "940",
+                "r" : "1006",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "941",
+                    "r" : "1007",
                     "s" : [ {
                       "value" : [ "'1'" ]
                     } ]
@@ -17962,9 +18783,9 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "946",
+                "r" : "1012",
                 "s" : [ {
-                  "r" : "947",
+                  "r" : "1013",
                   "value" : [ "{", "null", "}" ]
                 } ]
               } ]
@@ -17973,35 +18794,35 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "939",
+          "localId" : "1005",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "957",
+            "localId" : "1023",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "958",
+              "localId" : "1024",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "959",
+                "localId" : "1025",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "960",
+            "localId" : "1026",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "961",
+              "localId" : "1027",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "962",
+                "localId" : "1028",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -18009,19 +18830,19 @@ module.exports['Equivalent'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "940",
+            "localId" : "1006",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "943",
+              "localId" : "1009",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "944",
+                "localId" : "1010",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "945",
+                  "localId" : "1011",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -18031,7 +18852,7 @@ module.exports['Equivalent'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "941",
+                "localId" : "1007",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "1",
@@ -18040,42 +18861,42 @@ module.exports['Equivalent'] = {
             } ]
           }, {
             "type" : "As",
-            "localId" : "953",
+            "localId" : "1019",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "SingletonFrom",
-              "localId" : "950",
+              "localId" : "1016",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "ListTypeSpecifier",
-                "localId" : "951",
+                "localId" : "1017",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "952",
+                  "localId" : "1018",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               } ],
               "operand" : {
                 "type" : "List",
-                "localId" : "946",
+                "localId" : "1012",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "ListTypeSpecifier",
-                  "localId" : "948",
+                  "localId" : "1014",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "949",
+                    "localId" : "1015",
                     "name" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
                 },
                 "element" : [ {
                   "type" : "Null",
-                  "localId" : "947",
+                  "localId" : "1013",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 } ]
@@ -18083,15 +18904,15 @@ module.exports['Equivalent'] = {
             },
             "asTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "954",
+              "localId" : "1020",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "955",
+                "localId" : "1021",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "956",
+                  "localId" : "1022",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -18100,7 +18921,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "965",
+        "localId" : "1031",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NullListAndTuple",
         "context" : "Patient",
@@ -18109,28 +18930,28 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "965",
+            "r" : "1031",
             "s" : [ {
               "value" : [ "", "define ", "NullListAndTuple", ": " ]
             }, {
-              "r" : "966",
+              "r" : "1032",
               "s" : [ {
-                "r" : "967",
+                "r" : "1033",
                 "s" : [ {
-                  "r" : "968",
+                  "r" : "1034",
                   "value" : [ "{", "null", "}" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "971",
+                "r" : "1037",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "a", ": " ]
                   }, {
-                    "r" : "972",
+                    "r" : "1038",
                     "s" : [ {
                       "value" : [ "'1'" ]
                     } ]
@@ -18144,35 +18965,35 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "966",
+          "localId" : "1032",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "984",
+            "localId" : "1050",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "985",
+              "localId" : "1051",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "986",
+                "localId" : "1052",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "987",
+            "localId" : "1053",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "988",
+              "localId" : "1054",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "989",
+                "localId" : "1055",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -18180,42 +19001,42 @@ module.exports['Equivalent'] = {
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "980",
+            "localId" : "1046",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "SingletonFrom",
-              "localId" : "977",
+              "localId" : "1043",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "ListTypeSpecifier",
-                "localId" : "978",
+                "localId" : "1044",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "979",
+                  "localId" : "1045",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               } ],
               "operand" : {
                 "type" : "List",
-                "localId" : "967",
+                "localId" : "1033",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "ListTypeSpecifier",
-                  "localId" : "969",
+                  "localId" : "1035",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "970",
+                    "localId" : "1036",
                     "name" : "{urn:hl7-org:elm-types:r1}Any",
                     "annotation" : [ ]
                   }
                 },
                 "element" : [ {
                   "type" : "Null",
-                  "localId" : "968",
+                  "localId" : "1034",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 } ]
@@ -18223,15 +19044,15 @@ module.exports['Equivalent'] = {
             },
             "asTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "981",
+              "localId" : "1047",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "982",
+                "localId" : "1048",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "983",
+                  "localId" : "1049",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -18239,19 +19060,19 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "Tuple",
-            "localId" : "971",
+            "localId" : "1037",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "974",
+              "localId" : "1040",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "975",
+                "localId" : "1041",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "976",
+                  "localId" : "1042",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -18261,7 +19082,7 @@ module.exports['Equivalent'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "972",
+                "localId" : "1038",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "1",
@@ -18271,7 +19092,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "992",
+        "localId" : "1058",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameCodeAndCode",
         "context" : "Patient",
@@ -18280,20 +19101,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "992",
+            "r" : "1058",
             "s" : [ {
               "value" : [ "", "define ", "SameCodeAndCode", ": " ]
             }, {
-              "r" : "993",
+              "r" : "1059",
               "s" : [ {
-                "r" : "994",
+                "r" : "1060",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status code\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "995",
+                "r" : "1061",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status code clone\"" ]
                 } ]
@@ -18303,36 +19124,36 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "993",
+          "localId" : "1059",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "996",
+            "localId" : "1062",
             "name" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "997",
+            "localId" : "1063",
             "name" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "CodeRef",
-            "localId" : "994",
+            "localId" : "1060",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
             "name" : "Tobacco smoking status code",
             "annotation" : [ ]
           }, {
             "type" : "CodeRef",
-            "localId" : "995",
+            "localId" : "1061",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
             "name" : "Tobacco smoking status code clone",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1000",
+        "localId" : "1066",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameCodeAndConcept",
         "context" : "Patient",
@@ -18341,20 +19162,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1000",
+            "r" : "1066",
             "s" : [ {
               "value" : [ "", "define ", "SameCodeAndConcept", ": " ]
             }, {
-              "r" : "1001",
+              "r" : "1067",
               "s" : [ {
-                "r" : "1002",
+                "r" : "1068",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status code clone\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1003",
+                "r" : "1069",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status\"" ]
                 } ]
@@ -18364,47 +19185,47 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1001",
+          "localId" : "1067",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1007",
+            "localId" : "1073",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1008",
+            "localId" : "1074",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToConcept",
-            "localId" : "1005",
+            "localId" : "1071",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1006",
+              "localId" : "1072",
               "name" : "{urn:hl7-org:elm-types:r1}Code",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "CodeRef",
-              "localId" : "1002",
+              "localId" : "1068",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
               "name" : "Tobacco smoking status code clone",
               "annotation" : [ ]
             }
           }, {
             "type" : "ConceptRef",
-            "localId" : "1003",
+            "localId" : "1069",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
             "name" : "Tobacco smoking status",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1011",
+        "localId" : "1077",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameConceptAndCode",
         "context" : "Patient",
@@ -18413,20 +19234,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1011",
+            "r" : "1077",
             "s" : [ {
               "value" : [ "", "define ", "SameConceptAndCode", ": " ]
             }, {
-              "r" : "1012",
+              "r" : "1078",
               "s" : [ {
-                "r" : "1013",
+                "r" : "1079",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1014",
+                "r" : "1080",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status code clone\"" ]
                 } ]
@@ -18436,39 +19257,39 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1012",
+          "localId" : "1078",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1018",
+            "localId" : "1084",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1019",
+            "localId" : "1085",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ConceptRef",
-            "localId" : "1013",
+            "localId" : "1079",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
             "name" : "Tobacco smoking status",
             "annotation" : [ ]
           }, {
             "type" : "ToConcept",
-            "localId" : "1016",
+            "localId" : "1082",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1017",
+              "localId" : "1083",
               "name" : "{urn:hl7-org:elm-types:r1}Code",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "CodeRef",
-              "localId" : "1014",
+              "localId" : "1080",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
               "name" : "Tobacco smoking status code clone",
               "annotation" : [ ]
@@ -18476,7 +19297,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1022",
+        "localId" : "1088",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameConceptAndConcept",
         "context" : "Patient",
@@ -18485,20 +19306,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1022",
+            "r" : "1088",
             "s" : [ {
               "value" : [ "", "define ", "SameConceptAndConcept", ": " ]
             }, {
-              "r" : "1023",
+              "r" : "1089",
               "s" : [ {
-                "r" : "1024",
+                "r" : "1090",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1025",
+                "r" : "1091",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status clone\"" ]
                 } ]
@@ -18508,36 +19329,36 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1023",
+          "localId" : "1089",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1026",
+            "localId" : "1092",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1027",
+            "localId" : "1093",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ConceptRef",
-            "localId" : "1024",
+            "localId" : "1090",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
             "name" : "Tobacco smoking status",
             "annotation" : [ ]
           }, {
             "type" : "ConceptRef",
-            "localId" : "1025",
+            "localId" : "1091",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
             "name" : "Tobacco smoking status clone",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1030",
+        "localId" : "1096",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DiffCodeAndCode",
         "context" : "Patient",
@@ -18546,20 +19367,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1030",
+            "r" : "1096",
             "s" : [ {
               "value" : [ "", "define ", "DiffCodeAndCode", ": " ]
             }, {
-              "r" : "1031",
+              "r" : "1097",
               "s" : [ {
-                "r" : "1032",
+                "r" : "1098",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status code\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1033",
+                "r" : "1099",
                 "s" : [ {
                   "value" : [ "\"Total Score [AUDIT-C] code\"" ]
                 } ]
@@ -18569,36 +19390,36 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1031",
+          "localId" : "1097",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1034",
+            "localId" : "1100",
             "name" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1035",
+            "localId" : "1101",
             "name" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "CodeRef",
-            "localId" : "1032",
+            "localId" : "1098",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
             "name" : "Tobacco smoking status code",
             "annotation" : [ ]
           }, {
             "type" : "CodeRef",
-            "localId" : "1033",
+            "localId" : "1099",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
             "name" : "Total Score [AUDIT-C] code",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1038",
+        "localId" : "1104",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DiffCodeAndConcept",
         "context" : "Patient",
@@ -18607,20 +19428,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1038",
+            "r" : "1104",
             "s" : [ {
               "value" : [ "", "define ", "DiffCodeAndConcept", ": " ]
             }, {
-              "r" : "1039",
+              "r" : "1105",
               "s" : [ {
-                "r" : "1040",
+                "r" : "1106",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status code clone\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1041",
+                "r" : "1107",
                 "s" : [ {
                   "value" : [ "\"Total Score [AUDIT-C]\"" ]
                 } ]
@@ -18630,47 +19451,47 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1039",
+          "localId" : "1105",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1045",
+            "localId" : "1111",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1046",
+            "localId" : "1112",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToConcept",
-            "localId" : "1043",
+            "localId" : "1109",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1044",
+              "localId" : "1110",
               "name" : "{urn:hl7-org:elm-types:r1}Code",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "CodeRef",
-              "localId" : "1040",
+              "localId" : "1106",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
               "name" : "Tobacco smoking status code clone",
               "annotation" : [ ]
             }
           }, {
             "type" : "ConceptRef",
-            "localId" : "1041",
+            "localId" : "1107",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
             "name" : "Total Score [AUDIT-C]",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1049",
+        "localId" : "1115",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DiffConceptAndCode",
         "context" : "Patient",
@@ -18679,20 +19500,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1049",
+            "r" : "1115",
             "s" : [ {
               "value" : [ "", "define ", "DiffConceptAndCode", ": " ]
             }, {
-              "r" : "1050",
+              "r" : "1116",
               "s" : [ {
-                "r" : "1051",
+                "r" : "1117",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1052",
+                "r" : "1118",
                 "s" : [ {
                   "value" : [ "\"Total Score [AUDIT-C] code\"" ]
                 } ]
@@ -18702,39 +19523,39 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1050",
+          "localId" : "1116",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1056",
+            "localId" : "1122",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1057",
+            "localId" : "1123",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ConceptRef",
-            "localId" : "1051",
+            "localId" : "1117",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
             "name" : "Tobacco smoking status",
             "annotation" : [ ]
           }, {
             "type" : "ToConcept",
-            "localId" : "1054",
+            "localId" : "1120",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1055",
+              "localId" : "1121",
               "name" : "{urn:hl7-org:elm-types:r1}Code",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "CodeRef",
-              "localId" : "1052",
+              "localId" : "1118",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
               "name" : "Total Score [AUDIT-C] code",
               "annotation" : [ ]
@@ -18742,7 +19563,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1060",
+        "localId" : "1126",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DiffConceptAndConcept",
         "context" : "Patient",
@@ -18751,20 +19572,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1060",
+            "r" : "1126",
             "s" : [ {
               "value" : [ "", "define ", "DiffConceptAndConcept", ": " ]
             }, {
-              "r" : "1061",
+              "r" : "1127",
               "s" : [ {
-                "r" : "1062",
+                "r" : "1128",
                 "s" : [ {
                   "value" : [ "\"Tobacco smoking status\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1063",
+                "r" : "1129",
                 "s" : [ {
                   "value" : [ "\"Total Score [AUDIT-C]\"" ]
                 } ]
@@ -18774,36 +19595,36 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1061",
+          "localId" : "1127",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1064",
+            "localId" : "1130",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1065",
+            "localId" : "1131",
             "name" : "{urn:hl7-org:elm-types:r1}Concept",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ConceptRef",
-            "localId" : "1062",
+            "localId" : "1128",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
             "name" : "Tobacco smoking status",
             "annotation" : [ ]
           }, {
             "type" : "ConceptRef",
-            "localId" : "1063",
+            "localId" : "1129",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
             "name" : "Total Score [AUDIT-C]",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1068",
+        "localId" : "1134",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameVSIdAndVersion",
         "context" : "Patient",
@@ -18812,20 +19633,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1068",
+            "r" : "1134",
             "s" : [ {
               "value" : [ "", "define ", "SameVSIdAndVersion", ": " ]
             }, {
-              "r" : "1069",
+              "r" : "1135",
               "s" : [ {
-                "r" : "1070",
+                "r" : "1136",
                 "s" : [ {
                   "value" : [ "\"Unknown\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1071",
+                "r" : "1137",
                 "s" : [ {
                   "value" : [ "\"UnknownSame\"" ]
                 } ]
@@ -18835,30 +19656,30 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1069",
+          "localId" : "1135",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1072",
+            "localId" : "1138",
             "name" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1073",
+            "localId" : "1139",
             "name" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ValueSetRef",
-            "localId" : "1070",
+            "localId" : "1136",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "name" : "Unknown",
             "preserve" : true,
             "annotation" : [ ]
           }, {
             "type" : "ValueSetRef",
-            "localId" : "1071",
+            "localId" : "1137",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "name" : "UnknownSame",
             "preserve" : true,
@@ -18866,7 +19687,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1076",
+        "localId" : "1142",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SameVSCodes",
         "context" : "Patient",
@@ -18875,20 +19696,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1076",
+            "r" : "1142",
             "s" : [ {
               "value" : [ "", "define ", "SameVSCodes", ": " ]
             }, {
-              "r" : "1077",
+              "r" : "1143",
               "s" : [ {
-                "r" : "1078",
+                "r" : "1144",
                 "s" : [ {
                   "value" : [ "\"Known\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1079",
+                "r" : "1145",
                 "s" : [ {
                   "value" : [ "\"KnownSameCodes\"" ]
                 } ]
@@ -18898,30 +19719,30 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1077",
+          "localId" : "1143",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1080",
+            "localId" : "1146",
             "name" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1081",
+            "localId" : "1147",
             "name" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ValueSetRef",
-            "localId" : "1078",
+            "localId" : "1144",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "name" : "Known",
             "preserve" : true,
             "annotation" : [ ]
           }, {
             "type" : "ValueSetRef",
-            "localId" : "1079",
+            "localId" : "1145",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "name" : "KnownSameCodes",
             "preserve" : true,
@@ -18929,7 +19750,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1084",
+        "localId" : "1150",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DiffVSCodes",
         "context" : "Patient",
@@ -18938,20 +19759,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1084",
+            "r" : "1150",
             "s" : [ {
               "value" : [ "", "define ", "DiffVSCodes", ": " ]
             }, {
-              "r" : "1085",
+              "r" : "1151",
               "s" : [ {
-                "r" : "1086",
+                "r" : "1152",
                 "s" : [ {
                   "value" : [ "\"Known\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1087",
+                "r" : "1153",
                 "s" : [ {
                   "value" : [ "\"KnownDifferentCodes\"" ]
                 } ]
@@ -18961,30 +19782,30 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1085",
+          "localId" : "1151",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1088",
+            "localId" : "1154",
             "name" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1089",
+            "localId" : "1155",
             "name" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ValueSetRef",
-            "localId" : "1086",
+            "localId" : "1152",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "name" : "Known",
             "preserve" : true,
             "annotation" : [ ]
           }, {
             "type" : "ValueSetRef",
-            "localId" : "1087",
+            "localId" : "1153",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "name" : "KnownDifferentCodes",
             "preserve" : true,
@@ -18992,7 +19813,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1092",
+        "localId" : "1158",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnresolvableDiffVS",
         "context" : "Patient",
@@ -19001,20 +19822,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1092",
+            "r" : "1158",
             "s" : [ {
               "value" : [ "", "define ", "UnresolvableDiffVS", ": " ]
             }, {
-              "r" : "1093",
+              "r" : "1159",
               "s" : [ {
-                "r" : "1094",
+                "r" : "1160",
                 "s" : [ {
                   "value" : [ "\"Known\"" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1095",
+                "r" : "1161",
                 "s" : [ {
                   "value" : [ "\"Unknown\"" ]
                 } ]
@@ -19024,30 +19845,30 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1093",
+          "localId" : "1159",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1096",
+            "localId" : "1162",
             "name" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1097",
+            "localId" : "1163",
             "name" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ValueSetRef",
-            "localId" : "1094",
+            "localId" : "1160",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "name" : "Known",
             "preserve" : true,
             "annotation" : [ ]
           }, {
             "type" : "ValueSetRef",
-            "localId" : "1095",
+            "localId" : "1161",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}ValueSet",
             "name" : "Unknown",
             "preserve" : true,
@@ -19055,7 +19876,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1100",
+        "localId" : "1166",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimes",
         "context" : "Patient",
@@ -19064,20 +19885,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1100",
+            "r" : "1166",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimes", ": " ]
             }, {
-              "r" : "1101",
+              "r" : "1167",
               "s" : [ {
-                "r" : "1120",
+                "r" : "1186",
                 "s" : [ {
-                  "r" : "1102",
+                  "r" : "1168",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "1109",
+                  "r" : "1175",
                   "s" : [ {
-                    "r" : "1109",
+                    "r" : "1175",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -19086,14 +19907,14 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1147",
+                "r" : "1213",
                 "s" : [ {
-                  "r" : "1129",
+                  "r" : "1195",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "1136",
+                  "r" : "1202",
                   "s" : [ {
-                    "r" : "1136",
+                    "r" : "1202",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -19105,69 +19926,69 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1101",
+          "localId" : "1167",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1156",
+            "localId" : "1222",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1157",
+            "localId" : "1223",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1120",
+            "localId" : "1186",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1121",
+              "localId" : "1187",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1122",
+              "localId" : "1188",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1123",
+              "localId" : "1189",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1124",
+              "localId" : "1190",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1125",
+              "localId" : "1191",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1126",
+              "localId" : "1192",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1127",
+              "localId" : "1193",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1128",
+              "localId" : "1194",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1102",
+              "localId" : "1168",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -19175,7 +19996,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1103",
+              "localId" : "1169",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -19183,7 +20004,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1104",
+              "localId" : "1170",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -19191,7 +20012,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1105",
+              "localId" : "1171",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -19199,7 +20020,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1106",
+              "localId" : "1172",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -19207,7 +20028,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1107",
+              "localId" : "1173",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -19215,7 +20036,7 @@ module.exports['Equivalent'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1108",
+              "localId" : "1174",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -19223,7 +20044,7 @@ module.exports['Equivalent'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "1109",
+              "localId" : "1175",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -19231,53 +20052,53 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1147",
+            "localId" : "1213",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1148",
+              "localId" : "1214",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1149",
+              "localId" : "1215",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1150",
+              "localId" : "1216",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1151",
+              "localId" : "1217",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1152",
+              "localId" : "1218",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1153",
+              "localId" : "1219",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1154",
+              "localId" : "1220",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1155",
+              "localId" : "1221",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1129",
+              "localId" : "1195",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -19285,7 +20106,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1130",
+              "localId" : "1196",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -19293,7 +20114,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1131",
+              "localId" : "1197",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -19301,7 +20122,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1132",
+              "localId" : "1198",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -19309,7 +20130,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1133",
+              "localId" : "1199",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -19317,7 +20138,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1134",
+              "localId" : "1200",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -19325,7 +20146,7 @@ module.exports['Equivalent'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1135",
+              "localId" : "1201",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -19333,7 +20154,7 @@ module.exports['Equivalent'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "1136",
+              "localId" : "1202",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -19342,7 +20163,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1160",
+        "localId" : "1226",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimes",
         "context" : "Patient",
@@ -19351,20 +20172,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1160",
+            "r" : "1226",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimes", ": " ]
             }, {
-              "r" : "1161",
+              "r" : "1227",
               "s" : [ {
-                "r" : "1180",
+                "r" : "1246",
                 "s" : [ {
-                  "r" : "1162",
+                  "r" : "1228",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "1169",
+                  "r" : "1235",
                   "s" : [ {
-                    "r" : "1169",
+                    "r" : "1235",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -19373,14 +20194,14 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1207",
+                "r" : "1273",
                 "s" : [ {
-                  "r" : "1189",
+                  "r" : "1255",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "201", ", " ]
                 }, {
-                  "r" : "1196",
+                  "r" : "1262",
                   "s" : [ {
-                    "r" : "1196",
+                    "r" : "1262",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -19392,69 +20213,69 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1161",
+          "localId" : "1227",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1216",
+            "localId" : "1282",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1217",
+            "localId" : "1283",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1180",
+            "localId" : "1246",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1181",
+              "localId" : "1247",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1182",
+              "localId" : "1248",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1183",
+              "localId" : "1249",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1184",
+              "localId" : "1250",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1185",
+              "localId" : "1251",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1186",
+              "localId" : "1252",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1187",
+              "localId" : "1253",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1188",
+              "localId" : "1254",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1162",
+              "localId" : "1228",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -19462,7 +20283,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1163",
+              "localId" : "1229",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -19470,7 +20291,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1164",
+              "localId" : "1230",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -19478,7 +20299,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1165",
+              "localId" : "1231",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -19486,7 +20307,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1166",
+              "localId" : "1232",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -19494,7 +20315,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1167",
+              "localId" : "1233",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -19502,7 +20323,7 @@ module.exports['Equivalent'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1168",
+              "localId" : "1234",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -19510,7 +20331,7 @@ module.exports['Equivalent'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "1169",
+              "localId" : "1235",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -19518,53 +20339,53 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1207",
+            "localId" : "1273",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1208",
+              "localId" : "1274",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1209",
+              "localId" : "1275",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1210",
+              "localId" : "1276",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1211",
+              "localId" : "1277",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1212",
+              "localId" : "1278",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1213",
+              "localId" : "1279",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1214",
+              "localId" : "1280",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1215",
+              "localId" : "1281",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1189",
+              "localId" : "1255",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -19572,7 +20393,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1190",
+              "localId" : "1256",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -19580,7 +20401,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1191",
+              "localId" : "1257",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -19588,7 +20409,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1192",
+              "localId" : "1258",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -19596,7 +20417,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1193",
+              "localId" : "1259",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -19604,7 +20425,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1194",
+              "localId" : "1260",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -19612,7 +20433,7 @@ module.exports['Equivalent'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1195",
+              "localId" : "1261",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "201",
@@ -19620,7 +20441,7 @@ module.exports['Equivalent'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "1196",
+              "localId" : "1262",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -19629,7 +20450,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1220",
+        "localId" : "1286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesTZ",
         "context" : "Patient",
@@ -19638,20 +20459,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1220",
+            "r" : "1286",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesTZ", ": " ]
             }, {
-              "r" : "1221",
+              "r" : "1287",
               "s" : [ {
-                "r" : "1240",
+                "r" : "1306",
                 "s" : [ {
-                  "r" : "1222",
+                  "r" : "1288",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "23", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "1229",
+                  "r" : "1295",
                   "s" : [ {
-                    "r" : "1229",
+                    "r" : "1295",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -19660,14 +20481,14 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1267",
+                "r" : "1333",
                 "s" : [ {
-                  "r" : "1249",
+                  "r" : "1315",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "16", ", ", "2", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "1256",
+                  "r" : "1322",
                   "s" : [ {
-                    "r" : "1256",
+                    "r" : "1322",
                     "value" : [ "+", "4.0" ]
                   } ]
                 }, {
@@ -19679,69 +20500,69 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1221",
+          "localId" : "1287",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1276",
+            "localId" : "1342",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1277",
+            "localId" : "1343",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1240",
+            "localId" : "1306",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1241",
+              "localId" : "1307",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1242",
+              "localId" : "1308",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1243",
+              "localId" : "1309",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1244",
+              "localId" : "1310",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1245",
+              "localId" : "1311",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1246",
+              "localId" : "1312",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1247",
+              "localId" : "1313",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1248",
+              "localId" : "1314",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1222",
+              "localId" : "1288",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -19749,7 +20570,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1223",
+              "localId" : "1289",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -19757,7 +20578,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1224",
+              "localId" : "1290",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -19765,7 +20586,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1225",
+              "localId" : "1291",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -19773,7 +20594,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1226",
+              "localId" : "1292",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -19781,7 +20602,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1227",
+              "localId" : "1293",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -19789,7 +20610,7 @@ module.exports['Equivalent'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1228",
+              "localId" : "1294",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -19797,7 +20618,7 @@ module.exports['Equivalent'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "1229",
+              "localId" : "1295",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -19805,53 +20626,53 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1267",
+            "localId" : "1333",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1268",
+              "localId" : "1334",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1269",
+              "localId" : "1335",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1270",
+              "localId" : "1336",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1271",
+              "localId" : "1337",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1272",
+              "localId" : "1338",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1273",
+              "localId" : "1339",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1274",
+              "localId" : "1340",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1275",
+              "localId" : "1341",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1249",
+              "localId" : "1315",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -19859,7 +20680,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1250",
+              "localId" : "1316",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -19867,7 +20688,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1251",
+              "localId" : "1317",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "16",
@@ -19875,7 +20696,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1252",
+              "localId" : "1318",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -19883,7 +20704,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1253",
+              "localId" : "1319",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -19891,7 +20712,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1254",
+              "localId" : "1320",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -19899,7 +20720,7 @@ module.exports['Equivalent'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1255",
+              "localId" : "1321",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -19907,7 +20728,7 @@ module.exports['Equivalent'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "1256",
+              "localId" : "1322",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "4.0",
@@ -19916,7 +20737,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1280",
+        "localId" : "1346",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimesTZ",
         "context" : "Patient",
@@ -19925,20 +20746,20 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1280",
+            "r" : "1346",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimesTZ", ": " ]
             }, {
-              "r" : "1281",
+              "r" : "1347",
               "s" : [ {
-                "r" : "1300",
+                "r" : "1366",
                 "s" : [ {
-                  "r" : "1282",
+                  "r" : "1348",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "1289",
+                  "r" : "1355",
                   "s" : [ {
-                    "r" : "1289",
+                    "r" : "1355",
                     "value" : [ "+", "1.0" ]
                   } ]
                 }, {
@@ -19947,14 +20768,14 @@ module.exports['Equivalent'] = {
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1327",
+                "r" : "1393",
                 "s" : [ {
-                  "r" : "1309",
+                  "r" : "1375",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ", " ]
                 }, {
-                  "r" : "1316",
+                  "r" : "1382",
                   "s" : [ {
-                    "r" : "1316",
+                    "r" : "1382",
                     "value" : [ "+", "2.0" ]
                   } ]
                 }, {
@@ -19966,69 +20787,69 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1281",
+          "localId" : "1347",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1336",
+            "localId" : "1402",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1337",
+            "localId" : "1403",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1300",
+            "localId" : "1366",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1301",
+              "localId" : "1367",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1302",
+              "localId" : "1368",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1303",
+              "localId" : "1369",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1304",
+              "localId" : "1370",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1305",
+              "localId" : "1371",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1306",
+              "localId" : "1372",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1307",
+              "localId" : "1373",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1308",
+              "localId" : "1374",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1282",
+              "localId" : "1348",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -20036,7 +20857,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1283",
+              "localId" : "1349",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20044,7 +20865,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1284",
+              "localId" : "1350",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -20052,7 +20873,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1285",
+              "localId" : "1351",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -20060,7 +20881,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1286",
+              "localId" : "1352",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -20068,7 +20889,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1287",
+              "localId" : "1353",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -20076,7 +20897,7 @@ module.exports['Equivalent'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1288",
+              "localId" : "1354",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -20084,7 +20905,7 @@ module.exports['Equivalent'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "1289",
+              "localId" : "1355",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -20092,53 +20913,53 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1327",
+            "localId" : "1393",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1328",
+              "localId" : "1394",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1329",
+              "localId" : "1395",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1330",
+              "localId" : "1396",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1331",
+              "localId" : "1397",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1332",
+              "localId" : "1398",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1333",
+              "localId" : "1399",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1334",
+              "localId" : "1400",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1335",
+              "localId" : "1401",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1309",
+              "localId" : "1375",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -20146,7 +20967,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1310",
+              "localId" : "1376",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20154,7 +20975,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1311",
+              "localId" : "1377",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -20162,7 +20983,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1312",
+              "localId" : "1378",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -20170,7 +20991,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1313",
+              "localId" : "1379",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -20178,7 +20999,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1314",
+              "localId" : "1380",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -20186,7 +21007,7 @@ module.exports['Equivalent'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1315",
+              "localId" : "1381",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -20194,7 +21015,7 @@ module.exports['Equivalent'] = {
             },
             "timezoneOffset" : {
               "type" : "Literal",
-              "localId" : "1316",
+              "localId" : "1382",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "2.0",
@@ -20203,7 +21024,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1340",
+        "localId" : "1406",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesNullMs",
         "context" : "Patient",
@@ -20212,23 +21033,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1340",
+            "r" : "1406",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesNullMs", ": " ]
             }, {
-              "r" : "1341",
+              "r" : "1407",
               "s" : [ {
-                "r" : "1358",
+                "r" : "1424",
                 "s" : [ {
-                  "r" : "1342",
+                  "r" : "1408",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1380",
+                "r" : "1446",
                 "s" : [ {
-                  "r" : "1366",
+                  "r" : "1432",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ")" ]
                 } ]
               } ]
@@ -20237,64 +21058,64 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1341",
+          "localId" : "1407",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1387",
+            "localId" : "1453",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1388",
+            "localId" : "1454",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1358",
+            "localId" : "1424",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1359",
+              "localId" : "1425",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1360",
+              "localId" : "1426",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1361",
+              "localId" : "1427",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1362",
+              "localId" : "1428",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1363",
+              "localId" : "1429",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1364",
+              "localId" : "1430",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1365",
+              "localId" : "1431",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1342",
+              "localId" : "1408",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -20302,7 +21123,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1343",
+              "localId" : "1409",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20310,7 +21131,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1344",
+              "localId" : "1410",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -20318,7 +21139,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1345",
+              "localId" : "1411",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -20326,7 +21147,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1346",
+              "localId" : "1412",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -20334,7 +21155,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1347",
+              "localId" : "1413",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -20342,7 +21163,7 @@ module.exports['Equivalent'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1348",
+              "localId" : "1414",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -20350,43 +21171,43 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1380",
+            "localId" : "1446",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1381",
+              "localId" : "1447",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1382",
+              "localId" : "1448",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1383",
+              "localId" : "1449",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1384",
+              "localId" : "1450",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1385",
+              "localId" : "1451",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1386",
+              "localId" : "1452",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1366",
+              "localId" : "1432",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -20394,7 +21215,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1367",
+              "localId" : "1433",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20402,7 +21223,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1368",
+              "localId" : "1434",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -20410,7 +21231,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1369",
+              "localId" : "1435",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -20418,7 +21239,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1370",
+              "localId" : "1436",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -20426,7 +21247,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1371",
+              "localId" : "1437",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -20435,7 +21256,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1391",
+        "localId" : "1457",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesNullOtherMs",
         "context" : "Patient",
@@ -20444,23 +21265,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1391",
+            "r" : "1457",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesNullOtherMs", ": " ]
             }, {
-              "r" : "1392",
+              "r" : "1458",
               "s" : [ {
-                "r" : "1407",
+                "r" : "1473",
                 "s" : [ {
-                  "r" : "1393",
+                  "r" : "1459",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1430",
+                "r" : "1496",
                 "s" : [ {
-                  "r" : "1414",
+                  "r" : "1480",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "0", ")" ]
                 } ]
               } ]
@@ -20469,59 +21290,59 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1392",
+          "localId" : "1458",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1438",
+            "localId" : "1504",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1439",
+            "localId" : "1505",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1407",
+            "localId" : "1473",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1408",
+              "localId" : "1474",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1409",
+              "localId" : "1475",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1410",
+              "localId" : "1476",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1411",
+              "localId" : "1477",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1412",
+              "localId" : "1478",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1413",
+              "localId" : "1479",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1393",
+              "localId" : "1459",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -20529,7 +21350,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1394",
+              "localId" : "1460",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20537,7 +21358,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1395",
+              "localId" : "1461",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -20545,7 +21366,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1396",
+              "localId" : "1462",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -20553,7 +21374,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1397",
+              "localId" : "1463",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -20561,7 +21382,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1398",
+              "localId" : "1464",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -20569,48 +21390,48 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1430",
+            "localId" : "1496",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1431",
+              "localId" : "1497",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1432",
+              "localId" : "1498",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1433",
+              "localId" : "1499",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1434",
+              "localId" : "1500",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1435",
+              "localId" : "1501",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1436",
+              "localId" : "1502",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1437",
+              "localId" : "1503",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1414",
+              "localId" : "1480",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -20618,7 +21439,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1415",
+              "localId" : "1481",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20626,7 +21447,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1416",
+              "localId" : "1482",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -20634,7 +21455,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1417",
+              "localId" : "1483",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -20642,7 +21463,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1418",
+              "localId" : "1484",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "30",
@@ -20650,7 +21471,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1419",
+              "localId" : "1485",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "25",
@@ -20658,7 +21479,7 @@ module.exports['Equivalent'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1420",
+              "localId" : "1486",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -20667,7 +21488,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1442",
+        "localId" : "1508",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "EqDateTimesOnlyDate",
         "context" : "Patient",
@@ -20676,23 +21497,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1442",
+            "r" : "1508",
             "s" : [ {
               "value" : [ "", "define ", "EqDateTimesOnlyDate", ": " ]
             }, {
-              "r" : "1443",
+              "r" : "1509",
               "s" : [ {
-                "r" : "1452",
+                "r" : "1518",
                 "s" : [ {
-                  "r" : "1444",
+                  "r" : "1510",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1464",
+                "r" : "1530",
                 "s" : [ {
-                  "r" : "1456",
+                  "r" : "1522",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               } ]
@@ -20701,44 +21522,44 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1443",
+          "localId" : "1509",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1468",
+            "localId" : "1534",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1469",
+            "localId" : "1535",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1452",
+            "localId" : "1518",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1453",
+              "localId" : "1519",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1454",
+              "localId" : "1520",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1455",
+              "localId" : "1521",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1444",
+              "localId" : "1510",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -20746,7 +21567,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1445",
+              "localId" : "1511",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20754,7 +21575,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1446",
+              "localId" : "1512",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -20762,28 +21583,28 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1464",
+            "localId" : "1530",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1465",
+              "localId" : "1531",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1466",
+              "localId" : "1532",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1467",
+              "localId" : "1533",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1456",
+              "localId" : "1522",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -20791,7 +21612,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1457",
+              "localId" : "1523",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20799,7 +21620,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1458",
+              "localId" : "1524",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -20808,7 +21629,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1472",
+        "localId" : "1538",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimesOnlyDate",
         "context" : "Patient",
@@ -20817,23 +21638,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1472",
+            "r" : "1538",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimesOnlyDate", ": " ]
             }, {
-              "r" : "1473",
+              "r" : "1539",
               "s" : [ {
-                "r" : "1482",
+                "r" : "1548",
                 "s" : [ {
-                  "r" : "1474",
+                  "r" : "1540",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "14", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1494",
+                "r" : "1560",
                 "s" : [ {
-                  "r" : "1486",
+                  "r" : "1552",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               } ]
@@ -20842,44 +21663,44 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1473",
+          "localId" : "1539",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1498",
+            "localId" : "1564",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1499",
+            "localId" : "1565",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1482",
+            "localId" : "1548",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1483",
+              "localId" : "1549",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1484",
+              "localId" : "1550",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1485",
+              "localId" : "1551",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1474",
+              "localId" : "1540",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -20887,7 +21708,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1475",
+              "localId" : "1541",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20895,7 +21716,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1476",
+              "localId" : "1542",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "14",
@@ -20903,28 +21724,28 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1494",
+            "localId" : "1560",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1495",
+              "localId" : "1561",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1496",
+              "localId" : "1562",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1497",
+              "localId" : "1563",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1486",
+              "localId" : "1552",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -20932,7 +21753,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1487",
+              "localId" : "1553",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20940,7 +21761,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1488",
+              "localId" : "1554",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -20949,7 +21770,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1502",
+        "localId" : "1568",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PossiblyEqDateTimesOnlyDateOnOne",
         "context" : "Patient",
@@ -20958,23 +21779,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1502",
+            "r" : "1568",
             "s" : [ {
               "value" : [ "", "define ", "PossiblyEqDateTimesOnlyDateOnOne", ": " ]
             }, {
-              "r" : "1503",
+              "r" : "1569",
               "s" : [ {
-                "r" : "1512",
+                "r" : "1578",
                 "s" : [ {
-                  "r" : "1504",
+                  "r" : "1570",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1530",
+                "r" : "1596",
                 "s" : [ {
-                  "r" : "1516",
+                  "r" : "1582",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ", ", "13", ", ", "43", ", ", "32", ")" ]
                 } ]
               } ]
@@ -20983,44 +21804,44 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1503",
+          "localId" : "1569",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1537",
+            "localId" : "1603",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1538",
+            "localId" : "1604",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1512",
+            "localId" : "1578",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1513",
+              "localId" : "1579",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1514",
+              "localId" : "1580",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1515",
+              "localId" : "1581",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1504",
+              "localId" : "1570",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -21028,7 +21849,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1505",
+              "localId" : "1571",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -21036,7 +21857,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1506",
+              "localId" : "1572",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -21044,43 +21865,43 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1530",
+            "localId" : "1596",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1531",
+              "localId" : "1597",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1532",
+              "localId" : "1598",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1533",
+              "localId" : "1599",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1534",
+              "localId" : "1600",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1535",
+              "localId" : "1601",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1536",
+              "localId" : "1602",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1516",
+              "localId" : "1582",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -21088,7 +21909,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1517",
+              "localId" : "1583",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -21096,7 +21917,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1518",
+              "localId" : "1584",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -21104,7 +21925,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1519",
+              "localId" : "1585",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -21112,7 +21933,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1520",
+              "localId" : "1586",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "43",
@@ -21120,7 +21941,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1521",
+              "localId" : "1587",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "32",
@@ -21129,7 +21950,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1541",
+        "localId" : "1607",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UneqDateTimesOnlyDateOnOne",
         "context" : "Patient",
@@ -21138,23 +21959,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1541",
+            "r" : "1607",
             "s" : [ {
               "value" : [ "", "define ", "UneqDateTimesOnlyDateOnOne", ": " ]
             }, {
-              "r" : "1542",
+              "r" : "1608",
               "s" : [ {
-                "r" : "1557",
+                "r" : "1623",
                 "s" : [ {
-                  "r" : "1543",
+                  "r" : "1609",
                   "value" : [ "DateTime", "(", "2000", ", ", "4", ", ", "13", ", ", "12", ", ", "43", ", ", "32", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1572",
+                "r" : "1638",
                 "s" : [ {
-                  "r" : "1564",
+                  "r" : "1630",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -21163,59 +21984,59 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1542",
+          "localId" : "1608",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1576",
+            "localId" : "1642",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1577",
+            "localId" : "1643",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1557",
+            "localId" : "1623",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1558",
+              "localId" : "1624",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1559",
+              "localId" : "1625",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1560",
+              "localId" : "1626",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1561",
+              "localId" : "1627",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1562",
+              "localId" : "1628",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1563",
+              "localId" : "1629",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1543",
+              "localId" : "1609",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -21223,7 +22044,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1544",
+              "localId" : "1610",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -21231,7 +22052,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1545",
+              "localId" : "1611",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -21239,7 +22060,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1546",
+              "localId" : "1612",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -21247,7 +22068,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1547",
+              "localId" : "1613",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "43",
@@ -21255,7 +22076,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1548",
+              "localId" : "1614",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "32",
@@ -21263,28 +22084,28 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1572",
+            "localId" : "1638",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1573",
+              "localId" : "1639",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1574",
+              "localId" : "1640",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1575",
+              "localId" : "1641",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1564",
+              "localId" : "1630",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -21292,7 +22113,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1565",
+              "localId" : "1631",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -21300,7 +22121,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1566",
+              "localId" : "1632",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -21309,7 +22130,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1580",
+        "localId" : "1646",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PossiblyEqualDateTimes",
         "context" : "Patient",
@@ -21318,23 +22139,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1580",
+            "r" : "1646",
             "s" : [ {
               "value" : [ "", "define ", "PossiblyEqualDateTimes", ": " ]
             }, {
-              "r" : "1581",
+              "r" : "1647",
               "s" : [ {
-                "r" : "1590",
+                "r" : "1656",
                 "s" : [ {
-                  "r" : "1582",
+                  "r" : "1648",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1598",
+                "r" : "1664",
                 "s" : [ {
-                  "r" : "1594",
+                  "r" : "1660",
                   "value" : [ "DateTime", "(", "2000", ")" ]
                 } ]
               } ]
@@ -21343,44 +22164,44 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1581",
+          "localId" : "1647",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1600",
+            "localId" : "1666",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1601",
+            "localId" : "1667",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1590",
+            "localId" : "1656",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1591",
+              "localId" : "1657",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1592",
+              "localId" : "1658",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1593",
+              "localId" : "1659",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1582",
+              "localId" : "1648",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -21388,7 +22209,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1583",
+              "localId" : "1649",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -21396,7 +22217,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1584",
+              "localId" : "1650",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -21404,18 +22225,18 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1598",
+            "localId" : "1664",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1599",
+              "localId" : "1665",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1594",
+              "localId" : "1660",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -21424,7 +22245,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1604",
+        "localId" : "1670",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpossiblyEqualDateTimes",
         "context" : "Patient",
@@ -21433,23 +22254,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1604",
+            "r" : "1670",
             "s" : [ {
               "value" : [ "", "define ", "ImpossiblyEqualDateTimes", ": " ]
             }, {
-              "r" : "1605",
+              "r" : "1671",
               "s" : [ {
-                "r" : "1614",
+                "r" : "1680",
                 "s" : [ {
-                  "r" : "1606",
+                  "r" : "1672",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1624",
+                "r" : "1690",
                 "s" : [ {
-                  "r" : "1618",
+                  "r" : "1684",
                   "value" : [ "DateTime", "(", "2000", ", ", "4", ")" ]
                 } ]
               } ]
@@ -21458,44 +22279,44 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1605",
+          "localId" : "1671",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1627",
+            "localId" : "1693",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1628",
+            "localId" : "1694",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1614",
+            "localId" : "1680",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1615",
+              "localId" : "1681",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1616",
+              "localId" : "1682",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1617",
+              "localId" : "1683",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1606",
+              "localId" : "1672",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -21503,7 +22324,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1607",
+              "localId" : "1673",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -21511,7 +22332,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1608",
+              "localId" : "1674",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -21519,23 +22340,23 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1624",
+            "localId" : "1690",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1625",
+              "localId" : "1691",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1626",
+              "localId" : "1692",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1618",
+              "localId" : "1684",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -21543,7 +22364,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1619",
+              "localId" : "1685",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -21552,7 +22373,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1631",
+        "localId" : "1697",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateAndDateTimeTrue",
         "context" : "Patient",
@@ -21561,23 +22382,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1631",
+            "r" : "1697",
             "s" : [ {
               "value" : [ "", "define ", "DateAndDateTimeTrue", ": " ]
             }, {
-              "r" : "1632",
+              "r" : "1698",
               "s" : [ {
-                "r" : "1641",
+                "r" : "1707",
                 "s" : [ {
-                  "r" : "1633",
+                  "r" : "1699",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1653",
+                "r" : "1719",
                 "s" : [ {
-                  "r" : "1645",
+                  "r" : "1711",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -21586,54 +22407,54 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1632",
+          "localId" : "1698",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1660",
+            "localId" : "1726",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1661",
+            "localId" : "1727",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToDateTime",
-            "localId" : "1658",
+            "localId" : "1724",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1659",
+              "localId" : "1725",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1641",
+              "localId" : "1707",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1642",
+                "localId" : "1708",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1643",
+                "localId" : "1709",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1644",
+                "localId" : "1710",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1633",
+                "localId" : "1699",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -21641,7 +22462,7 @@ module.exports['Equivalent'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1634",
+                "localId" : "1700",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -21649,7 +22470,7 @@ module.exports['Equivalent'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1635",
+                "localId" : "1701",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -21658,28 +22479,28 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1653",
+            "localId" : "1719",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1654",
+              "localId" : "1720",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1655",
+              "localId" : "1721",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1656",
+              "localId" : "1722",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1645",
+              "localId" : "1711",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -21687,7 +22508,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1646",
+              "localId" : "1712",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -21695,7 +22516,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1647",
+              "localId" : "1713",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -21704,7 +22525,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1664",
+        "localId" : "1730",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateAndDateTimeNotEqual",
         "context" : "Patient",
@@ -21713,23 +22534,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1664",
+            "r" : "1730",
             "s" : [ {
               "value" : [ "", "define ", "DateAndDateTimeNotEqual", ": " ]
             }, {
-              "r" : "1665",
+              "r" : "1731",
               "s" : [ {
-                "r" : "1674",
+                "r" : "1740",
                 "s" : [ {
-                  "r" : "1666",
+                  "r" : "1732",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1686",
+                "r" : "1752",
                 "s" : [ {
-                  "r" : "1678",
+                  "r" : "1744",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "12", ")" ]
                 } ]
               } ]
@@ -21738,54 +22559,54 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1665",
+          "localId" : "1731",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1693",
+            "localId" : "1759",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1694",
+            "localId" : "1760",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToDateTime",
-            "localId" : "1691",
+            "localId" : "1757",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1692",
+              "localId" : "1758",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1674",
+              "localId" : "1740",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1675",
+                "localId" : "1741",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1676",
+                "localId" : "1742",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1677",
+                "localId" : "1743",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1666",
+                "localId" : "1732",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -21793,7 +22614,7 @@ module.exports['Equivalent'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1667",
+                "localId" : "1733",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -21801,7 +22622,7 @@ module.exports['Equivalent'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1668",
+                "localId" : "1734",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -21810,28 +22631,28 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1686",
+            "localId" : "1752",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1687",
+              "localId" : "1753",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1688",
+              "localId" : "1754",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1689",
+              "localId" : "1755",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1678",
+              "localId" : "1744",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -21839,7 +22660,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1679",
+              "localId" : "1745",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -21847,7 +22668,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1680",
+              "localId" : "1746",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -21856,7 +22677,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1697",
+        "localId" : "1763",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateAndDateTimeUncertainFalse",
         "context" : "Patient",
@@ -21865,23 +22686,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1697",
+            "r" : "1763",
             "s" : [ {
               "value" : [ "", "define ", "DateAndDateTimeUncertainFalse", ": " ]
             }, {
-              "r" : "1698",
+              "r" : "1764",
               "s" : [ {
-                "r" : "1707",
+                "r" : "1773",
                 "s" : [ {
-                  "r" : "1699",
+                  "r" : "1765",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1725",
+                "r" : "1791",
                 "s" : [ {
-                  "r" : "1711",
+                  "r" : "1777",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ", ", "2", ", ", "4", ", ", "23", ")" ]
                 } ]
               } ]
@@ -21890,54 +22711,54 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1698",
+          "localId" : "1764",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1735",
+            "localId" : "1801",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1736",
+            "localId" : "1802",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ToDateTime",
-            "localId" : "1733",
+            "localId" : "1799",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1734",
+              "localId" : "1800",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1707",
+              "localId" : "1773",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1708",
+                "localId" : "1774",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1709",
+                "localId" : "1775",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1710",
+                "localId" : "1776",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1699",
+                "localId" : "1765",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -21945,7 +22766,7 @@ module.exports['Equivalent'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1700",
+                "localId" : "1766",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -21953,7 +22774,7 @@ module.exports['Equivalent'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1701",
+                "localId" : "1767",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -21962,43 +22783,43 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1725",
+            "localId" : "1791",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1726",
+              "localId" : "1792",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1727",
+              "localId" : "1793",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1728",
+              "localId" : "1794",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1729",
+              "localId" : "1795",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1730",
+              "localId" : "1796",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1731",
+              "localId" : "1797",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1711",
+              "localId" : "1777",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -22006,7 +22827,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1712",
+              "localId" : "1778",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -22014,7 +22835,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1713",
+              "localId" : "1779",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -22022,7 +22843,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1714",
+              "localId" : "1780",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -22030,7 +22851,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1715",
+              "localId" : "1781",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -22038,7 +22859,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1716",
+              "localId" : "1782",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -22047,7 +22868,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1739",
+        "localId" : "1805",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateTimeAndDateTrue",
         "context" : "Patient",
@@ -22056,23 +22877,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1739",
+            "r" : "1805",
             "s" : [ {
               "value" : [ "", "define ", "DateTimeAndDateTrue", ": " ]
             }, {
-              "r" : "1740",
+              "r" : "1806",
               "s" : [ {
-                "r" : "1749",
+                "r" : "1815",
                 "s" : [ {
-                  "r" : "1741",
+                  "r" : "1807",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1761",
+                "r" : "1827",
                 "s" : [ {
-                  "r" : "1753",
+                  "r" : "1819",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -22081,44 +22902,44 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1740",
+          "localId" : "1806",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1768",
+            "localId" : "1834",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1769",
+            "localId" : "1835",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1749",
+            "localId" : "1815",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1750",
+              "localId" : "1816",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1751",
+              "localId" : "1817",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1752",
+              "localId" : "1818",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1741",
+              "localId" : "1807",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -22126,7 +22947,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1742",
+              "localId" : "1808",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -22134,7 +22955,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1743",
+              "localId" : "1809",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -22142,38 +22963,38 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "ToDateTime",
-            "localId" : "1766",
+            "localId" : "1832",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1767",
+              "localId" : "1833",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1761",
+              "localId" : "1827",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1762",
+                "localId" : "1828",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1763",
+                "localId" : "1829",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1764",
+                "localId" : "1830",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1753",
+                "localId" : "1819",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -22181,7 +23002,7 @@ module.exports['Equivalent'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1754",
+                "localId" : "1820",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -22189,7 +23010,7 @@ module.exports['Equivalent'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1755",
+                "localId" : "1821",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -22199,7 +23020,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1772",
+        "localId" : "1838",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateTimeAndDateNotEqual",
         "context" : "Patient",
@@ -22208,23 +23029,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1772",
+            "r" : "1838",
             "s" : [ {
               "value" : [ "", "define ", "DateTimeAndDateNotEqual", ": " ]
             }, {
-              "r" : "1773",
+              "r" : "1839",
               "s" : [ {
-                "r" : "1782",
+                "r" : "1848",
                 "s" : [ {
-                  "r" : "1774",
+                  "r" : "1840",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "12", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1794",
+                "r" : "1860",
                 "s" : [ {
-                  "r" : "1786",
+                  "r" : "1852",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -22233,44 +23054,44 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1773",
+          "localId" : "1839",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1801",
+            "localId" : "1867",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1802",
+            "localId" : "1868",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1782",
+            "localId" : "1848",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1783",
+              "localId" : "1849",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1784",
+              "localId" : "1850",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1785",
+              "localId" : "1851",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1774",
+              "localId" : "1840",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -22278,7 +23099,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1775",
+              "localId" : "1841",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -22286,7 +23107,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1776",
+              "localId" : "1842",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -22294,38 +23115,38 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "ToDateTime",
-            "localId" : "1799",
+            "localId" : "1865",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1800",
+              "localId" : "1866",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1794",
+              "localId" : "1860",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1795",
+                "localId" : "1861",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1796",
+                "localId" : "1862",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1797",
+                "localId" : "1863",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1786",
+                "localId" : "1852",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -22333,7 +23154,7 @@ module.exports['Equivalent'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1787",
+                "localId" : "1853",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -22341,7 +23162,7 @@ module.exports['Equivalent'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1788",
+                "localId" : "1854",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -22351,7 +23172,7 @@ module.exports['Equivalent'] = {
           } ]
         }
       }, {
-        "localId" : "1805",
+        "localId" : "1871",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateTimeAndDateUncertainFalse",
         "context" : "Patient",
@@ -22360,23 +23181,23 @@ module.exports['Equivalent'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1805",
+            "r" : "1871",
             "s" : [ {
               "value" : [ "", "define ", "DateTimeAndDateUncertainFalse", ": " ]
             }, {
-              "r" : "1806",
+              "r" : "1872",
               "s" : [ {
-                "r" : "1821",
+                "r" : "1887",
                 "s" : [ {
-                  "r" : "1807",
+                  "r" : "1873",
                   "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "13", ", ", "2", ", ", "4", ", ", "23", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "~", " " ]
               }, {
-                "r" : "1836",
+                "r" : "1902",
                 "s" : [ {
-                  "r" : "1828",
+                  "r" : "1894",
                   "value" : [ "Date", "(", "2000", ", ", "3", ", ", "13", ")" ]
                 } ]
               } ]
@@ -22385,59 +23206,59 @@ module.exports['Equivalent'] = {
         } ],
         "expression" : {
           "type" : "Equivalent",
-          "localId" : "1806",
+          "localId" : "1872",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1843",
+            "localId" : "1909",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1844",
+            "localId" : "1910",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1821",
+            "localId" : "1887",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1822",
+              "localId" : "1888",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1823",
+              "localId" : "1889",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1824",
+              "localId" : "1890",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1825",
+              "localId" : "1891",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1826",
+              "localId" : "1892",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1827",
+              "localId" : "1893",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1807",
+              "localId" : "1873",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2000",
@@ -22445,7 +23266,7 @@ module.exports['Equivalent'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1808",
+              "localId" : "1874",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -22453,7 +23274,7 @@ module.exports['Equivalent'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1809",
+              "localId" : "1875",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
@@ -22461,7 +23282,7 @@ module.exports['Equivalent'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1810",
+              "localId" : "1876",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -22469,7 +23290,7 @@ module.exports['Equivalent'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1811",
+              "localId" : "1877",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -22477,7 +23298,7 @@ module.exports['Equivalent'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1812",
+              "localId" : "1878",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -22485,38 +23306,38 @@ module.exports['Equivalent'] = {
             }
           }, {
             "type" : "ToDateTime",
-            "localId" : "1841",
+            "localId" : "1907",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1842",
+              "localId" : "1908",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Date",
-              "localId" : "1836",
+              "localId" : "1902",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1837",
+                "localId" : "1903",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1838",
+                "localId" : "1904",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1839",
+                "localId" : "1905",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1828",
+                "localId" : "1894",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -22524,7 +23345,7 @@ module.exports['Equivalent'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1829",
+                "localId" : "1895",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -22532,7 +23353,7 @@ module.exports['Equivalent'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1830",
+                "localId" : "1896",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "13",
@@ -22553,6 +23374,9 @@ context Patient
 define AGtB_Int: 5 < 4
 define AEqB_Int: 5 < 5
 define ALtB_Int: 5 < 6
+define AGtB_Long: 5L < 4L
+define AEqB_Long: 5L < 5L
+define ALtB_Long: 5L < 6L
 define AGtB_Quantity: 5 'm' < 4 'm'
 define AEqB_Quantity: 5 'm' < 5 'm'
 define ALtB_Quantity: 5 'm' < 6 'm'
@@ -22576,7 +23400,7 @@ module.exports['Less'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "302",
+        "r" : "326",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -22649,169 +23473,331 @@ module.exports['Less'] = {
           }
         }
       }, {
-        "localId" : "214",
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AGtB_Int",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "AGtB_Int", ": " ]
+            }, {
+              "r" : "215",
+              "s" : [ {
+                "r" : "216",
+                "value" : [ "5", " ", "<", " ", "4" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Less",
+          "localId" : "215",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "218",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "219",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "217",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "4",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "222",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AEqB_Int",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "222",
+            "s" : [ {
+              "value" : [ "", "define ", "AEqB_Int", ": " ]
+            }, {
+              "r" : "223",
+              "s" : [ {
+                "r" : "224",
+                "value" : [ "5", " ", "<", " ", "5" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Less",
+          "localId" : "223",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "226",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "227",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "224",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "230",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ALtB_Int",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "230",
+            "s" : [ {
+              "value" : [ "", "define ", "ALtB_Int", ": " ]
+            }, {
+              "r" : "231",
+              "s" : [ {
+                "r" : "232",
+                "value" : [ "5", " ", "<", " ", "6" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Less",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "234",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "232",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "233",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "6",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "238",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AGtB_Int",
+        "name" : "AGtB_Long",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "238",
             "s" : [ {
-              "value" : [ "", "define ", "AGtB_Int", ": " ]
+              "value" : [ "", "define ", "AGtB_Long", ": " ]
             }, {
-              "r" : "215",
+              "r" : "239",
               "s" : [ {
-                "r" : "216",
-                "value" : [ "5", " ", "<", " ", "4" ]
+                "r" : "240",
+                "value" : [ "5L", " ", "<", " ", "4L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "215",
+          "localId" : "239",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "218",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "242",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "219",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "243",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "240",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "217",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "4",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "222",
+        "localId" : "246",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AEqB_Int",
+        "name" : "AEqB_Long",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "222",
+            "r" : "246",
             "s" : [ {
-              "value" : [ "", "define ", "AEqB_Int", ": " ]
+              "value" : [ "", "define ", "AEqB_Long", ": " ]
             }, {
-              "r" : "223",
+              "r" : "247",
               "s" : [ {
-                "r" : "224",
-                "value" : [ "5", " ", "<", " ", "5" ]
+                "r" : "248",
+                "value" : [ "5L", " ", "<", " ", "5L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "223",
+          "localId" : "247",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "226",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "250",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "227",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "224",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "248",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "225",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "249",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "230",
+        "localId" : "254",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ALtB_Int",
+        "name" : "ALtB_Long",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "230",
+            "r" : "254",
             "s" : [ {
-              "value" : [ "", "define ", "ALtB_Int", ": " ]
+              "value" : [ "", "define ", "ALtB_Long", ": " ]
             }, {
-              "r" : "231",
+              "r" : "255",
               "s" : [ {
-                "r" : "232",
-                "value" : [ "5", " ", "<", " ", "6" ]
+                "r" : "256",
+                "value" : [ "5L", " ", "<", " ", "6L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "231",
+          "localId" : "255",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "234",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "258",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "235",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "259",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "232",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "256",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "233",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "257",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "6",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "238",
+        "localId" : "262",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity",
         "context" : "Patient",
@@ -22820,20 +23806,20 @@ module.exports['Less'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "238",
+            "r" : "262",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity", ": " ]
             }, {
-              "r" : "239",
+              "r" : "263",
               "s" : [ {
-                "r" : "240",
+                "r" : "264",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<", " " ]
               }, {
-                "r" : "241",
+                "r" : "265",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -22843,30 +23829,30 @@ module.exports['Less'] = {
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "239",
+          "localId" : "263",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "242",
+            "localId" : "266",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "243",
+            "localId" : "267",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "240",
+            "localId" : "264",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "241",
+            "localId" : "265",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -22874,7 +23860,7 @@ module.exports['Less'] = {
           } ]
         }
       }, {
-        "localId" : "246",
+        "localId" : "270",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity",
         "context" : "Patient",
@@ -22883,20 +23869,20 @@ module.exports['Less'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "246",
+            "r" : "270",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity", ": " ]
             }, {
-              "r" : "247",
+              "r" : "271",
               "s" : [ {
-                "r" : "248",
+                "r" : "272",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<", " " ]
               }, {
-                "r" : "249",
+                "r" : "273",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -22906,30 +23892,30 @@ module.exports['Less'] = {
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "247",
+          "localId" : "271",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "250",
+            "localId" : "274",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "251",
+            "localId" : "275",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "248",
+            "localId" : "272",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "249",
+            "localId" : "273",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
@@ -22937,7 +23923,7 @@ module.exports['Less'] = {
           } ]
         }
       }, {
-        "localId" : "254",
+        "localId" : "278",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity",
         "context" : "Patient",
@@ -22946,20 +23932,20 @@ module.exports['Less'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "254",
+            "r" : "278",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity", ": " ]
             }, {
-              "r" : "255",
+              "r" : "279",
               "s" : [ {
-                "r" : "256",
+                "r" : "280",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<", " " ]
               }, {
-                "r" : "257",
+                "r" : "281",
                 "s" : [ {
                   "value" : [ "6 ", "'m'" ]
                 } ]
@@ -22969,30 +23955,30 @@ module.exports['Less'] = {
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "255",
+          "localId" : "279",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "258",
+            "localId" : "282",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "259",
+            "localId" : "283",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "256",
+            "localId" : "280",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "257",
+            "localId" : "281",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 6,
             "unit" : "m",
@@ -23000,7 +23986,7 @@ module.exports['Less'] = {
           } ]
         }
       }, {
-        "localId" : "262",
+        "localId" : "286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_diff",
         "context" : "Patient",
@@ -23009,20 +23995,20 @@ module.exports['Less'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "262",
+            "r" : "286",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_diff", ": " ]
             }, {
-              "r" : "263",
+              "r" : "287",
               "s" : [ {
-                "r" : "264",
+                "r" : "288",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<", " " ]
               }, {
-                "r" : "265",
+                "r" : "289",
                 "s" : [ {
                   "value" : [ "5 ", "'cm'" ]
                 } ]
@@ -23032,30 +24018,30 @@ module.exports['Less'] = {
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "263",
+          "localId" : "287",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "266",
+            "localId" : "290",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "267",
+            "localId" : "291",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "264",
+            "localId" : "288",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "265",
+            "localId" : "289",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "cm",
@@ -23063,7 +24049,7 @@ module.exports['Less'] = {
           } ]
         }
       }, {
-        "localId" : "270",
+        "localId" : "294",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_diff",
         "context" : "Patient",
@@ -23072,20 +24058,20 @@ module.exports['Less'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "270",
+            "r" : "294",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_diff", ": " ]
             }, {
-              "r" : "271",
+              "r" : "295",
               "s" : [ {
-                "r" : "272",
+                "r" : "296",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<", " " ]
               }, {
-                "r" : "273",
+                "r" : "297",
                 "s" : [ {
                   "value" : [ "500 ", "'cm'" ]
                 } ]
@@ -23095,30 +24081,30 @@ module.exports['Less'] = {
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "271",
+          "localId" : "295",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "274",
+            "localId" : "298",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "275",
+            "localId" : "299",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "272",
+            "localId" : "296",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "273",
+            "localId" : "297",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 500,
             "unit" : "cm",
@@ -23126,7 +24112,7 @@ module.exports['Less'] = {
           } ]
         }
       }, {
-        "localId" : "278",
+        "localId" : "302",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_diff",
         "context" : "Patient",
@@ -23135,20 +24121,20 @@ module.exports['Less'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "278",
+            "r" : "302",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_diff", ": " ]
             }, {
-              "r" : "279",
+              "r" : "303",
               "s" : [ {
-                "r" : "280",
+                "r" : "304",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<", " " ]
               }, {
-                "r" : "281",
+                "r" : "305",
                 "s" : [ {
                   "value" : [ "5 ", "'km'" ]
                 } ]
@@ -23158,30 +24144,30 @@ module.exports['Less'] = {
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "279",
+          "localId" : "303",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "282",
+            "localId" : "306",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "283",
+            "localId" : "307",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "280",
+            "localId" : "304",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "281",
+            "localId" : "305",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "km",
@@ -23189,7 +24175,7 @@ module.exports['Less'] = {
           } ]
         }
       }, {
-        "localId" : "286",
+        "localId" : "310",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_incompatible",
         "context" : "Patient",
@@ -23198,20 +24184,20 @@ module.exports['Less'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "286",
+            "r" : "310",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "287",
+              "r" : "311",
               "s" : [ {
-                "r" : "288",
+                "r" : "312",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "<", " " ]
               }, {
-                "r" : "289",
+                "r" : "313",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -23221,30 +24207,30 @@ module.exports['Less'] = {
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "287",
+          "localId" : "311",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "290",
+            "localId" : "314",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "291",
+            "localId" : "315",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "288",
+            "localId" : "312",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "289",
+            "localId" : "313",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -23252,7 +24238,7 @@ module.exports['Less'] = {
           } ]
         }
       }, {
-        "localId" : "294",
+        "localId" : "318",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_incompatible",
         "context" : "Patient",
@@ -23261,20 +24247,20 @@ module.exports['Less'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "294",
+            "r" : "318",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "295",
+              "r" : "319",
               "s" : [ {
-                "r" : "296",
+                "r" : "320",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "<", " " ]
               }, {
-                "r" : "297",
+                "r" : "321",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -23284,30 +24270,30 @@ module.exports['Less'] = {
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "295",
+          "localId" : "319",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "298",
+            "localId" : "322",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "299",
+            "localId" : "323",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "296",
+            "localId" : "320",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "297",
+            "localId" : "321",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
@@ -23315,7 +24301,7 @@ module.exports['Less'] = {
           } ]
         }
       }, {
-        "localId" : "302",
+        "localId" : "326",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_incompatible",
         "context" : "Patient",
@@ -23324,20 +24310,20 @@ module.exports['Less'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "302",
+            "r" : "326",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "303",
+              "r" : "327",
               "s" : [ {
-                "r" : "304",
+                "r" : "328",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "<", " " ]
               }, {
-                "r" : "305",
+                "r" : "329",
                 "s" : [ {
                   "value" : [ "40 ", "'m'" ]
                 } ]
@@ -23347,30 +24333,30 @@ module.exports['Less'] = {
         } ],
         "expression" : {
           "type" : "Less",
-          "localId" : "303",
+          "localId" : "327",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "306",
+            "localId" : "330",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "307",
+            "localId" : "331",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "304",
+            "localId" : "328",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "305",
+            "localId" : "329",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 40,
             "unit" : "m",
@@ -23389,6 +24375,9 @@ context Patient
 define AGtB_Int: 5 <= 4
 define AEqB_Int: 5 <= 5
 define ALtB_Int: 5 <= 6
+define AGtB_Long: 5L <= 4L
+define AEqB_Long: 5L <= 5L
+define ALtB_Long: 5L <= 6L
 define AGtB_Quantity: 5 'm' <= 4 'm'
 define AEqB_Quantity: 5 'm' <= 5 'm'
 define ALtB_Quantity: 5 'm' <= 6 'm'
@@ -23412,7 +24401,7 @@ module.exports['LessOrEqual'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "302",
+        "r" : "326",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -23649,7 +24638,7 @@ module.exports['LessOrEqual'] = {
       }, {
         "localId" : "238",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AGtB_Quantity",
+        "name" : "AGtB_Long",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -23658,18 +24647,180 @@ module.exports['LessOrEqual'] = {
           "s" : {
             "r" : "238",
             "s" : [ {
-              "value" : [ "", "define ", "AGtB_Quantity", ": " ]
+              "value" : [ "", "define ", "AGtB_Long", ": " ]
             }, {
               "r" : "239",
               "s" : [ {
                 "r" : "240",
+                "value" : [ "5L", " ", "<=", " ", "4L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "LessOrEqual",
+          "localId" : "239",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "242",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "243",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "240",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "4",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "246",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AEqB_Long",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "246",
+            "s" : [ {
+              "value" : [ "", "define ", "AEqB_Long", ": " ]
+            }, {
+              "r" : "247",
+              "s" : [ {
+                "r" : "248",
+                "value" : [ "5L", " ", "<=", " ", "5L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "LessOrEqual",
+          "localId" : "247",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "250",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "248",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "249",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "254",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ALtB_Long",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "254",
+            "s" : [ {
+              "value" : [ "", "define ", "ALtB_Long", ": " ]
+            }, {
+              "r" : "255",
+              "s" : [ {
+                "r" : "256",
+                "value" : [ "5L", " ", "<=", " ", "6L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "LessOrEqual",
+          "localId" : "255",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "258",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "259",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "256",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "257",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "6",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "262",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AGtB_Quantity",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "262",
+            "s" : [ {
+              "value" : [ "", "define ", "AGtB_Quantity", ": " ]
+            }, {
+              "r" : "263",
+              "s" : [ {
+                "r" : "264",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<=", " " ]
               }, {
-                "r" : "241",
+                "r" : "265",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -23679,30 +24830,30 @@ module.exports['LessOrEqual'] = {
         } ],
         "expression" : {
           "type" : "LessOrEqual",
-          "localId" : "239",
+          "localId" : "263",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "242",
+            "localId" : "266",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "243",
+            "localId" : "267",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "240",
+            "localId" : "264",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "241",
+            "localId" : "265",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -23710,7 +24861,7 @@ module.exports['LessOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "246",
+        "localId" : "270",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity",
         "context" : "Patient",
@@ -23719,20 +24870,20 @@ module.exports['LessOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "246",
+            "r" : "270",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity", ": " ]
             }, {
-              "r" : "247",
+              "r" : "271",
               "s" : [ {
-                "r" : "248",
+                "r" : "272",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<=", " " ]
               }, {
-                "r" : "249",
+                "r" : "273",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -23742,30 +24893,30 @@ module.exports['LessOrEqual'] = {
         } ],
         "expression" : {
           "type" : "LessOrEqual",
-          "localId" : "247",
+          "localId" : "271",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "250",
+            "localId" : "274",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "251",
+            "localId" : "275",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "248",
+            "localId" : "272",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "249",
+            "localId" : "273",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
@@ -23773,7 +24924,7 @@ module.exports['LessOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "254",
+        "localId" : "278",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity",
         "context" : "Patient",
@@ -23782,20 +24933,20 @@ module.exports['LessOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "254",
+            "r" : "278",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity", ": " ]
             }, {
-              "r" : "255",
+              "r" : "279",
               "s" : [ {
-                "r" : "256",
+                "r" : "280",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<=", " " ]
               }, {
-                "r" : "257",
+                "r" : "281",
                 "s" : [ {
                   "value" : [ "6 ", "'m'" ]
                 } ]
@@ -23805,30 +24956,30 @@ module.exports['LessOrEqual'] = {
         } ],
         "expression" : {
           "type" : "LessOrEqual",
-          "localId" : "255",
+          "localId" : "279",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "258",
+            "localId" : "282",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "259",
+            "localId" : "283",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "256",
+            "localId" : "280",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "257",
+            "localId" : "281",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 6,
             "unit" : "m",
@@ -23836,7 +24987,7 @@ module.exports['LessOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "262",
+        "localId" : "286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_diff",
         "context" : "Patient",
@@ -23845,20 +24996,20 @@ module.exports['LessOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "262",
+            "r" : "286",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_diff", ": " ]
             }, {
-              "r" : "263",
+              "r" : "287",
               "s" : [ {
-                "r" : "264",
+                "r" : "288",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<=", " " ]
               }, {
-                "r" : "265",
+                "r" : "289",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -23868,30 +25019,30 @@ module.exports['LessOrEqual'] = {
         } ],
         "expression" : {
           "type" : "LessOrEqual",
-          "localId" : "263",
+          "localId" : "287",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "266",
+            "localId" : "290",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "267",
+            "localId" : "291",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "264",
+            "localId" : "288",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "265",
+            "localId" : "289",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -23899,7 +25050,7 @@ module.exports['LessOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "270",
+        "localId" : "294",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_diff",
         "context" : "Patient",
@@ -23908,20 +25059,20 @@ module.exports['LessOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "270",
+            "r" : "294",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_diff", ": " ]
             }, {
-              "r" : "271",
+              "r" : "295",
               "s" : [ {
-                "r" : "272",
+                "r" : "296",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<=", " " ]
               }, {
-                "r" : "273",
+                "r" : "297",
                 "s" : [ {
                   "value" : [ "500 ", "'cm'" ]
                 } ]
@@ -23931,30 +25082,30 @@ module.exports['LessOrEqual'] = {
         } ],
         "expression" : {
           "type" : "LessOrEqual",
-          "localId" : "271",
+          "localId" : "295",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "274",
+            "localId" : "298",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "275",
+            "localId" : "299",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "272",
+            "localId" : "296",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "273",
+            "localId" : "297",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 500,
             "unit" : "cm",
@@ -23962,7 +25113,7 @@ module.exports['LessOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "278",
+        "localId" : "302",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_diff",
         "context" : "Patient",
@@ -23971,20 +25122,20 @@ module.exports['LessOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "278",
+            "r" : "302",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_diff", ": " ]
             }, {
-              "r" : "279",
+              "r" : "303",
               "s" : [ {
-                "r" : "280",
+                "r" : "304",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", "<=", " " ]
               }, {
-                "r" : "281",
+                "r" : "305",
                 "s" : [ {
                   "value" : [ "5 ", "'km'" ]
                 } ]
@@ -23994,30 +25145,30 @@ module.exports['LessOrEqual'] = {
         } ],
         "expression" : {
           "type" : "LessOrEqual",
-          "localId" : "279",
+          "localId" : "303",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "282",
+            "localId" : "306",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "283",
+            "localId" : "307",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "280",
+            "localId" : "304",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "281",
+            "localId" : "305",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "km",
@@ -24025,7 +25176,7 @@ module.exports['LessOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "286",
+        "localId" : "310",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_incompatible",
         "context" : "Patient",
@@ -24034,20 +25185,20 @@ module.exports['LessOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "286",
+            "r" : "310",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "287",
+              "r" : "311",
               "s" : [ {
-                "r" : "288",
+                "r" : "312",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "<=", " " ]
               }, {
-                "r" : "289",
+                "r" : "313",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -24057,30 +25208,30 @@ module.exports['LessOrEqual'] = {
         } ],
         "expression" : {
           "type" : "LessOrEqual",
-          "localId" : "287",
+          "localId" : "311",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "290",
+            "localId" : "314",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "291",
+            "localId" : "315",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "288",
+            "localId" : "312",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "289",
+            "localId" : "313",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -24088,7 +25239,7 @@ module.exports['LessOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "294",
+        "localId" : "318",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_incompatible",
         "context" : "Patient",
@@ -24097,20 +25248,20 @@ module.exports['LessOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "294",
+            "r" : "318",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "295",
+              "r" : "319",
               "s" : [ {
-                "r" : "296",
+                "r" : "320",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "<=", " " ]
               }, {
-                "r" : "297",
+                "r" : "321",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -24120,30 +25271,30 @@ module.exports['LessOrEqual'] = {
         } ],
         "expression" : {
           "type" : "LessOrEqual",
-          "localId" : "295",
+          "localId" : "319",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "298",
+            "localId" : "322",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "299",
+            "localId" : "323",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "296",
+            "localId" : "320",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "297",
+            "localId" : "321",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
@@ -24151,7 +25302,7 @@ module.exports['LessOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "302",
+        "localId" : "326",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_incompatible",
         "context" : "Patient",
@@ -24160,20 +25311,20 @@ module.exports['LessOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "302",
+            "r" : "326",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "303",
+              "r" : "327",
               "s" : [ {
-                "r" : "304",
+                "r" : "328",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", "<=", " " ]
               }, {
-                "r" : "305",
+                "r" : "329",
                 "s" : [ {
                   "value" : [ "40 ", "'m'" ]
                 } ]
@@ -24183,30 +25334,30 @@ module.exports['LessOrEqual'] = {
         } ],
         "expression" : {
           "type" : "LessOrEqual",
-          "localId" : "303",
+          "localId" : "327",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "306",
+            "localId" : "330",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "307",
+            "localId" : "331",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "304",
+            "localId" : "328",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "305",
+            "localId" : "329",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 40,
             "unit" : "m",
@@ -24225,6 +25376,9 @@ context Patient
 define AGtB_Int: 5 > 4
 define AEqB_Int: 5 > 5
 define ALtB_Int: 5 > 6
+define AGtB_Long: 5L > 4L
+define AEqB_Long: 5L > 5L
+define ALtB_Long: 5L > 6L
 define AGtB_Quantity: 5 'm' > 4 'm'
 define AEqB_Quantity: 5 'm' > 5 'm'
 define ALtB_Quantity: 5 'm' > 6 'm'
@@ -24248,7 +25402,7 @@ module.exports['Greater'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "302",
+        "r" : "326",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -24485,7 +25639,7 @@ module.exports['Greater'] = {
       }, {
         "localId" : "238",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AGtB_Quantity",
+        "name" : "AGtB_Long",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -24494,18 +25648,180 @@ module.exports['Greater'] = {
           "s" : {
             "r" : "238",
             "s" : [ {
-              "value" : [ "", "define ", "AGtB_Quantity", ": " ]
+              "value" : [ "", "define ", "AGtB_Long", ": " ]
             }, {
               "r" : "239",
               "s" : [ {
                 "r" : "240",
+                "value" : [ "5L", " ", ">", " ", "4L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Greater",
+          "localId" : "239",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "242",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "243",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "240",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "4",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "246",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AEqB_Long",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "246",
+            "s" : [ {
+              "value" : [ "", "define ", "AEqB_Long", ": " ]
+            }, {
+              "r" : "247",
+              "s" : [ {
+                "r" : "248",
+                "value" : [ "5L", " ", ">", " ", "5L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Greater",
+          "localId" : "247",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "250",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "248",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "249",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "254",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ALtB_Long",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "254",
+            "s" : [ {
+              "value" : [ "", "define ", "ALtB_Long", ": " ]
+            }, {
+              "r" : "255",
+              "s" : [ {
+                "r" : "256",
+                "value" : [ "5L", " ", ">", " ", "6L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Greater",
+          "localId" : "255",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "258",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "259",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "256",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "257",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "6",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "262",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AGtB_Quantity",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "262",
+            "s" : [ {
+              "value" : [ "", "define ", "AGtB_Quantity", ": " ]
+            }, {
+              "r" : "263",
+              "s" : [ {
+                "r" : "264",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "241",
+                "r" : "265",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -24515,30 +25831,30 @@ module.exports['Greater'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "239",
+          "localId" : "263",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "242",
+            "localId" : "266",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "243",
+            "localId" : "267",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "240",
+            "localId" : "264",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "241",
+            "localId" : "265",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -24546,7 +25862,7 @@ module.exports['Greater'] = {
           } ]
         }
       }, {
-        "localId" : "246",
+        "localId" : "270",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity",
         "context" : "Patient",
@@ -24555,20 +25871,20 @@ module.exports['Greater'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "246",
+            "r" : "270",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity", ": " ]
             }, {
-              "r" : "247",
+              "r" : "271",
               "s" : [ {
-                "r" : "248",
+                "r" : "272",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "249",
+                "r" : "273",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -24578,30 +25894,30 @@ module.exports['Greater'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "247",
+          "localId" : "271",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "250",
+            "localId" : "274",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "251",
+            "localId" : "275",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "248",
+            "localId" : "272",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "249",
+            "localId" : "273",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
@@ -24609,7 +25925,7 @@ module.exports['Greater'] = {
           } ]
         }
       }, {
-        "localId" : "254",
+        "localId" : "278",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity",
         "context" : "Patient",
@@ -24618,20 +25934,20 @@ module.exports['Greater'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "254",
+            "r" : "278",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity", ": " ]
             }, {
-              "r" : "255",
+              "r" : "279",
               "s" : [ {
-                "r" : "256",
+                "r" : "280",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "257",
+                "r" : "281",
                 "s" : [ {
                   "value" : [ "6 ", "'m'" ]
                 } ]
@@ -24641,30 +25957,30 @@ module.exports['Greater'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "255",
+          "localId" : "279",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "258",
+            "localId" : "282",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "259",
+            "localId" : "283",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "256",
+            "localId" : "280",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "257",
+            "localId" : "281",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 6,
             "unit" : "m",
@@ -24672,7 +25988,7 @@ module.exports['Greater'] = {
           } ]
         }
       }, {
-        "localId" : "262",
+        "localId" : "286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_diff",
         "context" : "Patient",
@@ -24681,20 +25997,20 @@ module.exports['Greater'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "262",
+            "r" : "286",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_diff", ": " ]
             }, {
-              "r" : "263",
+              "r" : "287",
               "s" : [ {
-                "r" : "264",
+                "r" : "288",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "265",
+                "r" : "289",
                 "s" : [ {
                   "value" : [ "5 ", "'cm'" ]
                 } ]
@@ -24704,30 +26020,30 @@ module.exports['Greater'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "263",
+          "localId" : "287",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "266",
+            "localId" : "290",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "267",
+            "localId" : "291",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "264",
+            "localId" : "288",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "265",
+            "localId" : "289",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "cm",
@@ -24735,7 +26051,7 @@ module.exports['Greater'] = {
           } ]
         }
       }, {
-        "localId" : "270",
+        "localId" : "294",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_diff",
         "context" : "Patient",
@@ -24744,20 +26060,20 @@ module.exports['Greater'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "270",
+            "r" : "294",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_diff", ": " ]
             }, {
-              "r" : "271",
+              "r" : "295",
               "s" : [ {
-                "r" : "272",
+                "r" : "296",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "273",
+                "r" : "297",
                 "s" : [ {
                   "value" : [ "500 ", "'cm'" ]
                 } ]
@@ -24767,30 +26083,30 @@ module.exports['Greater'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "271",
+          "localId" : "295",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "274",
+            "localId" : "298",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "275",
+            "localId" : "299",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "272",
+            "localId" : "296",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "273",
+            "localId" : "297",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 500,
             "unit" : "cm",
@@ -24798,7 +26114,7 @@ module.exports['Greater'] = {
           } ]
         }
       }, {
-        "localId" : "278",
+        "localId" : "302",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_diff",
         "context" : "Patient",
@@ -24807,20 +26123,20 @@ module.exports['Greater'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "278",
+            "r" : "302",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_diff", ": " ]
             }, {
-              "r" : "279",
+              "r" : "303",
               "s" : [ {
-                "r" : "280",
+                "r" : "304",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "281",
+                "r" : "305",
                 "s" : [ {
                   "value" : [ "5 ", "'km'" ]
                 } ]
@@ -24830,30 +26146,30 @@ module.exports['Greater'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "279",
+          "localId" : "303",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "282",
+            "localId" : "306",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "283",
+            "localId" : "307",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "280",
+            "localId" : "304",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "281",
+            "localId" : "305",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "km",
@@ -24861,7 +26177,7 @@ module.exports['Greater'] = {
           } ]
         }
       }, {
-        "localId" : "286",
+        "localId" : "310",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_incompatible",
         "context" : "Patient",
@@ -24870,20 +26186,20 @@ module.exports['Greater'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "286",
+            "r" : "310",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "287",
+              "r" : "311",
               "s" : [ {
-                "r" : "288",
+                "r" : "312",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "289",
+                "r" : "313",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -24893,30 +26209,30 @@ module.exports['Greater'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "287",
+          "localId" : "311",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "290",
+            "localId" : "314",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "291",
+            "localId" : "315",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "288",
+            "localId" : "312",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "289",
+            "localId" : "313",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -24924,7 +26240,7 @@ module.exports['Greater'] = {
           } ]
         }
       }, {
-        "localId" : "294",
+        "localId" : "318",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_incompatible",
         "context" : "Patient",
@@ -24933,20 +26249,20 @@ module.exports['Greater'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "294",
+            "r" : "318",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "295",
+              "r" : "319",
               "s" : [ {
-                "r" : "296",
+                "r" : "320",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "297",
+                "r" : "321",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -24956,30 +26272,30 @@ module.exports['Greater'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "295",
+          "localId" : "319",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "298",
+            "localId" : "322",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "299",
+            "localId" : "323",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "296",
+            "localId" : "320",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "297",
+            "localId" : "321",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
@@ -24987,7 +26303,7 @@ module.exports['Greater'] = {
           } ]
         }
       }, {
-        "localId" : "302",
+        "localId" : "326",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_incompatible",
         "context" : "Patient",
@@ -24996,20 +26312,20 @@ module.exports['Greater'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "302",
+            "r" : "326",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "303",
+              "r" : "327",
               "s" : [ {
-                "r" : "304",
+                "r" : "328",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "305",
+                "r" : "329",
                 "s" : [ {
                   "value" : [ "40 ", "'m'" ]
                 } ]
@@ -25019,30 +26335,30 @@ module.exports['Greater'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "303",
+          "localId" : "327",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "306",
+            "localId" : "330",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "307",
+            "localId" : "331",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "304",
+            "localId" : "328",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "305",
+            "localId" : "329",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 40,
             "unit" : "m",
@@ -25061,6 +26377,9 @@ context Patient
 define AGtB_Int: 5 >= 4
 define AEqB_Int: 5 >= 5
 define ALtB_Int: 5 >= 6
+define AGtB_Long: 5L >= 4L
+define AEqB_Long: 5L >= 5L
+define ALtB_Long: 5L >= 6L
 define AGtB_Quantity: 5 'm' >= 4 'm'
 define AEqB_Quantity: 5 'm' >= 5 'm'
 define ALtB_Quantity: 5 'm' >= 6 'm'
@@ -25086,7 +26405,7 @@ module.exports['GreaterOrEqual'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "322",
+        "r" : "346",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -25192,136 +26511,298 @@ module.exports['GreaterOrEqual'] = {
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "219",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "219",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "217",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "4",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "222",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AEqB_Int",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "222",
+            "s" : [ {
+              "value" : [ "", "define ", "AEqB_Int", ": " ]
+            }, {
+              "r" : "223",
+              "s" : [ {
+                "r" : "224",
+                "value" : [ "5", " ", ">=", " ", "5" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "GreaterOrEqual",
+          "localId" : "223",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "226",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "227",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "224",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "230",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ALtB_Int",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "230",
+            "s" : [ {
+              "value" : [ "", "define ", "ALtB_Int", ": " ]
+            }, {
+              "r" : "231",
+              "s" : [ {
+                "r" : "232",
+                "value" : [ "5", " ", ">=", " ", "6" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "GreaterOrEqual",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "234",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "232",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "233",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "6",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "238",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AGtB_Long",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "238",
+            "s" : [ {
+              "value" : [ "", "define ", "AGtB_Long", ": " ]
+            }, {
+              "r" : "239",
+              "s" : [ {
+                "r" : "240",
+                "value" : [ "5L", " ", ">=", " ", "4L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "GreaterOrEqual",
+          "localId" : "239",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "242",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "243",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "240",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "217",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "4",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "222",
+        "localId" : "246",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AEqB_Int",
+        "name" : "AEqB_Long",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "222",
+            "r" : "246",
             "s" : [ {
-              "value" : [ "", "define ", "AEqB_Int", ": " ]
+              "value" : [ "", "define ", "AEqB_Long", ": " ]
             }, {
-              "r" : "223",
+              "r" : "247",
               "s" : [ {
-                "r" : "224",
-                "value" : [ "5", " ", ">=", " ", "5" ]
+                "r" : "248",
+                "value" : [ "5L", " ", ">=", " ", "5L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "223",
+          "localId" : "247",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "226",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "250",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "227",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "224",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "248",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "225",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "249",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "230",
+        "localId" : "254",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ALtB_Int",
+        "name" : "ALtB_Long",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "230",
+            "r" : "254",
             "s" : [ {
-              "value" : [ "", "define ", "ALtB_Int", ": " ]
+              "value" : [ "", "define ", "ALtB_Long", ": " ]
             }, {
-              "r" : "231",
+              "r" : "255",
               "s" : [ {
-                "r" : "232",
-                "value" : [ "5", " ", ">=", " ", "6" ]
+                "r" : "256",
+                "value" : [ "5L", " ", ">=", " ", "6L" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "231",
+          "localId" : "255",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "234",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "258",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "235",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "259",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "232",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "256",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "233",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "257",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "6",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "238",
+        "localId" : "262",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity",
         "context" : "Patient",
@@ -25330,20 +26811,20 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "238",
+            "r" : "262",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity", ": " ]
             }, {
-              "r" : "239",
+              "r" : "263",
               "s" : [ {
-                "r" : "240",
+                "r" : "264",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">=", " " ]
               }, {
-                "r" : "241",
+                "r" : "265",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -25353,30 +26834,30 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "239",
+          "localId" : "263",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "242",
+            "localId" : "266",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "243",
+            "localId" : "267",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "240",
+            "localId" : "264",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "241",
+            "localId" : "265",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -25384,7 +26865,7 @@ module.exports['GreaterOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "246",
+        "localId" : "270",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity",
         "context" : "Patient",
@@ -25393,20 +26874,20 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "246",
+            "r" : "270",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity", ": " ]
             }, {
-              "r" : "247",
+              "r" : "271",
               "s" : [ {
-                "r" : "248",
+                "r" : "272",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">=", " " ]
               }, {
-                "r" : "249",
+                "r" : "273",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -25416,30 +26897,30 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "247",
+          "localId" : "271",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "250",
+            "localId" : "274",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "251",
+            "localId" : "275",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "248",
+            "localId" : "272",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "249",
+            "localId" : "273",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
@@ -25447,7 +26928,7 @@ module.exports['GreaterOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "254",
+        "localId" : "278",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity",
         "context" : "Patient",
@@ -25456,20 +26937,20 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "254",
+            "r" : "278",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity", ": " ]
             }, {
-              "r" : "255",
+              "r" : "279",
               "s" : [ {
-                "r" : "256",
+                "r" : "280",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">=", " " ]
               }, {
-                "r" : "257",
+                "r" : "281",
                 "s" : [ {
                   "value" : [ "6 ", "'m'" ]
                 } ]
@@ -25479,30 +26960,30 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "255",
+          "localId" : "279",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "258",
+            "localId" : "282",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "259",
+            "localId" : "283",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "256",
+            "localId" : "280",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "257",
+            "localId" : "281",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 6,
             "unit" : "m",
@@ -25510,7 +26991,7 @@ module.exports['GreaterOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "262",
+        "localId" : "286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_diff",
         "context" : "Patient",
@@ -25519,20 +27000,20 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "262",
+            "r" : "286",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_diff", ": " ]
             }, {
-              "r" : "263",
+              "r" : "287",
               "s" : [ {
-                "r" : "264",
+                "r" : "288",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">=", " " ]
               }, {
-                "r" : "265",
+                "r" : "289",
                 "s" : [ {
                   "value" : [ "5 ", "'cm'" ]
                 } ]
@@ -25542,30 +27023,30 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "263",
+          "localId" : "287",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "266",
+            "localId" : "290",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "267",
+            "localId" : "291",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "264",
+            "localId" : "288",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "265",
+            "localId" : "289",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "cm",
@@ -25573,7 +27054,7 @@ module.exports['GreaterOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "270",
+        "localId" : "294",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_diff",
         "context" : "Patient",
@@ -25582,20 +27063,20 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "270",
+            "r" : "294",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_diff", ": " ]
             }, {
-              "r" : "271",
+              "r" : "295",
               "s" : [ {
-                "r" : "272",
+                "r" : "296",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">=", " " ]
               }, {
-                "r" : "273",
+                "r" : "297",
                 "s" : [ {
                   "value" : [ "500 ", "'cm'" ]
                 } ]
@@ -25605,30 +27086,30 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "271",
+          "localId" : "295",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "274",
+            "localId" : "298",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "275",
+            "localId" : "299",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "272",
+            "localId" : "296",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "273",
+            "localId" : "297",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 500,
             "unit" : "cm",
@@ -25636,7 +27117,7 @@ module.exports['GreaterOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "278",
+        "localId" : "302",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_diff",
         "context" : "Patient",
@@ -25645,20 +27126,20 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "278",
+            "r" : "302",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_diff", ": " ]
             }, {
-              "r" : "279",
+              "r" : "303",
               "s" : [ {
-                "r" : "280",
+                "r" : "304",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
               }, {
                 "value" : [ " ", ">=", " " ]
               }, {
-                "r" : "281",
+                "r" : "305",
                 "s" : [ {
                   "value" : [ "5 ", "'km'" ]
                 } ]
@@ -25668,30 +27149,30 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "279",
+          "localId" : "303",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "282",
+            "localId" : "306",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "283",
+            "localId" : "307",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "280",
+            "localId" : "304",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "281",
+            "localId" : "305",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "km",
@@ -25699,7 +27180,7 @@ module.exports['GreaterOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "286",
+        "localId" : "310",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AGtB_Quantity_incompatible",
         "context" : "Patient",
@@ -25708,20 +27189,20 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "286",
+            "r" : "310",
             "s" : [ {
               "value" : [ "", "define ", "AGtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "287",
+              "r" : "311",
               "s" : [ {
-                "r" : "288",
+                "r" : "312",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", ">=", " " ]
               }, {
-                "r" : "289",
+                "r" : "313",
                 "s" : [ {
                   "value" : [ "4 ", "'m'" ]
                 } ]
@@ -25731,30 +27212,30 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "287",
+          "localId" : "311",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "290",
+            "localId" : "314",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "291",
+            "localId" : "315",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "288",
+            "localId" : "312",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "289",
+            "localId" : "313",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 4,
             "unit" : "m",
@@ -25762,7 +27243,7 @@ module.exports['GreaterOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "294",
+        "localId" : "318",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "AEqB_Quantity_incompatible",
         "context" : "Patient",
@@ -25771,20 +27252,20 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "294",
+            "r" : "318",
             "s" : [ {
               "value" : [ "", "define ", "AEqB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "295",
+              "r" : "319",
               "s" : [ {
-                "r" : "296",
+                "r" : "320",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", ">=", " " ]
               }, {
-                "r" : "297",
+                "r" : "321",
                 "s" : [ {
                   "value" : [ "5 ", "'m'" ]
                 } ]
@@ -25794,30 +27275,30 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "295",
+          "localId" : "319",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "298",
+            "localId" : "322",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "299",
+            "localId" : "323",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "296",
+            "localId" : "320",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "297",
+            "localId" : "321",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "m",
@@ -25825,7 +27306,7 @@ module.exports['GreaterOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "302",
+        "localId" : "326",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ALtB_Quantity_incompatible",
         "context" : "Patient",
@@ -25834,20 +27315,20 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "302",
+            "r" : "326",
             "s" : [ {
               "value" : [ "", "define ", "ALtB_Quantity_incompatible", ": " ]
             }, {
-              "r" : "303",
+              "r" : "327",
               "s" : [ {
-                "r" : "304",
+                "r" : "328",
                 "s" : [ {
                   "value" : [ "5 ", "'Cel'" ]
                 } ]
               }, {
                 "value" : [ " ", ">=", " " ]
               }, {
-                "r" : "305",
+                "r" : "329",
                 "s" : [ {
                   "value" : [ "40 ", "'m'" ]
                 } ]
@@ -25857,30 +27338,30 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "GreaterOrEqual",
-          "localId" : "303",
+          "localId" : "327",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "306",
+            "localId" : "330",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "307",
+            "localId" : "331",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "304",
+            "localId" : "328",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "Cel",
             "annotation" : [ ]
           }, {
             "type" : "Quantity",
-            "localId" : "305",
+            "localId" : "329",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 40,
             "unit" : "m",
@@ -25888,7 +27369,7 @@ module.exports['GreaterOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "310",
+        "localId" : "334",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DivideUcum_incompatible",
         "context" : "Patient",
@@ -25897,26 +27378,26 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "310",
+            "r" : "334",
             "s" : [ {
               "value" : [ "", "define ", "DivideUcum_incompatible", ": " ]
             }, {
-              "r" : "311",
+              "r" : "335",
               "s" : [ {
-                "r" : "312",
+                "r" : "336",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "312",
+                  "r" : "336",
                   "s" : [ {
-                    "r" : "313",
+                    "r" : "337",
                     "s" : [ {
                       "value" : [ "100 ", "'[nmi_i]'" ]
                     } ]
                   }, {
                     "value" : [ " / " ]
                   }, {
-                    "r" : "314",
+                    "r" : "338",
                     "s" : [ {
                       "value" : [ "2 ", "'h'" ]
                     } ]
@@ -25927,7 +27408,7 @@ module.exports['GreaterOrEqual'] = {
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "317",
+                "r" : "341",
                 "s" : [ {
                   "value" : [ "49 ", "'mg/[lb_av]'" ]
                 } ]
@@ -25937,46 +27418,46 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "311",
+          "localId" : "335",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "318",
+            "localId" : "342",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "319",
+            "localId" : "343",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Divide",
-            "localId" : "312",
+            "localId" : "336",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "315",
+              "localId" : "339",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "316",
+              "localId" : "340",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "313",
+              "localId" : "337",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 100,
               "unit" : "[nmi_i]",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "314",
+              "localId" : "338",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "h",
@@ -25984,7 +27465,7 @@ module.exports['GreaterOrEqual'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "317",
+            "localId" : "341",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 49,
             "unit" : "mg/[lb_av]",
@@ -25992,7 +27473,7 @@ module.exports['GreaterOrEqual'] = {
           } ]
         }
       }, {
-        "localId" : "322",
+        "localId" : "346",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DivideUcum",
         "context" : "Patient",
@@ -26001,26 +27482,26 @@ module.exports['GreaterOrEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "322",
+            "r" : "346",
             "s" : [ {
               "value" : [ "", "define ", "DivideUcum", ": " ]
             }, {
-              "r" : "323",
+              "r" : "347",
               "s" : [ {
-                "r" : "324",
+                "r" : "348",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "324",
+                  "r" : "348",
                   "s" : [ {
-                    "r" : "325",
+                    "r" : "349",
                     "s" : [ {
                       "value" : [ "100 ", "'mg'" ]
                     } ]
                   }, {
                     "value" : [ " / " ]
                   }, {
-                    "r" : "326",
+                    "r" : "350",
                     "s" : [ {
                       "value" : [ "2 ", "'[lb_av]'" ]
                     } ]
@@ -26031,7 +27512,7 @@ module.exports['GreaterOrEqual'] = {
               }, {
                 "value" : [ " ", ">", " " ]
               }, {
-                "r" : "329",
+                "r" : "353",
                 "s" : [ {
                   "value" : [ "49 ", "'mg/[lb_av]'" ]
                 } ]
@@ -26041,46 +27522,46 @@ module.exports['GreaterOrEqual'] = {
         } ],
         "expression" : {
           "type" : "Greater",
-          "localId" : "323",
+          "localId" : "347",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "330",
+            "localId" : "354",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "331",
+            "localId" : "355",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Divide",
-            "localId" : "324",
+            "localId" : "348",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "327",
+              "localId" : "351",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "328",
+              "localId" : "352",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             } ],
             "operand" : [ {
               "type" : "Quantity",
-              "localId" : "325",
+              "localId" : "349",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 100,
               "unit" : "mg",
               "annotation" : [ ]
             }, {
               "type" : "Quantity",
-              "localId" : "326",
+              "localId" : "350",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "[lb_av]",
@@ -26088,7 +27569,7 @@ module.exports['GreaterOrEqual'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "329",
+            "localId" : "353",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 49,
             "unit" : "mg/[lb_av]",
diff --git a/test/elm/convert/convert-test.ts b/test/elm/convert/convert-test.ts
index 4a1e2dbf1..6548f3e60 100644
--- a/test/elm/convert/convert-test.ts
+++ b/test/elm/convert/convert-test.ts
@@ -39,14 +39,26 @@ describe('FromString', () => {
     (await this.integerValid.exec(this.ctx)).should.equal(10);
   });
 
-  it("should convert '10.2' to Integer 10", async function () {
-    (await this.integerDropDecimal.exec(this.ctx)).should.equal(10);
+  it("should be null trying to convert '10.2' to Integer", async function () {
+    should(await this.integerWithDecimal.exec(this.ctx)).be.null();
   });
 
   it("should be null trying to convert 'abc' to Integer", async function () {
     should(await this.integerInvalid.exec(this.ctx)).be.null();
   });
 
+  it("should convert '10' to Long", async function () {
+    (await this.longValid.exec(this.ctx)).should.equal(10n);
+  });
+
+  it("should be null trying to convert '10.2' to Long", async function () {
+    should(await this.longWithDecimal.exec(this.ctx)).be.null();
+  });
+
+  it("should be null trying to convert 'abc' to Long", async function () {
+    should(await this.longInvalid.exec(this.ctx)).be.null();
+  });
+
   it('should convert "10 \'A\'" to Quantity', async function () {
     const quantity = await this.quantityStr.exec(this.ctx);
     quantity.value.should.equal(10);
@@ -111,6 +123,10 @@ describe('FromInteger', () => {
     (await this.string10.exec(this.ctx)).should.equal('10');
   });
 
+  it('should convert 10 to 10L', async function () {
+    (await this.long10.exec(this.ctx)).should.equal(10n);
+  });
+
   it('should convert 10 to 10.0', async function () {
     (await this.decimal10.exec(this.ctx)).should.equal(10.0);
   });
@@ -124,6 +140,32 @@ describe('FromInteger', () => {
   });
 });
 
+describe('FromLong', () => {
+  beforeEach(function () {
+    setup(this, data);
+  });
+
+  it("should convert 10L to '10'", async function () {
+    (await this.string10.exec(this.ctx)).should.equal('10');
+  });
+
+  it('should convert 10L to 10', async function () {
+    (await this.integer10.exec(this.ctx)).should.equal(10);
+  });
+
+  it('should convert 10L to 10.0', async function () {
+    (await this.decimal10.exec(this.ctx)).should.equal(10.0);
+  });
+
+  it('should convert null to null', async function () {
+    isNull(await this.longNull.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should convert 10L to 10L', async function () {
+    (await this.longLong.exec(this.ctx)).should.equal(10n);
+  });
+});
+
 describe('FromQuantity', () => {
   beforeEach(function () {
     setup(this, data);
@@ -269,11 +311,11 @@ describe('FromTime', () => {
     setup(this, data);
   });
 
-  it.skip("should convert @T11:57 to '11:57'", async function () {
+  it("should convert @T11:57 to '11:57'", async function () {
     (await this.timeStr.exec(this.ctx)).should.equal('11:57');
   });
 
-  it.skip('should convert @T11:57 to @11:57', async function () {
+  it('should convert @T11:57 to @11:57', async function () {
     const time = await this.timeTime.exec(this.ctx);
     time.hour.should.equal(11);
     time.minute.should.equal(57);
@@ -360,6 +402,18 @@ describe('ToInteger', () => {
     should(await this.tooSmallInt.exec(this.ctx)).be.null();
   });
 
+  it('should return 20 for 20L', async function () {
+    (await this.longTwenty.exec(this.ctx)).should.equal(20);
+  });
+
+  it('should return null if long larger than max integer', async function () {
+    should(await this.tooLargeLong.exec(this.ctx)).be.null();
+  });
+
+  it('should return null if long smaller than min integer', async function () {
+    should(await this.tooSmallLong.exec(this.ctx)).be.null();
+  });
+
   it('should return 1 for boolean true', async function () {
     (await this.booleanTrue.exec(this.ctx)).should.equal(1);
   });
@@ -367,6 +421,72 @@ describe('ToInteger', () => {
   it('should return 0 for boolean false', async function () {
     (await this.booleanFalse.exec(this.ctx)).should.equal(0);
   });
+
+  it('should return null for an empty string', async function () {
+    should(await this.emptyString.exec(this.ctx)).be.null();
+  });
+
+  it('should return null for a whitespace string', async function () {
+    should(await this.whitespaceString.exec(this.ctx)).be.null();
+  });
+
+  it('should return null for a invalid string', async function () {
+    should(await this.invalidString.exec(this.ctx)).be.null();
+  });
+});
+
+describe('ToLong', () => {
+  beforeEach(function () {
+    setup(this, data);
+  });
+
+  it('should return positive long without polarity sign', async function () {
+    (await this.noSign.exec(this.ctx)).should.equal(12345n);
+  });
+
+  it('should return positive long with polarity sign', async function () {
+    (await this.positiveSign.exec(this.ctx)).should.equal(12345n);
+  });
+
+  it('should return negative long', async function () {
+    (await this.negativeSign.exec(this.ctx)).should.equal(-12345n);
+  });
+
+  it('should return null if long larger than max', async function () {
+    should(await this.tooLargeLong.exec(this.ctx)).be.null();
+  });
+
+  it('should return null if long smaller than min', async function () {
+    should(await this.tooSmallLong.exec(this.ctx)).be.null();
+  });
+
+  it('should return 101 for "101" using convert keyword', async function () {
+    (await this.withConvertKeyword.exec(this.ctx)).should.equal(101n);
+  });
+
+  it('should return 12345 for integer 12345', async function () {
+    (await this.int.exec(this.ctx)).should.equal(12345n);
+  });
+
+  it('should return 1 for boolean true', async function () {
+    (await this.booleanTrue.exec(this.ctx)).should.equal(1n);
+  });
+
+  it('should return 0 for boolean false', async function () {
+    (await this.booleanFalse.exec(this.ctx)).should.equal(0n);
+  });
+
+  it('should return null for an empty string', async function () {
+    should(await this.emptyString.exec(this.ctx)).be.null();
+  });
+
+  it('should return null for a whitespace string', async function () {
+    should(await this.whitespaceString.exec(this.ctx)).be.null();
+  });
+
+  it('should return null for a invalid string', async function () {
+    should(await this.invalidString.exec(this.ctx)).be.null();
+  });
 });
 
 describe('ToQuantity', () => {
@@ -382,6 +502,10 @@ describe('ToQuantity', () => {
     (await this.integerOverload.exec(this.ctx)).should.eql(new Quantity(13, '1'));
   });
 
+  it('should convert a long to a quantity with unit 1', async function () {
+    (await this.longOverload.exec(this.ctx)).should.eql(new Quantity(14, '1'));
+  });
+
   it('should convert an integer uncertainty to a quantity uncertainty', async function () {
     (await this.uncertaintyOverload.exec(this.ctx)).should.eql(
       new Uncertainty(new Quantity(6, '1'), new Quantity(18, '1'))
@@ -513,7 +637,7 @@ describe('ToBoolean', () => {
     (await this.upperCaseTrue.exec(this.ctx)).should.equal(true);
   });
 
-  it('should return true for FALSE', async function () {
+  it('should return false for FALSE', async function () {
     (await this.upperCaseFalse.exec(this.ctx)).should.equal(false);
   });
 
@@ -521,7 +645,7 @@ describe('ToBoolean', () => {
     (await this.lowerCaseT.exec(this.ctx)).should.equal(true);
   });
 
-  it('should return true for false', async function () {
+  it('should return false for false', async function () {
     (await this.lowerCaseF.exec(this.ctx)).should.equal(false);
   });
 
@@ -532,6 +656,54 @@ describe('ToBoolean', () => {
   it('should return false for F', async function () {
     (await this.upperCaseF.exec(this.ctx)).should.equal(false);
   });
+
+  it('should return true for "y"', async function () {
+    (await this.isTrue.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return false for "0"', async function () {
+    (await this.isFalse.exec(this.ctx)).should.equal(false);
+  });
+
+  it('should return null for "falsetto"', async function () {
+    should(await this.isNull.exec(this.ctx)).be.null();
+  });
+
+  it('should return true for 1', async function () {
+    (await this.isTrueWithInteger.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return false for 0', async function () {
+    (await this.isFalseWithInteger.exec(this.ctx)).should.equal(false);
+  });
+
+  it('should return null for 2', async function () {
+    should(await this.isNullWithInteger.exec(this.ctx)).be.null();
+  });
+
+  it('should return true for 1L', async function () {
+    (await this.isTrueWithLong.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return false for 0L', async function () {
+    (await this.isFalseWithLong.exec(this.ctx)).should.equal(false);
+  });
+
+  it('should return null for 2L', async function () {
+    should(await this.isNullWithLong.exec(this.ctx)).be.null();
+  });
+
+  it('should return true for 1.0', async function () {
+    (await this.isTrueWithDecimal.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return false for 0.0', async function () {
+    (await this.isFalseWithDecimal.exec(this.ctx)).should.equal(false);
+  });
+
+  it('should return null for 1.5', async function () {
+    should(await this.isNullWithDecimal.exec(this.ctx)).be.null();
+  });
 });
 
 describe('ToDate', () => {
@@ -593,6 +765,42 @@ describe('ConvertsToBoolean', () => {
     (await this.isFalse.exec(this.ctx)).should.equal(false);
   });
 
+  it('should return true for 1', async function () {
+    (await this.isTrueWithIntegerTrueValue.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return true for 0', async function () {
+    (await this.isTrueWithIntegerFalseValue.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return false for 2', async function () {
+    (await this.isFalseWithIntegerInvalidValue.exec(this.ctx)).should.equal(false);
+  });
+
+  it('should return true for 1L', async function () {
+    (await this.isTrueWithLongTrueValue.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return true for 0L', async function () {
+    (await this.isTrueWithLongFalseValue.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return false for 2L', async function () {
+    (await this.isFalseWithLongInvalidValue.exec(this.ctx)).should.equal(false);
+  });
+
+  it('should return true for 1.0', async function () {
+    (await this.isTrueWithDecimalTrueValue.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return true for 0.0', async function () {
+    (await this.isTrueWithDecimalFalseValue.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return false for 1.5', async function () {
+    (await this.isFalseWithDecimalInvalidValue.exec(this.ctx)).should.equal(false);
+  });
+
   it('should return null for null input', async function () {
     should(await this.isNull.exec(this.ctx)).be.null();
   });
@@ -661,10 +869,14 @@ describe('ConvertsToInteger', () => {
     setup(this, data);
   });
 
-  it('should return true for valid integer', async function () {
+  it('should return true for valid integer string', async function () {
     (await this.isTrue.exec(this.ctx)).should.equal(true);
   });
 
+  it('should return true for valid long', async function () {
+    (await this.isTrueWithLong.exec(this.ctx)).should.equal(true);
+  });
+
   it('should return true for boolean true', async function () {
     (await this.isTrueWithBooleanTrue.exec(this.ctx)).should.equal(true);
   });
@@ -677,6 +889,52 @@ describe('ConvertsToInteger', () => {
     (await this.isFalse.exec(this.ctx)).should.equal(false);
   });
 
+  it('should return false for an empty string', async function () {
+    (await this.isFalseWithEmptyString.exec(this.ctx)).should.equal(false);
+  });
+
+  it('should return false for a whitespace string', async function () {
+    (await this.isFalseWithWhitespaceString.exec(this.ctx)).should.equal(false);
+  });
+
+  it('should return null for null input', async function () {
+    should(await this.isNull.exec(this.ctx)).be.null();
+  });
+});
+
+describe('ConvertsToLong', () => {
+  beforeEach(function () {
+    setup(this, data);
+  });
+
+  it('should return true for valid integer string', async function () {
+    (await this.isTrue.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return true for valid integer', async function () {
+    (await this.isTrueWithInteger.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return true for boolean true', async function () {
+    (await this.isTrueWithBooleanTrue.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return true for boolean false', async function () {
+    (await this.isTrueWithBooleanFalse.exec(this.ctx)).should.equal(true);
+  });
+
+  it('should return false for invalid integer string', async function () {
+    (await this.isFalse.exec(this.ctx)).should.equal(false);
+  });
+
+  it('should return false for an empty string', async function () {
+    (await this.isFalseWithEmptyString.exec(this.ctx)).should.equal(false);
+  });
+
+  it('should return false for a whitespace string', async function () {
+    (await this.isFalseWithWhitespaceString.exec(this.ctx)).should.equal(false);
+  });
+
   it('should return null for null input', async function () {
     should(await this.isNull.exec(this.ctx)).be.null();
   });
@@ -695,6 +953,10 @@ describe('ConvertsToQuantity', () => {
     (await this.isTrueWithInteger.exec(this.ctx)).should.equal(true);
   });
 
+  it('should return true for valid long', async function () {
+    (await this.isTrueWithLong.exec(this.ctx)).should.equal(true);
+  });
+
   it('should return true for valid string', async function () {
     (await this.isTrueWithString.exec(this.ctx)).should.equal(true);
   });
diff --git a/test/elm/convert/data.cql b/test/elm/convert/data.cql
index bfa8b99ae..eb64cd79f 100644
--- a/test/elm/convert/data.cql
+++ b/test/elm/convert/data.cql
@@ -6,8 +6,11 @@ define boolFalse: convert 'false' to Boolean
 define decimalValid: convert '10.2' to Decimal
 define decimalInvalid: convert 'abc' to Decimal
 define integerValid: convert '10' to Integer
-define integerDropDecimal: convert '10.2' to Integer
+define integerWithDecimal: convert '10.2' to Integer
 define integerInvalid: convert 'abc' to Integer
+define longValid: convert '10' to Long
+define longWithDecimal: convert '10.2' to Long
+define longInvalid: convert 'abc' to Long
 define quantityStr: convert '10 \'A\'' to Quantity
 define posQuantityStr: convert '+10 \'A\'' to Quantity
 define negQuantityStr: convert '-10 \'A\'' to Quantity
@@ -21,10 +24,18 @@ define TimezoneTime: convert '14:30:00.0-07:00' to Time // 2:30PM Mountain Stand
 
 // @Test: FromInteger
 define string10: convert 10 to String
+define long10: convert 10 to Long
 define decimal10: convert 10 to Decimal
-define intNull: convert null to Decimal
+define intNull: convert (null as Integer) to Decimal
 define intInt: convert 10 to Integer
 
+// @Test: FromLong
+define string10: convert 10L to String
+define integer10: convert 10L to Integer
+define decimal10: convert 10L to Decimal
+define longNull: convert (null as Long) to Decimal
+define longLong: convert 10L to Long
+
 // @Test: FromQuantity
 define quantityStr: convert 10 'A' to String
 define negQuantityStr: convert -10 'A' to String
@@ -77,12 +88,33 @@ define PositiveSign: ToInteger('+12345')
 define NegativeSign: ToInteger('-12345')
 define TooLargeInt: ToInteger('2147483648')
 define TooSmallInt: ToInteger('-2147483649')
+define LongTwenty: ToInteger(20L)
+define TooLargeLong: ToInteger(2147483648L)
+define TooSmallLong: ToInteger(-2147483649L)
 define BooleanTrue: ToInteger(true)
 define BooleanFalse: ToInteger(false)
+define EmptyString: ToInteger('')
+define WhitespaceString: ToInteger('   ')
+define InvalidString: ToInteger('abc')
+
+// @Test: ToLong
+define NoSign: ToLong('12345')
+define PositiveSign: ToLong('+12345')
+define NegativeSign: ToLong('-12345')
+define TooLargeLong: ToLong('9223372036854775808')
+define TooSmallLong: ToLong('-9223372036854775809')
+define WithConvertKeyword: convert '101' to Long
+define Int: ToLong(12345)
+define BooleanTrue: ToLong(true)
+define BooleanFalse: ToLong(false)
+define EmptyString: ToLong('')
+define WhitespaceString: ToLong('   ')
+define InvalidString: ToLong('abc')
 
 // @Test: ToQuantity
 define DecimalOverload: ToQuantity(0.1)
 define IntegerOverload: ToQuantity(13)
+define LongOverload: ToQuantity(14L)
 define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
 define UncertaintyOverload: ToQuantity(UncertaintySixToEighteen)
 define StringOverload: ToQuantity('-0.1 \'mg\'')
@@ -124,6 +156,15 @@ define LowerCaseF: ToBoolean('f')
 define IsTrue: ToBoolean('y')
 define IsFalse: ToBoolean('0')
 define IsNull: ToBoolean('falsetto')
+define IsTrueWithInteger: ToBoolean(1)
+define IsFalseWithInteger: ToBoolean(0)
+define IsNullWithInteger: ToBoolean(2)
+define IsTrueWithLong: ToBoolean(1L)
+define IsFalseWithLong: ToBoolean(0L)
+define IsNullWithLong: ToBoolean(2L)
+define IsTrueWithDecimal: ToBoolean(1.0)
+define IsFalseWithDecimal: ToBoolean(0.0)
+define IsNullWithDecimal: ToBoolean(1.5)
 
 // @Test: ToConcept
 define IsValid: ToConcept(Code { system: 'http://loinc.org', code: '8480-6' }) // Concept { codes: { Code { system: 'http://loinc.org', code: '8480-6' } } }
@@ -138,6 +179,15 @@ define ToDateDateTimeString: ToDate(@2014-01-01T12:30:00)
 // @Test: ConvertsToBoolean
 define IsTrueWithTrueValue: ConvertsToBoolean('y')
 define IsTrueWithFalseValue: ConvertsToBoolean('0')
+define IsTrueWithIntegerTrueValue: ConvertsToBoolean(1)
+define IsTrueWithIntegerFalseValue: ConvertsToBoolean(0)
+define IsFalseWithIntegerInvalidValue: ConvertsToBoolean(2)
+define IsTrueWithLongTrueValue: ConvertsToBoolean(1L)
+define IsTrueWithLongFalseValue: ConvertsToBoolean(0L)
+define IsFalseWithLongInvalidValue: ConvertsToBoolean(2L)
+define IsTrueWithDecimalTrueValue: ConvertsToBoolean(1.0)
+define IsTrueWithDecimalFalseValue: ConvertsToBoolean(0.0)
+define IsFalseWithDecimalInvalidValue: ConvertsToBoolean(1.5)
 define IsFalse: ConvertsToBoolean('foo')
 define IsNull: ConvertsToBoolean(null as String)
 
@@ -159,14 +209,28 @@ define IsNull: ConvertsToDecimal(null as Decimal)
 
 // @Test: ConvertsToInteger
 define IsTrue: ConvertsToInteger('101')
+define IsTrueWithLong: ConvertsToInteger(101L)
 define IsTrueWithBooleanTrue: ConvertsToInteger(true)
 define IsTrueWithBooleanFalse: ConvertsToInteger(false)
 define IsFalse: ConvertsToInteger('foo')
+define IsFalseWithEmptyString: ConvertsToInteger('')
+define IsFalseWithWhitespaceString: ConvertsToInteger('   ')
 define IsNull: ConvertsToInteger(null as Integer)
 
+// @Test: ConvertsToLong
+define IsTrue: ConvertsToLong('101')
+define IsTrueWithInteger: ConvertsToLong(101)
+define IsTrueWithBooleanTrue: ConvertsToLong(true)
+define IsTrueWithBooleanFalse: ConvertsToLong(false)
+define IsFalse: ConvertsToLong('foo')
+define IsFalseWithEmptyString: ConvertsToLong('')
+define IsFalseWithWhitespaceString: ConvertsToLong('   ')
+define IsNull: ConvertsToLong(null as Integer)
+
 // @Test: ConvertsToQuantity
 define IsTrueWithDecimal: ConvertsToQuantity(0.1)
 define IsTrueWithInteger: ConvertsToQuantity(101)
+define IsTrueWithLong: ConvertsToQuantity(101L)
 define IsTrueWithString: ConvertsToQuantity('1.0 \'mg\'')
 define IsFalse: ConvertsToQuantity('foo')
 define IsFalseWithInvalidUcum: ConvertsToQuantity('1.0 \'cc\'')
diff --git a/test/elm/convert/data.js b/test/elm/convert/data.js
index 4bb8f8352..542407822 100644
--- a/test/elm/convert/data.js
+++ b/test/elm/convert/data.js
@@ -19,8 +19,11 @@ define boolFalse: convert 'false' to Boolean
 define decimalValid: convert '10.2' to Decimal
 define decimalInvalid: convert 'abc' to Decimal
 define integerValid: convert '10' to Integer
-define integerDropDecimal: convert '10.2' to Integer
+define integerWithDecimal: convert '10.2' to Integer
 define integerInvalid: convert 'abc' to Integer
+define longValid: convert '10' to Long
+define longWithDecimal: convert '10.2' to Long
+define longInvalid: convert 'abc' to Long
 define quantityStr: convert '10 \'A\'' to Quantity
 define posQuantityStr: convert '+10 \'A\'' to Quantity
 define negQuantityStr: convert '-10 \'A\'' to Quantity
@@ -45,7 +48,7 @@ module.exports['FromString'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "370",
+        "r" : "397",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -467,7 +470,7 @@ module.exports['FromString'] = {
       }, {
         "localId" : "271",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "integerDropDecimal",
+        "name" : "integerWithDecimal",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -476,7 +479,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "271",
             "s" : [ {
-              "value" : [ "", "define ", "integerDropDecimal", ": " ]
+              "value" : [ "", "define ", "integerWithDecimal", ": " ]
             }, {
               "r" : "276",
               "s" : [ {
@@ -572,8 +575,8 @@ module.exports['FromString'] = {
         }
       }, {
         "localId" : "289",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "quantityStr",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longValid",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -582,7 +585,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "quantityStr", ": " ]
+              "value" : [ "", "define ", "longValid", ": " ]
             }, {
               "r" : "294",
               "s" : [ {
@@ -590,23 +593,23 @@ module.exports['FromString'] = {
               }, {
                 "r" : "291",
                 "s" : [ {
-                  "value" : [ "'10 \\'A\\''" ]
+                  "value" : [ "'10'" ]
                 } ]
               }, {
                 "value" : [ " to " ]
               }, {
                 "r" : "290",
                 "s" : [ {
-                  "value" : [ "Quantity" ]
+                  "value" : [ "Long" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
+          "type" : "ToLong",
           "localId" : "294",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
@@ -619,14 +622,14 @@ module.exports['FromString'] = {
             "localId" : "291",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "10 'A'",
+            "value" : "10",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "298",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "posQuantityStr",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longWithDecimal",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -635,7 +638,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "298",
             "s" : [ {
-              "value" : [ "", "define ", "posQuantityStr", ": " ]
+              "value" : [ "", "define ", "longWithDecimal", ": " ]
             }, {
               "r" : "303",
               "s" : [ {
@@ -643,23 +646,23 @@ module.exports['FromString'] = {
               }, {
                 "r" : "300",
                 "s" : [ {
-                  "value" : [ "'+10 \\'A\\''" ]
+                  "value" : [ "'10.2'" ]
                 } ]
               }, {
                 "value" : [ " to " ]
               }, {
                 "r" : "299",
                 "s" : [ {
-                  "value" : [ "Quantity" ]
+                  "value" : [ "Long" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
+          "type" : "ToLong",
           "localId" : "303",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
@@ -672,14 +675,14 @@ module.exports['FromString'] = {
             "localId" : "300",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "+10 'A'",
+            "value" : "10.2",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "307",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "negQuantityStr",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longInvalid",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -688,7 +691,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "307",
             "s" : [ {
-              "value" : [ "", "define ", "negQuantityStr", ": " ]
+              "value" : [ "", "define ", "longInvalid", ": " ]
             }, {
               "r" : "312",
               "s" : [ {
@@ -696,23 +699,23 @@ module.exports['FromString'] = {
               }, {
                 "r" : "309",
                 "s" : [ {
-                  "value" : [ "'-10 \\'A\\''" ]
+                  "value" : [ "'abc'" ]
                 } ]
               }, {
                 "value" : [ " to " ]
               }, {
                 "r" : "308",
                 "s" : [ {
-                  "value" : [ "Quantity" ]
+                  "value" : [ "Long" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
+          "type" : "ToLong",
           "localId" : "312",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
@@ -725,14 +728,14 @@ module.exports['FromString'] = {
             "localId" : "309",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "-10 'A'",
+            "value" : "abc",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "316",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "quantityStrDecimal",
+        "name" : "quantityStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -741,7 +744,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "316",
             "s" : [ {
-              "value" : [ "", "define ", "quantityStrDecimal", ": " ]
+              "value" : [ "", "define ", "quantityStr", ": " ]
             }, {
               "r" : "321",
               "s" : [ {
@@ -749,7 +752,7 @@ module.exports['FromString'] = {
               }, {
                 "r" : "318",
                 "s" : [ {
-                  "value" : [ "'10.0 \\'mA\\''" ]
+                  "value" : [ "'10 \\'A\\''" ]
                 } ]
               }, {
                 "value" : [ " to " ]
@@ -778,14 +781,14 @@ module.exports['FromString'] = {
             "localId" : "318",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "10.0 'mA'",
+            "value" : "10 'A'",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "325",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "dateTimeStr",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "posQuantityStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -794,7 +797,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "325",
             "s" : [ {
-              "value" : [ "", "define ", "dateTimeStr", ": " ]
+              "value" : [ "", "define ", "posQuantityStr", ": " ]
             }, {
               "r" : "330",
               "s" : [ {
@@ -802,23 +805,23 @@ module.exports['FromString'] = {
               }, {
                 "r" : "327",
                 "s" : [ {
-                  "value" : [ "'2015-01-02'" ]
+                  "value" : [ "'+10 \\'A\\''" ]
                 } ]
               }, {
                 "value" : [ " to " ]
               }, {
                 "r" : "326",
                 "s" : [ {
-                  "value" : [ "DateTime" ]
+                  "value" : [ "Quantity" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDateTime",
+          "type" : "ToQuantity",
           "localId" : "330",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
@@ -831,14 +834,14 @@ module.exports['FromString'] = {
             "localId" : "327",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "2015-01-02",
+            "value" : "+10 'A'",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "334",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "dateStr",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "negQuantityStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -847,7 +850,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "334",
             "s" : [ {
-              "value" : [ "", "define ", "dateStr", ": " ]
+              "value" : [ "", "define ", "negQuantityStr", ": " ]
             }, {
               "r" : "339",
               "s" : [ {
@@ -855,23 +858,23 @@ module.exports['FromString'] = {
               }, {
                 "r" : "336",
                 "s" : [ {
-                  "value" : [ "'2015-01-02'" ]
+                  "value" : [ "'-10 \\'A\\''" ]
                 } ]
               }, {
                 "value" : [ " to " ]
               }, {
                 "r" : "335",
                 "s" : [ {
-                  "value" : [ "Date" ]
+                  "value" : [ "Quantity" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDate",
+          "type" : "ToQuantity",
           "localId" : "339",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
@@ -884,14 +887,14 @@ module.exports['FromString'] = {
             "localId" : "336",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "2015-01-02",
+            "value" : "-10 'A'",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "343",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "NullConvert",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "quantityStrDecimal",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -900,7 +903,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "343",
             "s" : [ {
-              "value" : [ "", "define ", "NullConvert", ": " ]
+              "value" : [ "", "define ", "quantityStrDecimal", ": " ]
             }, {
               "r" : "348",
               "s" : [ {
@@ -908,23 +911,23 @@ module.exports['FromString'] = {
               }, {
                 "r" : "345",
                 "s" : [ {
-                  "value" : [ "'foo'" ]
+                  "value" : [ "'10.0 \\'mA\\''" ]
                 } ]
               }, {
                 "value" : [ " to " ]
               }, {
                 "r" : "344",
                 "s" : [ {
-                  "value" : [ "DateTime" ]
+                  "value" : [ "Quantity" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDateTime",
+          "type" : "ToQuantity",
           "localId" : "348",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
@@ -937,14 +940,14 @@ module.exports['FromString'] = {
             "localId" : "345",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "foo",
+            "value" : "10.0 'mA'",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "352",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ZDateTime",
+        "name" : "dateTimeStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -953,7 +956,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "352",
             "s" : [ {
-              "value" : [ "", "define ", "ZDateTime", ": " ]
+              "value" : [ "", "define ", "dateTimeStr", ": " ]
             }, {
               "r" : "357",
               "s" : [ {
@@ -961,7 +964,7 @@ module.exports['FromString'] = {
               }, {
                 "r" : "354",
                 "s" : [ {
-                  "value" : [ "'2014-01-01T14:30:00.0Z'" ]
+                  "value" : [ "'2015-01-02'" ]
                 } ]
               }, {
                 "value" : [ " to " ]
@@ -990,14 +993,14 @@ module.exports['FromString'] = {
             "localId" : "354",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "2014-01-01T14:30:00.0Z",
+            "value" : "2015-01-02",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "361",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "TimezoneDateTime",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "dateStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1006,7 +1009,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "361",
             "s" : [ {
-              "value" : [ "// January 1st, 2014, 2:30PM UTC\n", "define ", "TimezoneDateTime", ": " ]
+              "value" : [ "", "define ", "dateStr", ": " ]
             }, {
               "r" : "366",
               "s" : [ {
@@ -1014,23 +1017,23 @@ module.exports['FromString'] = {
               }, {
                 "r" : "363",
                 "s" : [ {
-                  "value" : [ "'2014-01-01T14:30:00.0-07:00'" ]
+                  "value" : [ "'2015-01-02'" ]
                 } ]
               }, {
                 "value" : [ " to " ]
               }, {
                 "r" : "362",
                 "s" : [ {
-                  "value" : [ "DateTime" ]
+                  "value" : [ "Date" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDateTime",
+          "type" : "ToDate",
           "localId" : "366",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
@@ -1043,14 +1046,14 @@ module.exports['FromString'] = {
             "localId" : "363",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "2014-01-01T14:30:00.0-07:00",
+            "value" : "2015-01-02",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "370",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimezoneTime",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "NullConvert",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1059,7 +1062,7 @@ module.exports['FromString'] = {
           "s" : {
             "r" : "370",
             "s" : [ {
-              "value" : [ "// January 1st, 2014, 2:30PM Mountain Standard (GMT-7:00)\n", "define ", "TimezoneTime", ": " ]
+              "value" : [ "", "define ", "NullConvert", ": " ]
             }, {
               "r" : "375",
               "s" : [ {
@@ -1067,23 +1070,23 @@ module.exports['FromString'] = {
               }, {
                 "r" : "372",
                 "s" : [ {
-                  "value" : [ "'14:30:00.0-07:00'" ]
+                  "value" : [ "'foo'" ]
                 } ]
               }, {
                 "value" : [ " to " ]
               }, {
                 "r" : "371",
                 "s" : [ {
-                  "value" : [ "Time" ]
+                  "value" : [ "DateTime" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
+          "type" : "ToDateTime",
           "localId" : "375",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
@@ -1096,295 +1099,186 @@ module.exports['FromString'] = {
             "localId" : "372",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "14:30:00.0-07:00",
+            "value" : "foo",
             "annotation" : [ ]
           }
         }
-      } ]
-    }
-  }
-}
-
-/* FromInteger
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define string10: convert 10 to String
-define decimal10: convert 10 to Decimal
-define intNull: convert null to Decimal
-define intInt: convert 10 to Integer
-*/
-
-module.exports['FromInteger'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "236",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "379",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ZDateTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "379",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "ZDateTime", ": " ]
             }, {
+              "r" : "384",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "convert " ]
+              }, {
+                "r" : "381",
+                "s" : [ {
+                  "value" : [ "'2014-01-01T14:30:00.0Z'" ]
+                } ]
+              }, {
+                "value" : [ " to " ]
+              }, {
+                "r" : "380",
+                "s" : [ {
+                  "value" : [ "DateTime" ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "ToDateTime",
+          "localId" : "384",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
-          "signature" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "385",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
           "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "type" : "Literal",
+            "localId" : "381",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "2014-01-01T14:30:00.0Z",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "string10",
+        "localId" : "388",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "TimezoneDateTime",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "388",
             "s" : [ {
-              "value" : [ "", "define ", "string10", ": " ]
+              "value" : [ "// January 1st, 2014, 2:30PM UTC\n", "define ", "TimezoneDateTime", ": " ]
             }, {
-              "r" : "218",
+              "r" : "393",
               "s" : [ {
-                "r" : "216",
-                "value" : [ "convert ", "10", " to " ]
+                "value" : [ "convert " ]
               }, {
-                "r" : "215",
+                "r" : "390",
                 "s" : [ {
-                  "value" : [ "String" ]
+                  "value" : [ "'2014-01-01T14:30:00.0-07:00'" ]
                 } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ToString",
-          "localId" : "218",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "219",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          } ],
-          "operand" : {
-            "type" : "Literal",
-            "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "10",
-            "annotation" : [ ]
-          }
-        }
-      }, {
-        "localId" : "222",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "decimal10",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "222",
-            "s" : [ {
-              "value" : [ "", "define ", "decimal10", ": " ]
-            }, {
-              "r" : "226",
-              "s" : [ {
-                "r" : "224",
-                "value" : [ "convert ", "10", " to " ]
               }, {
-                "r" : "223",
+                "value" : [ " to " ]
+              }, {
+                "r" : "389",
                 "s" : [ {
-                  "value" : [ "Decimal" ]
+                  "value" : [ "DateTime" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDecimal",
-          "localId" : "226",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "ToDateTime",
+          "localId" : "393",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "227",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "394",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "224",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "10",
+            "localId" : "390",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "2014-01-01T14:30:00.0-07:00",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "230",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "intNull",
+        "localId" : "397",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimezoneTime",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "230",
+            "r" : "397",
             "s" : [ {
-              "value" : [ "", "define ", "intNull", ": " ]
+              "value" : [ "// January 1st, 2014, 2:30PM Mountain Standard (GMT-7:00)\n", "define ", "TimezoneTime", ": " ]
             }, {
-              "r" : "233",
+              "r" : "402",
               "s" : [ {
-                "r" : "232",
-                "value" : [ "convert ", "null", " to " ]
+                "value" : [ "convert " ]
               }, {
-                "r" : "231",
+                "r" : "399",
                 "s" : [ {
-                  "value" : [ "Decimal" ]
+                  "value" : [ "'14:30:00.0-07:00'" ]
+                } ]
+              }, {
+                "value" : [ " to " ]
+              }, {
+                "r" : "398",
+                "s" : [ {
+                  "value" : [ "Time" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "As",
-          "localId" : "233",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-          "asType" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "ToTime",
+          "localId" : "402",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
-          "signature" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "403",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
           "operand" : {
-            "type" : "Null",
-            "localId" : "232",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+            "type" : "Literal",
+            "localId" : "399",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "14:30:00.0-07:00",
             "annotation" : [ ]
           }
         }
-      }, {
-        "localId" : "236",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "intInt",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "236",
-            "s" : [ {
-              "value" : [ "", "define ", "intInt", ": " ]
-            }, {
-              "r" : "238",
-              "s" : [ {
-                "r" : "238",
-                "value" : [ "convert ", "10", " to " ]
-              }, {
-                "r" : "237",
-                "s" : [ {
-                  "value" : [ "Integer" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Literal",
-          "localId" : "238",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-          "value" : "10",
-          "annotation" : [ ]
-        }
       } ]
     }
   }
 }
 
-/* FromQuantity
+/* FromInteger
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define quantityStr: convert 10 'A' to String
-define negQuantityStr: convert -10 'A' to String
-define posQuantityStr: convert +10 'A' to String
-define quantityQuantity: convert 10 'A' to Quantity
+define string10: convert 10 to String
+define long10: convert 10 to Long
+define decimal10: convert 10 to Decimal
+define intNull: convert (null as Integer) to Decimal
+define intInt: convert 10 to Integer
 */
 
-module.exports['FromQuantity'] = {
+module.exports['FromInteger'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -1396,7 +1290,7 @@ module.exports['FromQuantity'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "240",
+        "r" : "248",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -1471,7 +1365,7 @@ module.exports['FromQuantity'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "quantityStr",
+        "name" : "string10",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1480,18 +1374,12 @@ module.exports['FromQuantity'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "quantityStr", ": " ]
+              "value" : [ "", "define ", "string10", ": " ]
             }, {
               "r" : "218",
               "s" : [ {
-                "value" : [ "convert " ]
-              }, {
                 "r" : "216",
-                "s" : [ {
-                  "value" : [ "10 ", "'A'" ]
-                } ]
-              }, {
-                "value" : [ " to " ]
+                "value" : [ "convert ", "10", " to " ]
               }, {
                 "r" : "215",
                 "s" : [ {
@@ -1509,22 +1397,22 @@ module.exports['FromQuantity'] = {
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
             "localId" : "219",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Quantity",
+            "type" : "Literal",
             "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 10,
-            "unit" : "A",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "222",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "negQuantityStr",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "long10",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1533,161 +1421,200 @@ module.exports['FromQuantity'] = {
           "s" : {
             "r" : "222",
             "s" : [ {
-              "value" : [ "", "define ", "negQuantityStr", ": " ]
+              "value" : [ "", "define ", "long10", ": " ]
             }, {
-              "r" : "228",
+              "r" : "226",
               "s" : [ {
-                "value" : [ "convert " ]
-              }, {
                 "r" : "224",
-                "s" : [ {
-                  "value" : [ "-" ]
-                }, {
-                  "r" : "225",
-                  "s" : [ {
-                    "value" : [ "10 ", "'A'" ]
-                  } ]
-                } ]
-              }, {
-                "value" : [ " to " ]
+                "value" : [ "convert ", "10", " to " ]
               }, {
                 "r" : "223",
                 "s" : [ {
-                  "value" : [ "String" ]
+                  "value" : [ "Long" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToString",
-          "localId" : "228",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+          "type" : "ToLong",
+          "localId" : "226",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "229",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "227",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Negate",
+            "type" : "Literal",
             "localId" : "224",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "226",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Quantity",
-              "localId" : "225",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10,
-              "unit" : "A",
-              "annotation" : [ ]
-            }
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "232",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "posQuantityStr",
+        "localId" : "230",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimal10",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "232",
+            "r" : "230",
             "s" : [ {
-              "value" : [ "", "define ", "posQuantityStr", ": " ]
+              "value" : [ "", "define ", "decimal10", ": " ]
             }, {
-              "r" : "236",
+              "r" : "234",
               "s" : [ {
-                "value" : [ "convert " ]
-              }, {
-                "r" : "234",
-                "s" : [ {
-                  "value" : [ "+" ]
-                }, {
-                  "r" : "234",
-                  "s" : [ {
-                    "value" : [ "10 ", "'A'" ]
-                  } ]
-                } ]
-              }, {
-                "value" : [ " to " ]
+                "r" : "232",
+                "value" : [ "convert ", "10", " to " ]
               }, {
-                "r" : "233",
+                "r" : "231",
                 "s" : [ {
-                  "value" : [ "String" ]
+                  "value" : [ "Decimal" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToString",
-          "localId" : "236",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+          "type" : "ToDecimal",
+          "localId" : "234",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "237",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Quantity",
-            "localId" : "234",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 10,
-            "unit" : "A",
+            "type" : "Literal",
+            "localId" : "232",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "240",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "quantityQuantity",
+        "localId" : "238",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "intNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "240",
+            "r" : "238",
             "s" : [ {
-              "value" : [ "", "define ", "quantityQuantity", ": " ]
+              "value" : [ "", "define ", "intNull", ": " ]
             }, {
-              "r" : "242",
+              "r" : "244",
               "s" : [ {
                 "value" : [ "convert " ]
               }, {
-                "r" : "242",
+                "r" : "240",
                 "s" : [ {
-                  "value" : [ "10 ", "'A'" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "240",
+                  "s" : [ {
+                    "r" : "241",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "242",
+                    "s" : [ {
+                      "value" : [ "Integer" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
                 "value" : [ " to " ]
               }, {
-                "r" : "241",
+                "r" : "239",
                 "s" : [ {
-                  "value" : [ "Quantity" ]
+                  "value" : [ "Decimal" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Quantity",
-          "localId" : "242",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-          "value" : 10,
-          "unit" : "A",
+          "type" : "ToDecimal",
+          "localId" : "244",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "245",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "As",
+            "localId" : "240",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "strict" : false,
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "248",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "intInt",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "248",
+            "s" : [ {
+              "value" : [ "", "define ", "intInt", ": " ]
+            }, {
+              "r" : "250",
+              "s" : [ {
+                "r" : "250",
+                "value" : [ "convert ", "10", " to " ]
+              }, {
+                "r" : "249",
+                "s" : [ {
+                  "value" : [ "Integer" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Literal",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+          "value" : "10",
           "annotation" : [ ]
         }
       } ]
@@ -1695,17 +1622,18 @@ module.exports['FromQuantity'] = {
   }
 }
 
-/* FromBoolean
+/* FromLong
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define booleanTrueStr: convert true to String
-define booleanFalseStr: convert false to String
-define booleanTrueBool: convert true to Boolean
-define booleanFalseBool: convert false to Boolean
+define string10: convert 10L to String
+define integer10: convert 10L to Integer
+define decimal10: convert 10L to Decimal
+define longNull: convert (null as Long) to Decimal
+define longLong: convert 10L to Long
 */
 
-module.exports['FromBoolean'] = {
+module.exports['FromLong'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -1717,7 +1645,7 @@ module.exports['FromBoolean'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "235",
+        "r" : "248",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -1792,7 +1720,7 @@ module.exports['FromBoolean'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "booleanTrueStr",
+        "name" : "string10",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1801,12 +1729,12 @@ module.exports['FromBoolean'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "booleanTrueStr", ": " ]
+              "value" : [ "", "define ", "string10", ": " ]
             }, {
               "r" : "218",
               "s" : [ {
                 "r" : "216",
-                "value" : [ "convert ", "true", " to " ]
+                "value" : [ "convert ", "10L", " to " ]
               }, {
                 "r" : "215",
                 "s" : [ {
@@ -1824,22 +1752,22 @@ module.exports['FromBoolean'] = {
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
             "localId" : "219",
-            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
             "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "value" : "true",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "10",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "222",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "booleanFalseStr",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "integer10",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1848,45 +1776,45 @@ module.exports['FromBoolean'] = {
           "s" : {
             "r" : "222",
             "s" : [ {
-              "value" : [ "", "define ", "booleanFalseStr", ": " ]
+              "value" : [ "", "define ", "integer10", ": " ]
             }, {
               "r" : "226",
               "s" : [ {
                 "r" : "224",
-                "value" : [ "convert ", "false", " to " ]
+                "value" : [ "convert ", "10L", " to " ]
               }, {
                 "r" : "223",
                 "s" : [ {
-                  "value" : [ "String" ]
+                  "value" : [ "Integer" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToString",
+          "type" : "ToInteger",
           "localId" : "226",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
             "localId" : "227",
-            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
             "localId" : "224",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "value" : "false",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "10",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "230",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "booleanTrueBool",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "decimal10",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1895,51 +1823,142 @@ module.exports['FromBoolean'] = {
           "s" : {
             "r" : "230",
             "s" : [ {
-              "value" : [ "", "define ", "booleanTrueBool", ": " ]
+              "value" : [ "", "define ", "decimal10", ": " ]
             }, {
-              "r" : "232",
+              "r" : "234",
               "s" : [ {
                 "r" : "232",
-                "value" : [ "convert ", "true", " to " ]
+                "value" : [ "convert ", "10L", " to " ]
               }, {
                 "r" : "231",
                 "s" : [ {
-                  "value" : [ "Boolean" ]
+                  "value" : [ "Decimal" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Literal",
-          "localId" : "232",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "value" : "true",
-          "annotation" : [ ]
+          "type" : "ToDecimal",
+          "localId" : "234",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "232",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "10",
+            "annotation" : [ ]
+          }
         }
       }, {
-        "localId" : "235",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "booleanFalseBool",
+        "localId" : "238",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "longNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "235",
+            "r" : "238",
             "s" : [ {
-              "value" : [ "", "define ", "booleanFalseBool", ": " ]
+              "value" : [ "", "define ", "longNull", ": " ]
             }, {
-              "r" : "237",
+              "r" : "244",
               "s" : [ {
-                "r" : "237",
-                "value" : [ "convert ", "false", " to " ]
+                "value" : [ "convert " ]
               }, {
-                "r" : "236",
+                "r" : "240",
                 "s" : [ {
-                  "value" : [ "Boolean" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "240",
+                  "s" : [ {
+                    "r" : "241",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "242",
+                    "s" : [ {
+                      "value" : [ "Long" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " to " ]
+              }, {
+                "r" : "239",
+                "s" : [ {
+                  "value" : [ "Decimal" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDecimal",
+          "localId" : "244",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "245",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "As",
+            "localId" : "240",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "strict" : false,
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "248",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "longLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "248",
+            "s" : [ {
+              "value" : [ "", "define ", "longLong", ": " ]
+            }, {
+              "r" : "250",
+              "s" : [ {
+                "r" : "250",
+                "value" : [ "convert ", "10L", " to " ]
+              }, {
+                "r" : "249",
+                "s" : [ {
+                  "value" : [ "Long" ]
                 } ]
               } ]
             } ]
@@ -1947,10 +1966,10 @@ module.exports['FromBoolean'] = {
         } ],
         "expression" : {
           "type" : "Literal",
-          "localId" : "237",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "value" : "false",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+          "value" : "10",
           "annotation" : [ ]
         }
       } ]
@@ -1958,16 +1977,17 @@ module.exports['FromBoolean'] = {
   }
 }
 
-/* FromDateTime
+/* FromQuantity
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define dateTimeToStr: convert @2015-01-02T12:01:02.321-06:00 to String
-define dateTimeToDate: convert @2015-01-02T12:01:02.321-06:00 to Date
-define dateTimeToDateTime: convert @2015-01-02T12:01:02.321-06:00 to DateTime
-*/
-
-module.exports['FromDateTime'] = {
+define quantityStr: convert 10 'A' to String
+define negQuantityStr: convert -10 'A' to String
+define posQuantityStr: convert +10 'A' to String
+define quantityQuantity: convert 10 'A' to Quantity
+*/
+
+module.exports['FromQuantity'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -1979,7 +1999,7 @@ module.exports['FromDateTime'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "246",
+        "r" : "240",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -2054,7 +2074,7 @@ module.exports['FromDateTime'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "dateTimeToStr",
+        "name" : "quantityStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -2063,12 +2083,18 @@ module.exports['FromDateTime'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "dateTimeToStr", ": " ]
+              "value" : [ "", "define ", "quantityStr", ": " ]
             }, {
-              "r" : "226",
+              "r" : "218",
               "s" : [ {
+                "value" : [ "convert " ]
+              }, {
                 "r" : "216",
-                "value" : [ "convert ", "@2015-01-02T12:01:02.321-06:00", " to " ]
+                "s" : [ {
+                  "value" : [ "10 ", "'A'" ]
+                } ]
+              }, {
+                "value" : [ " to " ]
               }, {
                 "r" : "215",
                 "s" : [ {
@@ -2080,288 +2106,209 @@ module.exports['FromDateTime'] = {
         } ],
         "expression" : {
           "type" : "ToString",
-          "localId" : "226",
+          "localId" : "218",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "227",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "219",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "DateTime",
+            "type" : "Quantity",
             "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "217",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "218",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "219",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "220",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "221",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "222",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "223",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "321",
-              "annotation" : [ ]
-            },
-            "timezoneOffset" : {
-              "type" : "Literal",
-              "localId" : "224",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "-6.0",
-              "annotation" : [ ]
-            }
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 10,
+            "unit" : "A",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "230",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "dateTimeToDate",
+        "localId" : "222",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+        "name" : "negQuantityStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "230",
+            "r" : "222",
             "s" : [ {
-              "value" : [ "", "define ", "dateTimeToDate", ": " ]
+              "value" : [ "", "define ", "negQuantityStr", ": " ]
             }, {
-              "r" : "242",
+              "r" : "228",
               "s" : [ {
-                "r" : "232",
-                "value" : [ "convert ", "@2015-01-02T12:01:02.321-06:00", " to " ]
+                "value" : [ "convert " ]
               }, {
-                "r" : "231",
+                "r" : "224",
                 "s" : [ {
-                  "value" : [ "Date" ]
+                  "value" : [ "-" ]
+                }, {
+                  "r" : "225",
+                  "s" : [ {
+                    "value" : [ "10 ", "'A'" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ " to " ]
+              }, {
+                "r" : "223",
+                "s" : [ {
+                  "value" : [ "String" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDate",
-          "localId" : "242",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "ToString",
+          "localId" : "228",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "243",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "229",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "DateTime",
-            "localId" : "232",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Negate",
+            "localId" : "224",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
-            "signature" : [ ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "233",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "234",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "235",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "236",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "237",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "238",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "239",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "321",
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "226",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
-            },
-            "timezoneOffset" : {
-              "type" : "Literal",
-              "localId" : "240",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "-6.0",
+            } ],
+            "operand" : {
+              "type" : "Quantity",
+              "localId" : "225",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 10,
+              "unit" : "A",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "246",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "dateTimeToDateTime",
+        "localId" : "232",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+        "name" : "posQuantityStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "246",
+            "r" : "232",
             "s" : [ {
-              "value" : [ "", "define ", "dateTimeToDateTime", ": " ]
+              "value" : [ "", "define ", "posQuantityStr", ": " ]
             }, {
-              "r" : "248",
+              "r" : "236",
               "s" : [ {
-                "r" : "248",
-                "value" : [ "convert ", "@2015-01-02T12:01:02.321-06:00", " to " ]
+                "value" : [ "convert " ]
               }, {
-                "r" : "247",
+                "r" : "234",
                 "s" : [ {
-                  "value" : [ "DateTime" ]
+                  "value" : [ "+" ]
+                }, {
+                  "r" : "234",
+                  "s" : [ {
+                    "value" : [ "10 ", "'A'" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ " to " ]
+              }, {
+                "r" : "233",
+                "s" : [ {
+                  "value" : [ "String" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "DateTime",
-          "localId" : "248",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "ToString",
+          "localId" : "236",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
-          "signature" : [ ],
-          "year" : {
-            "type" : "Literal",
-            "localId" : "249",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "2015",
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "237",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
-          },
-          "month" : {
-            "type" : "Literal",
-            "localId" : "250",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "1",
-            "annotation" : [ ]
-          },
-          "day" : {
-            "type" : "Literal",
-            "localId" : "251",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "2",
-            "annotation" : [ ]
-          },
-          "hour" : {
-            "type" : "Literal",
-            "localId" : "252",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "12",
-            "annotation" : [ ]
-          },
-          "minute" : {
-            "type" : "Literal",
-            "localId" : "253",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "1",
-            "annotation" : [ ]
-          },
-          "second" : {
-            "type" : "Literal",
-            "localId" : "254",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "2",
-            "annotation" : [ ]
-          },
-          "millisecond" : {
-            "type" : "Literal",
-            "localId" : "255",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "321",
-            "annotation" : [ ]
-          },
-          "timezoneOffset" : {
-            "type" : "Literal",
-            "localId" : "256",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "-6.0",
+          } ],
+          "operand" : {
+            "type" : "Quantity",
+            "localId" : "234",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 10,
+            "unit" : "A",
             "annotation" : [ ]
           }
         }
+      }, {
+        "localId" : "240",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "quantityQuantity",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "240",
+            "s" : [ {
+              "value" : [ "", "define ", "quantityQuantity", ": " ]
+            }, {
+              "r" : "242",
+              "s" : [ {
+                "value" : [ "convert " ]
+              }, {
+                "r" : "242",
+                "s" : [ {
+                  "value" : [ "10 ", "'A'" ]
+                } ]
+              }, {
+                "value" : [ " to " ]
+              }, {
+                "r" : "241",
+                "s" : [ {
+                  "value" : [ "Quantity" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Quantity",
+          "localId" : "242",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "value" : 10,
+          "unit" : "A",
+          "annotation" : [ ]
+        }
       } ]
     }
   }
 }
 
-/* FromDate
+/* FromBoolean
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define dateYMDToDateTime: convert @2015-01-01 to DateTime
-define dateYMToDateTime: convert @2015-01 to DateTime
-define dateYToDateTime: convert @2015 to DateTime
-define dateToDate: convert @2015-01-01 to Date
-define dateToStr: convert @2015-01-01 to String
+define booleanTrueStr: convert true to String
+define booleanFalseStr: convert false to String
+define booleanTrueBool: convert true to Boolean
+define booleanFalseBool: convert false to Boolean
 */
 
-module.exports['FromDate'] = {
+module.exports['FromBoolean'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -2373,7 +2320,7 @@ module.exports['FromDate'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "256",
+        "r" : "235",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -2447,8 +2394,8 @@ module.exports['FromDate'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "dateYMDToDateTime",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+        "name" : "booleanTrueStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -2457,310 +2404,173 @@ module.exports['FromDate'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "dateYMDToDateTime", ": " ]
+              "value" : [ "", "define ", "booleanTrueStr", ": " ]
             }, {
-              "r" : "222",
+              "r" : "218",
               "s" : [ {
-                "r" : "220",
-                "value" : [ "convert ", "@2015-01-01", " to " ]
+                "r" : "216",
+                "value" : [ "convert ", "true", " to " ]
               }, {
                 "r" : "215",
                 "s" : [ {
-                  "value" : [ "DateTime" ]
+                  "value" : [ "String" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDateTime",
-          "localId" : "222",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "ToString",
+          "localId" : "218",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "223",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "localId" : "219",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Date",
-            "localId" : "220",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "217",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "218",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "219",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "value" : "true",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "226",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "dateYMToDateTime",
+        "localId" : "222",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+        "name" : "booleanFalseStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "226",
+            "r" : "222",
             "s" : [ {
-              "value" : [ "", "define ", "dateYMToDateTime", ": " ]
+              "value" : [ "", "define ", "booleanFalseStr", ": " ]
             }, {
-              "r" : "233",
+              "r" : "226",
               "s" : [ {
-                "r" : "231",
-                "value" : [ "convert ", "@2015-01", " to " ]
+                "r" : "224",
+                "value" : [ "convert ", "false", " to " ]
               }, {
-                "r" : "227",
+                "r" : "223",
                 "s" : [ {
-                  "value" : [ "DateTime" ]
+                  "value" : [ "String" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDateTime",
-          "localId" : "233",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "ToString",
+          "localId" : "226",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "234",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "localId" : "227",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Date",
-            "localId" : "231",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "229",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "230",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }
+            "type" : "Literal",
+            "localId" : "224",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "value" : "false",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "237",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "dateYToDateTime",
+        "localId" : "230",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "booleanTrueBool",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "237",
+            "r" : "230",
             "s" : [ {
-              "value" : [ "", "define ", "dateYToDateTime", ": " ]
+              "value" : [ "", "define ", "booleanTrueBool", ": " ]
             }, {
-              "r" : "243",
+              "r" : "232",
               "s" : [ {
-                "r" : "241",
-                "value" : [ "convert ", "@2015", " to " ]
+                "r" : "232",
+                "value" : [ "convert ", "true", " to " ]
               }, {
-                "r" : "238",
+                "r" : "231",
                 "s" : [ {
-                  "value" : [ "DateTime" ]
+                  "value" : [ "Boolean" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDateTime",
-          "localId" : "243",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "244",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ]
-          } ],
-          "operand" : {
-            "type" : "Date",
-            "localId" : "241",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "240",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "247",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "dateToDate",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "247",
-            "s" : [ {
-              "value" : [ "", "define ", "dateToDate", ": " ]
-            }, {
-              "r" : "253",
-              "s" : [ {
-                "r" : "253",
-                "value" : [ "convert ", "@2015-01-01", " to " ]
-              }, {
-                "r" : "248",
-                "s" : [ {
-                  "value" : [ "Date" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Date",
-          "localId" : "253",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "year" : {
-            "type" : "Literal",
-            "localId" : "250",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "2015",
-            "annotation" : [ ]
-          },
-          "month" : {
-            "type" : "Literal",
-            "localId" : "251",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "1",
-            "annotation" : [ ]
-          },
-          "day" : {
-            "type" : "Literal",
-            "localId" : "252",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "1",
-            "annotation" : [ ]
-          }
+          "type" : "Literal",
+          "localId" : "232",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "value" : "true",
+          "annotation" : [ ]
         }
       }, {
-        "localId" : "256",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "dateToStr",
+        "localId" : "235",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "booleanFalseBool",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "256",
+            "r" : "235",
             "s" : [ {
-              "value" : [ "", "define ", "dateToStr", ": " ]
+              "value" : [ "", "define ", "booleanFalseBool", ": " ]
             }, {
-              "r" : "264",
+              "r" : "237",
               "s" : [ {
-                "r" : "262",
-                "value" : [ "convert ", "@2015-01-01", " to " ]
+                "r" : "237",
+                "value" : [ "convert ", "false", " to " ]
               }, {
-                "r" : "257",
+                "r" : "236",
                 "s" : [ {
-                  "value" : [ "String" ]
+                  "value" : [ "Boolean" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToString",
-          "localId" : "264",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "265",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ]
-          } ],
-          "operand" : {
-            "type" : "Date",
-            "localId" : "262",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "259",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "260",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "261",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }
-          }
+          "type" : "Literal",
+          "localId" : "237",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "value" : "false",
+          "annotation" : [ ]
         }
       } ]
     }
   }
 }
 
-/* FromTime
+/* FromDateTime
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define timeStr: convert @T11:57 to String
-define timeTime: convert @T11:57 to Time
+define dateTimeToStr: convert @2015-01-02T12:01:02.321-06:00 to String
+define dateTimeToDate: convert @2015-01-02T12:01:02.321-06:00 to Date
+define dateTimeToDateTime: convert @2015-01-02T12:01:02.321-06:00 to DateTime
 */
 
-module.exports['FromTime'] = {
+module.exports['FromDateTime'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -2772,7 +2582,7 @@ module.exports['FromTime'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "224",
+        "r" : "246",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -2847,7 +2657,7 @@ module.exports['FromTime'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "timeStr",
+        "name" : "dateTimeToStr",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -2856,12 +2666,12 @@ module.exports['FromTime'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "timeStr", ": " ]
+              "value" : [ "", "define ", "dateTimeToStr", ": " ]
             }, {
-              "r" : "220",
+              "r" : "226",
               "s" : [ {
                 "r" : "216",
-                "value" : [ "convert ", "@T11:57", " to " ]
+                "value" : [ "convert ", "@2015-01-02T12:01:02.321-06:00", " to " ]
               }, {
                 "r" : "215",
                 "s" : [ {
@@ -2873,102 +2683,288 @@ module.exports['FromTime'] = {
         } ],
         "expression" : {
           "type" : "ToString",
-          "localId" : "220",
+          "localId" : "226",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "221",
-            "name" : "{urn:hl7-org:elm-types:r1}Time",
+            "localId" : "227",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Time",
+            "type" : "DateTime",
             "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ ],
-            "hour" : {
+            "year" : {
               "type" : "Literal",
               "localId" : "217",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "11",
+              "value" : "2015",
               "annotation" : [ ]
             },
-            "minute" : {
+            "month" : {
               "type" : "Literal",
               "localId" : "218",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "57",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "219",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "220",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "221",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "222",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "223",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "321",
+              "annotation" : [ ]
+            },
+            "timezoneOffset" : {
+              "type" : "Literal",
+              "localId" : "224",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "-6.0",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "224",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "timeTime",
+        "localId" : "230",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "dateTimeToDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "224",
+            "r" : "230",
             "s" : [ {
-              "value" : [ "", "define ", "timeTime", ": " ]
+              "value" : [ "", "define ", "dateTimeToDate", ": " ]
             }, {
-              "r" : "226",
+              "r" : "242",
               "s" : [ {
-                "r" : "226",
-                "value" : [ "convert ", "@T11:57", " to " ]
+                "r" : "232",
+                "value" : [ "convert ", "@2015-01-02T12:01:02.321-06:00", " to " ]
               }, {
-                "r" : "225",
+                "r" : "231",
                 "s" : [ {
-                  "value" : [ "Time" ]
+                  "value" : [ "Date" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Time",
-          "localId" : "226",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToDate",
+          "localId" : "242",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
-          "signature" : [ ],
-          "hour" : {
-            "type" : "Literal",
-            "localId" : "227",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "11",
-            "annotation" : [ ]
-          },
-          "minute" : {
-            "type" : "Literal",
-            "localId" : "228",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "57",
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "243",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
-          }
+          } ],
+          "operand" : {
+            "type" : "DateTime",
+            "localId" : "232",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "233",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "234",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "235",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "236",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "237",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "238",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "321",
+              "annotation" : [ ]
+            },
+            "timezoneOffset" : {
+              "type" : "Literal",
+              "localId" : "240",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "-6.0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "246",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "dateTimeToDateTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "246",
+            "s" : [ {
+              "value" : [ "", "define ", "dateTimeToDateTime", ": " ]
+            }, {
+              "r" : "248",
+              "s" : [ {
+                "r" : "248",
+                "value" : [ "convert ", "@2015-01-02T12:01:02.321-06:00", " to " ]
+              }, {
+                "r" : "247",
+                "s" : [ {
+                  "value" : [ "DateTime" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "DateTime",
+          "localId" : "248",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "year" : {
+            "type" : "Literal",
+            "localId" : "249",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2015",
+            "annotation" : [ ]
+          },
+          "month" : {
+            "type" : "Literal",
+            "localId" : "250",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          },
+          "day" : {
+            "type" : "Literal",
+            "localId" : "251",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2",
+            "annotation" : [ ]
+          },
+          "hour" : {
+            "type" : "Literal",
+            "localId" : "252",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "12",
+            "annotation" : [ ]
+          },
+          "minute" : {
+            "type" : "Literal",
+            "localId" : "253",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          },
+          "second" : {
+            "type" : "Literal",
+            "localId" : "254",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2",
+            "annotation" : [ ]
+          },
+          "millisecond" : {
+            "type" : "Literal",
+            "localId" : "255",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "321",
+            "annotation" : [ ]
+          },
+          "timezoneOffset" : {
+            "type" : "Literal",
+            "localId" : "256",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "-6.0",
+            "annotation" : [ ]
+          }
         }
       } ]
     }
   }
 }
 
-/* FromCode
+/* FromDate
 library TestSnippet version '1'
 using Simple version '1.0.0'
-codesystem "SNOMED-CT": '2.16.840.1.113883.6.96'
 context Patient
-define hepB: Code '66071002' from "SNOMED-CT" display 'Type B viral hepatitis'
-define codeConcept: convert hepB to Concept
-define codeCode: convert hepB to Code
-define foo: 'bar'
+define dateYMDToDateTime: convert @2015-01-01 to DateTime
+define dateYMToDateTime: convert @2015-01 to DateTime
+define dateYToDateTime: convert @2015 to DateTime
+define dateToDate: convert @2015-01-01 to Date
+define dateToStr: convert @2015-01-01 to String
 */
 
-module.exports['FromCode'] = {
+module.exports['FromDate'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -2980,7 +2976,7 @@ module.exports['FromCode'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "234",
+        "r" : "256",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -3023,46 +3019,27 @@ module.exports['FromCode'] = {
         } ]
       } ]
     },
-    "codeSystems" : {
-      "def" : [ {
-        "localId" : "208",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}CodeSystem",
-        "name" : "SNOMED-CT",
-        "id" : "2.16.840.1.113883.6.96",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "208",
-            "s" : [ {
-              "value" : [ "", "codesystem ", "\"SNOMED-CT\"", ": ", "'2.16.840.1.113883.6.96'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
     "contexts" : {
       "def" : [ {
-        "localId" : "213",
+        "localId" : "211",
         "name" : "Patient",
         "annotation" : [ ]
       } ]
     },
     "statements" : {
       "def" : [ {
-        "localId" : "211",
+        "localId" : "209",
         "name" : "Patient",
         "context" : "Patient",
         "annotation" : [ ],
         "expression" : {
           "type" : "SingletonFrom",
-          "localId" : "212",
+          "localId" : "210",
           "annotation" : [ ],
           "signature" : [ ],
           "operand" : {
             "type" : "Retrieve",
-            "localId" : "210",
+            "localId" : "208",
             "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
             "annotation" : [ ],
             "include" : [ ],
@@ -3072,188 +3049,2721 @@ module.exports['FromCode'] = {
           }
         }
       }, {
-        "localId" : "216",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
-        "name" : "hepB",
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "dateYMDToDateTime",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "216",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "hepB", ": " ]
+              "value" : [ "", "define ", "dateYMDToDateTime", ": " ]
             }, {
-              "r" : "217",
+              "r" : "222",
               "s" : [ {
-                "value" : [ "Code ", "'66071002'", " from " ]
+                "r" : "220",
+                "value" : [ "convert ", "@2015-01-01", " to " ]
               }, {
-                "r" : "218",
+                "r" : "215",
                 "s" : [ {
-                  "value" : [ "\"SNOMED-CT\"" ]
+                  "value" : [ "DateTime" ]
                 } ]
-              }, {
-                "value" : [ " display ", "'Type B viral hepatitis'" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Code",
-          "localId" : "217",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
-          "code" : "66071002",
-          "display" : "Type B viral hepatitis",
+          "type" : "ToDateTime",
+          "localId" : "222",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
-          "system" : {
-            "localId" : "218",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}CodeSystem",
-            "name" : "SNOMED-CT",
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "223",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
-          }
-        }
-      }, {
-        "localId" : "221",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
-        "name" : "codeConcept",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "221",
-            "s" : [ {
-              "value" : [ "", "define ", "codeConcept", ": " ]
-            }, {
-              "r" : "225",
-              "s" : [ {
-                "value" : [ "convert " ]
-              }, {
-                "r" : "223",
-                "s" : [ {
+          } ],
+          "operand" : {
+            "type" : "Date",
+            "localId" : "220",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "217",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "218",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "219",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "226",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "dateYMToDateTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "226",
+            "s" : [ {
+              "value" : [ "", "define ", "dateYMToDateTime", ": " ]
+            }, {
+              "r" : "233",
+              "s" : [ {
+                "r" : "231",
+                "value" : [ "convert ", "@2015-01", " to " ]
+              }, {
+                "r" : "227",
+                "s" : [ {
+                  "value" : [ "DateTime" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDateTime",
+          "localId" : "233",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "234",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Date",
+            "localId" : "231",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "229",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "230",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "237",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "dateYToDateTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "237",
+            "s" : [ {
+              "value" : [ "", "define ", "dateYToDateTime", ": " ]
+            }, {
+              "r" : "243",
+              "s" : [ {
+                "r" : "241",
+                "value" : [ "convert ", "@2015", " to " ]
+              }, {
+                "r" : "238",
+                "s" : [ {
+                  "value" : [ "DateTime" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDateTime",
+          "localId" : "243",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "244",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Date",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "240",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "247",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "dateToDate",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "247",
+            "s" : [ {
+              "value" : [ "", "define ", "dateToDate", ": " ]
+            }, {
+              "r" : "253",
+              "s" : [ {
+                "r" : "253",
+                "value" : [ "convert ", "@2015-01-01", " to " ]
+              }, {
+                "r" : "248",
+                "s" : [ {
+                  "value" : [ "Date" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Date",
+          "localId" : "253",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "year" : {
+            "type" : "Literal",
+            "localId" : "250",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2015",
+            "annotation" : [ ]
+          },
+          "month" : {
+            "type" : "Literal",
+            "localId" : "251",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          },
+          "day" : {
+            "type" : "Literal",
+            "localId" : "252",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "256",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+        "name" : "dateToStr",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "256",
+            "s" : [ {
+              "value" : [ "", "define ", "dateToStr", ": " ]
+            }, {
+              "r" : "264",
+              "s" : [ {
+                "r" : "262",
+                "value" : [ "convert ", "@2015-01-01", " to " ]
+              }, {
+                "r" : "257",
+                "s" : [ {
+                  "value" : [ "String" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToString",
+          "localId" : "264",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "265",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Date",
+            "localId" : "262",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "259",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2015",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "260",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "261",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* FromTime
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define timeStr: convert @T11:57 to String
+define timeTime: convert @T11:57 to Time
+*/
+
+module.exports['FromTime'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "224",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+        "name" : "timeStr",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "timeStr", ": " ]
+            }, {
+              "r" : "220",
+              "s" : [ {
+                "r" : "216",
+                "value" : [ "convert ", "@T11:57", " to " ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "value" : [ "String" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToString",
+          "localId" : "220",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Time",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "217",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "11",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "218",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "57",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "224",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "timeTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "timeTime", ": " ]
+            }, {
+              "r" : "226",
+              "s" : [ {
+                "r" : "226",
+                "value" : [ "convert ", "@T11:57", " to " ]
+              }, {
+                "r" : "225",
+                "s" : [ {
+                  "value" : [ "Time" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Time",
+          "localId" : "226",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "hour" : {
+            "type" : "Literal",
+            "localId" : "227",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "11",
+            "annotation" : [ ]
+          },
+          "minute" : {
+            "type" : "Literal",
+            "localId" : "228",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "57",
+            "annotation" : [ ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* FromCode
+library TestSnippet version '1'
+using Simple version '1.0.0'
+codesystem "SNOMED-CT": '2.16.840.1.113883.6.96'
+context Patient
+define hepB: Code '66071002' from "SNOMED-CT" display 'Type B viral hepatitis'
+define codeConcept: convert hepB to Concept
+define codeCode: convert hepB to Code
+define foo: 'bar'
+*/
+
+module.exports['FromCode'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "234",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "codeSystems" : {
+      "def" : [ {
+        "localId" : "208",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}CodeSystem",
+        "name" : "SNOMED-CT",
+        "id" : "2.16.840.1.113883.6.96",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "208",
+            "s" : [ {
+              "value" : [ "", "codesystem ", "\"SNOMED-CT\"", ": ", "'2.16.840.1.113883.6.96'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "213",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "212",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "210",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "216",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
+        "name" : "hepB",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "216",
+            "s" : [ {
+              "value" : [ "", "define ", "hepB", ": " ]
+            }, {
+              "r" : "217",
+              "s" : [ {
+                "value" : [ "Code ", "'66071002'", " from " ]
+              }, {
+                "r" : "218",
+                "s" : [ {
+                  "value" : [ "\"SNOMED-CT\"" ]
+                } ]
+              }, {
+                "value" : [ " display ", "'Type B viral hepatitis'" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Code",
+          "localId" : "217",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
+          "code" : "66071002",
+          "display" : "Type B viral hepatitis",
+          "annotation" : [ ],
+          "system" : {
+            "localId" : "218",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}CodeSystem",
+            "name" : "SNOMED-CT",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "221",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
+        "name" : "codeConcept",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "221",
+            "s" : [ {
+              "value" : [ "", "define ", "codeConcept", ": " ]
+            }, {
+              "r" : "225",
+              "s" : [ {
+                "value" : [ "convert " ]
+              }, {
+                "r" : "223",
+                "s" : [ {
+                  "value" : [ "hepB" ]
+                } ]
+              }, {
+                "value" : [ " to " ]
+              }, {
+                "r" : "222",
+                "s" : [ {
+                  "value" : [ "Concept" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToConcept",
+          "localId" : "225",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "226",
+            "name" : "{urn:hl7-org:elm-types:r1}Code",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ExpressionRef",
+            "localId" : "223",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
+            "name" : "hepB",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "229",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
+        "name" : "codeCode",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "229",
+            "s" : [ {
+              "value" : [ "", "define ", "codeCode", ": " ]
+            }, {
+              "r" : "231",
+              "s" : [ {
+                "value" : [ "convert " ]
+              }, {
+                "r" : "231",
+                "s" : [ {
                   "value" : [ "hepB" ]
                 } ]
               }, {
                 "value" : [ " to " ]
               }, {
-                "r" : "222",
+                "r" : "230",
+                "s" : [ {
+                  "value" : [ "Code" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ExpressionRef",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
+          "name" : "hepB",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+        "name" : "foo",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "foo", ": " ]
+            }, {
+              "r" : "235",
+              "s" : [ {
+                "value" : [ "'bar'" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Literal",
+          "localId" : "235",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+          "valueType" : "{urn:hl7-org:elm-types:r1}String",
+          "value" : "bar",
+          "annotation" : [ ]
+        }
+      } ]
+    }
+  }
+}
+
+/* ToDecimal
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define NoSign: ToDecimal('0.0')
+define PositiveSign: ToDecimal('+1.1')
+define NegativeSign: ToDecimal('-1.1')
+define TooPrecise: ToDecimal('.444444444')
+define TooLargeDec: ToDecimal('444444444444444444444444444444')
+define TooSmallDec: ToDecimal('-444444444444444444444444444444')
+define NullDecimal: ToDecimal((null as String))
+define WrongFormat: ToDecimal('+.1')
+*/
+
+module.exports['ToDecimal'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "285",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "NoSign",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "NoSign", ": " ]
+            }, {
+              "r" : "220",
+              "s" : [ {
+                "value" : [ "ToDecimal", "(" ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "value" : [ "'0.0'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDecimal",
+          "localId" : "220",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "0.0",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "224",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "PositiveSign",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "PositiveSign", ": " ]
+            }, {
+              "r" : "230",
+              "s" : [ {
+                "value" : [ "ToDecimal", "(" ]
+              }, {
+                "r" : "225",
+                "s" : [ {
+                  "value" : [ "'+1.1'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDecimal",
+          "localId" : "230",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "+1.1",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "NegativeSign",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "NegativeSign", ": " ]
+            }, {
+              "r" : "240",
+              "s" : [ {
+                "value" : [ "ToDecimal", "(" ]
+              }, {
+                "r" : "235",
+                "s" : [ {
+                  "value" : [ "'-1.1'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDecimal",
+          "localId" : "240",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "241",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "235",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "-1.1",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "244",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "TooPrecise",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "244",
+            "s" : [ {
+              "value" : [ "", "define ", "TooPrecise", ": " ]
+            }, {
+              "r" : "250",
+              "s" : [ {
+                "value" : [ "ToDecimal", "(" ]
+              }, {
+                "r" : "245",
+                "s" : [ {
+                  "value" : [ "'.444444444'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDecimal",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "245",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : ".444444444",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "254",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "TooLargeDec",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "254",
+            "s" : [ {
+              "value" : [ "", "define ", "TooLargeDec", ": " ]
+            }, {
+              "r" : "260",
+              "s" : [ {
+                "value" : [ "ToDecimal", "(" ]
+              }, {
+                "r" : "255",
+                "s" : [ {
+                  "value" : [ "'444444444444444444444444444444'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDecimal",
+          "localId" : "260",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "261",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "444444444444444444444444444444",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "TooSmallDec",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "264",
+            "s" : [ {
+              "value" : [ "", "define ", "TooSmallDec", ": " ]
+            }, {
+              "r" : "270",
+              "s" : [ {
+                "value" : [ "ToDecimal", "(" ]
+              }, {
+                "r" : "265",
+                "s" : [ {
+                  "value" : [ "'-444444444444444444444444444444'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDecimal",
+          "localId" : "270",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "271",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "265",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "-444444444444444444444444444444",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "274",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "NullDecimal",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "274",
+            "s" : [ {
+              "value" : [ "", "define ", "NullDecimal", ": " ]
+            }, {
+              "r" : "281",
+              "s" : [ {
+                "value" : [ "ToDecimal", "(" ]
+              }, {
+                "r" : "275",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "275",
+                  "s" : [ {
+                    "r" : "276",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "277",
+                    "s" : [ {
+                      "value" : [ "String" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDecimal",
+          "localId" : "281",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "282",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "As",
+            "localId" : "275",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "strict" : false,
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "276",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "277",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "285",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "WrongFormat",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "285",
+            "s" : [ {
+              "value" : [ "", "define ", "WrongFormat", ": " ]
+            }, {
+              "r" : "291",
+              "s" : [ {
+                "value" : [ "ToDecimal", "(" ]
+              }, {
+                "r" : "286",
+                "s" : [ {
+                  "value" : [ "'+.1'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToDecimal",
+          "localId" : "291",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "292",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "286",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "+.1",
+            "annotation" : [ ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* ToInteger
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define NoSign: ToInteger('12345')
+define PositiveSign: ToInteger('+12345')
+define NegativeSign: ToInteger('-12345')
+define TooLargeInt: ToInteger('2147483648')
+define TooSmallInt: ToInteger('-2147483649')
+define LongTwenty: ToInteger(20L)
+define TooLargeLong: ToInteger(2147483648L)
+define TooSmallLong: ToInteger(-2147483649L)
+define BooleanTrue: ToInteger(true)
+define BooleanFalse: ToInteger(false)
+define EmptyString: ToInteger('')
+define WhitespaceString: ToInteger('   ')
+define InvalidString: ToInteger('abc')
+*/
+
+module.exports['ToInteger'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "331",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "NoSign",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "NoSign", ": " ]
+            }, {
+              "r" : "220",
+              "s" : [ {
+                "value" : [ "ToInteger", "(" ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "value" : [ "'12345'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "220",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "12345",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "224",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "PositiveSign",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "PositiveSign", ": " ]
+            }, {
+              "r" : "230",
+              "s" : [ {
+                "value" : [ "ToInteger", "(" ]
+              }, {
+                "r" : "225",
+                "s" : [ {
+                  "value" : [ "'+12345'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "230",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "+12345",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "NegativeSign",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "NegativeSign", ": " ]
+            }, {
+              "r" : "240",
+              "s" : [ {
+                "value" : [ "ToInteger", "(" ]
+              }, {
+                "r" : "235",
+                "s" : [ {
+                  "value" : [ "'-12345'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "240",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "241",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "235",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "-12345",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "244",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "TooLargeInt",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "244",
+            "s" : [ {
+              "value" : [ "", "define ", "TooLargeInt", ": " ]
+            }, {
+              "r" : "250",
+              "s" : [ {
+                "value" : [ "ToInteger", "(" ]
+              }, {
+                "r" : "245",
+                "s" : [ {
+                  "value" : [ "'2147483648'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "245",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "2147483648",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "254",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "TooSmallInt",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "254",
+            "s" : [ {
+              "value" : [ "", "define ", "TooSmallInt", ": " ]
+            }, {
+              "r" : "260",
+              "s" : [ {
+                "value" : [ "ToInteger", "(" ]
+              }, {
+                "r" : "255",
+                "s" : [ {
+                  "value" : [ "'-2147483649'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "260",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "261",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "-2147483649",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "LongTwenty",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "264",
+            "s" : [ {
+              "value" : [ "", "define ", "LongTwenty", ": " ]
+            }, {
+              "r" : "269",
+              "s" : [ {
+                "r" : "265",
+                "value" : [ "ToInteger", "(", "20L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "269",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "270",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "265",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "20",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "273",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "TooLargeLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "273",
+            "s" : [ {
+              "value" : [ "", "define ", "TooLargeLong", ": " ]
+            }, {
+              "r" : "278",
+              "s" : [ {
+                "r" : "274",
+                "value" : [ "ToInteger", "(", "2147483648L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "278",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "279",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "274",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2147483648",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "282",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "TooSmallLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "282",
+            "s" : [ {
+              "value" : [ "", "define ", "TooSmallLong", ": " ]
+            }, {
+              "r" : "289",
+              "s" : [ {
+                "value" : [ "ToInteger", "(" ]
+              }, {
+                "r" : "283",
+                "s" : [ {
+                  "r" : "284",
+                  "value" : [ "-", "2147483649L" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "289",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "290",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Negate",
+            "localId" : "283",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "285",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2147483649",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "293",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "BooleanTrue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "293",
+            "s" : [ {
+              "value" : [ "", "define ", "BooleanTrue", ": " ]
+            }, {
+              "r" : "298",
+              "s" : [ {
+                "r" : "294",
+                "value" : [ "ToInteger", "(", "true", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "298",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "299",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "294",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "value" : "true",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "302",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "BooleanFalse",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "302",
+            "s" : [ {
+              "value" : [ "", "define ", "BooleanFalse", ": " ]
+            }, {
+              "r" : "307",
+              "s" : [ {
+                "r" : "303",
+                "value" : [ "ToInteger", "(", "false", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "307",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "308",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "303",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "value" : "false",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "311",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "EmptyString",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "311",
+            "s" : [ {
+              "value" : [ "", "define ", "EmptyString", ": " ]
+            }, {
+              "r" : "317",
+              "s" : [ {
+                "value" : [ "ToInteger", "(" ]
+              }, {
+                "r" : "312",
+                "s" : [ {
+                  "value" : [ "''" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "317",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "318",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "312",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "321",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "WhitespaceString",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "321",
+            "s" : [ {
+              "value" : [ "", "define ", "WhitespaceString", ": " ]
+            }, {
+              "r" : "327",
+              "s" : [ {
+                "value" : [ "ToInteger", "(" ]
+              }, {
+                "r" : "322",
+                "s" : [ {
+                  "value" : [ "'   '" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "327",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "328",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "322",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "   ",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "331",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "InvalidString",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "331",
+            "s" : [ {
+              "value" : [ "", "define ", "InvalidString", ": " ]
+            }, {
+              "r" : "337",
+              "s" : [ {
+                "value" : [ "ToInteger", "(" ]
+              }, {
+                "r" : "332",
+                "s" : [ {
+                  "value" : [ "'abc'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToInteger",
+          "localId" : "337",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "338",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "332",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "abc",
+            "annotation" : [ ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* ToLong
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define NoSign: ToLong('12345')
+define PositiveSign: ToLong('+12345')
+define NegativeSign: ToLong('-12345')
+define TooLargeLong: ToLong('9223372036854775808')
+define TooSmallLong: ToLong('-9223372036854775809')
+define WithConvertKeyword: convert '101' to Long
+define Int: ToLong(12345)
+define BooleanTrue: ToLong(true)
+define BooleanFalse: ToLong(false)
+define EmptyString: ToLong('')
+define WhitespaceString: ToLong('   ')
+define InvalidString: ToLong('abc')
+*/
+
+module.exports['ToLong'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "320",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "NoSign",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "NoSign", ": " ]
+            }, {
+              "r" : "220",
+              "s" : [ {
+                "value" : [ "ToLong", "(" ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "value" : [ "'12345'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToLong",
+          "localId" : "220",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "12345",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "224",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "PositiveSign",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "PositiveSign", ": " ]
+            }, {
+              "r" : "230",
+              "s" : [ {
+                "value" : [ "ToLong", "(" ]
+              }, {
+                "r" : "225",
+                "s" : [ {
+                  "value" : [ "'+12345'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToLong",
+          "localId" : "230",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "+12345",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "NegativeSign",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "NegativeSign", ": " ]
+            }, {
+              "r" : "240",
+              "s" : [ {
+                "value" : [ "ToLong", "(" ]
+              }, {
+                "r" : "235",
+                "s" : [ {
+                  "value" : [ "'-12345'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToLong",
+          "localId" : "240",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "241",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "235",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "-12345",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "244",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "TooLargeLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "244",
+            "s" : [ {
+              "value" : [ "", "define ", "TooLargeLong", ": " ]
+            }, {
+              "r" : "250",
+              "s" : [ {
+                "value" : [ "ToLong", "(" ]
+              }, {
+                "r" : "245",
+                "s" : [ {
+                  "value" : [ "'9223372036854775808'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToLong",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "245",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "9223372036854775808",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "254",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "TooSmallLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "254",
+            "s" : [ {
+              "value" : [ "", "define ", "TooSmallLong", ": " ]
+            }, {
+              "r" : "260",
+              "s" : [ {
+                "value" : [ "ToLong", "(" ]
+              }, {
+                "r" : "255",
+                "s" : [ {
+                  "value" : [ "'-9223372036854775809'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToLong",
+          "localId" : "260",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "261",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "-9223372036854775809",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "WithConvertKeyword",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "264",
+            "s" : [ {
+              "value" : [ "", "define ", "WithConvertKeyword", ": " ]
+            }, {
+              "r" : "269",
+              "s" : [ {
+                "value" : [ "convert " ]
+              }, {
+                "r" : "266",
+                "s" : [ {
+                  "value" : [ "'101'" ]
+                } ]
+              }, {
+                "value" : [ " to " ]
+              }, {
+                "r" : "265",
                 "s" : [ {
-                  "value" : [ "Concept" ]
+                  "value" : [ "Long" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToConcept",
-          "localId" : "225",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
+          "type" : "ToLong",
+          "localId" : "269",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "226",
-            "name" : "{urn:hl7-org:elm-types:r1}Code",
+            "localId" : "270",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "ExpressionRef",
-            "localId" : "223",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
-            "name" : "hepB",
+            "type" : "Literal",
+            "localId" : "266",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "101",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "229",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
-        "name" : "codeCode",
+        "localId" : "273",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "Int",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "229",
+            "r" : "273",
             "s" : [ {
-              "value" : [ "", "define ", "codeCode", ": " ]
+              "value" : [ "", "define ", "Int", ": " ]
             }, {
-              "r" : "231",
+              "r" : "278",
               "s" : [ {
-                "value" : [ "convert " ]
+                "r" : "274",
+                "value" : [ "ToLong", "(", "12345", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToLong",
+          "localId" : "278",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "279",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "274",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "12345",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "282",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "BooleanTrue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "282",
+            "s" : [ {
+              "value" : [ "", "define ", "BooleanTrue", ": " ]
+            }, {
+              "r" : "287",
+              "s" : [ {
+                "r" : "283",
+                "value" : [ "ToLong", "(", "true", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToLong",
+          "localId" : "287",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "288",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "283",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "value" : "true",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "291",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "BooleanFalse",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "291",
+            "s" : [ {
+              "value" : [ "", "define ", "BooleanFalse", ": " ]
+            }, {
+              "r" : "296",
+              "s" : [ {
+                "r" : "292",
+                "value" : [ "ToLong", "(", "false", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToLong",
+          "localId" : "296",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "297",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "292",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "value" : "false",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "300",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "EmptyString",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "300",
+            "s" : [ {
+              "value" : [ "", "define ", "EmptyString", ": " ]
+            }, {
+              "r" : "306",
+              "s" : [ {
+                "value" : [ "ToLong", "(" ]
               }, {
-                "r" : "231",
+                "r" : "301",
                 "s" : [ {
-                  "value" : [ "hepB" ]
+                  "value" : [ "''" ]
                 } ]
               }, {
-                "value" : [ " to " ]
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToLong",
+          "localId" : "306",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "307",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "301",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "310",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "WhitespaceString",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "310",
+            "s" : [ {
+              "value" : [ "", "define ", "WhitespaceString", ": " ]
+            }, {
+              "r" : "316",
+              "s" : [ {
+                "value" : [ "ToLong", "(" ]
               }, {
-                "r" : "230",
+                "r" : "311",
                 "s" : [ {
-                  "value" : [ "Code" ]
+                  "value" : [ "'   '" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ExpressionRef",
-          "localId" : "231",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
-          "name" : "hepB",
-          "annotation" : [ ]
+          "type" : "ToLong",
+          "localId" : "316",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "317",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "311",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "   ",
+            "annotation" : [ ]
+          }
         }
       }, {
-        "localId" : "234",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "foo",
+        "localId" : "320",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "InvalidString",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "320",
             "s" : [ {
-              "value" : [ "", "define ", "foo", ": " ]
+              "value" : [ "", "define ", "InvalidString", ": " ]
             }, {
-              "r" : "235",
+              "r" : "326",
               "s" : [ {
-                "value" : [ "'bar'" ]
+                "value" : [ "ToLong", "(" ]
+              }, {
+                "r" : "321",
+                "s" : [ {
+                  "value" : [ "'abc'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
-        } ],
-        "expression" : {
-          "type" : "Literal",
-          "localId" : "235",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-          "valueType" : "{urn:hl7-org:elm-types:r1}String",
-          "value" : "bar",
-          "annotation" : [ ]
+        } ],
+        "expression" : {
+          "type" : "ToLong",
+          "localId" : "326",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "327",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "321",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "abc",
+            "annotation" : [ ]
+          }
         }
       } ]
     }
   }
 }
 
-/* ToDecimal
+/* ToQuantity
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define NoSign: ToDecimal('0.0')
-define PositiveSign: ToDecimal('+1.1')
-define NegativeSign: ToDecimal('-1.1')
-define TooPrecise: ToDecimal('.444444444')
-define TooLargeDec: ToDecimal('444444444444444444444444444444')
-define TooSmallDec: ToDecimal('-444444444444444444444444444444')
-define NullDecimal: ToDecimal((null as String))
-define WrongFormat: ToDecimal('+.1')
+define DecimalOverload: ToQuantity(0.1)
+define IntegerOverload: ToQuantity(13)
+define LongOverload: ToQuantity(14L)
+define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
+define UncertaintyOverload: ToQuantity(UncertaintySixToEighteen)
+define StringOverload: ToQuantity('-0.1 \'mg\'')
+define RatioOverload: ToQuantity(5 'mg':10 'mL')
+define WrongFormatQuantity: ToQuantity('abc')
+define TooLargeQuantity: ToQuantity('444444444444444444444444444444 \'\'')
+define TooSmallQuantity: ToQuantity('-444444444444444444444444444444 \'\'')
+define NullArg: ToQuantity((null as String))
 */
 
-module.exports['ToDecimal'] = {
+module.exports['ToQuantity'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -3265,7 +5775,7 @@ module.exports['ToDecimal'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "285",
+        "r" : "328",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -3339,8 +5849,8 @@ module.exports['ToDecimal'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "NoSign",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "DecimalOverload",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -3349,63 +5859,257 @@ module.exports['ToDecimal'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "NoSign", ": " ]
+              "value" : [ "", "define ", "DecimalOverload", ": " ]
             }, {
-              "r" : "220",
+              "r" : "219",
               "s" : [ {
-                "value" : [ "ToDecimal", "(" ]
-              }, {
                 "r" : "215",
-                "s" : [ {
-                  "value" : [ "'0.0'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "value" : [ "ToQuantity", "(", "0.1", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDecimal",
-          "localId" : "220",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "ToQuantity",
+          "localId" : "219",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "221",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "220",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
             "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "0.0",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.1",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "224",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "PositiveSign",
+        "localId" : "223",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "IntegerOverload",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "223",
+            "s" : [ {
+              "value" : [ "", "define ", "IntegerOverload", ": " ]
+            }, {
+              "r" : "228",
+              "s" : [ {
+                "r" : "224",
+                "value" : [ "ToQuantity", "(", "13", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToQuantity",
+          "localId" : "228",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "229",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "224",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "13",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "232",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "LongOverload",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "232",
+            "s" : [ {
+              "value" : [ "", "define ", "LongOverload", ": " ]
+            }, {
+              "r" : "240",
+              "s" : [ {
+                "r" : "233",
+                "value" : [ "ToQuantity", "(", "14L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ToQuantity",
+          "localId" : "240",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "244",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "ToDecimal",
+            "localId" : "242",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "243",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "233",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "14",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "247",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "UncertaintySixToEighteen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "247",
+            "s" : [ {
+              "value" : [ "", "define ", "UncertaintySixToEighteen", ": " ]
+            }, {
+              "r" : "248",
+              "s" : [ {
+                "value" : [ "months between " ]
+              }, {
+                "r" : "253",
+                "s" : [ {
+                  "r" : "249",
+                  "value" : [ "DateTime", "(", "2005", ")" ]
+                } ]
+              }, {
+                "value" : [ " and " ]
+              }, {
+                "r" : "261",
+                "s" : [ {
+                  "r" : "255",
+                  "value" : [ "DateTime", "(", "2006", ", ", "7", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "DurationBetween",
+          "localId" : "248",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "precision" : "Month",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "264",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "265",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "DateTime",
+            "localId" : "253",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "254",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "249",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2005",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "DateTime",
+            "localId" : "261",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "262",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "263",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "255",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2006",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "7",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "268",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "UncertaintyOverload",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "224",
+            "r" : "268",
             "s" : [ {
-              "value" : [ "", "define ", "PositiveSign", ": " ]
+              "value" : [ "", "define ", "UncertaintyOverload", ": " ]
             }, {
-              "r" : "230",
+              "r" : "273",
               "s" : [ {
-                "value" : [ "ToDecimal", "(" ]
+                "value" : [ "ToQuantity", "(" ]
               }, {
-                "r" : "225",
+                "r" : "269",
                 "s" : [ {
-                  "value" : [ "'+1.1'" ]
+                  "value" : [ "UncertaintySixToEighteen" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3414,46 +6118,45 @@ module.exports['ToDecimal'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToDecimal",
-          "localId" : "230",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "ToQuantity",
+          "localId" : "273",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "231",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "274",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Literal",
-            "localId" : "225",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "+1.1",
+            "type" : "ExpressionRef",
+            "localId" : "269",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "UncertaintySixToEighteen",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "234",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "NegativeSign",
+        "localId" : "277",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "StringOverload",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "277",
             "s" : [ {
-              "value" : [ "", "define ", "NegativeSign", ": " ]
+              "value" : [ "", "define ", "StringOverload", ": " ]
             }, {
-              "r" : "240",
+              "r" : "283",
               "s" : [ {
-                "value" : [ "ToDecimal", "(" ]
+                "value" : [ "ToQuantity", "(" ]
               }, {
-                "r" : "235",
+                "r" : "278",
                 "s" : [ {
-                  "value" : [ "'-1.1'" ]
+                  "value" : [ "'-0.1 \\'mg\\''" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3462,46 +6165,56 @@ module.exports['ToDecimal'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToDecimal",
-          "localId" : "240",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "ToQuantity",
+          "localId" : "283",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "241",
+            "localId" : "284",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "235",
+            "localId" : "278",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "-1.1",
+            "value" : "-0.1 'mg'",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "244",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "TooPrecise",
+        "localId" : "287",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "RatioOverload",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "244",
+            "r" : "287",
             "s" : [ {
-              "value" : [ "", "define ", "TooPrecise", ": " ]
+              "value" : [ "", "define ", "RatioOverload", ": " ]
             }, {
-              "r" : "250",
+              "r" : "294",
               "s" : [ {
-                "value" : [ "ToDecimal", "(" ]
+                "value" : [ "ToQuantity", "(" ]
               }, {
-                "r" : "245",
+                "r" : "290",
                 "s" : [ {
-                  "value" : [ "'.444444444'" ]
+                  "r" : "288",
+                  "s" : [ {
+                    "value" : [ "5 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ":" ]
+                }, {
+                  "r" : "289",
+                  "s" : [ {
+                    "value" : [ "10 ", "'mL'" ]
+                  } ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3510,46 +6223,58 @@ module.exports['ToDecimal'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToDecimal",
-          "localId" : "250",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "ToQuantity",
+          "localId" : "294",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "251",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "295",
+            "name" : "{urn:hl7-org:elm-types:r1}Ratio",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Literal",
-            "localId" : "245",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : ".444444444",
-            "annotation" : [ ]
+            "type" : "Ratio",
+            "localId" : "290",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+            "annotation" : [ ],
+            "numerator" : {
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "denominator" : {
+              "localId" : "289",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 10,
+              "unit" : "mL",
+              "annotation" : [ ]
+            }
           }
         }
       }, {
-        "localId" : "254",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "TooLargeDec",
+        "localId" : "298",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "WrongFormatQuantity",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "254",
+            "r" : "298",
             "s" : [ {
-              "value" : [ "", "define ", "TooLargeDec", ": " ]
+              "value" : [ "", "define ", "WrongFormatQuantity", ": " ]
             }, {
-              "r" : "260",
+              "r" : "304",
               "s" : [ {
-                "value" : [ "ToDecimal", "(" ]
+                "value" : [ "ToQuantity", "(" ]
               }, {
-                "r" : "255",
+                "r" : "299",
                 "s" : [ {
-                  "value" : [ "'444444444444444444444444444444'" ]
+                  "value" : [ "'abc'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3558,46 +6283,46 @@ module.exports['ToDecimal'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToDecimal",
-          "localId" : "260",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "ToQuantity",
+          "localId" : "304",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "261",
+            "localId" : "305",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "255",
+            "localId" : "299",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "444444444444444444444444444444",
+            "value" : "abc",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "264",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "TooSmallDec",
+        "localId" : "308",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "TooLargeQuantity",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "308",
             "s" : [ {
-              "value" : [ "", "define ", "TooSmallDec", ": " ]
+              "value" : [ "", "define ", "TooLargeQuantity", ": " ]
             }, {
-              "r" : "270",
+              "r" : "314",
               "s" : [ {
-                "value" : [ "ToDecimal", "(" ]
+                "value" : [ "ToQuantity", "(" ]
               }, {
-                "r" : "265",
+                "r" : "309",
                 "s" : [ {
-                  "value" : [ "'-444444444444444444444444444444'" ]
+                  "value" : [ "'444444444444444444444444444444 \\'\\''" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3606,59 +6331,46 @@ module.exports['ToDecimal'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToDecimal",
-          "localId" : "270",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "ToQuantity",
+          "localId" : "314",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "271",
+            "localId" : "315",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "265",
+            "localId" : "309",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "-444444444444444444444444444444",
+            "value" : "444444444444444444444444444444 ''",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "274",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "NullDecimal",
+        "localId" : "318",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "TooSmallQuantity",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "274",
+            "r" : "318",
             "s" : [ {
-              "value" : [ "", "define ", "NullDecimal", ": " ]
+              "value" : [ "", "define ", "TooSmallQuantity", ": " ]
             }, {
-              "r" : "281",
+              "r" : "324",
               "s" : [ {
-                "value" : [ "ToDecimal", "(" ]
+                "value" : [ "ToQuantity", "(" ]
               }, {
-                "r" : "275",
+                "r" : "319",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "275",
-                  "s" : [ {
-                    "r" : "276",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "277",
-                    "s" : [ {
-                      "value" : [ "String" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "'-444444444444444444444444444444 \\'\\''" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3667,59 +6379,59 @@ module.exports['ToDecimal'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToDecimal",
-          "localId" : "281",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "ToQuantity",
+          "localId" : "324",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "282",
+            "localId" : "325",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "As",
-            "localId" : "275",
+            "type" : "Literal",
+            "localId" : "319",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "strict" : false,
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "276",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "277",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
-              "annotation" : [ ]
-            }
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "-444444444444444444444444444444 ''",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "285",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "WrongFormat",
+        "localId" : "328",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "NullArg",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "285",
+            "r" : "328",
             "s" : [ {
-              "value" : [ "", "define ", "WrongFormat", ": " ]
+              "value" : [ "", "define ", "NullArg", ": " ]
             }, {
-              "r" : "291",
+              "r" : "335",
               "s" : [ {
-                "value" : [ "ToDecimal", "(" ]
+                "value" : [ "ToQuantity", "(" ]
               }, {
-                "r" : "286",
+                "r" : "329",
                 "s" : [ {
-                  "value" : [ "'+.1'" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "329",
+                  "s" : [ {
+                    "r" : "330",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "331",
+                    "s" : [ {
+                      "value" : [ "String" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3728,23 +6440,36 @@ module.exports['ToDecimal'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToDecimal",
-          "localId" : "291",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "ToQuantity",
+          "localId" : "335",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "292",
+            "localId" : "336",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Literal",
-            "localId" : "286",
+            "type" : "As",
+            "localId" : "329",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "+.1",
-            "annotation" : [ ]
+            "strict" : false,
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "330",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "331",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            }
           }
         }
       } ]
@@ -3752,20 +6477,19 @@ module.exports['ToDecimal'] = {
   }
 }
 
-/* ToInteger
+/* ToRatio
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define NoSign: ToInteger('12345')
-define PositiveSign: ToInteger('+12345')
-define NegativeSign: ToInteger('-12345')
-define TooLargeInt: ToInteger('2147483648')
-define TooSmallInt: ToInteger('-2147483649')
-define BooleanTrue: ToInteger(true)
-define BooleanFalse: ToInteger(false)
+define NullArg: ToRatio((null as String))
+define IsValid: ToRatio('1.0 \'mg\':2.0 \'mg\'')
+define IsValidWithCustomUCUM: ToRatio('1.0 \'{foo:bar}\':2.0 \'mg\'')
+define InvalidSeparator: ToRatio('1.0 \'mg\';2.0 \'mg\'')
+define InvalidNumerator: ToRatio('1.0 \'cc\':2.0 \'mg\'')
+define InvalidDenominator: ToRatio('1.0 \'mg\':2.0 \'cc\'')
 */
 
-module.exports['ToInteger'] = {
+module.exports['ToRatio'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -3777,7 +6501,7 @@ module.exports['ToInteger'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "273",
+        "r" : "265",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -3851,8 +6575,8 @@ module.exports['ToInteger'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "NoSign",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+        "name" : "NullArg",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -3861,15 +6585,28 @@ module.exports['ToInteger'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "NoSign", ": " ]
+              "value" : [ "", "define ", "NullArg", ": " ]
             }, {
-              "r" : "220",
+              "r" : "221",
               "s" : [ {
-                "value" : [ "ToInteger", "(" ]
+                "value" : [ "ToRatio", "(" ]
               }, {
                 "r" : "215",
                 "s" : [ {
-                  "value" : [ "'12345'" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "215",
+                  "s" : [ {
+                    "r" : "216",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "217",
+                    "s" : [ {
+                      "value" : [ "String" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3878,46 +6615,59 @@ module.exports['ToInteger'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToInteger",
-          "localId" : "220",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "ToRatio",
+          "localId" : "221",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "221",
+            "localId" : "222",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Literal",
+            "type" : "As",
             "localId" : "215",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "12345",
-            "annotation" : [ ]
+            "strict" : false,
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            }
           }
         }
       }, {
-        "localId" : "224",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "PositiveSign",
+        "localId" : "225",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+        "name" : "IsValid",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "224",
+            "r" : "225",
             "s" : [ {
-              "value" : [ "", "define ", "PositiveSign", ": " ]
+              "value" : [ "", "define ", "IsValid", ": " ]
             }, {
-              "r" : "230",
+              "r" : "231",
               "s" : [ {
-                "value" : [ "ToInteger", "(" ]
+                "value" : [ "ToRatio", "(" ]
               }, {
-                "r" : "225",
+                "r" : "226",
                 "s" : [ {
-                  "value" : [ "'+12345'" ]
+                  "value" : [ "'1.0 \\'mg\\':2.0 \\'mg\\''" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3926,46 +6676,46 @@ module.exports['ToInteger'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToInteger",
-          "localId" : "230",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "ToRatio",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "231",
+            "localId" : "232",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "225",
+            "localId" : "226",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "+12345",
+            "value" : "1.0 'mg':2.0 'mg'",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "234",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "NegativeSign",
+        "localId" : "235",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+        "name" : "IsValidWithCustomUCUM",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "235",
             "s" : [ {
-              "value" : [ "", "define ", "NegativeSign", ": " ]
+              "value" : [ "", "define ", "IsValidWithCustomUCUM", ": " ]
             }, {
-              "r" : "240",
+              "r" : "241",
               "s" : [ {
-                "value" : [ "ToInteger", "(" ]
+                "value" : [ "ToRatio", "(" ]
               }, {
-                "r" : "235",
+                "r" : "236",
                 "s" : [ {
-                  "value" : [ "'-12345'" ]
+                  "value" : [ "'1.0 \\'{foo:bar}\\':2.0 \\'mg\\''" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -3974,46 +6724,46 @@ module.exports['ToInteger'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToInteger",
-          "localId" : "240",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "ToRatio",
+          "localId" : "241",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "241",
+            "localId" : "242",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "235",
+            "localId" : "236",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "-12345",
+            "value" : "1.0 '{foo:bar}':2.0 'mg'",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "244",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "TooLargeInt",
+        "localId" : "245",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+        "name" : "InvalidSeparator",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "244",
+            "r" : "245",
             "s" : [ {
-              "value" : [ "", "define ", "TooLargeInt", ": " ]
+              "value" : [ "", "define ", "InvalidSeparator", ": " ]
             }, {
-              "r" : "250",
+              "r" : "251",
               "s" : [ {
-                "value" : [ "ToInteger", "(" ]
+                "value" : [ "ToRatio", "(" ]
               }, {
-                "r" : "245",
+                "r" : "246",
                 "s" : [ {
-                  "value" : [ "'2147483648'" ]
+                  "value" : [ "'1.0 \\'mg\\';2.0 \\'mg\\''" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4022,46 +6772,46 @@ module.exports['ToInteger'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToInteger",
-          "localId" : "250",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "ToRatio",
+          "localId" : "251",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "251",
+            "localId" : "252",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "245",
+            "localId" : "246",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "2147483648",
+            "value" : "1.0 'mg';2.0 'mg'",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "254",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "TooSmallInt",
+        "localId" : "255",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+        "name" : "InvalidNumerator",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "254",
+            "r" : "255",
             "s" : [ {
-              "value" : [ "", "define ", "TooSmallInt", ": " ]
+              "value" : [ "", "define ", "InvalidNumerator", ": " ]
             }, {
-              "r" : "260",
+              "r" : "261",
               "s" : [ {
-                "value" : [ "ToInteger", "(" ]
+                "value" : [ "ToRatio", "(" ]
               }, {
-                "r" : "255",
+                "r" : "256",
                 "s" : [ {
-                  "value" : [ "'-2147483649'" ]
+                  "value" : [ "'1.0 \\'cc\\':2.0 \\'mg\\''" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4070,106 +6820,70 @@ module.exports['ToInteger'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToInteger",
-          "localId" : "260",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "ToRatio",
+          "localId" : "261",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "261",
+            "localId" : "262",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "255",
+            "localId" : "256",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "-2147483649",
-            "annotation" : [ ]
-          }
-        }
-      }, {
-        "localId" : "264",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "BooleanTrue",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "264",
-            "s" : [ {
-              "value" : [ "", "define ", "BooleanTrue", ": " ]
-            }, {
-              "r" : "269",
-              "s" : [ {
-                "r" : "265",
-                "value" : [ "ToInteger", "(", "true", ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ToInteger",
-          "localId" : "269",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "270",
-            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "annotation" : [ ]
-          } ],
-          "operand" : {
-            "type" : "Literal",
-            "localId" : "265",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "value" : "true",
+            "value" : "1.0 'cc':2.0 'mg'",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "273",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "BooleanFalse",
+        "localId" : "265",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+        "name" : "InvalidDenominator",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "273",
+            "r" : "265",
             "s" : [ {
-              "value" : [ "", "define ", "BooleanFalse", ": " ]
+              "value" : [ "", "define ", "InvalidDenominator", ": " ]
             }, {
-              "r" : "278",
+              "r" : "271",
               "s" : [ {
-                "r" : "274",
-                "value" : [ "ToInteger", "(", "false", ")" ]
+                "value" : [ "ToRatio", "(" ]
+              }, {
+                "r" : "266",
+                "s" : [ {
+                  "value" : [ "'1.0 \\'mg\\':2.0 \\'cc\\''" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToInteger",
-          "localId" : "278",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "ToRatio",
+          "localId" : "271",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "279",
-            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "localId" : "272",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "274",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "value" : "false",
+            "localId" : "266",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "1.0 'mg':2.0 'cc'",
             "annotation" : [ ]
           }
         }
@@ -4178,23 +6892,23 @@ module.exports['ToInteger'] = {
   }
 }
 
-/* ToQuantity
+/* ToTime
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define DecimalOverload: ToQuantity(0.1)
-define IntegerOverload: ToQuantity(13)
-define UncertaintySixToEighteen: months between DateTime(2005) and DateTime(2006, 7)
-define UncertaintyOverload: ToQuantity(UncertaintySixToEighteen)
-define StringOverload: ToQuantity('-0.1 \'mg\'')
-define RatioOverload: ToQuantity(5 'mg':10 'mL')
-define WrongFormatQuantity: ToQuantity('abc')
-define TooLargeQuantity: ToQuantity('444444444444444444444444444444 \'\'')
-define TooSmallQuantity: ToQuantity('-444444444444444444444444444444 \'\'')
-define NullArg: ToQuantity((null as String))
+define NullArgTime: ToTime((null as String))
+define IncorrectFormatTime: ToTime('10:00PM')
+define InvalidTime: ToTime('25:99.000')
+define TimeH: ToTime('02')
+define TimeHM: ToTime('02:04')
+define TimeHMS: ToTime('02:04:59')
+define TimeHMSMs: ToTime('02:04:59.123')
+define HourTooHigh: ToTime('24')
+define MinuteTooHigh: ToTime('23:60')
+define SecondTooHigh: ToTime('23:59:60')
 */
 
-module.exports['ToQuantity'] = {
+module.exports['ToTime'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -4206,7 +6920,7 @@ module.exports['ToQuantity'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "313",
+        "r" : "305",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -4280,8 +6994,8 @@ module.exports['ToQuantity'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "DecimalOverload",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "NullArgTime",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -4290,204 +7004,185 @@ module.exports['ToQuantity'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalOverload", ": " ]
+              "value" : [ "", "define ", "NullArgTime", ": " ]
             }, {
-              "r" : "219",
+              "r" : "221",
               "s" : [ {
+                "value" : [ "ToTime", "(" ]
+              }, {
                 "r" : "215",
-                "value" : [ "ToQuantity", "(", "0.1", ")" ]
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "215",
+                  "s" : [ {
+                    "r" : "216",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "217",
+                    "s" : [ {
+                      "value" : [ "String" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
-          "localId" : "219",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "ToTime",
+          "localId" : "221",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "220",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "222",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Literal",
+            "type" : "As",
             "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-            "value" : "0.1",
-            "annotation" : [ ]
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "strict" : false,
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            }
           }
         }
       }, {
-        "localId" : "223",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "IntegerOverload",
+        "localId" : "225",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "IncorrectFormatTime",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "223",
+            "r" : "225",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerOverload", ": " ]
+              "value" : [ "", "define ", "IncorrectFormatTime", ": " ]
             }, {
-              "r" : "228",
+              "r" : "231",
               "s" : [ {
-                "r" : "224",
-                "value" : [ "ToQuantity", "(", "13", ")" ]
+                "value" : [ "ToTime", "(" ]
+              }, {
+                "r" : "226",
+                "s" : [ {
+                  "value" : [ "'10:00PM'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
-          "localId" : "228",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "ToTime",
+          "localId" : "231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "229",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "232",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "224",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "13",
+            "localId" : "226",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "10:00PM",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "232",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "UncertaintySixToEighteen",
+        "localId" : "235",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "InvalidTime",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "232",
+            "r" : "235",
             "s" : [ {
-              "value" : [ "", "define ", "UncertaintySixToEighteen", ": " ]
+              "value" : [ "", "define ", "InvalidTime", ": " ]
             }, {
-              "r" : "233",
+              "r" : "241",
               "s" : [ {
-                "value" : [ "months between " ]
+                "value" : [ "ToTime", "(" ]
               }, {
-                "r" : "238",
+                "r" : "236",
                 "s" : [ {
-                  "r" : "234",
-                  "value" : [ "DateTime", "(", "2005", ")" ]
+                  "value" : [ "'25:99.000'" ]
                 } ]
               }, {
-                "value" : [ " and " ]
-              }, {
-                "r" : "246",
-                "s" : [ {
-                  "r" : "240",
-                  "value" : [ "DateTime", "(", "2006", ", ", "7", ")" ]
-                } ]
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "DurationBetween",
-          "localId" : "233",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "precision" : "Month",
+          "type" : "ToTime",
+          "localId" : "241",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "249",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "250",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "242",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
-          "operand" : [ {
-            "type" : "DateTime",
-            "localId" : "238",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "239",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "234",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2005",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "DateTime",
-            "localId" : "246",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "247",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "248",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "240",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2006",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "241",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
-              "annotation" : [ ]
-            }
-          } ]
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "236",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "25:99.000",
+            "annotation" : [ ]
+          }
         }
       }, {
-        "localId" : "253",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "UncertaintyOverload",
+        "localId" : "245",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeH",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "253",
+            "r" : "245",
             "s" : [ {
-              "value" : [ "", "define ", "UncertaintyOverload", ": " ]
+              "value" : [ "", "define ", "TimeH", ": " ]
             }, {
-              "r" : "258",
+              "r" : "251",
               "s" : [ {
-                "value" : [ "ToQuantity", "(" ]
+                "value" : [ "ToTime", "(" ]
               }, {
-                "r" : "254",
+                "r" : "246",
                 "s" : [ {
-                  "value" : [ "UncertaintySixToEighteen" ]
+                  "value" : [ "'02'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4496,45 +7191,46 @@ module.exports['ToQuantity'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
-          "localId" : "258",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "ToTime",
+          "localId" : "251",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "259",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "252",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "ExpressionRef",
-            "localId" : "254",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "name" : "UncertaintySixToEighteen",
+            "type" : "Literal",
+            "localId" : "246",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "02",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "262",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "StringOverload",
+        "localId" : "255",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeHM",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "262",
+            "r" : "255",
             "s" : [ {
-              "value" : [ "", "define ", "StringOverload", ": " ]
+              "value" : [ "", "define ", "TimeHM", ": " ]
             }, {
-              "r" : "268",
+              "r" : "261",
               "s" : [ {
-                "value" : [ "ToQuantity", "(" ]
+                "value" : [ "ToTime", "(" ]
               }, {
-                "r" : "263",
+                "r" : "256",
                 "s" : [ {
-                  "value" : [ "'-0.1 \\'mg\\''" ]
+                  "value" : [ "'02:04'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4543,56 +7239,46 @@ module.exports['ToQuantity'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
-          "localId" : "268",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "ToTime",
+          "localId" : "261",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "269",
+            "localId" : "262",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "263",
+            "localId" : "256",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "-0.1 'mg'",
+            "value" : "02:04",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "272",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "RatioOverload",
+        "localId" : "265",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeHMS",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "272",
+            "r" : "265",
             "s" : [ {
-              "value" : [ "", "define ", "RatioOverload", ": " ]
+              "value" : [ "", "define ", "TimeHMS", ": " ]
             }, {
-              "r" : "279",
+              "r" : "271",
               "s" : [ {
-                "value" : [ "ToQuantity", "(" ]
+                "value" : [ "ToTime", "(" ]
               }, {
-                "r" : "275",
+                "r" : "266",
                 "s" : [ {
-                  "r" : "273",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ":" ]
-                }, {
-                  "r" : "274",
-                  "s" : [ {
-                    "value" : [ "10 ", "'mL'" ]
-                  } ]
+                  "value" : [ "'02:04:59'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4601,58 +7287,46 @@ module.exports['ToQuantity'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
-          "localId" : "279",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "ToTime",
+          "localId" : "271",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "280",
-            "name" : "{urn:hl7-org:elm-types:r1}Ratio",
+            "localId" : "272",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Ratio",
-            "localId" : "275",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
-            "annotation" : [ ],
-            "numerator" : {
-              "localId" : "273",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "mg",
-              "annotation" : [ ]
-            },
-            "denominator" : {
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10,
-              "unit" : "mL",
-              "annotation" : [ ]
-            }
+            "type" : "Literal",
+            "localId" : "266",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "02:04:59",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "283",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "WrongFormatQuantity",
+        "localId" : "275",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "TimeHMSMs",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "283",
+            "r" : "275",
             "s" : [ {
-              "value" : [ "", "define ", "WrongFormatQuantity", ": " ]
+              "value" : [ "", "define ", "TimeHMSMs", ": " ]
             }, {
-              "r" : "289",
+              "r" : "281",
               "s" : [ {
-                "value" : [ "ToQuantity", "(" ]
+                "value" : [ "ToTime", "(" ]
               }, {
-                "r" : "284",
+                "r" : "276",
                 "s" : [ {
-                  "value" : [ "'abc'" ]
+                  "value" : [ "'02:04:59.123'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4661,46 +7335,46 @@ module.exports['ToQuantity'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
-          "localId" : "289",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "ToTime",
+          "localId" : "281",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "290",
+            "localId" : "282",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "284",
+            "localId" : "276",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "abc",
+            "value" : "02:04:59.123",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "293",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "TooLargeQuantity",
+        "localId" : "285",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "HourTooHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "293",
+            "r" : "285",
             "s" : [ {
-              "value" : [ "", "define ", "TooLargeQuantity", ": " ]
+              "value" : [ "", "define ", "HourTooHigh", ": " ]
             }, {
-              "r" : "299",
+              "r" : "291",
               "s" : [ {
-                "value" : [ "ToQuantity", "(" ]
+                "value" : [ "ToTime", "(" ]
               }, {
-                "r" : "294",
+                "r" : "286",
                 "s" : [ {
-                  "value" : [ "'444444444444444444444444444444 \\'\\''" ]
+                  "value" : [ "'24'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4709,46 +7383,46 @@ module.exports['ToQuantity'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
-          "localId" : "299",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "ToTime",
+          "localId" : "291",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "300",
+            "localId" : "292",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "294",
+            "localId" : "286",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "444444444444444444444444444444 ''",
+            "value" : "24",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "303",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "TooSmallQuantity",
+        "localId" : "295",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "MinuteTooHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "303",
+            "r" : "295",
             "s" : [ {
-              "value" : [ "", "define ", "TooSmallQuantity", ": " ]
+              "value" : [ "", "define ", "MinuteTooHigh", ": " ]
             }, {
-              "r" : "309",
+              "r" : "301",
               "s" : [ {
-                "value" : [ "ToQuantity", "(" ]
+                "value" : [ "ToTime", "(" ]
               }, {
-                "r" : "304",
+                "r" : "296",
                 "s" : [ {
-                  "value" : [ "'-444444444444444444444444444444 \\'\\''" ]
+                  "value" : [ "'23:60'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4757,59 +7431,46 @@ module.exports['ToQuantity'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
-          "localId" : "309",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "ToTime",
+          "localId" : "301",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "310",
+            "localId" : "302",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "304",
+            "localId" : "296",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "-444444444444444444444444444444 ''",
+            "value" : "23:60",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "313",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "NullArg",
+        "localId" : "305",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "SecondTooHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "313",
+            "r" : "305",
             "s" : [ {
-              "value" : [ "", "define ", "NullArg", ": " ]
+              "value" : [ "", "define ", "SecondTooHigh", ": " ]
             }, {
-              "r" : "320",
+              "r" : "311",
               "s" : [ {
-                "value" : [ "ToQuantity", "(" ]
+                "value" : [ "ToTime", "(" ]
               }, {
-                "r" : "314",
+                "r" : "306",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "314",
-                  "s" : [ {
-                    "r" : "315",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "316",
-                    "s" : [ {
-                      "value" : [ "String" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "'23:59:60'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -4818,36 +7479,23 @@ module.exports['ToQuantity'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToQuantity",
-          "localId" : "320",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "ToTime",
+          "localId" : "311",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "321",
+            "localId" : "312",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "As",
-            "localId" : "314",
+            "type" : "Literal",
+            "localId" : "306",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "strict" : false,
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "315",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "316",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
-              "annotation" : [ ]
-            }
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "23:59:60",
+            "annotation" : [ ]
           }
         }
       } ]
@@ -4855,19 +7503,33 @@ module.exports['ToQuantity'] = {
   }
 }
 
-/* ToRatio
+/* ToBoolean
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define NullArg: ToRatio((null as String))
-define IsValid: ToRatio('1.0 \'mg\':2.0 \'mg\'')
-define IsValidWithCustomUCUM: ToRatio('1.0 \'{foo:bar}\':2.0 \'mg\'')
-define InvalidSeparator: ToRatio('1.0 \'mg\';2.0 \'mg\'')
-define InvalidNumerator: ToRatio('1.0 \'cc\':2.0 \'mg\'')
-define InvalidDenominator: ToRatio('1.0 \'mg\':2.0 \'cc\'')
+define UpperCaseTrue: ToBoolean('TRUE')
+define UpperCaseFalse: ToBoolean('FALSE')
+define LowerCaseTrue: ToBoolean('true')
+define LowerCaseFalse: ToBoolean('false')
+define UpperCaseT: ToBoolean('T')
+define UpperCaseF: ToBoolean('F')
+define LowerCaseT: ToBoolean('t')
+define LowerCaseF: ToBoolean('f')
+define IsTrue: ToBoolean('y')
+define IsFalse: ToBoolean('0')
+define IsNull: ToBoolean('falsetto')
+define IsTrueWithInteger: ToBoolean(1)
+define IsFalseWithInteger: ToBoolean(0)
+define IsNullWithInteger: ToBoolean(2)
+define IsTrueWithLong: ToBoolean(1L)
+define IsFalseWithLong: ToBoolean(0L)
+define IsNullWithLong: ToBoolean(2L)
+define IsTrueWithDecimal: ToBoolean(1.0)
+define IsFalseWithDecimal: ToBoolean(0.0)
+define IsNullWithDecimal: ToBoolean(1.5)
 */
 
-module.exports['ToRatio'] = {
+module.exports['ToBoolean'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -4879,7 +7541,7 @@ module.exports['ToRatio'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "265",
+        "r" : "396",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -4953,8 +7615,8 @@ module.exports['ToRatio'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
-        "name" : "NullArg",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UpperCaseTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -4963,137 +7625,15 @@ module.exports['ToRatio'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "NullArg", ": " ]
+              "value" : [ "", "define ", "UpperCaseTrue", ": " ]
             }, {
-              "r" : "221",
+              "r" : "220",
               "s" : [ {
-                "value" : [ "ToRatio", "(" ]
+                "value" : [ "ToBoolean", "(" ]
               }, {
                 "r" : "215",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "215",
-                  "s" : [ {
-                    "r" : "216",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "217",
-                    "s" : [ {
-                      "value" : [ "String" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ToRatio",
-          "localId" : "221",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "222",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
-            "annotation" : [ ]
-          } ],
-          "operand" : {
-            "type" : "As",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "strict" : false,
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "225",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
-        "name" : "IsValid",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "225",
-            "s" : [ {
-              "value" : [ "", "define ", "IsValid", ": " ]
-            }, {
-              "r" : "231",
-              "s" : [ {
-                "value" : [ "ToRatio", "(" ]
-              }, {
-                "r" : "226",
-                "s" : [ {
-                  "value" : [ "'1.0 \\'mg\\':2.0 \\'mg\\''" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ToRatio",
-          "localId" : "231",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "232",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
-            "annotation" : [ ]
-          } ],
-          "operand" : {
-            "type" : "Literal",
-            "localId" : "226",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "1.0 'mg':2.0 'mg'",
-            "annotation" : [ ]
-          }
-        }
-      }, {
-        "localId" : "235",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
-        "name" : "IsValidWithCustomUCUM",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "235",
-            "s" : [ {
-              "value" : [ "", "define ", "IsValidWithCustomUCUM", ": " ]
-            }, {
-              "r" : "241",
-              "s" : [ {
-                "value" : [ "ToRatio", "(" ]
-              }, {
-                "r" : "236",
-                "s" : [ {
-                  "value" : [ "'1.0 \\'{foo:bar}\\':2.0 \\'mg\\''" ]
+                  "value" : [ "'TRUE'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5102,46 +7642,46 @@ module.exports['ToRatio'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToRatio",
-          "localId" : "241",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+          "type" : "ToBoolean",
+          "localId" : "220",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "242",
+            "localId" : "221",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "236",
+            "localId" : "215",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "1.0 '{foo:bar}':2.0 'mg'",
+            "value" : "TRUE",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "245",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
-        "name" : "InvalidSeparator",
+        "localId" : "224",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UpperCaseFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "245",
+            "r" : "224",
             "s" : [ {
-              "value" : [ "", "define ", "InvalidSeparator", ": " ]
+              "value" : [ "", "define ", "UpperCaseFalse", ": " ]
             }, {
-              "r" : "251",
+              "r" : "230",
               "s" : [ {
-                "value" : [ "ToRatio", "(" ]
+                "value" : [ "ToBoolean", "(" ]
               }, {
-                "r" : "246",
+                "r" : "225",
                 "s" : [ {
-                  "value" : [ "'1.0 \\'mg\\';2.0 \\'mg\\''" ]
+                  "value" : [ "'FALSE'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5150,46 +7690,46 @@ module.exports['ToRatio'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToRatio",
-          "localId" : "251",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+          "type" : "ToBoolean",
+          "localId" : "230",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "252",
+            "localId" : "231",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "246",
+            "localId" : "225",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "1.0 'mg';2.0 'mg'",
+            "value" : "FALSE",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "255",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
-        "name" : "InvalidNumerator",
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LowerCaseTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "255",
+            "r" : "234",
             "s" : [ {
-              "value" : [ "", "define ", "InvalidNumerator", ": " ]
+              "value" : [ "", "define ", "LowerCaseTrue", ": " ]
             }, {
-              "r" : "261",
+              "r" : "240",
               "s" : [ {
-                "value" : [ "ToRatio", "(" ]
+                "value" : [ "ToBoolean", "(" ]
               }, {
-                "r" : "256",
+                "r" : "235",
                 "s" : [ {
-                  "value" : [ "'1.0 \\'cc\\':2.0 \\'mg\\''" ]
+                  "value" : [ "'true'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5198,46 +7738,46 @@ module.exports['ToRatio'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToRatio",
-          "localId" : "261",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+          "type" : "ToBoolean",
+          "localId" : "240",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "262",
+            "localId" : "241",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "256",
+            "localId" : "235",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "1.0 'cc':2.0 'mg'",
+            "value" : "true",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "265",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
-        "name" : "InvalidDenominator",
+        "localId" : "244",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LowerCaseFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "265",
+            "r" : "244",
             "s" : [ {
-              "value" : [ "", "define ", "InvalidDenominator", ": " ]
+              "value" : [ "", "define ", "LowerCaseFalse", ": " ]
             }, {
-              "r" : "271",
+              "r" : "250",
               "s" : [ {
-                "value" : [ "ToRatio", "(" ]
+                "value" : [ "ToBoolean", "(" ]
               }, {
-                "r" : "266",
+                "r" : "245",
                 "s" : [ {
-                  "value" : [ "'1.0 \\'mg\\':2.0 \\'cc\\''" ]
+                  "value" : [ "'false'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5246,164 +7786,94 @@ module.exports['ToRatio'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToRatio",
-          "localId" : "271",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Ratio",
+          "type" : "ToBoolean",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "272",
+            "localId" : "251",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "266",
+            "localId" : "245",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "1.0 'mg':2.0 'cc'",
+            "value" : "false",
             "annotation" : [ ]
           }
         }
-      } ]
-    }
-  }
-}
-
-/* ToTime
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define NullArgTime: ToTime((null as String))
-define IncorrectFormatTime: ToTime('10:00PM')
-define InvalidTime: ToTime('25:99.000')
-define TimeH: ToTime('02')
-define TimeHM: ToTime('02:04')
-define TimeHMS: ToTime('02:04:59')
-define TimeHMSMs: ToTime('02:04:59.123')
-define HourTooHigh: ToTime('24')
-define MinuteTooHigh: ToTime('23:60')
-define SecondTooHigh: ToTime('23:59:60')
-*/
-
-module.exports['ToTime'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "305",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "254",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UpperCaseT",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "254",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "UpperCaseT", ": " ]
             }, {
+              "r" : "260",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "ToBoolean", "(" ]
+              }, {
+                "r" : "255",
+                "s" : [ {
+                  "value" : [ "'T'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "ToBoolean",
+          "localId" : "260",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "signature" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "261",
+            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "annotation" : [ ]
+          } ],
           "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "type" : "Literal",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "T",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "NullArgTime",
+        "localId" : "264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UpperCaseF",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "NullArgTime", ": " ]
+              "value" : [ "", "define ", "UpperCaseF", ": " ]
             }, {
-              "r" : "221",
+              "r" : "270",
               "s" : [ {
-                "value" : [ "ToTime", "(" ]
+                "value" : [ "ToBoolean", "(" ]
               }, {
-                "r" : "215",
+                "r" : "265",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "215",
-                  "s" : [ {
-                    "r" : "216",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "217",
-                    "s" : [ {
-                      "value" : [ "String" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "'F'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5412,59 +7882,46 @@ module.exports['ToTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
-          "localId" : "221",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToBoolean",
+          "localId" : "270",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "222",
+            "localId" : "271",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "As",
-            "localId" : "215",
+            "type" : "Literal",
+            "localId" : "265",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "strict" : false,
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
-              "annotation" : [ ]
-            }
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "F",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "225",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "IncorrectFormatTime",
+        "localId" : "274",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LowerCaseT",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "225",
+            "r" : "274",
             "s" : [ {
-              "value" : [ "", "define ", "IncorrectFormatTime", ": " ]
+              "value" : [ "", "define ", "LowerCaseT", ": " ]
             }, {
-              "r" : "231",
+              "r" : "280",
               "s" : [ {
-                "value" : [ "ToTime", "(" ]
+                "value" : [ "ToBoolean", "(" ]
               }, {
-                "r" : "226",
+                "r" : "275",
                 "s" : [ {
-                  "value" : [ "'10:00PM'" ]
+                  "value" : [ "'t'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5473,46 +7930,46 @@ module.exports['ToTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
-          "localId" : "231",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToBoolean",
+          "localId" : "280",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "232",
+            "localId" : "281",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "226",
+            "localId" : "275",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "10:00PM",
+            "value" : "t",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "235",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "InvalidTime",
+        "localId" : "284",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LowerCaseF",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "235",
+            "r" : "284",
             "s" : [ {
-              "value" : [ "", "define ", "InvalidTime", ": " ]
+              "value" : [ "", "define ", "LowerCaseF", ": " ]
             }, {
-              "r" : "241",
+              "r" : "290",
               "s" : [ {
-                "value" : [ "ToTime", "(" ]
+                "value" : [ "ToBoolean", "(" ]
               }, {
-                "r" : "236",
+                "r" : "285",
                 "s" : [ {
-                  "value" : [ "'25:99.000'" ]
+                  "value" : [ "'f'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5521,46 +7978,46 @@ module.exports['ToTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
-          "localId" : "241",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToBoolean",
+          "localId" : "290",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "242",
+            "localId" : "291",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "236",
+            "localId" : "285",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "25:99.000",
+            "value" : "f",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "245",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimeH",
+        "localId" : "294",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "245",
+            "r" : "294",
             "s" : [ {
-              "value" : [ "", "define ", "TimeH", ": " ]
+              "value" : [ "", "define ", "IsTrue", ": " ]
             }, {
-              "r" : "251",
+              "r" : "300",
               "s" : [ {
-                "value" : [ "ToTime", "(" ]
+                "value" : [ "ToBoolean", "(" ]
               }, {
-                "r" : "246",
+                "r" : "295",
                 "s" : [ {
-                  "value" : [ "'02'" ]
+                  "value" : [ "'y'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5569,46 +8026,46 @@ module.exports['ToTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
-          "localId" : "251",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToBoolean",
+          "localId" : "300",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "252",
+            "localId" : "301",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "246",
+            "localId" : "295",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "02",
+            "value" : "y",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "255",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimeHM",
+        "localId" : "304",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "255",
+            "r" : "304",
             "s" : [ {
-              "value" : [ "", "define ", "TimeHM", ": " ]
+              "value" : [ "", "define ", "IsFalse", ": " ]
             }, {
-              "r" : "261",
+              "r" : "310",
               "s" : [ {
-                "value" : [ "ToTime", "(" ]
+                "value" : [ "ToBoolean", "(" ]
               }, {
-                "r" : "256",
+                "r" : "305",
                 "s" : [ {
-                  "value" : [ "'02:04'" ]
+                  "value" : [ "'0'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5617,46 +8074,46 @@ module.exports['ToTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
-          "localId" : "261",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToBoolean",
+          "localId" : "310",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "262",
+            "localId" : "311",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "256",
+            "localId" : "305",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "02:04",
+            "value" : "0",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "265",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimeHMS",
+        "localId" : "314",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "265",
+            "r" : "314",
             "s" : [ {
-              "value" : [ "", "define ", "TimeHMS", ": " ]
+              "value" : [ "", "define ", "IsNull", ": " ]
             }, {
-              "r" : "271",
+              "r" : "320",
               "s" : [ {
-                "value" : [ "ToTime", "(" ]
+                "value" : [ "ToBoolean", "(" ]
               }, {
-                "r" : "266",
+                "r" : "315",
                 "s" : [ {
-                  "value" : [ "'02:04:59'" ]
+                  "value" : [ "'falsetto'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -5665,536 +8122,543 @@ module.exports['ToTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
-          "localId" : "271",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToBoolean",
+          "localId" : "320",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "272",
+            "localId" : "321",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "266",
+            "localId" : "315",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "02:04:59",
+            "value" : "falsetto",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "275",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "TimeHMSMs",
+        "localId" : "324",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithInteger",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "275",
+            "r" : "324",
             "s" : [ {
-              "value" : [ "", "define ", "TimeHMSMs", ": " ]
+              "value" : [ "", "define ", "IsTrueWithInteger", ": " ]
             }, {
-              "r" : "281",
+              "r" : "329",
               "s" : [ {
-                "value" : [ "ToTime", "(" ]
-              }, {
-                "r" : "276",
-                "s" : [ {
-                  "value" : [ "'02:04:59.123'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "325",
+                "value" : [ "ToBoolean", "(", "1", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
-          "localId" : "281",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToBoolean",
+          "localId" : "329",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "282",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "330",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "276",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "02:04:59.123",
+            "localId" : "325",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "285",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "HourTooHigh",
+        "localId" : "333",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalseWithInteger",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "285",
+            "r" : "333",
             "s" : [ {
-              "value" : [ "", "define ", "HourTooHigh", ": " ]
+              "value" : [ "", "define ", "IsFalseWithInteger", ": " ]
             }, {
-              "r" : "291",
+              "r" : "338",
               "s" : [ {
-                "value" : [ "ToTime", "(" ]
-              }, {
-                "r" : "286",
-                "s" : [ {
-                  "value" : [ "'24'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "334",
+                "value" : [ "ToBoolean", "(", "0", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
-          "localId" : "291",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToBoolean",
+          "localId" : "338",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "292",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "339",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "286",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "24",
+            "localId" : "334",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "295",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "MinuteTooHigh",
+        "localId" : "342",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsNullWithInteger",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "295",
+            "r" : "342",
             "s" : [ {
-              "value" : [ "", "define ", "MinuteTooHigh", ": " ]
+              "value" : [ "", "define ", "IsNullWithInteger", ": " ]
             }, {
-              "r" : "301",
+              "r" : "347",
               "s" : [ {
-                "value" : [ "ToTime", "(" ]
-              }, {
-                "r" : "296",
-                "s" : [ {
-                  "value" : [ "'23:60'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "343",
+                "value" : [ "ToBoolean", "(", "2", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
-          "localId" : "301",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToBoolean",
+          "localId" : "347",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "302",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "348",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "296",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "23:60",
+            "localId" : "343",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "305",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "SecondTooHigh",
+        "localId" : "351",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "305",
+            "r" : "351",
             "s" : [ {
-              "value" : [ "", "define ", "SecondTooHigh", ": " ]
+              "value" : [ "", "define ", "IsTrueWithLong", ": " ]
             }, {
-              "r" : "311",
+              "r" : "356",
               "s" : [ {
-                "value" : [ "ToTime", "(" ]
-              }, {
-                "r" : "306",
-                "s" : [ {
-                  "value" : [ "'23:59:60'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "352",
+                "value" : [ "ToBoolean", "(", "1L", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToTime",
-          "localId" : "311",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "ToBoolean",
+          "localId" : "356",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "312",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "357",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "306",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "23:59:60",
+            "localId" : "352",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
             "annotation" : [ ]
-          }
-        }
-      } ]
-    }
-  }
-}
-
-/* ToBoolean
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define UpperCaseTrue: ToBoolean('TRUE')
-define UpperCaseFalse: ToBoolean('FALSE')
-define LowerCaseTrue: ToBoolean('true')
-define LowerCaseFalse: ToBoolean('false')
-define UpperCaseT: ToBoolean('T')
-define UpperCaseF: ToBoolean('F')
-define LowerCaseT: ToBoolean('t')
-define LowerCaseF: ToBoolean('f')
-define IsTrue: ToBoolean('y')
-define IsFalse: ToBoolean('0')
-define IsNull: ToBoolean('falsetto')
-*/
-
-module.exports['ToBoolean'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "314",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
+          }
+        }
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "360",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalseWithLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "360",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "IsFalseWithLong", ": " ]
             }, {
+              "r" : "365",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "361",
+                "value" : [ "ToBoolean", "(", "0L", ")" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "ToBoolean",
+          "localId" : "365",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "signature" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "366",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
           "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "type" : "Literal",
+            "localId" : "361",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "214",
+        "localId" : "369",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UpperCaseTrue",
+        "name" : "IsNullWithLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "369",
             "s" : [ {
-              "value" : [ "", "define ", "UpperCaseTrue", ": " ]
+              "value" : [ "", "define ", "IsNullWithLong", ": " ]
             }, {
-              "r" : "220",
+              "r" : "374",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
-              }, {
-                "r" : "215",
-                "s" : [ {
-                  "value" : [ "'TRUE'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "370",
+                "value" : [ "ToBoolean", "(", "2L", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "ToBoolean",
-          "localId" : "220",
+          "localId" : "374",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "221",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "375",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "TRUE",
+            "localId" : "370",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "224",
+        "localId" : "378",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UpperCaseFalse",
+        "name" : "IsTrueWithDecimal",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "224",
+            "r" : "378",
             "s" : [ {
-              "value" : [ "", "define ", "UpperCaseFalse", ": " ]
+              "value" : [ "", "define ", "IsTrueWithDecimal", ": " ]
             }, {
-              "r" : "230",
+              "r" : "383",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
-              }, {
-                "r" : "225",
-                "s" : [ {
-                  "value" : [ "'FALSE'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "379",
+                "value" : [ "ToBoolean", "(", "1.0", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "ToBoolean",
-          "localId" : "230",
+          "localId" : "383",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "231",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "384",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "225",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "FALSE",
+            "localId" : "379",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "1.0",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "234",
+        "localId" : "387",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "LowerCaseTrue",
+        "name" : "IsFalseWithDecimal",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "387",
             "s" : [ {
-              "value" : [ "", "define ", "LowerCaseTrue", ": " ]
+              "value" : [ "", "define ", "IsFalseWithDecimal", ": " ]
             }, {
-              "r" : "240",
+              "r" : "392",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
-              }, {
-                "r" : "235",
-                "s" : [ {
-                  "value" : [ "'true'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "388",
+                "value" : [ "ToBoolean", "(", "0.0", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "ToBoolean",
-          "localId" : "240",
+          "localId" : "392",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "241",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "393",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "235",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "true",
+            "localId" : "388",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.0",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "244",
+        "localId" : "396",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "LowerCaseFalse",
+        "name" : "IsNullWithDecimal",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "244",
+            "r" : "396",
             "s" : [ {
-              "value" : [ "", "define ", "LowerCaseFalse", ": " ]
+              "value" : [ "", "define ", "IsNullWithDecimal", ": " ]
             }, {
-              "r" : "250",
+              "r" : "401",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
-              }, {
-                "r" : "245",
-                "s" : [ {
-                  "value" : [ "'false'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "397",
+                "value" : [ "ToBoolean", "(", "1.5", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "ToBoolean",
-          "localId" : "250",
+          "localId" : "401",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "251",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "402",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "245",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "false",
+            "localId" : "397",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "1.5",
             "annotation" : [ ]
           }
         }
+      } ]
+    }
+  }
+}
+
+/* ToConcept
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define IsValid: ToConcept(Code { system: 'http://loinc.org', code: '8480-6' }) // Concept { codes: { Code { system: 'http://loinc.org', code: '8480-6' } } }
+define IsNull: ToConcept(null as Code)
+*/
+
+module.exports['ToConcept'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "228",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
       }, {
-        "localId" : "254",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UpperCaseT",
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
+        "name" : "IsValid",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "254",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "UpperCaseT", ": " ]
+              "value" : [ "", "define ", "IsValid", ": " ]
             }, {
-              "r" : "260",
+              "r" : "224",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
+                "value" : [ "ToConcept", "(" ]
               }, {
-                "r" : "255",
+                "r" : "215",
                 "s" : [ {
-                  "value" : [ "'T'" ]
+                  "value" : [ "Code", " { " ]
+                }, {
+                  "s" : [ {
+                    "value" : [ "system", ": " ]
+                  }, {
+                    "r" : "217",
+                    "s" : [ {
+                      "value" : [ "'http://loinc.org'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "s" : [ {
+                    "value" : [ "code", ": " ]
+                  }, {
+                    "r" : "219",
+                    "s" : [ {
+                      "value" : [ "'8480-6'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -6203,46 +8667,72 @@ module.exports['ToBoolean'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToBoolean",
-          "localId" : "260",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "ToConcept",
+          "localId" : "224",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "261",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "225",
+            "name" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Literal",
-            "localId" : "255",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "T",
-            "annotation" : [ ]
+            "type" : "Instance",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
+            "classType" : "{urn:hl7-org:elm-types:r1}Code",
+            "annotation" : [ ],
+            "element" : [ {
+              "name" : "system",
+              "value" : {
+                "type" : "Literal",
+                "localId" : "217",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "http://loinc.org",
+                "annotation" : [ ]
+              }
+            }, {
+              "name" : "code",
+              "value" : {
+                "type" : "Literal",
+                "localId" : "219",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "8480-6",
+                "annotation" : [ ]
+              }
+            } ]
           }
         }
       }, {
-        "localId" : "264",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UpperCaseF",
+        "localId" : "228",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
+        "name" : "IsNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "228",
             "s" : [ {
-              "value" : [ "", "define ", "UpperCaseF", ": " ]
+              "value" : [ "// Concept { codes: { Code { system: 'http://loinc.org', code: '8480-6' } } }\n", "define ", "IsNull", ": " ]
             }, {
-              "r" : "270",
+              "r" : "235",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
+                "value" : [ "ToConcept", "(" ]
               }, {
-                "r" : "265",
+                "r" : "229",
                 "s" : [ {
-                  "value" : [ "'F'" ]
+                  "r" : "230",
+                  "value" : [ "null", " as " ]
+                }, {
+                  "r" : "231",
+                  "s" : [ {
+                    "value" : [ "Code" ]
+                  } ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -6251,94 +8741,158 @@ module.exports['ToBoolean'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToBoolean",
-          "localId" : "270",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "ToConcept",
+          "localId" : "235",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "271",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "236",
+            "name" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Literal",
-            "localId" : "265",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "F",
-            "annotation" : [ ]
+            "type" : "As",
+            "localId" : "229",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
+            "strict" : false,
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "230",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "231",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
+              "name" : "{urn:hl7-org:elm-types:r1}Code",
+              "annotation" : [ ]
+            }
           }
         }
+      } ]
+    }
+  }
+}
+
+/* ToDate
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define ToDateString: ToDate('2015-01-02')
+define ToDateDateTime: ToDate(DateTime(2000, 3, 15, 13, 30, 25, 200))
+define ToDateNull: ToDate(null as String)
+define ToDateDateTimeString: ToDate(@2014-01-01T12:30:00)
+*/
+
+module.exports['ToDate'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "267",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
       }, {
-        "localId" : "274",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "LowerCaseT",
-        "context" : "Patient",
-        "accessLevel" : "Public",
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "274",
+            "r" : "206",
             "s" : [ {
-              "value" : [ "", "define ", "LowerCaseT", ": " ]
+              "value" : [ "", "using " ]
             }, {
-              "r" : "280",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
-              }, {
-                "r" : "275",
-                "s" : [ {
-                  "value" : [ "'t'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "value" : [ "Simple" ]
               } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ],
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
         "expression" : {
-          "type" : "ToBoolean",
-          "localId" : "280",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "SingletonFrom",
+          "localId" : "210",
           "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "281",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
-            "annotation" : [ ]
-          } ],
+          "signature" : [ ],
           "operand" : {
-            "type" : "Literal",
-            "localId" : "275",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "t",
-            "annotation" : [ ]
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
           }
         }
       }, {
-        "localId" : "284",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "LowerCaseF",
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "ToDateString",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "284",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "LowerCaseF", ": " ]
+              "value" : [ "", "define ", "ToDateString", ": " ]
             }, {
-              "r" : "290",
+              "r" : "220",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
+                "value" : [ "ToDate", "(" ]
               }, {
-                "r" : "285",
+                "r" : "215",
                 "s" : [ {
-                  "value" : [ "'f'" ]
+                  "value" : [ "'2015-01-02'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -6347,46 +8901,47 @@ module.exports['ToBoolean'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToBoolean",
-          "localId" : "290",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "ToDate",
+          "localId" : "220",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "291",
+            "localId" : "221",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "285",
+            "localId" : "215",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "f",
+            "value" : "2015-01-02",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "294",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsTrue",
+        "localId" : "224",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "ToDateDateTime",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "294",
+            "r" : "224",
             "s" : [ {
-              "value" : [ "", "define ", "IsTrue", ": " ]
+              "value" : [ "", "define ", "ToDateDateTime", ": " ]
             }, {
-              "r" : "300",
+              "r" : "252",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
+                "value" : [ "ToDate", "(" ]
               }, {
-                "r" : "295",
+                "r" : "241",
                 "s" : [ {
-                  "value" : [ "'y'" ]
+                  "r" : "225",
+                  "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ")" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -6395,46 +8950,142 @@ module.exports['ToBoolean'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToBoolean",
-          "localId" : "300",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "ToDate",
+          "localId" : "252",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "301",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "253",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Literal",
-            "localId" : "295",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "y",
-            "annotation" : [ ]
+            "type" : "DateTime",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "242",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "243",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "244",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "245",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "246",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "247",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "248",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "225",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2000",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "226",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "227",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "15",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "228",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "13",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "229",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "30",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "230",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "25",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "231",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
+            }
           }
         }
       }, {
-        "localId" : "304",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsFalse",
+        "localId" : "256",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "ToDateNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "304",
+            "r" : "256",
             "s" : [ {
-              "value" : [ "", "define ", "IsFalse", ": " ]
+              "value" : [ "", "define ", "ToDateNull", ": " ]
             }, {
-              "r" : "310",
+              "r" : "263",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
+                "value" : [ "ToDate", "(" ]
               }, {
-                "r" : "305",
+                "r" : "257",
                 "s" : [ {
-                  "value" : [ "'0'" ]
+                  "r" : "258",
+                  "value" : [ "null", " as " ]
+                }, {
+                  "r" : "259",
+                  "s" : [ {
+                    "value" : [ "String" ]
+                  } ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -6443,71 +9094,119 @@ module.exports['ToBoolean'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToBoolean",
-          "localId" : "310",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "ToDate",
+          "localId" : "263",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "311",
+            "localId" : "264",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Literal",
-            "localId" : "305",
+            "type" : "As",
+            "localId" : "257",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "0",
-            "annotation" : [ ]
+            "strict" : false,
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "258",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "259",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            }
           }
         }
       }, {
-        "localId" : "314",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsNull",
+        "localId" : "267",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "ToDateDateTimeString",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "314",
+            "r" : "267",
             "s" : [ {
-              "value" : [ "", "define ", "IsNull", ": " ]
+              "value" : [ "", "define ", "ToDateDateTimeString", ": " ]
             }, {
-              "r" : "320",
+              "r" : "278",
               "s" : [ {
-                "value" : [ "ToBoolean", "(" ]
-              }, {
-                "r" : "315",
-                "s" : [ {
-                  "value" : [ "'falsetto'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "268",
+                "value" : [ "ToDate", "(", "@2014-01-01T12:30:00", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToBoolean",
-          "localId" : "320",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "ToDate",
+          "localId" : "278",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "321",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "279",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Literal",
-            "localId" : "315",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "falsetto",
-            "annotation" : [ ]
+            "type" : "DateTime",
+            "localId" : "268",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "269",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2014",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "270",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "271",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "272",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "273",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "30",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "274",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
           }
         }
       } ]
@@ -6515,15 +9214,26 @@ module.exports['ToBoolean'] = {
   }
 }
 
-/* ToConcept
+/* ConvertsToBoolean
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define IsValid: ToConcept(Code { system: 'http://loinc.org', code: '8480-6' }) // Concept { codes: { Code { system: 'http://loinc.org', code: '8480-6' } } }
-define IsNull: ToConcept(null as Code)
+define IsTrueWithTrueValue: ConvertsToBoolean('y')
+define IsTrueWithFalseValue: ConvertsToBoolean('0')
+define IsTrueWithIntegerTrueValue: ConvertsToBoolean(1)
+define IsTrueWithIntegerFalseValue: ConvertsToBoolean(0)
+define IsFalseWithIntegerInvalidValue: ConvertsToBoolean(2)
+define IsTrueWithLongTrueValue: ConvertsToBoolean(1L)
+define IsTrueWithLongFalseValue: ConvertsToBoolean(0L)
+define IsFalseWithLongInvalidValue: ConvertsToBoolean(2L)
+define IsTrueWithDecimalTrueValue: ConvertsToBoolean(1.0)
+define IsTrueWithDecimalFalseValue: ConvertsToBoolean(0.0)
+define IsFalseWithDecimalInvalidValue: ConvertsToBoolean(1.5)
+define IsFalse: ConvertsToBoolean('foo')
+define IsNull: ConvertsToBoolean(null as String)
 */
 
-module.exports['ToConcept'] = {
+module.exports['ConvertsToBoolean'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -6535,7 +9245,7 @@ module.exports['ToConcept'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "228",
+        "r" : "325",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -6609,8 +9319,8 @@ module.exports['ToConcept'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
-        "name" : "IsValid",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithTrueValue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -6619,37 +9329,15 @@ module.exports['ToConcept'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "IsValid", ": " ]
+              "value" : [ "", "define ", "IsTrueWithTrueValue", ": " ]
             }, {
-              "r" : "224",
+              "r" : "220",
               "s" : [ {
-                "value" : [ "ToConcept", "(" ]
+                "value" : [ "ConvertsToBoolean", "(" ]
               }, {
                 "r" : "215",
                 "s" : [ {
-                  "value" : [ "Code", " { " ]
-                }, {
-                  "s" : [ {
-                    "value" : [ "system", ": " ]
-                  }, {
-                    "r" : "217",
-                    "s" : [ {
-                      "value" : [ "'http://loinc.org'" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "s" : [ {
-                    "value" : [ "code", ": " ]
-                  }, {
-                    "r" : "219",
-                    "s" : [ {
-                      "value" : [ "'8480-6'" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ " }" ]
+                  "value" : [ "'y'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -6658,72 +9346,46 @@ module.exports['ToConcept'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToConcept",
-          "localId" : "224",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
+          "type" : "ConvertsToBoolean",
+          "localId" : "220",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "225",
-            "name" : "{urn:hl7-org:elm-types:r1}Code",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "Instance",
+            "type" : "Literal",
             "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
-            "classType" : "{urn:hl7-org:elm-types:r1}Code",
-            "annotation" : [ ],
-            "element" : [ {
-              "name" : "system",
-              "value" : {
-                "type" : "Literal",
-                "localId" : "217",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "http://loinc.org",
-                "annotation" : [ ]
-              }
-            }, {
-              "name" : "code",
-              "value" : {
-                "type" : "Literal",
-                "localId" : "219",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "8480-6",
-                "annotation" : [ ]
-              }
-            } ]
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "y",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "228",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
-        "name" : "IsNull",
+        "localId" : "224",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithFalseValue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "228",
+            "r" : "224",
             "s" : [ {
-              "value" : [ "// Concept { codes: { Code { system: 'http://loinc.org', code: '8480-6' } } }\n", "define ", "IsNull", ": " ]
+              "value" : [ "", "define ", "IsTrueWithFalseValue", ": " ]
             }, {
-              "r" : "235",
+              "r" : "230",
               "s" : [ {
-                "value" : [ "ToConcept", "(" ]
+                "value" : [ "ConvertsToBoolean", "(" ]
               }, {
-                "r" : "229",
+                "r" : "225",
                 "s" : [ {
-                  "r" : "230",
-                  "value" : [ "null", " as " ]
-                }, {
-                  "r" : "231",
-                  "s" : [ {
-                    "value" : [ "Code" ]
-                  } ]
+                  "value" : [ "'0'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -6732,671 +9394,405 @@ module.exports['ToConcept'] = {
           }
         } ],
         "expression" : {
-          "type" : "ToConcept",
-          "localId" : "235",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Concept",
+          "type" : "ConvertsToBoolean",
+          "localId" : "230",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "236",
-            "name" : "{urn:hl7-org:elm-types:r1}Code",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "As",
-            "localId" : "229",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
-            "strict" : false,
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "230",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "231",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
-              "name" : "{urn:hl7-org:elm-types:r1}Code",
-              "annotation" : [ ]
-            }
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "0",
+            "annotation" : [ ]
           }
         }
-      } ]
-    }
-  }
-}
-
-/* ToDate
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define ToDateString: ToDate('2015-01-02')
-define ToDateDateTime: ToDate(DateTime(2000, 3, 15, 13, 30, 25, 200))
-define ToDateNull: ToDate(null as String)
-define ToDateDateTimeString: ToDate(@2014-01-01T12:30:00)
-*/
-
-module.exports['ToDate'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "267",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithIntegerTrueValue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "234",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "IsTrueWithIntegerTrueValue", ": " ]
             }, {
+              "r" : "239",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "235",
+                "value" : [ "ConvertsToBoolean", "(", "1", ")" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+        } ],
+        "expression" : {
+          "type" : "ConvertsToBoolean",
+          "localId" : "239",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "signature" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "240",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
           "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "type" : "Literal",
+            "localId" : "235",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "ToDateString",
+        "localId" : "243",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithIntegerFalseValue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "243",
             "s" : [ {
-              "value" : [ "", "define ", "ToDateString", ": " ]
+              "value" : [ "", "define ", "IsTrueWithIntegerFalseValue", ": " ]
             }, {
-              "r" : "220",
+              "r" : "248",
               "s" : [ {
-                "value" : [ "ToDate", "(" ]
-              }, {
-                "r" : "215",
-                "s" : [ {
-                  "value" : [ "'2015-01-02'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "244",
+                "value" : [ "ConvertsToBoolean", "(", "0", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDate",
-          "localId" : "220",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "ConvertsToBoolean",
+          "localId" : "248",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "221",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "249",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "2015-01-02",
+            "localId" : "244",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "224",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "ToDateDateTime",
+        "localId" : "252",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalseWithIntegerInvalidValue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "224",
+            "r" : "252",
             "s" : [ {
-              "value" : [ "", "define ", "ToDateDateTime", ": " ]
+              "value" : [ "", "define ", "IsFalseWithIntegerInvalidValue", ": " ]
             }, {
-              "r" : "252",
+              "r" : "257",
               "s" : [ {
-                "value" : [ "ToDate", "(" ]
-              }, {
-                "r" : "241",
-                "s" : [ {
-                  "r" : "225",
-                  "value" : [ "DateTime", "(", "2000", ", ", "3", ", ", "15", ", ", "13", ", ", "30", ", ", "25", ", ", "200", ")" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "253",
+                "value" : [ "ConvertsToBoolean", "(", "2", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDate",
-          "localId" : "252",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "ConvertsToBoolean",
+          "localId" : "257",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "253",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "258",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "DateTime",
-            "localId" : "241",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "242",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "243",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "244",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "245",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "246",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "247",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "248",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "225",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2000",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "226",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "227",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "15",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "228",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "13",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "229",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "30",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "230",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "25",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "231",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
-              "annotation" : [ ]
-            }
+            "type" : "Literal",
+            "localId" : "253",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "2",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "256",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "ToDateNull",
+        "localId" : "261",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithLongTrueValue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "256",
+            "r" : "261",
             "s" : [ {
-              "value" : [ "", "define ", "ToDateNull", ": " ]
+              "value" : [ "", "define ", "IsTrueWithLongTrueValue", ": " ]
             }, {
-              "r" : "263",
+              "r" : "266",
               "s" : [ {
-                "value" : [ "ToDate", "(" ]
-              }, {
-                "r" : "257",
-                "s" : [ {
-                  "r" : "258",
-                  "value" : [ "null", " as " ]
-                }, {
-                  "r" : "259",
-                  "s" : [ {
-                    "value" : [ "String" ]
-                  } ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "262",
+                "value" : [ "ConvertsToBoolean", "(", "1L", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDate",
-          "localId" : "263",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "ConvertsToBoolean",
+          "localId" : "266",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "264",
-            "name" : "{urn:hl7-org:elm-types:r1}String",
+            "localId" : "267",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "As",
-            "localId" : "257",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "strict" : false,
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "258",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "259",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
-              "annotation" : [ ]
-            }
+            "type" : "Literal",
+            "localId" : "262",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "270",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithLongFalseValue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "270",
+            "s" : [ {
+              "value" : [ "", "define ", "IsTrueWithLongFalseValue", ": " ]
+            }, {
+              "r" : "275",
+              "s" : [ {
+                "r" : "271",
+                "value" : [ "ConvertsToBoolean", "(", "0L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToBoolean",
+          "localId" : "275",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "276",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "271",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "267",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "ToDateDateTimeString",
+        "localId" : "279",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalseWithLongInvalidValue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "267",
+            "r" : "279",
             "s" : [ {
-              "value" : [ "", "define ", "ToDateDateTimeString", ": " ]
+              "value" : [ "", "define ", "IsFalseWithLongInvalidValue", ": " ]
             }, {
-              "r" : "278",
+              "r" : "284",
               "s" : [ {
-                "r" : "268",
-                "value" : [ "ToDate", "(", "@2014-01-01T12:30:00", ")" ]
+                "r" : "280",
+                "value" : [ "ConvertsToBoolean", "(", "2L", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ToDate",
-          "localId" : "278",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "ConvertsToBoolean",
+          "localId" : "284",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "279",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "285",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
-            "type" : "DateTime",
-            "localId" : "268",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "269",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2014",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "270",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "271",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "272",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "273",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "30",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "274",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
+            "type" : "Literal",
+            "localId" : "280",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "2",
+            "annotation" : [ ]
           }
         }
-      } ]
-    }
-  }
-}
-
-/* ConvertsToBoolean
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define IsTrueWithTrueValue: ConvertsToBoolean('y')
-define IsTrueWithFalseValue: ConvertsToBoolean('0')
-define IsFalse: ConvertsToBoolean('foo')
-define IsNull: ConvertsToBoolean(null as String)
-*/
-
-module.exports['ConvertsToBoolean'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "244",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "288",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithDecimalTrueValue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "288",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "IsTrueWithDecimalTrueValue", ": " ]
             }, {
+              "r" : "293",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "289",
+                "value" : [ "ConvertsToBoolean", "(", "1.0", ")" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "ConvertsToBoolean",
+          "localId" : "293",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "signature" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "294",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
           "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "type" : "Literal",
+            "localId" : "289",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "1.0",
+            "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "214",
+        "localId" : "297",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsTrueWithTrueValue",
+        "name" : "IsTrueWithDecimalFalseValue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "297",
             "s" : [ {
-              "value" : [ "", "define ", "IsTrueWithTrueValue", ": " ]
+              "value" : [ "", "define ", "IsTrueWithDecimalFalseValue", ": " ]
             }, {
-              "r" : "220",
+              "r" : "302",
               "s" : [ {
-                "value" : [ "ConvertsToBoolean", "(" ]
-              }, {
-                "r" : "215",
-                "s" : [ {
-                  "value" : [ "'y'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "298",
+                "value" : [ "ConvertsToBoolean", "(", "0.0", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "ConvertsToBoolean",
-          "localId" : "220",
+          "localId" : "302",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "221",
+            "localId" : "303",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "y",
+            "localId" : "298",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "0.0",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "224",
+        "localId" : "306",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsTrueWithFalseValue",
+        "name" : "IsFalseWithDecimalInvalidValue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "224",
+            "r" : "306",
             "s" : [ {
-              "value" : [ "", "define ", "IsTrueWithFalseValue", ": " ]
+              "value" : [ "", "define ", "IsFalseWithDecimalInvalidValue", ": " ]
             }, {
-              "r" : "230",
+              "r" : "311",
               "s" : [ {
-                "value" : [ "ConvertsToBoolean", "(" ]
-              }, {
-                "r" : "225",
-                "s" : [ {
-                  "value" : [ "'0'" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
+                "r" : "307",
+                "value" : [ "ConvertsToBoolean", "(", "1.5", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "ConvertsToBoolean",
-          "localId" : "230",
+          "localId" : "311",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "231",
+            "localId" : "312",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "225",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-            "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "0",
+            "localId" : "307",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "value" : "1.5",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "234",
+        "localId" : "315",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IsFalse",
         "context" : "Patient",
@@ -7405,15 +9801,15 @@ module.exports['ConvertsToBoolean'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "315",
             "s" : [ {
               "value" : [ "", "define ", "IsFalse", ": " ]
             }, {
-              "r" : "240",
+              "r" : "321",
               "s" : [ {
                 "value" : [ "ConvertsToBoolean", "(" ]
               }, {
-                "r" : "235",
+                "r" : "316",
                 "s" : [ {
                   "value" : [ "'foo'" ]
                 } ]
@@ -7425,18 +9821,18 @@ module.exports['ConvertsToBoolean'] = {
         } ],
         "expression" : {
           "type" : "ConvertsToBoolean",
-          "localId" : "240",
+          "localId" : "321",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "241",
+            "localId" : "322",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "235",
+            "localId" : "316",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo",
@@ -7444,7 +9840,7 @@ module.exports['ConvertsToBoolean'] = {
           }
         }
       }, {
-        "localId" : "244",
+        "localId" : "325",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IsNull",
         "context" : "Patient",
@@ -7453,20 +9849,20 @@ module.exports['ConvertsToBoolean'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "244",
+            "r" : "325",
             "s" : [ {
               "value" : [ "", "define ", "IsNull", ": " ]
             }, {
-              "r" : "251",
+              "r" : "332",
               "s" : [ {
                 "value" : [ "ConvertsToBoolean", "(" ]
               }, {
-                "r" : "245",
+                "r" : "326",
                 "s" : [ {
-                  "r" : "246",
+                  "r" : "327",
                   "value" : [ "null", " as " ]
                 }, {
-                  "r" : "247",
+                  "r" : "328",
                   "s" : [ {
                     "value" : [ "String" ]
                   } ]
@@ -7479,31 +9875,31 @@ module.exports['ConvertsToBoolean'] = {
         } ],
         "expression" : {
           "type" : "ConvertsToBoolean",
-          "localId" : "251",
+          "localId" : "332",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "252",
+            "localId" : "333",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "As",
-            "localId" : "245",
+            "localId" : "326",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "strict" : false,
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "246",
+              "localId" : "327",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "247",
+              "localId" : "328",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
@@ -8109,7 +10505,273 @@ define IsFalse: ConvertsToDecimal('foo')
 define IsNull: ConvertsToDecimal(null as Decimal)
 */
 
-module.exports['ConvertsToDecimal'] = {
+module.exports['ConvertsToDecimal'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "234",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "IsTrue", ": " ]
+            }, {
+              "r" : "220",
+              "s" : [ {
+                "value" : [ "ConvertsToDecimal", "(" ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "value" : [ "'0.1'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToDecimal",
+          "localId" : "220",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "0.1",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "224",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalse",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "IsFalse", ": " ]
+            }, {
+              "r" : "230",
+              "s" : [ {
+                "value" : [ "ConvertsToDecimal", "(" ]
+              }, {
+                "r" : "225",
+                "s" : [ {
+                  "value" : [ "'foo'" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToDecimal",
+          "localId" : "230",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "foo",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "234",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsNull",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "IsNull", ": " ]
+            }, {
+              "r" : "241",
+              "s" : [ {
+                "value" : [ "ConvertsToDecimal", "(" ]
+              }, {
+                "r" : "235",
+                "s" : [ {
+                  "r" : "236",
+                  "value" : [ "null", " as " ]
+                }, {
+                  "r" : "237",
+                  "s" : [ {
+                    "value" : [ "Decimal" ]
+                  } ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToDecimal",
+          "localId" : "241",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "242",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "As",
+            "localId" : "235",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "strict" : false,
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "237",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* ConvertsToInteger
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define IsTrue: ConvertsToInteger('101')
+define IsTrueWithLong: ConvertsToInteger(101L)
+define IsTrueWithBooleanTrue: ConvertsToInteger(true)
+define IsTrueWithBooleanFalse: ConvertsToInteger(false)
+define IsFalse: ConvertsToInteger('foo')
+define IsFalseWithEmptyString: ConvertsToInteger('')
+define IsFalseWithWhitespaceString: ConvertsToInteger('   ')
+define IsNull: ConvertsToInteger(null as Integer)
+*/
+
+module.exports['ConvertsToInteger'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -8121,7 +10783,7 @@ module.exports['ConvertsToDecimal'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "234",
+        "r" : "281",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -8209,11 +10871,11 @@ module.exports['ConvertsToDecimal'] = {
             }, {
               "r" : "220",
               "s" : [ {
-                "value" : [ "ConvertsToDecimal", "(" ]
+                "value" : [ "ConvertsToInteger", "(" ]
               }, {
                 "r" : "215",
                 "s" : [ {
-                  "value" : [ "'0.1'" ]
+                  "value" : [ "'101'" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -8222,7 +10884,7 @@ module.exports['ConvertsToDecimal'] = {
           }
         } ],
         "expression" : {
-          "type" : "ConvertsToDecimal",
+          "type" : "ConvertsToInteger",
           "localId" : "220",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -8237,14 +10899,14 @@ module.exports['ConvertsToDecimal'] = {
             "localId" : "215",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
-            "value" : "0.1",
+            "value" : "101",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "224",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsFalse",
+        "name" : "IsTrueWithLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -8252,14 +10914,140 @@ module.exports['ConvertsToDecimal'] = {
           "t" : [ ],
           "s" : {
             "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "IsTrueWithLong", ": " ]
+            }, {
+              "r" : "229",
+              "s" : [ {
+                "r" : "225",
+                "value" : [ "ConvertsToInteger", "(", "101L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToInteger",
+          "localId" : "229",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "230",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "101",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "233",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithBooleanTrue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "233",
+            "s" : [ {
+              "value" : [ "", "define ", "IsTrueWithBooleanTrue", ": " ]
+            }, {
+              "r" : "238",
+              "s" : [ {
+                "r" : "234",
+                "value" : [ "ConvertsToInteger", "(", "true", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToInteger",
+          "localId" : "238",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "239",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "234",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "value" : "true",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "242",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithBooleanFalse",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "242",
+            "s" : [ {
+              "value" : [ "", "define ", "IsTrueWithBooleanFalse", ": " ]
+            }, {
+              "r" : "247",
+              "s" : [ {
+                "r" : "243",
+                "value" : [ "ConvertsToInteger", "(", "false", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToInteger",
+          "localId" : "247",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "248",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "243",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "value" : "false",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "251",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalse",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "251",
             "s" : [ {
               "value" : [ "", "define ", "IsFalse", ": " ]
             }, {
-              "r" : "230",
+              "r" : "257",
               "s" : [ {
-                "value" : [ "ConvertsToDecimal", "(" ]
+                "value" : [ "ConvertsToInteger", "(" ]
               }, {
-                "r" : "225",
+                "r" : "252",
                 "s" : [ {
                   "value" : [ "'foo'" ]
                 } ]
@@ -8270,19 +11058,19 @@ module.exports['ConvertsToDecimal'] = {
           }
         } ],
         "expression" : {
-          "type" : "ConvertsToDecimal",
-          "localId" : "230",
+          "type" : "ConvertsToInteger",
+          "localId" : "257",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "231",
+            "localId" : "258",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "225",
+            "localId" : "252",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo",
@@ -8290,7 +11078,103 @@ module.exports['ConvertsToDecimal'] = {
           }
         }
       }, {
-        "localId" : "234",
+        "localId" : "261",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalseWithEmptyString",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "261",
+            "s" : [ {
+              "value" : [ "", "define ", "IsFalseWithEmptyString", ": " ]
+            }, {
+              "r" : "267",
+              "s" : [ {
+                "value" : [ "ConvertsToInteger", "(" ]
+              }, {
+                "r" : "262",
+                "s" : [ {
+                  "value" : [ "''" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToInteger",
+          "localId" : "267",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "268",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "262",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "271",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalseWithWhitespaceString",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "271",
+            "s" : [ {
+              "value" : [ "", "define ", "IsFalseWithWhitespaceString", ": " ]
+            }, {
+              "r" : "277",
+              "s" : [ {
+                "value" : [ "ConvertsToInteger", "(" ]
+              }, {
+                "r" : "272",
+                "s" : [ {
+                  "value" : [ "'   '" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToInteger",
+          "localId" : "277",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "278",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "272",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "   ",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "281",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IsNull",
         "context" : "Patient",
@@ -8299,22 +11183,22 @@ module.exports['ConvertsToDecimal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "234",
+            "r" : "281",
             "s" : [ {
               "value" : [ "", "define ", "IsNull", ": " ]
             }, {
-              "r" : "241",
+              "r" : "288",
               "s" : [ {
-                "value" : [ "ConvertsToDecimal", "(" ]
+                "value" : [ "ConvertsToInteger", "(" ]
               }, {
-                "r" : "235",
+                "r" : "282",
                 "s" : [ {
-                  "r" : "236",
+                  "r" : "283",
                   "value" : [ "null", " as " ]
                 }, {
-                  "r" : "237",
+                  "r" : "284",
                   "s" : [ {
-                    "value" : [ "Decimal" ]
+                    "value" : [ "Integer" ]
                   } ]
                 } ]
               }, {
@@ -8324,34 +11208,34 @@ module.exports['ConvertsToDecimal'] = {
           }
         } ],
         "expression" : {
-          "type" : "ConvertsToDecimal",
-          "localId" : "241",
+          "type" : "ConvertsToInteger",
+          "localId" : "288",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "242",
+            "localId" : "289",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "As",
-            "localId" : "235",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "localId" : "282",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "strict" : false,
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "236",
+              "localId" : "283",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "237",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
@@ -8361,18 +11245,21 @@ module.exports['ConvertsToDecimal'] = {
   }
 }
 
-/* ConvertsToInteger
+/* ConvertsToLong
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define IsTrue: ConvertsToInteger('101')
-define IsTrueWithBooleanTrue: ConvertsToInteger(true)
-define IsTrueWithBooleanFalse: ConvertsToInteger(false)
-define IsFalse: ConvertsToInteger('foo')
-define IsNull: ConvertsToInteger(null as Integer)
+define IsTrue: ConvertsToLong('101')
+define IsTrueWithInteger: ConvertsToLong(101)
+define IsTrueWithBooleanTrue: ConvertsToLong(true)
+define IsTrueWithBooleanFalse: ConvertsToLong(false)
+define IsFalse: ConvertsToLong('foo')
+define IsFalseWithEmptyString: ConvertsToLong('')
+define IsFalseWithWhitespaceString: ConvertsToLong('   ')
+define IsNull: ConvertsToLong(null as Integer)
 */
 
-module.exports['ConvertsToInteger'] = {
+module.exports['ConvertsToLong'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -8384,7 +11271,7 @@ module.exports['ConvertsToInteger'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "252",
+        "r" : "281",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -8472,7 +11359,7 @@ module.exports['ConvertsToInteger'] = {
             }, {
               "r" : "220",
               "s" : [ {
-                "value" : [ "ConvertsToInteger", "(" ]
+                "value" : [ "ConvertsToLong", "(" ]
               }, {
                 "r" : "215",
                 "s" : [ {
@@ -8485,7 +11372,7 @@ module.exports['ConvertsToInteger'] = {
           }
         } ],
         "expression" : {
-          "type" : "ConvertsToInteger",
+          "type" : "ConvertsToLong",
           "localId" : "220",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -8507,7 +11394,7 @@ module.exports['ConvertsToInteger'] = {
       }, {
         "localId" : "224",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsTrueWithBooleanTrue",
+        "name" : "IsTrueWithInteger",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -8516,18 +11403,18 @@ module.exports['ConvertsToInteger'] = {
           "s" : {
             "r" : "224",
             "s" : [ {
-              "value" : [ "", "define ", "IsTrueWithBooleanTrue", ": " ]
+              "value" : [ "", "define ", "IsTrueWithInteger", ": " ]
             }, {
               "r" : "229",
               "s" : [ {
                 "r" : "225",
-                "value" : [ "ConvertsToInteger", "(", "true", ")" ]
+                "value" : [ "ConvertsToLong", "(", "101", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ConvertsToInteger",
+          "type" : "ConvertsToLong",
           "localId" : "229",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -8540,16 +11427,16 @@ module.exports['ConvertsToInteger'] = {
           "operand" : {
             "type" : "Literal",
             "localId" : "225",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "value" : "true",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "101",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "233",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsTrueWithBooleanFalse",
+        "name" : "IsTrueWithBooleanTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -8558,18 +11445,18 @@ module.exports['ConvertsToInteger'] = {
           "s" : {
             "r" : "233",
             "s" : [ {
-              "value" : [ "", "define ", "IsTrueWithBooleanFalse", ": " ]
+              "value" : [ "", "define ", "IsTrueWithBooleanTrue", ": " ]
             }, {
               "r" : "238",
               "s" : [ {
                 "r" : "234",
-                "value" : [ "ConvertsToInteger", "(", "false", ")" ]
+                "value" : [ "ConvertsToLong", "(", "true", ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ConvertsToInteger",
+          "type" : "ConvertsToLong",
           "localId" : "238",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -8584,14 +11471,14 @@ module.exports['ConvertsToInteger'] = {
             "localId" : "234",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
-            "value" : "false",
+            "value" : "true",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "242",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsFalse",
+        "name" : "IsTrueWithBooleanFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -8599,14 +11486,56 @@ module.exports['ConvertsToInteger'] = {
           "t" : [ ],
           "s" : {
             "r" : "242",
+            "s" : [ {
+              "value" : [ "", "define ", "IsTrueWithBooleanFalse", ": " ]
+            }, {
+              "r" : "247",
+              "s" : [ {
+                "r" : "243",
+                "value" : [ "ConvertsToLong", "(", "false", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToLong",
+          "localId" : "247",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "248",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "243",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "value" : "false",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "251",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalse",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "251",
             "s" : [ {
               "value" : [ "", "define ", "IsFalse", ": " ]
             }, {
-              "r" : "248",
+              "r" : "257",
               "s" : [ {
-                "value" : [ "ConvertsToInteger", "(" ]
+                "value" : [ "ConvertsToLong", "(" ]
               }, {
-                "r" : "243",
+                "r" : "252",
                 "s" : [ {
                   "value" : [ "'foo'" ]
                 } ]
@@ -8617,19 +11546,19 @@ module.exports['ConvertsToInteger'] = {
           }
         } ],
         "expression" : {
-          "type" : "ConvertsToInteger",
-          "localId" : "248",
+          "type" : "ConvertsToLong",
+          "localId" : "257",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "249",
+            "localId" : "258",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "243",
+            "localId" : "252",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo",
@@ -8637,7 +11566,103 @@ module.exports['ConvertsToInteger'] = {
           }
         }
       }, {
-        "localId" : "252",
+        "localId" : "261",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalseWithEmptyString",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "261",
+            "s" : [ {
+              "value" : [ "", "define ", "IsFalseWithEmptyString", ": " ]
+            }, {
+              "r" : "267",
+              "s" : [ {
+                "value" : [ "ConvertsToLong", "(" ]
+              }, {
+                "r" : "262",
+                "s" : [ {
+                  "value" : [ "''" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToLong",
+          "localId" : "267",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "268",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "262",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "271",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsFalseWithWhitespaceString",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "271",
+            "s" : [ {
+              "value" : [ "", "define ", "IsFalseWithWhitespaceString", ": " ]
+            }, {
+              "r" : "277",
+              "s" : [ {
+                "value" : [ "ConvertsToLong", "(" ]
+              }, {
+                "r" : "272",
+                "s" : [ {
+                  "value" : [ "'   '" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToLong",
+          "localId" : "277",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "278",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "272",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+            "valueType" : "{urn:hl7-org:elm-types:r1}String",
+            "value" : "   ",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "281",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IsNull",
         "context" : "Patient",
@@ -8646,20 +11671,20 @@ module.exports['ConvertsToInteger'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "252",
+            "r" : "281",
             "s" : [ {
               "value" : [ "", "define ", "IsNull", ": " ]
             }, {
-              "r" : "259",
+              "r" : "288",
               "s" : [ {
-                "value" : [ "ConvertsToInteger", "(" ]
+                "value" : [ "ConvertsToLong", "(" ]
               }, {
-                "r" : "253",
+                "r" : "282",
                 "s" : [ {
-                  "r" : "254",
+                  "r" : "283",
                   "value" : [ "null", " as " ]
                 }, {
-                  "r" : "255",
+                  "r" : "284",
                   "s" : [ {
                     "value" : [ "Integer" ]
                   } ]
@@ -8671,32 +11696,32 @@ module.exports['ConvertsToInteger'] = {
           }
         } ],
         "expression" : {
-          "type" : "ConvertsToInteger",
-          "localId" : "259",
+          "type" : "ConvertsToLong",
+          "localId" : "288",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "260",
+            "localId" : "289",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "As",
-            "localId" : "253",
+            "localId" : "282",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "strict" : false,
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "254",
+              "localId" : "283",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "255",
+              "localId" : "284",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
@@ -8714,6 +11739,7 @@ using Simple version '1.0.0'
 context Patient
 define IsTrueWithDecimal: ConvertsToQuantity(0.1)
 define IsTrueWithInteger: ConvertsToQuantity(101)
+define IsTrueWithLong: ConvertsToQuantity(101L)
 define IsTrueWithString: ConvertsToQuantity('1.0 \'mg\'')
 define IsFalse: ConvertsToQuantity('foo')
 define IsFalseWithInvalidUcum: ConvertsToQuantity('1.0 \'cc\'')
@@ -8732,7 +11758,7 @@ module.exports['ConvertsToQuantity'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "262",
+        "r" : "271",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -8891,7 +11917,7 @@ module.exports['ConvertsToQuantity'] = {
       }, {
         "localId" : "232",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsTrueWithString",
+        "name" : "IsTrueWithLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -8899,14 +11925,56 @@ module.exports['ConvertsToQuantity'] = {
           "t" : [ ],
           "s" : {
             "r" : "232",
+            "s" : [ {
+              "value" : [ "", "define ", "IsTrueWithLong", ": " ]
+            }, {
+              "r" : "237",
+              "s" : [ {
+                "r" : "233",
+                "value" : [ "ConvertsToQuantity", "(", "101L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ConvertsToQuantity",
+          "localId" : "237",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "238",
+            "name" : "{urn:hl7-org:elm-types:r1}Any",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Literal",
+            "localId" : "233",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "101",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "241",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsTrueWithString",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "241",
             "s" : [ {
               "value" : [ "", "define ", "IsTrueWithString", ": " ]
             }, {
-              "r" : "238",
+              "r" : "247",
               "s" : [ {
                 "value" : [ "ConvertsToQuantity", "(" ]
               }, {
-                "r" : "233",
+                "r" : "242",
                 "s" : [ {
                   "value" : [ "'1.0 \\'mg\\''" ]
                 } ]
@@ -8918,18 +11986,18 @@ module.exports['ConvertsToQuantity'] = {
         } ],
         "expression" : {
           "type" : "ConvertsToQuantity",
-          "localId" : "238",
+          "localId" : "247",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "239",
+            "localId" : "248",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "233",
+            "localId" : "242",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "1.0 'mg'",
@@ -8937,7 +12005,7 @@ module.exports['ConvertsToQuantity'] = {
           }
         }
       }, {
-        "localId" : "242",
+        "localId" : "251",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IsFalse",
         "context" : "Patient",
@@ -8946,15 +12014,15 @@ module.exports['ConvertsToQuantity'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "242",
+            "r" : "251",
             "s" : [ {
               "value" : [ "", "define ", "IsFalse", ": " ]
             }, {
-              "r" : "248",
+              "r" : "257",
               "s" : [ {
                 "value" : [ "ConvertsToQuantity", "(" ]
               }, {
-                "r" : "243",
+                "r" : "252",
                 "s" : [ {
                   "value" : [ "'foo'" ]
                 } ]
@@ -8966,18 +12034,18 @@ module.exports['ConvertsToQuantity'] = {
         } ],
         "expression" : {
           "type" : "ConvertsToQuantity",
-          "localId" : "248",
+          "localId" : "257",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "249",
+            "localId" : "258",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "243",
+            "localId" : "252",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "foo",
@@ -8985,7 +12053,7 @@ module.exports['ConvertsToQuantity'] = {
           }
         }
       }, {
-        "localId" : "252",
+        "localId" : "261",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IsFalseWithInvalidUcum",
         "context" : "Patient",
@@ -8994,15 +12062,15 @@ module.exports['ConvertsToQuantity'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "252",
+            "r" : "261",
             "s" : [ {
               "value" : [ "", "define ", "IsFalseWithInvalidUcum", ": " ]
             }, {
-              "r" : "258",
+              "r" : "267",
               "s" : [ {
                 "value" : [ "ConvertsToQuantity", "(" ]
               }, {
-                "r" : "253",
+                "r" : "262",
                 "s" : [ {
                   "value" : [ "'1.0 \\'cc\\''" ]
                 } ]
@@ -9014,18 +12082,18 @@ module.exports['ConvertsToQuantity'] = {
         } ],
         "expression" : {
           "type" : "ConvertsToQuantity",
-          "localId" : "258",
+          "localId" : "267",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "259",
+            "localId" : "268",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Literal",
-            "localId" : "253",
+            "localId" : "262",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "1.0 'cc'",
@@ -9033,7 +12101,7 @@ module.exports['ConvertsToQuantity'] = {
           }
         }
       }, {
-        "localId" : "262",
+        "localId" : "271",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IsNull",
         "context" : "Patient",
@@ -9042,20 +12110,20 @@ module.exports['ConvertsToQuantity'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "262",
+            "r" : "271",
             "s" : [ {
               "value" : [ "", "define ", "IsNull", ": " ]
             }, {
-              "r" : "269",
+              "r" : "278",
               "s" : [ {
                 "value" : [ "ConvertsToQuantity", "(" ]
               }, {
-                "r" : "263",
+                "r" : "272",
                 "s" : [ {
-                  "r" : "264",
+                  "r" : "273",
                   "value" : [ "null", " as " ]
                 }, {
-                  "r" : "265",
+                  "r" : "274",
                   "s" : [ {
                     "value" : [ "String" ]
                   } ]
@@ -9068,31 +12136,31 @@ module.exports['ConvertsToQuantity'] = {
         } ],
         "expression" : {
           "type" : "ConvertsToQuantity",
-          "localId" : "269",
+          "localId" : "278",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "270",
+            "localId" : "279",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "As",
-            "localId" : "263",
+            "localId" : "272",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "strict" : false,
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "264",
+              "localId" : "273",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "265",
+              "localId" : "274",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
diff --git a/test/elm/interval/data.cql b/test/elm/interval/data.cql
index 7ece16f4a..95604e200 100644
--- a/test/elm/interval/data.cql
+++ b/test/elm/interval/data.cql
@@ -3,6 +3,8 @@ define Open: Interval(DateTime(2012, 1, 1), DateTime(2013, 1, 1))
 define LeftOpen: Interval(DateTime(2012, 1, 1), DateTime(2013, 1, 1)]
 define RightOpen: Interval[DateTime(2012, 1, 1), DateTime(2013, 1, 1))
 define Closed: Interval[DateTime(2012, 1, 1), DateTime(2013, 1, 1)]
+define LongOpen: Interval(1L, 3L)
+define LongClosed: Interval[1L, 3L]
 
 // @Test: Equal
 define EqualClosed: Interval[1, 5] = Interval[1, 5]
@@ -11,9 +13,15 @@ define EqualOpenClosed: Interval(1, 5) = Interval[2, 4]
 define UnequalClosed: Interval[1, 5] = Interval[2, 4]
 define UnequalOpen: Interval(1, 5) = Interval(2, 4)
 define UnequalClosedOpen: Interval[1, 5] = Interval(2, 4)
+define EqualLongClosed: Interval[1L, 5L] = Interval[1L, 5L]
+define EqualLongOpen: Interval(1L, 5L) = Interval(1L, 5L)
+define EqualLongOpenClosed: Interval(1L, 5L) = Interval[2L, 4L]
+define UnequalLongClosed: Interval[1L, 5L] = Interval[2L, 4L]
+define UnequalLongOpen: Interval(1L, 5L) = Interval(2L, 4L)
+define UnequalLongClosedOpen: Interval[1L, 5L] = Interval(2L, 4L)
 define EqualQuantityClosed: Interval[1 'mg', 5 'mg'] = Interval[1 'mg', 5 'mg']
 define EqualQuantityOpen: Interval(1 'mg', 5 'mg') = Interval(1 'mg', 5 'mg')
-define EqualQuantityOpenClosed: Interval(1 'mg', 5 'mg') = Interval[2 'mg', 4 'mg']
+define EqualQuantityOpenClosed: Interval(1.99999999 'mg', 4.00000001 'mg') = Interval[2 'mg', 4 'mg']
 define UnequalQuantityClosed: Interval[1 'mg', 5 'mg'] = Interval[2 'mg', 4 'mg']
 define UnequalQuantityOpen: Interval(1 'mg', 5 'mg') = Interval(2 'mg', 4 'mg')
 define UnequalQuantityClosedOpen: Interval[1 'mg', 5 'mg'] = Interval(2 'mg', 4 'mg')
@@ -30,9 +38,15 @@ define EqualOpenClosed: Interval(1, 5) != Interval[2, 4]
 define UnequalClosed: Interval[1, 5] != Interval[2, 4]
 define UnequalOpen: Interval(1, 5) != Interval(2, 4)
 define UnequalClosedOpen: Interval[1, 5] != Interval(2, 4)
+define EqualLongClosed: Interval[1L, 5L] != Interval[1L, 5L]
+define EqualLongOpen: Interval(1L, 5L) != Interval(1L, 5L)
+define EqualLongOpenClosed: Interval(1L, 5L) != Interval[2L, 4L]
+define UnequalLongClosed: Interval[1L, 5L] != Interval[2L, 4L]
+define UnequalLongOpen: Interval(1L, 5L) != Interval(2L, 4L)
+define UnequalLongClosedOpen: Interval[1L, 5L] != Interval(2L, 4L)
 define EqualQuantityClosed: Interval[1 'mg', 5 'mg'] != Interval[1 'mg', 5 'mg']
 define EqualQuantityOpen: Interval(1 'mg', 5 'mg') != Interval(1 'mg', 5 'mg')
-define EqualQuantityOpenClosed: Interval(1 'mg', 5 'mg') != Interval[2 'mg', 4 'mg']
+define EqualQuantityOpenClosed: Interval(1.99999999 'mg', 4.00000001 'mg') != Interval[2 'mg', 4 'mg']
 define UnequalQuantityClosed: Interval[1 'mg', 5 'mg'] != Interval[2 'mg', 4 'mg']
 define UnequalQuantityOpen: Interval(1 'mg', 5 'mg') != Interval(2 'mg', 4 'mg')
 define UnequalQuantityClosedOpen: Interval[1 'mg', 5 'mg'] != Interval(2 'mg', 4 'mg')
@@ -45,6 +59,8 @@ define DifferingPrecision: Interval[DateTime(2012, 1, 1, 12, 30, 21), DateTime(2
 // @Test: Contains
 define ContainsInt: Interval[1, 5] contains 3
 define NotContainsInt: Interval(1, 5] contains 1
+define ContainsLong: Interval[1L, 5L] contains 3L
+define NotContainsLong: Interval(1L, 5L] contains 1L
 define ContainsReal: Interval[1.234, 3.456] contains 2.345
 define NotContainsReal: Interval[1.234, 3.456] contains 4.567
 define ContainsQuantity: Interval[1 'mg', 5 'mg'] contains 3 'mg'
@@ -80,32 +96,40 @@ define ImpreciseNotContainsDate: ImpDateIvl contains DateTime(2012, 9, 1, 0, 0,
 define ImpreciseMayContainDate: ImpDateIvl contains DateTime(2012, 3, 15, 0, 0, 0, 0)
 define NegInfBegContainsInt: Interval[null, 5] contains -7
 define NegInfBegNotContainsInt: Interval[null, 5] contains 7
-define UnknownOpenBegContainsInt: Interval(null, 5] contains 5
-define UnknownClosedBegContainsInt: Interval[null, 5] contains 5
+define UnknownBegContainsInt: Interval(null, 5] contains 5
 define UnknownBegMayContainInt: Interval(null, 5] contains -7
 define UnknownBegNotContainsInt: Interval(null, 5] contains 7
 define PosInfEndContainsInt: Interval[0, null] contains 123456789
 define PosInfEndNotContainsInt: Interval[0, null] contains -1
-define UnknownOpenEndContainsInt: Interval[0, null) contains 0
-define UnknownClosedEndContainsInt: Interval[0, null] contains 0
+define UnknownEndContainsInt: Interval[0, null) contains 0
 define UnknownEndMayContainInt: Interval[0, null) contains 123456789
 define UnknownEndNotContainsInt: Interval[0, null) contains -1
+define NegInfBegContainsLong: Interval[null, 5L] contains -7L
+define NegInfBegNotContainsLong: Interval[null, 5L] contains 7L
+define UnknownBegContainsLong: Interval(null, 5L] contains 5L
+define UnknownBegMayContainLong: Interval(null, 5L] contains -7L
+define UnknownBegNotContainsLong: Interval(null, 5L] contains 7L
+define PosInfEndContainsLong: Interval[0L, null] contains 123456789L
+define PosInfEndNotContainsLong: Interval[0L, null] contains -1L
+define UnknownEndContainsLong: Interval[0L, null) contains 0L
+define UnknownEndMayContainLong: Interval[0L, null) contains 123456789L
+define UnknownEndNotContainsLong: Interval[0L, null) contains -1L
 define NegInfBegContainsDate: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(1, 1, 1, 0, 0, 0, 0)
 define NegInfBegNotContainsDate: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(2013, 1, 2, 0, 0, 0, 0)
-define UnknownOpenBegMayContainDate: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(2012, 12, 31, 23, 59, 59, 999)
-define UnknownClosedBegContainsDate: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(2012, 12, 31, 23, 59, 59, 999)
+define UnknownBegContainsDate: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)] contains DateTime(2013, 1, 1, 0, 0, 0, 0)
 define UnknownBegMayContainDate: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(1, 1, 1, 0, 0, 0, 0)
 define UnknownBegNotContainsDate: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(2013, 1, 2, 0, 0, 0, 0)
 define PosInfEndContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] contains DateTime(2014, 1, 1, 0, 0, 0, 0)
 define PosInfEndNotContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] contains DateTime(2012, 1, 1, 0, 0, 0, 0)
-define UnknownOpenEndContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) contains DateTime(2013, 1, 1, 0, 0, 0, 0)
-define UnknownClosedEndContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] contains DateTime(2013, 1, 1, 0, 0, 0, 0)
+define UnknownEndContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) contains DateTime(2013, 1, 1, 0, 0, 0, 0)
 define UnknownEndMayContainDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) contains DateTime(2014, 1, 1, 0, 0, 0, 0)
 define UnknownEndNotContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) contains DateTime(2012, 1, 1, 0, 0, 0, 0)
 
 // @Test: In
 define ContainsInt: 3 in Interval[1, 5]
 define NotContainsInt: 1 in Interval(1, 5]
+define ContainsLong: 3L in Interval[1L, 5L]
+define NotContainsLong: 1L in Interval(1L, 5L]
 define ContainsReal: 2.345 in Interval[1.234, 3.456]
 define NotContainsReal: 4.567 in Interval[1.234, 3.456]
 define ContainsQuantity: 5 'mg' in Interval[4 'mg', 6 'mg']
@@ -141,25 +165,37 @@ define ImpreciseNotContainsDate: DateTime(2012, 9, 1, 0, 0, 0, 0) in ImpDateIvl
 define ImpreciseMayContainDate: DateTime(2012, 3, 15, 0, 0, 0, 0) in ImpDateIvl
 define NegInfBegContainsInt: -7 in Interval[null, 5]
 define NegInfBegNotContainsInt: 7 in Interval[null, 5]
-define UnknownOpenBegContainsInt: 5 in Interval(null, 5]
+define UnknownBegContainsInt: 5 in Interval(null, 5]
 define UnknownClosedBegContainsInt: 5 in Interval[null, 5]
 define UnknownBegMayContainInt: -7 in Interval(null, 5]
 define UnknownBegNotContainsInt: 7 in Interval(null, 5]
 define PosInfEndContainsInt: 123456789 in Interval[0, null]
 define PosInfEndNotContainsInt: -1 in Interval[0, null]
-define UnknownOpenEndContainsInt: 0 in Interval[0, null)
+define UnknownEndContainsInt: 0 in Interval[0, null)
 define UnknownClosedEndContainsInt: 0 in Interval[0, null]
 define UnknownEndMayContainInt: 123456789 in Interval[0, null)
 define UnknownEndNotContainsInt: -1 in Interval[0, null)
+define NegInfBegContainsLong: -7L in Interval[null, 5L]
+define NegInfBegNotContainsLong: 7L in Interval[null, 5L]
+define UnknownBegContainsLong: 5L in Interval(null, 5L]
+define UnknownClosedBegContainsLong: 5L in Interval[null, 5L]
+define UnknownBegMayContainLong: -7L in Interval(null, 5L]
+define UnknownBegNotContainsLong: 7L in Interval(null, 5L]
+define PosInfEndContainsLong: 123456789L in Interval[0L, null]
+define PosInfEndNotContainsLong: -1L in Interval[0L, null]
+define UnknownEndContainsLong: 0L in Interval[0L, null)
+define UnknownClosedEndContainsLong: 0L in Interval[0L, null]
+define UnknownEndMayContainLong: 123456789L in Interval[0L, null)
+define UnknownEndNotContainsLong: -1L in Interval[0L, null)
 define NegInfBegContainsDate: DateTime(1, 1, 1, 0, 0, 0, 0) in Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
 define NegInfBegNotContainsDate: DateTime(2013, 1, 2, 0, 0, 0, 0) in Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownOpenBegMayContainDate: DateTime(2012, 12, 31, 23, 59, 59, 999) in Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define UnknownBegContainsDate: DateTime(2013, 1, 1, 0, 0, 0, 0) in Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)]
 define UnknownClosedBegContainsDate: DateTime(2012, 12, 31, 23, 59, 59, 999) in Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
 define UnknownBegMayContainDate: DateTime(1, 1, 1, 0, 0, 0, 0) in Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
 define UnknownBegNotContainsDate: DateTime(2013, 1, 2, 0, 0, 0, 0) in Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
 define PosInfEndContainsDate:  DateTime(2014, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
 define PosInfEndNotContainsDate: DateTime(2012, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
-define UnknownOpenEndContainsDate: DateTime(2013, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
+define UnknownEndContainsDate: DateTime(2013, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
 define UnknownClosedEndContainsDate: DateTime(2013, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
 define UnknownEndMayContainDate: DateTime(2014, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
 define UnknownEndNotContainsDate: DateTime(2012, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
@@ -167,6 +203,8 @@ define UnknownEndNotContainsDate: DateTime(2012, 1, 1, 0, 0, 0, 0) in Interval[D
 // @Test: Includes
 define IncludesIntIvl: Interval[1, 5] includes Interval[1, 4]
 define NotIncludesIntIvl: Interval(1, 5] includes Interval[1, 4]
+define IncludesLongIvl: Interval[1L, 5L] includes Interval[1L, 4L]
+define NotIncludesLongIvl: Interval(1L, 5L] includes Interval[1L, 4L]
 define IncludesRealIvl: Interval[1.234, 3.456] includes Interval[2.34, 2.56]
 define NotIncludesRealIvl: Interval[1.234, 3.456] includes Interval[1.23, 2.56]
 define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
@@ -206,6 +244,16 @@ define PosInfEndNotIncludesIntIvl: Interval[0, null] includes Interval[-1234, 56
 define UnknownEndIncludesIntIvl: Interval[0, null) includes Interval[0, 0]
 define UnknownEndMayIncludeIntIvl: Interval[0, null) includes Interval[1234, 5678]
 define UnknownEndNotIncludesIntIvl: Interval[0, null) includes Interval[-1234, 5678]
+define NegInfBegIncludesLongIvl: Interval[null, 5L] includes Interval[-7L, 2L]
+define NegInfBegNotIncludesLongIvl: Interval[null, 5L] includes Interval[4L, 7L]
+define UnknownBegIncludesLongIvl: Interval(null, 5L] includes Interval[5L, 5L]
+define UnknownBegMayIncludeLongIvl: Interval(null, 5L] includes Interval[-7L, 2L]
+define UnknownBegNotIncludesLongIvl: Interval(null, 5L] includes Interval[4L, 7L]
+define PosInfEndIncludesLongIvl: Interval[0L, null] includes Interval[1234L, 5678L]
+define PosInfEndNotIncludesLongIvl: Interval[0L, null] includes Interval[-1234L, 5678L]
+define UnknownEndIncludesLongIvl: Interval[0L, null) includes Interval[0L, 0L]
+define UnknownEndMayIncludeLongIvl: Interval[0L, null) includes Interval[1234L, 5678L]
+define UnknownEndNotIncludesLongIvl: Interval[0L, null) includes Interval[-1234L, 5678L]
 define NegInfBegIncludesDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2000, 1, 1, 0, 0, 0, 0)]
 define NegInfBegNotIncludesDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
 define UnknownBegIncludesDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(2012, 12, 31, 23, 59, 59, 999), DateTime(2012, 12, 31, 23, 59, 59, 999)]
@@ -222,6 +270,8 @@ define ProperlyIncludesIntIvl: Interval[1, 5] properly includes Interval[2, 4]
 define ProperlyIncludesIntBeginsIvl: Interval[1, 5] properly includes Interval[1, 4]
 define ProperlyIncludesIntEndsIvl: Interval[1, 5] properly includes Interval[2, 5]
 define NotProperlyIncludesIntIvl: Interval[1, 5] properly includes Interval[1, 5]
+define ProperlyIncludesLongIvl: Interval[1L, 5L] properly includes Interval[2L, 4L]
+define NotProperlyIncludesLongIvl: Interval[1L, 5L] properly includes Interval[1L, 5L]
 define ProperlyIncludesRealIvl: Interval[1.234, 3.456] properly includes Interval[2.34, 2.56]
 define NotProperlyIncludesRealIvl: Interval[1.234, 3.456] properly includes Interval[1.234, 3.456]
 define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
@@ -230,6 +280,11 @@ define NotProperlyIncludesDateIvl: DateIvl properly includes Interval[DateTime(2
 define PosInfEndProperlyIncludesIntIvl: Interval[0, null] properly includes Interval[1234, 5678]
 define PosInfEndNotProperlyIncludesIntIvl: Interval[0, null] properly includes Interval[0, null]
 define UnknownEndMayProperlyIncludeIntIvl: Interval[0, null) properly includes Interval[0, 0]
+define ProperlyIncludesLongBeginsIvl: Interval[1L, 5L] properly includes Interval[1L, 4L]
+define ProperlyIncludesLongEndsIvl: Interval[1L, 5L] properly includes Interval[2L, 5L]
+define PosInfEndProperlyIncludesLongIvl: Interval[0L, null] properly includes Interval[1234L, 5678L]
+define PosInfEndNotProperlyIncludesLongIvl: Interval[0L, null] properly includes Interval[0L, null]
+define UnknownEndMayProperlyIncludeLongIvl: Interval[0L, null) properly includes Interval[0L, 0L]
 define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
 define ProperlyIncludesDayOfIvlLowEdge: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
 define ProperlyIncludesDayOfIvlHighEdge: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 2, 23, 59, 59, 999))
@@ -243,6 +298,8 @@ define MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding: PrecisionDateIvl prop
 // @Test: IncludedIn
 define IncludesIntIvl: Interval[1, 4] included in Interval[1, 5]
 define NotIncludesIntIvl: Interval[1, 4] included in Interval(1, 5]
+define IncludesLongIvl: Interval[1L, 4L] included in Interval[1L, 5L]
+define NotIncludesLongIvl: Interval[1L, 4L] included in Interval(1L, 5L]
 define IncludesRealIvl: Interval[2.34, 2.56] included in Interval[1.234, 3.456]
 define NotIncludesRealIvl: Interval[1.23, 2.56] included in Interval[1.234, 3.456]
 define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
@@ -282,6 +339,16 @@ define PosInfEndNotIncludedInIntIvl: Interval[0, null] included in Interval[-100
 define UnknownEndIncludedInIntIvl: Interval[0, null) included in Interval[-100, null]
 define UnknownEndMayBeIncludedInIntIvl: Interval[0, null) included in Interval[-100, 100]
 define UnknownEndNotIncludedInIntIvl: Interval[0, null) included in Interval[100, 200]
+define NegInfBegIncludedInLongIvl: Interval[null, 5L] included in Interval[null, 100L]
+define NegInfBegNotIncludedInLongIvl: Interval[null, 5L] included in Interval[-100L, 100L]
+define UnknownBegIncludedInLongIvl: Interval(null, 5L] included in Interval[null, 100L]
+define UnknownBegMayBeIncludedInLongIvl: Interval(null, 5L] included in Interval[-100L, 100L]
+define UnknownBegNotIncludedInLongIvl: Interval(null, 5L] included in Interval[-100L, 0L]
+define PosInfEndIncludedInLongIvl: Interval[0L, null] included in Interval[-100L, null]
+define PosInfEndNotIncludedInLongIvl: Interval[0L, null] included in Interval[-100L, 100L]
+define UnknownEndIncludedInLongIvl: Interval[0L, null) included in Interval[-100L, null]
+define UnknownEndMayBeIncludedInLongIvl: Interval[0L, null) included in Interval[-100L, 100L]
+define UnknownEndNotIncludedInLongIvl: Interval[0L, null) included in Interval[100L, 200L]
 define NegInfBegIncludedInDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[null, DateTime(2020, 1, 1, 0, 0, 0, 0)]
 define NegInfBegNotIncludedInDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
 define UnknownBegIncludedInDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[null, DateTime(2020, 1, 1, 0, 0, 0, 0)]
@@ -298,6 +365,10 @@ define ProperlyIncludesIntIvl: Interval[2, 4] properly included in Interval[1, 5
 define ProperlyIncludesIntBeginsIvl: Interval[1, 4] properly included in Interval[1, 5]
 define ProperlyIncludesIntEndsIvl: Interval[2, 5] properly included in Interval[1, 5]
 define NotProperlyIncludesIntIvl: Interval[1, 5] properly included in Interval[1, 5]
+define ProperlyIncludesLongIvl: Interval[2L, 4L] properly included in Interval[1L, 5L]
+define ProperlyIncludesLongBeginsIvl: Interval[1L, 4L] properly included in Interval[1L, 5L]
+define ProperlyIncludesLongEndsIvl: Interval[2L, 5L] properly included in Interval[1L, 5L]
+define NotProperlyIncludesLongIvl: Interval[1L, 5L] properly included in Interval[1L, 5L]
 define ProperlyIncludesRealIvl: Interval[2.34, 2.56] properly included in Interval[1.234, 3.456]
 define NotProperlyIncludesRealIvl: Interval[1.23, 2.56] properly included in Interval[1.23, 2.56]
 define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
@@ -319,6 +390,8 @@ define MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding: Interval[DateTime(201
 // @Test: After
 define AfterIntIvl: Interval[5, 10] after Interval[2, 4]
 define NotAfterIntIvl: Interval[5, 10] after Interval[2, 5]
+define AfterLongIvl: Interval[5L, 10L] after Interval[2L, 4L]
+define NotAfterLongIvl: Interval[5L, 10L] after Interval[2L, 5L]
 define AfterRealIvl: Interval[1.234, 2.345] after Interval[0.0, 1.23]
 define NotAfterRealIvl: Interval[1.234, 2.345] after Interval[0.0, 1.234]
 define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
@@ -345,6 +418,13 @@ define PosInfEndAfterIntIvl: Interval[0, null] after Interval[-100, -20]
 define PosInfEndNotAfterIntIvl: Interval[0, null] after Interval[-100, 0]
 define UnknownEndAfterIntIvl: Interval[0, null) after Interval[-100, -20]
 define UnknownEndNotAfterIntIvl: Interval[0, null) after Interval[-100, 0]
+define NegInfBegNotAfterLongIvl: Interval[null, 100L] after Interval[-100L, 0L]
+define UnknownBegMayBeAfterLongIvl: Interval(null, 100L] after Interval[-100L, 0L]
+define UnknownBegNotAfterLongIvl: Interval(null, 5L] after Interval[0L, 100L]
+define PosInfEndAfterLongIvl: Interval[0L, null] after Interval[-100L, -20L]
+define PosInfEndNotAfterLongIvl: Interval[0L, null] after Interval[-100L, 0L]
+define UnknownEndAfterLongIvl: Interval[0L, null) after Interval[-100L, -20L]
+define UnknownEndNotAfterLongIvl: Interval[0L, null) after Interval[-100L, 0L]
 define NegInfBegNotAfterDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
 define UnknownBegMayBeAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
 define UnknownBegNotAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
@@ -356,6 +436,8 @@ define UnknownEndNotAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), nul
 // @Test: Before
 define BeforeIntIvl: Interval[2, 4] before Interval[5, 10]
 define NotBeforeIntIvl: Interval[2, 5] before Interval[5, 10]
+define BeforeLongIvl: Interval[2L, 4L] before Interval[5L, 10L]
+define NotBeforeLongIvl: Interval[2L, 5L] before Interval[5L, 10L]
 define BeforeRealIvl: Interval[0.0, 1.23] before Interval[1.234, 2.345]
 define NotBeforeRealIvl: Interval[1.234, 2.345] before Interval[0.0, 1.234]
 define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
@@ -382,6 +464,13 @@ define UnknownBegNotBeforeIntIvl: Interval(null, 5] before Interval[0, 100]
 define PosInfEndNotBeforeIntIvl: Interval[0, null] before Interval[1000, 2000]
 define UnknownEndMayBeBeforeIntIvl: Interval[0, null) before Interval[1000, 2000]
 define UnknownEndNotBeforeIntIvl: Interval[0, null) before Interval[-100, 0]
+define NegInfBegBeforeLongIvl: Interval[null, 100L] before Interval[101L, 200L]
+define NegInfBegNotBeforeLongIvl: Interval[null, 100L] before Interval[100L, 200L]
+define UnknownBegBeforeLongIvl: Interval(null, 100L] before Interval[101L, 200L]
+define UnknownBegNotBeforeLongIvl: Interval(null, 5L] before Interval[0L, 100L]
+define PosInfEndNotBeforeLongIvl: Interval[0L, null] before Interval[1000L, 2000L]
+define UnknownEndMayBeBeforeLongIvl: Interval[0L, null) before Interval[1000L, 2000L]
+define UnknownEndNotBeforeLongIvl: Interval[0L, null) before Interval[-100L, 0L]
 define NegInfBegBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
 define NegInfBegNotBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
 define UnknownBegBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
@@ -476,6 +565,9 @@ define DateOnlyMeetsAfterDateIvl: Interval[Date(2012, 9, 1), Date(2012, 10, 1)]
 define MeetsAfterIntIvl: Interval[11, 15] meets Interval[5, 10]
 define MeetsBeforeIntIvl: Interval[1, 4] meets Interval[5, 10]
 define NotMeetsIntIvl: Interval[1, 2] meets Interval[5, 10]
+define MeetsAfterLongIvl: Interval[11L, 15L] meets Interval[5L, 10L]
+define MeetsBeforeLongIvl: Interval[1L, 4L] meets Interval[5L, 10L]
+define NotMeetsLongIvl: Interval[1L, 2L] meets Interval[5L, 10L]
 define MeetsAfterRealIvl: Interval[1.50000001, 2.5] meets Interval[0.5, 1.5]
 define MeetsBeforeRealIvl: Interval[0.5, 1.5] meets Interval[1.50000001, 2.5]
 define NotMeetsRealIvl: Interval[0.0, 1.0] meets Interval[1.1, 2.0]
@@ -511,6 +603,20 @@ define UnknownEndMeetsAfterIntIvl: Interval[100, null) meets Interval[0, 99]
 define UnknownEndMayMeetBeforeIntIvl: Interval[0, null) meets Interval[50, 100]
 define UnknownEndNotMeetsIntIvl: Interval[0, null) meets Interval[0, 100]
 define IntIvlMayMeetAfterUnknownEnd: Interval[0, 100] meets Interval[-100, null)
+define NegInfBegMeetsBeforeLongIvl: Interval[null, 100L] meets Interval[101L, 200L]
+define NegInfBegNotMeetsLongIvl: Interval[null, 100L] meets Interval[100L, 200L]
+define LongIvlNotMeetsNegInfBeg: Interval[100L, 200L] meets Interval[null, 400L]
+define UnknownBegMeetsBeforeLongIvl: Interval(null, 100L] meets Interval[101L, 200L]
+define UnknownBegMayMeetAfterLongIvl: Interval(null, 100L] meets Interval[0L, 50L]
+define UnknownBegNotMeetsLongIvl: Interval(null, 5L] meets Interval[0L, 100L]
+define LongIvlMayMeetBeforeUnknownBeg: Interval[0L, 100L] meets Interval(null, 400L)
+define PosInfEndMeetsAfterLongIvl: Interval[100L, null] meets Interval[0L, 99L]
+define PosInfEndNotMeetsLongIvl: Interval[0L, null] meets Interval[1000L, 2000L]
+define LongIvlNotMeetsPosInfEnd: Interval[100L, 200L] meets Interval[0L, null]
+define UnknownEndMeetsAfterLongIvl: Interval[100L, null) meets Interval[0L, 99L]
+define UnknownEndMayMeetBeforeLongIvl: Interval[0L, null) meets Interval[50L, 100L]
+define UnknownEndNotMeetsLongIvl: Interval[0L, null) meets Interval[0L, 100L]
+define LongIvlMayMeetAfterUnknownEnd: Interval[0L, 100L] meets Interval[-100L, null)
 define NegInfBegMeetsBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
 define NegInfBegNotMeetsDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
 define DateIvlNotMeetsNegInfBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
@@ -530,6 +636,9 @@ define DateIvlMayMeetAfterUnknownEnd: Interval[DateTime(2020, 1, 1, 0, 0, 0, 0),
 define MeetsAfterIntIvl: Interval[11, 15] meets after Interval[5, 10]
 define MeetsBeforeIntIvl: Interval[1, 4] meets after Interval[5, 10]
 define NotMeetsIntIvl: Interval[1, 2] meets after Interval[5, 10]
+define MeetsAfterLongIvl: Interval[11L, 15L] meets after Interval[5L, 10L]
+define MeetsBeforeLongIvl: Interval[1L, 4L] meets after Interval[5L, 10L]
+define NotMeetsLongIvl: Interval[1L, 2L] meets after Interval[5L, 10L]
 define MeetsAfterRealIvl: Interval[1.50000001, 2.5] meets after Interval[0.5, 1.5]
 define MeetsBeforeRealIvl: Interval[0.5, 1.5] meets after Interval[1.50000001, 2.5]
 define NotMeetsRealIvl: Interval[0.0, 1.0] meets after Interval[1.1, 2.0]
@@ -565,6 +674,20 @@ define UnknownEndMeetsAfterIntIvl: Interval[100, null) meets after Interval[0, 9
 define UnknownEndMayMeetBeforeIntIvl: Interval[0, null) meets after Interval[50, 100]
 define UnknownEndNotMeetsIntIvl: Interval[0, null) meets after Interval[0, 100]
 define IntIvlMayMeetAfterUnknownEnd: Interval[0, 100] meets after Interval[-100, null)
+define NegInfBegMeetsBeforeLongIvl: Interval[null, 100L] meets after Interval[101L, 200L]
+define NegInfBegNotMeetsLongIvl: Interval[null, 100L] meets after Interval[100L, 200L]
+define LongIvlNotMeetsNegInfBeg: Interval[100L, 200L] meets after Interval[null, 400L]
+define UnknownBegMeetsBeforeLongIvl: Interval(null, 100L] meets after Interval[101L, 200L]
+define UnknownBegMayMeetAfterLongIvl: Interval(null, 100L] meets after Interval[0L, 50L]
+define UnknownBegNotMeetsLongIvl: Interval(null, 5L] meets after Interval[0L, 100L]
+define LongIvlMayMeetBeforeUnknownBeg: Interval[0L, 100L] meets after Interval(null, 400L)
+define PosInfEndMeetsAfterLongIvl: Interval[100L, null] meets after Interval[0L, 99L]
+define PosInfEndNotMeetsLongIvl: Interval[0L, null] meets after Interval[1000L, 2000L]
+define LongIvlNotMeetsPosInfEnd: Interval[100L, 200L] meets after Interval[0L, null]
+define UnknownEndMeetsAfterLongIvl: Interval[100L, null) meets after Interval[0L, 99L]
+define UnknownEndMayMeetBeforeLongIvl: Interval[0L, null) meets after Interval[50L, 100L]
+define UnknownEndNotMeetsLongIvl: Interval[0L, null) meets after Interval[0L, 100L]
+define LongIvlMayMeetAfterUnknownEnd: Interval[0L, 100L] meets after Interval[-100L, null)
 define NegInfBegMeetsBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
 define NegInfBegNotMeetsDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
 define DateIvlNotMeetsNegInfBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets after Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
@@ -584,6 +707,9 @@ define DateIvlMayMeetAfterUnknownEnd: Interval[DateTime(2020, 1, 1, 0, 0, 0, 0),
 define MeetsAfterIntIvl: Interval[11, 15] meets before Interval[5, 10]
 define MeetsBeforeIntIvl: Interval[1, 4] meets before Interval[5, 10]
 define NotMeetsIntIvl: Interval[1, 2] meets before Interval[5, 10]
+define MeetsAfterLongIvl: Interval[11L, 15L] meets before Interval[5L, 10L]
+define MeetsBeforeLongIvl: Interval[1L, 4L] meets before Interval[5L, 10L]
+define NotMeetsLongIvl: Interval[1L, 2L] meets before Interval[5L, 10L]
 define MeetsAfterRealIvl: Interval[1.50000001, 2.5] meets before Interval[0.5, 1.5]
 define MeetsBeforeRealIvl: Interval[0.5, 1.5] meets before Interval[1.50000001, 2.5]
 define NotMeetsRealIvl: Interval[0.0, 1.0] meets before Interval[1.1, 2.0]
@@ -619,6 +745,20 @@ define UnknownEndMeetsAfterIntIvl: Interval[100, null) meets before Interval[0,
 define UnknownEndMayMeetBeforeIntIvl: Interval[0, null) meets before Interval[50, 100]
 define UnknownEndNotMeetsIntIvl: Interval[0, null) meets before Interval[0, 100]
 define IntIvlMayMeetAfterUnknownEnd: Interval[0, 100] meets before Interval[-100, null)
+define NegInfBegMeetsBeforeLongIvl: Interval[null, 100L] meets before Interval[101L, 200L]
+define NegInfBegNotMeetsLongIvl: Interval[null, 100L] meets before Interval[100L, 200L]
+define LongIvlNotMeetsNegInfBeg: Interval[100L, 200L] meets before Interval[null, 400L]
+define UnknownBegMeetsBeforeLongIvl: Interval(null, 100L] meets before Interval[101L, 200L]
+define UnknownBegMayMeetAfterLongIvl: Interval(null, 100L] meets before Interval[0L, 50L]
+define UnknownBegNotMeetsLongIvl: Interval(null, 5L] meets before Interval[0L, 100L]
+define LongIvlMayMeetBeforeUnknownBeg: Interval[0L, 100L] meets before Interval(null, 400L)
+define PosInfEndMeetsAfterLongIvl: Interval[100L, null] meets before Interval[0L, 99L]
+define PosInfEndNotMeetsLongIvl: Interval[0L, null] meets before Interval[1000L, 2000L]
+define LongIvlNotMeetsPosInfEnd: Interval[100L, 200L] meets before Interval[0L, null]
+define UnknownEndMeetsAfterLongIvl: Interval[100L, null) meets before Interval[0L, 99L]
+define UnknownEndMayMeetBeforeLongIvl: Interval[0L, null) meets before Interval[50L, 100L]
+define UnknownEndNotMeetsLongIvl: Interval[0L, null) meets before Interval[0L, 100L]
+define LongIvlMayMeetAfterUnknownEnd: Interval[0L, 100L] meets before Interval[-100L, null)
 define NegInfBegMeetsBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
 define NegInfBegNotMeetsDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
 define DateIvlNotMeetsNegInfBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets before Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
@@ -639,6 +779,10 @@ define OverlapsBeforeIntIvl: Interval[1, 5] overlaps Interval[2, 7]
 define OverlapsAfterIntIvl: Interval[3, 8] overlaps Interval[1, 6]
 define OverlapsBoundaryIntIvl: Interval[1, 5] overlaps Interval[5, 10]
 define NoOverlapsIntIvl: Interval[1,5) overlaps Interval[5, 10]
+define OverlapsBeforeLongIvl: Interval[1L, 5L] overlaps Interval[2L, 7L]
+define OverlapsAfterLongIvl: Interval[3L, 8L] overlaps Interval[1L, 6L]
+define OverlapsBoundaryLongIvl: Interval[1L, 5L] overlaps Interval[5L, 10L]
+define NoOverlapsLongIvl: Interval[1L,5L) overlaps Interval[5L, 10L]
 define OverlapsBeforeRealIvl: Interval[1.234, 1.567] overlaps Interval[1.345, 1.678]
 define OverlapsAfterRealIvl: Interval[1.345, 1.678] overlaps Interval[1.234, 1.567]
 define OverlapsBoundaryRealIvl: Interval[1.0, 1.234] overlaps Interval[1.234, 2.0]
@@ -683,6 +827,10 @@ define OverlapsBeforeIntIvl: Interval[1, 5] overlaps after Interval[2, 7]
 define OverlapsAfterIntIvl: Interval[3, 8] overlaps after Interval[1, 6]
 define OverlapsBoundaryIntIvl: Interval[5, 10] overlaps after Interval[1, 5]
 define NoOverlapsIntIvl: Interval[1,5) overlaps after Interval[5, 10]
+define OverlapsBeforeLongIvl: Interval[1L, 5L] overlaps after Interval[2L, 7L]
+define OverlapsAfterLongIvl: Interval[3L, 8L] overlaps after Interval[1L, 6L]
+define OverlapsBoundaryLongIvl: Interval[5L, 10L] overlaps after Interval[1L, 5L]
+define NoOverlapsLongIvl: Interval[1L,5L) overlaps after Interval[5L, 10L]
 define OverlapsBeforeRealIvl: Interval[1.234, 1.567] overlaps after Interval[1.345, 1.678]
 define OverlapsAfterRealIvl: Interval[1.345, 1.678] overlaps after Interval[1.234, 1.567]
 define OverlapsBoundaryRealIvl: Interval[1.234, 2.0] overlaps after Interval[1.0, 1.234]
@@ -722,6 +870,10 @@ define OverlapsBeforeIntIvl: Interval[1, 5] overlaps before Interval[2, 7]
 define OverlapsAfterIntIvl: Interval[3, 8] overlaps before Interval[1, 6]
 define OverlapsBoundaryIntIvl: Interval[1, 5] overlaps before Interval[5, 10]
 define NoOverlapsIntIvl: Interval[1,5) overlaps before Interval[5, 10]
+define OverlapsBeforeLongIvl: Interval[1L, 5L] overlaps before Interval[2L, 7L]
+define OverlapsAfterLongIvl: Interval[3L, 8L] overlaps before Interval[1L, 6L]
+define OverlapsBoundaryLongIvl: Interval[1L, 5L] overlaps before Interval[5L, 10L]
+define NoOverlapsLongIvl: Interval[1L,5L) overlaps before Interval[5L, 10L]
 define OverlapsBeforeRealIvl: Interval[1.234, 1.567] overlaps before Interval[1.345, 1.678]
 define OverlapsAfterRealIvl: Interval[1.345, 1.678] overlaps before Interval[1.234, 1.567]
 define OverlapsBoundaryRealIvl: Interval[1.0, 1.234] overlaps before Interval[1.234, 2.0]
@@ -759,6 +911,8 @@ define MayOverlapAfterDayOfImpreciseIvl: PrecisionDateIvl overlaps before day of
 // @Test: Width
 define IntWidth: width of Interval[-2, 5]
 define IntOpenWidth: width of Interval(-2, 5)
+define LongWidth: width of Interval[-2L, 5L]
+define LongOpenWidth: width of Interval(-2L, 5L)
 define IntWidthThreeToMax: width of Interval[3, null]
 define IntWidthMinToThree: width of Interval[null, 3]
 define IntWidthThreeToUnknown: width of Interval[3, null)
@@ -773,6 +927,8 @@ define WidthOfTimeInterval: width of Interval[Time(12,00,00), Time(12,30,02)]
 // @Test: Size
 define IntSize: Size(Interval[-2, 5])
 define IntOpenSize: Size(Interval(-2, 5))
+define LongSize: Size(Interval[-2L, 5L])
+define LongOpenSize: Size(Interval(-2L, 5L))
 define IntSizeThreeToMax: Size(Interval[3, null])
 define IntSizeMinToThree: Size(Interval[null, 3])
 define IntSizeThreeToUnknown: Size(Interval[3, null))
@@ -789,18 +945,22 @@ define SizeOfTimeInterval: Size(Interval[Time(12,00,00), Time(12,30,02)])
 define ClosedNotNull: start of Interval[DateTime(2012, 1, 1), DateTime(2013, 1, 1)]
 define ClosedNullDateTime: start of Interval[null, DateTime(2013, 1, 1)]
 define ClosedNullInteger: start of Interval[null, 3]
+define ClosedNullLong: start of Interval[null, 3L]
 define ClosedNullDecimal: start of Interval[null, 5.1]
 define NullInterval: start of (null as Interval<DateTime>)
 define OpenNotNull: start of Interval(DateTime(2012, 1, 1), DateTime(2013, 1, 1))
+define OpenLongNotNull: start of Interval(1L, 3L)
 define OpenNull: start of Interval(null, DateTime(2013, 1, 1))
 
 // @Test: End
 define ClosedNotNull: end of Interval[DateTime(2012, 1, 1), DateTime(2013, 1, 1)]
 define ClosedNullDateTime: end of Interval[DateTime(2013, 1, 1), null]
 define ClosedNullInteger: end of Interval[5, null]
+define ClosedNullLong: end of Interval[5L, null]
 define ClosedNullDecimal: end of Interval[7.3, null]
 define NullInterval: end of (null as Interval<DateTime>)
 define OpenNotNull: end of Interval(DateTime(2012, 1, 1), DateTime(2013, 1, 1))
+define OpenLongNotNull: end of Interval(1L, 3L)
 define OpenNull: end of Interval(DateTime(2013, 1, 1), null)
 
 // @Test: Starts
@@ -808,6 +968,9 @@ define TestStartsNull: Interval[null, null] starts Interval[1, 10]
 define IntegerIntervalStartsTrue: Interval[4,10] starts Interval[4, 15]
 define IntegerIntervalStartsFalse: Interval[1, 10] starts Interval[4, 10]
 define IntegerIntervalStartEndsFalse: Interval[4, 10] starts Interval[4, 9]
+define LongIntervalStartsTrue: Interval[4L,10L] starts Interval[4L, 15L]
+define LongIntervalStartsFalse: Interval[1L, 10L] starts Interval[4L, 10L]
+define LongIntervalStartEndsFalse: Interval[4L, 10L] starts Interval[4L, 9L]
 define DecimalIntervalStartsTrue: Interval[4.0, 10.0] starts Interval[4.0, 15.0]
 define DecimalIntervalStartsFalse: Interval[1.0, 10.0] starts Interval[4.0, 10.0]
 define DecimalIntervalStartsEndsFalse: Interval[4.0, 10.0] starts Interval[4.0, 9.0]
@@ -824,6 +987,9 @@ define TestEndsNull: Interval[1, 10] ends Interval[null, null]
 define IntegerIntervalEndsTrue: Interval[4,10] ends Interval[1,10]
 define IntegerIntervalEndsFalse: Interval[4, 9] ends Interval[1,10]
 define IntegerIntervalEndsStartsFalse: Interval[0, 10] ends Interval[1,10]
+define LongIntervalEndsTrue: Interval[4L,10L] ends Interval[1L,10L]
+define LongIntervalEndsFalse: Interval[4L, 9L] ends Interval[1L,10L]
+define LongIntervalEndsStartsFalse: Interval[0L, 10L] ends Interval[1L,10L]
 define DecimalIntervalEndsTrue: Interval[4.0,10.0] ends Interval[1.0,10.0]
 define DecimalIntervalEndsFalse: Interval[11.0, 20.0] ends Interval[1.0,10.0]
 define DecimalIntervalEndsStartsFalse: Interval[0.0, 10.0] ends Interval[1.0, 10.0]
@@ -852,6 +1018,23 @@ define NullUnion: null union Interval[0,10]
 define UnionNull: Interval[5,10] union null
 define NullUnionNull: (null as Interval<Integer>) union (null as Interval<Integer>)
 
+// @Test: LongIntervalUnion
+define LongFullInterval: Interval[0L,10L]
+define LongClosedUnionClosed: Interval[0L,5L] union Interval[5L,10L]
+define LongClosedUnionOpen: Interval[0L,5L] union Interval[5L,10L)
+define LongOpenUnionOpen: Interval(0L,5L] union Interval[5L,10L)
+define LongOpenUnionClosed: Interval(0L,5L] union Interval[5L,10L]
+define LongSameAsUnion: Interval[0L,10L] union Interval[0L,10L]
+define LongBeforeUnion: Interval[0L,4L] union Interval[6L,10L]
+define LongMeetsUnion: Interval[0L,5L] union Interval[5L,10L]
+define LongOverlapsUnion: Interval[0L,7L] union Interval[3L,10L]
+define LongBeginsUnion: Interval[0L,5L] union Interval[0L,10L]
+define LongDuringUnion: Interval[3L,5L] union Interval[0L,10L]
+define LongEndsUnion: Interval[5L,10L] union Interval[0L,10L]
+define NullUnion: null union Interval[0L,10L]
+define UnionNull: Interval[5L,10L] union null
+define NullUnionNull: (null as Interval<Long>) union (null as Interval<Long>)
+
 // @Test: DateTimeIntervalUnion
 define DateTimeFullInterval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
 define DateTimeClosedUnionClosed: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
@@ -877,6 +1060,17 @@ define IntBeginsExcept: Interval[0,5] except Interval[0,10]
 define IntDuringExcept: Interval[3,5] except Interval[0,10]
 define IntEndsExcept: Interval[5,10] except Interval[0,10]
 
+// @Test: LongIntervalExcept
+define LongFullInterval: Interval[0L,10L]
+define LongHalfInterval: Interval[0L,5L)
+define LongSameAsExcept: Interval[0L,10L] except Interval[0L,10L]
+define LongBeforeExcept: Interval[0L,4L] except Interval[6L,10L]
+define LongMeetsExcept: Interval[0L,5L] except Interval[5L,10L]
+define LongOverlapsExcept: Interval[0L,7L] except Interval[5L,10L]
+define LongBeginsExcept: Interval[0L,5L] except Interval[0L,10L]
+define LongDuringExcept: Interval[3L,5L] except Interval[0L,10L]
+define LongEndsExcept: Interval[5L,10L] except Interval[0L,10L]
+
 // @Test: DateTimeIntervalExcept
 define DateTimeFullInterval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
 define DateTimeHalfInterval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
@@ -903,6 +1097,21 @@ define IntBeginsIntersect: Interval[0,5] intersect Interval[0,10]
 define IntDuringIntersect: Interval[3,5] intersect Interval[0,10]
 define IntEndsIntersect: Interval[5,10] intersect Interval[0,10]
 
+// @Test: LongIntervalIntersect
+define LongFullInterval: Interval[0L,10L]
+define LongMeetsInterval: Interval[5L,5L]
+define LongOverlapsInterval: Interval[5L,7L]
+define LongBeginsInterval: Interval[0L,5L]
+define LongDuringInterval: Interval[3L,5L]
+define LongEndsInterval: Interval[5L,10L]
+define LongSameAsIntersect: Interval[0L,10L] intersect Interval[0L,10L]
+define LongBeforeIntersect: Interval[0L,4L] intersect Interval[6L,10L]
+define LongMeetsIntersect: Interval[0L,5L] intersect Interval[5L,10L]
+define LongOverlapsIntersect: Interval[0L,7L] intersect Interval[5L,10L]
+define LongBeginsIntersect: Interval[0L,5L] intersect Interval[0L,10L]
+define LongDuringIntersect: Interval[3L,5L] intersect Interval[0L,10L]
+define LongEndsIntersect: Interval[5L,10L] intersect Interval[0L,10L]
+
 // @Test: DateTimeIntervalIntersect
 define DateTimeFullInterval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
 define DateTimeMeetsInterval: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)]
@@ -943,6 +1152,31 @@ define IntCollapseOverlapContainedEdge: collapse { Int1_10Interval, Int5_10Inter
 define IntCollapseOverlapContainedEdge2: collapse { Int1_15Interval, Int1_10Interval }
 define IntCollapseOverlapMultipleCombine: collapse { Int1_6Interval, Int5_12Interval, Int10_15Interval }
 
+// @Test: LongIntervalCollapse
+define LongEmptyIntervalList: List<Interval<Long>>{}
+define Long1_6Interval: Interval[1L, 6L]
+define Long1_10Interval: Interval[1L, 10L]
+define Long5_10Interval: Interval[5L, 10L]
+define Long5_12Interval: Interval[5L, 12L]
+define Long10_15Interval: Interval[10L, 15L]
+define Long15_20Interval: Interval[15L, 20L]
+define Long1_12Interval: Interval[1L, 12L]
+define Long1_15Interval: Interval[1L, 15L]
+define Long1_10IntervalList: { Long1_10Interval }
+define Long1_12IntervalList: { Long1_12Interval }
+define Long1_15IntervalList: { Long1_15Interval }
+define LongTwoItemDisjointList: { Long1_10Interval, Long15_20Interval }
+define LongCollapseEmpty: collapse LongEmptyIntervalList
+define LongCollapseSingleInterval: collapse Long1_10IntervalList
+define LongCollapseDisjoint: collapse LongTwoItemDisjointList
+define LongCollapseDisjointReversed: collapse { Long15_20Interval, Long1_10Interval }
+define LongCollapseAdjacent: collapse { Long1_10Interval, Long10_15Interval }
+define LongCollapseOverlap: collapse { Long1_10Interval, Long5_12Interval }
+define LongCollapseOverlapContained: collapse { Long1_15Interval, Long5_12Interval }
+define LongCollapseOverlapContainedEdge: collapse { Long1_10Interval, Long5_10Interval }
+define LongCollapseOverlapContainedEdge2: collapse { Long1_15Interval, Long1_10Interval }
+define LongCollapseOverlapMultipleCombine: collapse { Long1_6Interval, Long5_12Interval, Long10_15Interval }
+
 // @Test: DateTimeIntervalCollapse
 define DateTimeEmptyIntervalList: List<Interval<DateTime>>{}
 define DateTime1_6Interval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 6, 0, 0, 0, 0)]
@@ -1024,10 +1258,12 @@ define CollapseSeparatedQuantityPer3: collapse QuantitySeparatedBy3 per 3
 
 // Quantity Intervals with units
 define QuantityMeterIntervalList: { Interval[ToQuantity('1 \'m\''), ToQuantity('1.995 \'m\'')], Interval[ToQuantity('2 \'m\''), ToQuantity('3 \'m\'')] }
-define CollapseDisjointQuantityUnits: collapse QuantityMeterIntervalList
 define ExpectedQuantityUnitsCollapse: { Interval[ToQuantity('1 \'m\''), ToQuantity('3 \'m\'')] }
 define CollapseQuantityUnitsWithinPer: collapse QuantityMeterIntervalList per ToQuantity('1 \'cm\'')
 define CollapseQuantityUnitsNotWithinPer: collapse QuantityMeterIntervalList per ToQuantity('1 \'mm\'')
+define CollapseDisjointQuantityUnits: collapse QuantityMeterIntervalList
+define QuantityMeterIntervalListWithinDefaultPer: { Interval[ToQuantity('1 \'m\''), ToQuantity('1.99999999 \'m\'')], Interval[ToQuantity('2 \'m\''), ToQuantity('3 \'m\'')] }
+define CollapseQuantityUnitsWithinDefaultPer: collapse QuantityMeterIntervalListWithinDefaultPer
 
 // Null test cases
 define NullLowIntervalList: { Interval[null, 4], Interval[3, 5] }
@@ -1276,6 +1512,30 @@ define BadPerMinute: expand { Interval(2, 4] } per 1 minute
 
 define PerDecimalMorePrecise: expand { Interval[10, 10] } per 0.1
 
+// @Test: LongIntervalExpand
+define LongClosedSinglePer1: expand { Interval[2L, 4L] } per 1 '1'
+define LongClosedSinglePer3: expand { Interval[2L, 10L] } per 3 '1'
+define LongClosedSinglePer3NoteTheWidth: expand { Interval[2L, 4L] } per 3 '1'
+
+define LongNullInList: expand { Interval[2L, 4L], null } per 1 '1'
+define LongOverlapping: expand { Interval[2L, 4L], Interval[3L, 5L] } per 1 '1'
+define LongNonOverlapping: expand { Interval[2L, 4L], Interval[6L, 6L] } per 1 '1'
+
+define LongNoPer: expand { Interval[2L, 4L] }
+
+define LongOpenStart: expand { Interval(2L, 4L] } per 1 '1'
+define LongOpenEnd: expand { Interval[2L, 4L) } per 1 '1'
+define LongOpenBoth: expand { Interval(2L, 4L) } per 1 '1'
+
+define LongEmptyList: List<Interval<Long>>{}
+define LongPerTooBig: expand { Interval[2L, 4L], null } per 5 '1'
+define LongNullOpen: expand { Interval[null, 4L] } per 1 '1'
+define LongNullClose: expand { Interval[2L, null] } per 1 '1'
+define LongNullBoth: expand { Interval[null, null] } per 1 '1'
+define LongBadPerMinute: expand { Interval(2L, 4L] } per 1 minute
+
+define LongPerDecimalMorePrecise: expand { Interval[10L, 10L] } per 0.1
+
 // @Test: DecimalIntervalExpand
 define ClosedSingle: expand { Interval[2, 5] } per 1.5 '1'
 define ClosedSingle1: expand { Interval[2.5, 10] } per 2 '1'
@@ -1338,6 +1598,9 @@ define DateTimeMillisecondPrecisionNotSame: Interval[DateTime(2018,01,01,01,01,0
 define IntegerIntervalSame: Interval[2,5] same as Interval[2,5]
 define IntegerIntervalNotSame: Interval[2,5] same as Interval[2,4]
 define IntegerIntervalSameOpen: Interval[2,5] same as Interval[2,6)
+define LongIntervalSame: Interval[2L,5L] same as Interval[2L,5L]
+define LongIntervalNotSame: Interval[2L,5L] same as Interval[2L,4L]
+define LongIntervalSameOpen: Interval[2L,5L] same as Interval[2L,6L)
 define OpenNullHighLowDifferent: Interval(3,null) same as Interval(2,4)
 define OpenNullLowHighDifferent: Interval(1,5) same as Interval(null,4)
 define OpenNullHighLowSame: Interval(2,null) same as Interval(2,4)
@@ -1346,3 +1609,11 @@ define OpenNullLowOpenNullHigh: Interval(1,null) same as Interval(null,4)
 define OpenNullHighsLowsDifferent: Interval(1,null) same as Interval(2,null)
 define OpenNullHighsLowsSame: Interval(1,null) same as Interval(1,null)
 define OpenNullLowsHighsSame: Interval(null,3) same as Interval(null,3)
+define LongOpenNullHighLowDifferent: Interval(3L,null) same as Interval(2L,4L)
+define LongOpenNullLowHighDifferent: Interval(1L,5L) same as Interval(null,4L)
+define LongOpenNullHighLowSame: Interval(2L,null) same as Interval(2L,4L)
+define LongOpenNullLowHighSame: Interval(1L,4L) same as Interval(null,4L)
+define LongOpenNullLowOpenNullHigh: Interval(1L,null) same as Interval(null,4L)
+define LongOpenNullHighsLowsDifferent: Interval(1L,null) same as Interval(2L,null)
+define LongOpenNullHighsLowsSame: Interval(1L,null) same as Interval(1L,null)
+define LongOpenNullLowsHighsSame: Interval(null,3L) same as Interval(null,3L)
diff --git a/test/elm/interval/data.js b/test/elm/interval/data.js
index 72a2e14eb..b739eaaf3 100644
--- a/test/elm/interval/data.js
+++ b/test/elm/interval/data.js
@@ -16,6 +16,8 @@ define Open: Interval(DateTime(2012, 1, 1), DateTime(2013, 1, 1))
 define LeftOpen: Interval(DateTime(2012, 1, 1), DateTime(2013, 1, 1)]
 define RightOpen: Interval[DateTime(2012, 1, 1), DateTime(2013, 1, 1))
 define Closed: Interval[DateTime(2012, 1, 1), DateTime(2013, 1, 1)]
+define LongOpen: Interval(1L, 3L)
+define LongClosed: Interval[1L, 3L]
 */
 
 module.exports['Interval'] = {
@@ -30,7 +32,7 @@ module.exports['Interval'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "310",
+        "r" : "352",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -730,6 +732,138 @@ module.exports['Interval'] = {
             }
           }
         }
+      }, {
+        "localId" : "342",
+        "name" : "LongOpen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "342",
+            "s" : [ {
+              "value" : [ "", "define ", "LongOpen", ": " ]
+            }, {
+              "r" : "345",
+              "s" : [ {
+                "r" : "343",
+                "value" : [ "Interval(", "1L", ", ", "3L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "348",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "349",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "345",
+          "lowClosed" : false,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "346",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "347",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "343",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "344",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "352",
+        "name" : "LongClosed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "352",
+            "s" : [ {
+              "value" : [ "", "define ", "LongClosed", ": " ]
+            }, {
+              "r" : "355",
+              "s" : [ {
+                "r" : "353",
+                "value" : [ "Interval[", "1L", ", ", "3L", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "358",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "359",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "355",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "356",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "357",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "353",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "354",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          }
+        }
       } ]
     }
   }
@@ -745,9 +879,15 @@ define EqualOpenClosed: Interval(1, 5) = Interval[2, 4]
 define UnequalClosed: Interval[1, 5] = Interval[2, 4]
 define UnequalOpen: Interval(1, 5) = Interval(2, 4)
 define UnequalClosedOpen: Interval[1, 5] = Interval(2, 4)
+define EqualLongClosed: Interval[1L, 5L] = Interval[1L, 5L]
+define EqualLongOpen: Interval(1L, 5L) = Interval(1L, 5L)
+define EqualLongOpenClosed: Interval(1L, 5L) = Interval[2L, 4L]
+define UnequalLongClosed: Interval[1L, 5L] = Interval[2L, 4L]
+define UnequalLongOpen: Interval(1L, 5L) = Interval(2L, 4L)
+define UnequalLongClosedOpen: Interval[1L, 5L] = Interval(2L, 4L)
 define EqualQuantityClosed: Interval[1 'mg', 5 'mg'] = Interval[1 'mg', 5 'mg']
 define EqualQuantityOpen: Interval(1 'mg', 5 'mg') = Interval(1 'mg', 5 'mg')
-define EqualQuantityOpenClosed: Interval(1 'mg', 5 'mg') = Interval[2 'mg', 4 'mg']
+define EqualQuantityOpenClosed: Interval(1.99999999 'mg', 4.00000001 'mg') = Interval[2 'mg', 4 'mg']
 define UnequalQuantityClosed: Interval[1 'mg', 5 'mg'] = Interval[2 'mg', 4 'mg']
 define UnequalQuantityOpen: Interval(1 'mg', 5 'mg') = Interval(2 'mg', 4 'mg')
 define UnequalQuantityClosedOpen: Interval[1 'mg', 5 'mg'] = Interval(2 'mg', 4 'mg')
@@ -770,7 +910,7 @@ module.exports['Equal'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "774",
+        "r" : "882",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -1607,7 +1747,7 @@ module.exports['Equal'] = {
       }, {
         "localId" : "322",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualQuantityClosed",
+        "name" : "EqualLongClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1616,48 +1756,22 @@ module.exports['Equal'] = {
           "s" : {
             "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "EqualQuantityClosed", ": " ]
+              "value" : [ "", "define ", "EqualLongClosed", ": " ]
             }, {
               "r" : "323",
               "s" : [ {
                 "r" : "326",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "324",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "325",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
                 "r" : "331",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "329",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "330",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -1675,7 +1789,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "335",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -1685,7 +1799,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "337",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -1702,24 +1816,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "328",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "324",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "325",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -1735,24 +1849,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "333",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "329",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "330",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
@@ -1760,7 +1874,7 @@ module.exports['Equal'] = {
       }, {
         "localId" : "340",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualQuantityOpen",
+        "name" : "EqualLongOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1769,48 +1883,22 @@ module.exports['Equal'] = {
           "s" : {
             "r" : "340",
             "s" : [ {
-              "value" : [ "", "define ", "EqualQuantityOpen", ": " ]
+              "value" : [ "", "define ", "EqualLongOpen", ": " ]
             }, {
               "r" : "341",
               "s" : [ {
                 "r" : "344",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "342",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "343",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "1L", ", ", "5L", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
                 "r" : "349",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "347",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "348",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "1L", ", ", "5L", ")" ]
                 } ]
               } ]
             } ]
@@ -1828,7 +1916,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "353",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -1838,7 +1926,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "355",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -1855,24 +1943,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "346",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "342",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "343",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -1888,24 +1976,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "351",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "347",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "348",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
@@ -1913,7 +2001,7 @@ module.exports['Equal'] = {
       }, {
         "localId" : "358",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualQuantityOpenClosed",
+        "name" : "EqualLongOpenClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1922,48 +2010,22 @@ module.exports['Equal'] = {
           "s" : {
             "r" : "358",
             "s" : [ {
-              "value" : [ "", "define ", "EqualQuantityOpenClosed", ": " ]
+              "value" : [ "", "define ", "EqualLongOpenClosed", ": " ]
             }, {
               "r" : "359",
               "s" : [ {
                 "r" : "362",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "360",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "361",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "1L", ", ", "5L", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
                 "r" : "367",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "365",
-                  "s" : [ {
-                    "value" : [ "2 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "366",
-                  "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                 } ]
               } ]
             } ]
@@ -1981,7 +2043,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "371",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -1991,7 +2053,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "373",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -2008,24 +2070,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "364",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "360",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "361",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -2041,24 +2103,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "369",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "365",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "366",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
@@ -2066,7 +2128,7 @@ module.exports['Equal'] = {
       }, {
         "localId" : "376",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnequalQuantityClosed",
+        "name" : "UnequalLongClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -2075,48 +2137,22 @@ module.exports['Equal'] = {
           "s" : {
             "r" : "376",
             "s" : [ {
-              "value" : [ "", "define ", "UnequalQuantityClosed", ": " ]
+              "value" : [ "", "define ", "UnequalLongClosed", ": " ]
             }, {
               "r" : "377",
               "s" : [ {
                 "r" : "380",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "378",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "379",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
                 "r" : "385",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "383",
-                  "s" : [ {
-                    "value" : [ "2 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "384",
-                  "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                 } ]
               } ]
             } ]
@@ -2134,7 +2170,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "389",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -2144,7 +2180,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "391",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -2161,24 +2197,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "382",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "378",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "379",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -2194,24 +2230,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "387",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "383",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "384",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
@@ -2219,7 +2255,7 @@ module.exports['Equal'] = {
       }, {
         "localId" : "394",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnequalQuantityOpen",
+        "name" : "UnequalLongOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -2228,48 +2264,22 @@ module.exports['Equal'] = {
           "s" : {
             "r" : "394",
             "s" : [ {
-              "value" : [ "", "define ", "UnequalQuantityOpen", ": " ]
+              "value" : [ "", "define ", "UnequalLongOpen", ": " ]
             }, {
               "r" : "395",
               "s" : [ {
                 "r" : "398",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "396",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "397",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "1L", ", ", "5L", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
                 "r" : "403",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "401",
-                  "s" : [ {
-                    "value" : [ "2 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "402",
-                  "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "2L", ", ", "4L", ")" ]
                 } ]
               } ]
             } ]
@@ -2287,7 +2297,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "407",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -2297,7 +2307,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "409",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -2314,24 +2324,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "400",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "396",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "397",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -2347,24 +2357,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "405",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "401",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "402",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
@@ -2372,7 +2382,7 @@ module.exports['Equal'] = {
       }, {
         "localId" : "412",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnequalQuantityClosedOpen",
+        "name" : "UnequalLongClosedOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -2381,48 +2391,22 @@ module.exports['Equal'] = {
           "s" : {
             "r" : "412",
             "s" : [ {
-              "value" : [ "", "define ", "UnequalQuantityClosedOpen", ": " ]
+              "value" : [ "", "define ", "UnequalLongClosedOpen", ": " ]
             }, {
               "r" : "413",
               "s" : [ {
                 "r" : "416",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "414",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "415",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
                 "r" : "421",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "419",
-                  "s" : [ {
-                    "value" : [ "2 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "420",
-                  "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "2L", ", ", "4L", ")" ]
                 } ]
               } ]
             } ]
@@ -2440,7 +2424,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "425",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -2450,7 +2434,7 @@ module.exports['Equal'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "427",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -2467,24 +2451,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "418",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "414",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "415",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -2500,24 +2484,24 @@ module.exports['Equal'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "423",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "419",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 2,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
+              "type" : "Literal",
               "localId" : "420",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "mg",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
@@ -2525,7 +2509,7 @@ module.exports['Equal'] = {
       }, {
         "localId" : "430",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualDates",
+        "name" : "EqualQuantityClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -2534,52 +2518,48 @@ module.exports['Equal'] = {
           "s" : {
             "r" : "430",
             "s" : [ {
-              "value" : [ "", "define ", "EqualDates", ": " ]
+              "value" : [ "", "define ", "EqualQuantityClosed", ": " ]
             }, {
               "r" : "431",
               "s" : [ {
-                "r" : "480",
+                "r" : "434",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "448",
+                  "r" : "432",
                   "s" : [ {
-                    "r" : "432",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "472",
+                  "r" : "433",
                   "s" : [ {
-                    "r" : "456",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "5 ", "'mg'" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "531",
+                "r" : "439",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "499",
+                  "r" : "437",
                   "s" : [ {
-                    "r" : "483",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "523",
+                  "r" : "438",
                   "s" : [ {
-                    "r" : "507",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "5 ", "'mg'" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -2592,485 +2572,123 @@ module.exports['Equal'] = {
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "534",
+            "localId" : "442",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "535",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "443",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "536",
+            "localId" : "444",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "537",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "445",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "480",
+            "localId" : "434",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "481",
+              "localId" : "435",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "482",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "436",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "448",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "449",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "450",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "451",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "452",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "453",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "454",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "455",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "432",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "433",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "434",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "435",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "436",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "437",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "438",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "432",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "472",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "473",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "474",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "475",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "476",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "477",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "478",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "479",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "456",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "457",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "458",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "459",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "460",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "461",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "462",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "433",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "mg",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "531",
+            "localId" : "439",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "532",
+              "localId" : "440",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "533",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "441",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "499",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "500",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "501",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "502",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "503",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "504",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "505",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "506",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "483",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "484",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "485",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "486",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "487",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "488",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "489",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "437",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "523",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "524",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "525",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "526",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "527",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "528",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "529",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "530",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "507",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "508",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "509",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "510",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "511",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "512",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "513",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "438",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "mg",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "540",
+        "localId" : "448",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualDatesOpenClosed",
+        "name" : "EqualQuantityOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "540",
+            "r" : "448",
             "s" : [ {
-              "value" : [ "", "define ", "EqualDatesOpenClosed", ": " ]
+              "value" : [ "", "define ", "EqualQuantityOpen", ": " ]
             }, {
-              "r" : "541",
+              "r" : "449",
               "s" : [ {
-                "r" : "590",
+                "r" : "452",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "Interval(" ]
                 }, {
-                  "r" : "558",
+                  "r" : "450",
                   "s" : [ {
-                    "r" : "542",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "582",
+                  "r" : "451",
                   "s" : [ {
-                    "r" : "566",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "5 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
@@ -3078,25 +2696,23 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "641",
+                "r" : "457",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "Interval(" ]
                 }, {
-                  "r" : "609",
+                  "r" : "455",
                   "s" : [ {
-                    "r" : "593",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "633",
+                  "r" : "456",
                   "s" : [ {
-                    "r" : "617",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "value" : [ "5 ", "'mg'" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -3104,91 +2720,860 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "541",
+          "localId" : "449",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "644",
+            "localId" : "460",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "645",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "461",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "646",
+            "localId" : "462",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "647",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "463",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "590",
-            "lowClosed" : true,
+            "localId" : "452",
+            "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "591",
+              "localId" : "453",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "592",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "454",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "558",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Quantity",
+              "localId" : "450",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "451",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "457",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "458",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "559",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "560",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "561",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "459",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "562",
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "455",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "456",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "466",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqualQuantityOpenClosed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "466",
+            "s" : [ {
+              "value" : [ "", "define ", "EqualQuantityOpenClosed", ": " ]
+            }, {
+              "r" : "467",
+              "s" : [ {
+                "r" : "470",
+                "s" : [ {
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "468",
+                  "s" : [ {
+                    "value" : [ "1.99999999 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "469",
+                  "s" : [ {
+                    "value" : [ "4.00000001 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "475",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "473",
+                  "s" : [ {
+                    "value" : [ "2 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "474",
+                  "s" : [ {
+                    "value" : [ "4 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "467",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "478",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "479",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "480",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "481",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "470",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "471",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "472",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "468",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1.99999999,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "469",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4.00000001,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "475",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "476",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "477",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "473",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "474",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "484",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnequalQuantityClosed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "484",
+            "s" : [ {
+              "value" : [ "", "define ", "UnequalQuantityClosed", ": " ]
+            }, {
+              "r" : "485",
+              "s" : [ {
+                "r" : "488",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "486",
+                  "s" : [ {
+                    "value" : [ "1 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "487",
+                  "s" : [ {
+                    "value" : [ "5 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "493",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "491",
+                  "s" : [ {
+                    "value" : [ "2 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "492",
+                  "s" : [ {
+                    "value" : [ "4 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "485",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "496",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "497",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "498",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "499",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "488",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "489",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "490",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "486",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "487",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "493",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "494",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "495",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "491",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "492",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "502",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnequalQuantityOpen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "502",
+            "s" : [ {
+              "value" : [ "", "define ", "UnequalQuantityOpen", ": " ]
+            }, {
+              "r" : "503",
+              "s" : [ {
+                "r" : "506",
+                "s" : [ {
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "504",
+                  "s" : [ {
+                    "value" : [ "1 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "505",
+                  "s" : [ {
+                    "value" : [ "5 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "511",
+                "s" : [ {
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "509",
+                  "s" : [ {
+                    "value" : [ "2 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "510",
+                  "s" : [ {
+                    "value" : [ "4 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "503",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "514",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "515",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "516",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "517",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "506",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "507",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "508",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "504",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "505",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "511",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "512",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "513",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "509",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "510",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "520",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnequalQuantityClosedOpen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "520",
+            "s" : [ {
+              "value" : [ "", "define ", "UnequalQuantityClosedOpen", ": " ]
+            }, {
+              "r" : "521",
+              "s" : [ {
+                "r" : "524",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "522",
+                  "s" : [ {
+                    "value" : [ "1 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "523",
+                  "s" : [ {
+                    "value" : [ "5 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "529",
+                "s" : [ {
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "527",
+                  "s" : [ {
+                    "value" : [ "2 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "528",
+                  "s" : [ {
+                    "value" : [ "4 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "521",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "532",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "533",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "534",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "535",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "524",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "525",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "526",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "522",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "523",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "529",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "530",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "531",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "527",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 2,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "528",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "538",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqualDates",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "538",
+            "s" : [ {
+              "value" : [ "", "define ", "EqualDates", ": " ]
+            }, {
+              "r" : "539",
+              "s" : [ {
+                "r" : "588",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "556",
+                  "s" : [ {
+                    "r" : "540",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "580",
+                  "s" : [ {
+                    "r" : "564",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "639",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "607",
+                  "s" : [ {
+                    "r" : "591",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "631",
+                  "s" : [ {
+                    "r" : "615",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "539",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "642",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "643",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "644",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "645",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "588",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "589",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "590",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "556",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "557",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "563",
+                "localId" : "558",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "564",
+                "localId" : "559",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "565",
+                "localId" : "560",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "561",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "562",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "563",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "542",
+                "localId" : "540",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -3196,7 +3581,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "543",
+                "localId" : "541",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3204,7 +3589,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "544",
+                "localId" : "542",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3212,7 +3597,7 @@ module.exports['Equal'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "545",
+                "localId" : "543",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3220,7 +3605,7 @@ module.exports['Equal'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "546",
+                "localId" : "544",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3228,7 +3613,7 @@ module.exports['Equal'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "547",
+                "localId" : "545",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3236,7 +3621,7 @@ module.exports['Equal'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "548",
+                "localId" : "546",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3245,48 +3630,48 @@ module.exports['Equal'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "582",
+              "localId" : "580",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "583",
+                "localId" : "581",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "584",
+                "localId" : "582",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "585",
+                "localId" : "583",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "586",
+                "localId" : "584",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "587",
+                "localId" : "585",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "588",
+                "localId" : "586",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "589",
+                "localId" : "587",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "566",
+                "localId" : "564",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -3294,7 +3679,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "567",
+                "localId" : "565",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3302,7 +3687,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "568",
+                "localId" : "566",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3310,7 +3695,7 @@ module.exports['Equal'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "569",
+                "localId" : "567",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3318,7 +3703,7 @@ module.exports['Equal'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "570",
+                "localId" : "568",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3326,7 +3711,7 @@ module.exports['Equal'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "571",
+                "localId" : "569",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3334,7 +3719,7 @@ module.exports['Equal'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "572",
+                "localId" : "570",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3343,65 +3728,65 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "641",
+            "localId" : "639",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "642",
+              "localId" : "640",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "643",
+                "localId" : "641",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "609",
+              "localId" : "607",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "610",
+                "localId" : "608",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "611",
+                "localId" : "609",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "612",
+                "localId" : "610",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "613",
+                "localId" : "611",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "614",
+                "localId" : "612",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "615",
+                "localId" : "613",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "616",
+                "localId" : "614",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "593",
+                "localId" : "591",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -3409,7 +3794,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "594",
+                "localId" : "592",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3417,7 +3802,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "595",
+                "localId" : "593",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3425,7 +3810,7 @@ module.exports['Equal'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "596",
+                "localId" : "594",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3433,7 +3818,7 @@ module.exports['Equal'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "597",
+                "localId" : "595",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3441,7 +3826,7 @@ module.exports['Equal'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "598",
+                "localId" : "596",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3449,7 +3834,7 @@ module.exports['Equal'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "599",
+                "localId" : "597",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -3458,136 +3843,136 @@ module.exports['Equal'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "633",
+              "localId" : "631",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "634",
+                "localId" : "632",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "635",
+                "localId" : "633",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "636",
+                "localId" : "634",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "637",
+                "localId" : "635",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "638",
+                "localId" : "636",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "639",
+                "localId" : "637",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "640",
+                "localId" : "638",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "617",
+                "localId" : "615",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "618",
+                "localId" : "616",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "619",
+                "localId" : "617",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "620",
+                "localId" : "618",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "621",
+                "localId" : "619",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "622",
+                "localId" : "620",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "623",
+                "localId" : "621",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "650",
+        "localId" : "648",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "SameDays",
+        "name" : "EqualDatesOpenClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "650",
+            "r" : "648",
             "s" : [ {
-              "value" : [ "", "define ", "SameDays", ": " ]
+              "value" : [ "", "define ", "EqualDatesOpenClosed", ": " ]
             }, {
-              "r" : "651",
+              "r" : "649",
               "s" : [ {
-                "r" : "676",
+                "r" : "698",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "660",
+                  "r" : "666",
                   "s" : [ {
-                    "r" : "652",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                    "r" : "650",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "672",
+                  "r" : "690",
                   "s" : [ {
-                    "r" : "664",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                    "r" : "674",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
@@ -3595,25 +3980,25 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "703",
+                "r" : "749",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "687",
+                  "r" : "717",
                   "s" : [ {
-                    "r" : "679",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                    "r" : "701",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "699",
+                  "r" : "741",
                   "s" : [ {
-                    "r" : "691",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                    "r" : "725",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -3621,71 +4006,91 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "651",
+          "localId" : "649",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "706",
+            "localId" : "752",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "707",
+              "localId" : "753",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "708",
+            "localId" : "754",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "709",
+              "localId" : "755",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "676",
+            "localId" : "698",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "677",
+              "localId" : "699",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "678",
+                "localId" : "700",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "660",
+              "localId" : "666",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "661",
+                "localId" : "667",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "662",
+                "localId" : "668",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "663",
+                "localId" : "669",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "670",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "671",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "672",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "673",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "652",
+                "localId" : "650",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -3693,7 +4098,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "653",
+                "localId" : "651",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3701,37 +4106,89 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "654",
+                "localId" : "652",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "653",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "654",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "655",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "656",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "672",
+              "localId" : "690",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "673",
+                "localId" : "691",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "674",
+                "localId" : "692",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "675",
+                "localId" : "693",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "694",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "695",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "696",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "697",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "664",
+                "localId" : "674",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -3739,7 +4196,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "665",
+                "localId" : "675",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3747,54 +4204,106 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "666",
+                "localId" : "676",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "703",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "704",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "705",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "677",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "678",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "679",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "680",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "749",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "750",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "751",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "687",
+              "localId" : "717",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "688",
+                "localId" : "718",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "689",
+                "localId" : "719",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "690",
+                "localId" : "720",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "721",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "722",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "723",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "724",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "679",
+                "localId" : "701",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -3802,7 +4311,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "680",
+                "localId" : "702",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3810,37 +4319,321 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "681",
+                "localId" : "703",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "704",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "705",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "706",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "707",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "699",
+              "localId" : "741",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "700",
+                "localId" : "742",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "701",
+                "localId" : "743",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "702",
+                "localId" : "744",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "745",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "746",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "747",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "748",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "691",
+                "localId" : "725",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "726",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "727",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "728",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "729",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "730",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "731",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "758",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "SameDays",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "758",
+            "s" : [ {
+              "value" : [ "", "define ", "SameDays", ": " ]
+            }, {
+              "r" : "759",
+              "s" : [ {
+                "r" : "784",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "768",
+                  "s" : [ {
+                    "r" : "760",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "780",
+                  "s" : [ {
+                    "r" : "772",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "811",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "795",
+                  "s" : [ {
+                    "r" : "787",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "807",
+                  "s" : [ {
+                    "r" : "799",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "759",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "814",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "815",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "816",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "817",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "784",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "785",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "786",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "768",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "769",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "770",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "771",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "760",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "761",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "762",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "780",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "781",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "782",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "783",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "772",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -3848,7 +4641,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "692",
+                "localId" : "773",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3856,7 +4649,116 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "693",
+                "localId" : "774",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "811",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "812",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "813",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "795",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "796",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "797",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "798",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "787",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "788",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "789",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "807",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "808",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "809",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "810",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "799",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "800",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "801",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -3866,7 +4768,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "712",
+        "localId" : "820",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DifferentDays",
         "context" : "Patient",
@@ -3875,27 +4777,27 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "712",
+            "r" : "820",
             "s" : [ {
               "value" : [ "", "define ", "DifferentDays", ": " ]
             }, {
-              "r" : "713",
+              "r" : "821",
               "s" : [ {
-                "r" : "738",
+                "r" : "846",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "722",
+                  "r" : "830",
                   "s" : [ {
-                    "r" : "714",
+                    "r" : "822",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "734",
+                  "r" : "842",
                   "s" : [ {
-                    "r" : "726",
+                    "r" : "834",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
@@ -3904,21 +4806,21 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "765",
+                "r" : "873",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "749",
+                  "r" : "857",
                   "s" : [ {
-                    "r" : "741",
+                    "r" : "849",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "761",
+                  "r" : "869",
                   "s" : [ {
-                    "r" : "753",
+                    "r" : "861",
                     "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ")" ]
                   } ]
                 }, {
@@ -3930,71 +4832,71 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "713",
+          "localId" : "821",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "768",
+            "localId" : "876",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "769",
+              "localId" : "877",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "770",
+            "localId" : "878",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "771",
+              "localId" : "879",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "738",
+            "localId" : "846",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "739",
+              "localId" : "847",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "740",
+                "localId" : "848",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "722",
+              "localId" : "830",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "723",
+                "localId" : "831",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "724",
+                "localId" : "832",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "725",
+                "localId" : "833",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "714",
+                "localId" : "822",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -4002,7 +4904,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "715",
+                "localId" : "823",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4010,7 +4912,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "716",
+                "localId" : "824",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4019,28 +4921,28 @@ module.exports['Equal'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "734",
+              "localId" : "842",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "735",
+                "localId" : "843",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "736",
+                "localId" : "844",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "737",
+                "localId" : "845",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "726",
+                "localId" : "834",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -4048,7 +4950,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "727",
+                "localId" : "835",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4056,7 +4958,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "728",
+                "localId" : "836",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4065,45 +4967,45 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "765",
+            "localId" : "873",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "766",
+              "localId" : "874",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "767",
+                "localId" : "875",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "749",
+              "localId" : "857",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "750",
+                "localId" : "858",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "751",
+                "localId" : "859",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "752",
+                "localId" : "860",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "741",
+                "localId" : "849",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -4111,7 +5013,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "742",
+                "localId" : "850",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4119,7 +5021,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "743",
+                "localId" : "851",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4128,28 +5030,28 @@ module.exports['Equal'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "761",
+              "localId" : "869",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "762",
+                "localId" : "870",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "763",
+                "localId" : "871",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "764",
+                "localId" : "872",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "753",
+                "localId" : "861",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -4157,7 +5059,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "754",
+                "localId" : "862",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "7",
@@ -4165,7 +5067,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "755",
+                "localId" : "863",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4175,7 +5077,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "774",
+        "localId" : "882",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DifferingPrecision",
         "context" : "Patient",
@@ -4184,27 +5086,27 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "774",
+            "r" : "882",
             "s" : [ {
               "value" : [ "", "define ", "DifferingPrecision", ": " ]
             }, {
-              "r" : "775",
+              "r" : "883",
               "s" : [ {
-                "r" : "818",
+                "r" : "926",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "790",
+                  "r" : "898",
                   "s" : [ {
-                    "r" : "776",
+                    "r" : "884",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ", ", "21", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "811",
+                  "r" : "919",
                   "s" : [ {
-                    "r" : "797",
+                    "r" : "905",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ", ", "21", ")" ]
                   } ]
                 }, {
@@ -4213,21 +5115,21 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "857",
+                "r" : "965",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "833",
+                  "r" : "941",
                   "s" : [ {
-                    "r" : "821",
+                    "r" : "929",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "851",
+                  "r" : "959",
                   "s" : [ {
-                    "r" : "839",
+                    "r" : "947",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ")" ]
                   } ]
                 }, {
@@ -4239,86 +5141,86 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "775",
+          "localId" : "883",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "860",
+            "localId" : "968",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "861",
+              "localId" : "969",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "862",
+            "localId" : "970",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "863",
+              "localId" : "971",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "818",
+            "localId" : "926",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "819",
+              "localId" : "927",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "820",
+                "localId" : "928",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "790",
+              "localId" : "898",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "791",
+                "localId" : "899",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "792",
+                "localId" : "900",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "793",
+                "localId" : "901",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "794",
+                "localId" : "902",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "795",
+                "localId" : "903",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "796",
+                "localId" : "904",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "776",
+                "localId" : "884",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -4326,7 +5228,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "777",
+                "localId" : "885",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4334,7 +5236,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "778",
+                "localId" : "886",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4342,7 +5244,7 @@ module.exports['Equal'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "779",
+                "localId" : "887",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -4350,7 +5252,7 @@ module.exports['Equal'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "780",
+                "localId" : "888",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -4358,7 +5260,7 @@ module.exports['Equal'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "781",
+                "localId" : "889",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "21",
@@ -4367,43 +5269,43 @@ module.exports['Equal'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "811",
+              "localId" : "919",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "812",
+                "localId" : "920",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "813",
+                "localId" : "921",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "814",
+                "localId" : "922",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "815",
+                "localId" : "923",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "816",
+                "localId" : "924",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "817",
+                "localId" : "925",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "797",
+                "localId" : "905",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -4411,7 +5313,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "798",
+                "localId" : "906",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4419,7 +5321,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "799",
+                "localId" : "907",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4427,7 +5329,7 @@ module.exports['Equal'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "800",
+                "localId" : "908",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -4435,7 +5337,7 @@ module.exports['Equal'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "801",
+                "localId" : "909",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -4443,7 +5345,7 @@ module.exports['Equal'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "802",
+                "localId" : "910",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "21",
@@ -4452,55 +5354,55 @@ module.exports['Equal'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "857",
+            "localId" : "965",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "858",
+              "localId" : "966",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "859",
+                "localId" : "967",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "833",
+              "localId" : "941",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "834",
+                "localId" : "942",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "835",
+                "localId" : "943",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "836",
+                "localId" : "944",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "837",
+                "localId" : "945",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "838",
+                "localId" : "946",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "821",
+                "localId" : "929",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -4508,7 +5410,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "822",
+                "localId" : "930",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4516,7 +5418,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "823",
+                "localId" : "931",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4524,7 +5426,7 @@ module.exports['Equal'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "824",
+                "localId" : "932",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -4532,7 +5434,7 @@ module.exports['Equal'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "825",
+                "localId" : "933",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -4541,38 +5443,38 @@ module.exports['Equal'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "851",
+              "localId" : "959",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "852",
+                "localId" : "960",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "853",
+                "localId" : "961",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "854",
+                "localId" : "962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "855",
+                "localId" : "963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "856",
+                "localId" : "964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "839",
+                "localId" : "947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -4580,7 +5482,7 @@ module.exports['Equal'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "840",
+                "localId" : "948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4588,7 +5490,7 @@ module.exports['Equal'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "841",
+                "localId" : "949",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -4596,7 +5498,7 @@ module.exports['Equal'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "842",
+                "localId" : "950",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -4604,7 +5506,7 @@ module.exports['Equal'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "843",
+                "localId" : "951",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "30",
@@ -4628,9 +5530,15 @@ define EqualOpenClosed: Interval(1, 5) != Interval[2, 4]
 define UnequalClosed: Interval[1, 5] != Interval[2, 4]
 define UnequalOpen: Interval(1, 5) != Interval(2, 4)
 define UnequalClosedOpen: Interval[1, 5] != Interval(2, 4)
+define EqualLongClosed: Interval[1L, 5L] != Interval[1L, 5L]
+define EqualLongOpen: Interval(1L, 5L) != Interval(1L, 5L)
+define EqualLongOpenClosed: Interval(1L, 5L) != Interval[2L, 4L]
+define UnequalLongClosed: Interval[1L, 5L] != Interval[2L, 4L]
+define UnequalLongOpen: Interval(1L, 5L) != Interval(2L, 4L)
+define UnequalLongClosedOpen: Interval[1L, 5L] != Interval(2L, 4L)
 define EqualQuantityClosed: Interval[1 'mg', 5 'mg'] != Interval[1 'mg', 5 'mg']
 define EqualQuantityOpen: Interval(1 'mg', 5 'mg') != Interval(1 'mg', 5 'mg')
-define EqualQuantityOpenClosed: Interval(1 'mg', 5 'mg') != Interval[2 'mg', 4 'mg']
+define EqualQuantityOpenClosed: Interval(1.99999999 'mg', 4.00000001 'mg') != Interval[2 'mg', 4 'mg']
 define UnequalQuantityClosed: Interval[1 'mg', 5 'mg'] != Interval[2 'mg', 4 'mg']
 define UnequalQuantityOpen: Interval(1 'mg', 5 'mg') != Interval(2 'mg', 4 'mg')
 define UnequalQuantityClosedOpen: Interval[1 'mg', 5 'mg'] != Interval(2 'mg', 4 'mg')
@@ -4653,7 +5561,7 @@ module.exports['NotEqual'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "806",
+        "r" : "926",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -5562,7 +6470,7 @@ module.exports['NotEqual'] = {
       }, {
         "localId" : "334",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualQuantityClosed",
+        "name" : "EqualLongClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -5571,48 +6479,22 @@ module.exports['NotEqual'] = {
           "s" : {
             "r" : "334",
             "s" : [ {
-              "value" : [ "", "define ", "EqualQuantityClosed", ": " ]
+              "value" : [ "", "define ", "EqualLongClosed", ": " ]
             }, {
               "r" : "350",
               "s" : [ {
                 "r" : "338",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "336",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "337",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
                 "r" : "343",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "341",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "342",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -5641,7 +6523,7 @@ module.exports['NotEqual'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "347",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }, {
@@ -5651,7 +6533,7 @@ module.exports['NotEqual'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "349",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             } ],
@@ -5668,24 +6550,24 @@ module.exports['NotEqual'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "340",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "336",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 1,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "337",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 5,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "5",
                 "annotation" : [ ]
               }
             }, {
@@ -5701,24 +6583,24 @@ module.exports['NotEqual'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "345",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "341",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 1,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "342",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 5,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "5",
                 "annotation" : [ ]
               }
             } ]
@@ -5727,7 +6609,7 @@ module.exports['NotEqual'] = {
       }, {
         "localId" : "354",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualQuantityOpen",
+        "name" : "EqualLongOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -5736,48 +6618,22 @@ module.exports['NotEqual'] = {
           "s" : {
             "r" : "354",
             "s" : [ {
-              "value" : [ "", "define ", "EqualQuantityOpen", ": " ]
+              "value" : [ "", "define ", "EqualLongOpen", ": " ]
             }, {
               "r" : "370",
               "s" : [ {
                 "r" : "358",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "356",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "357",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "1L", ", ", "5L", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
                 "r" : "363",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "361",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "362",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "1L", ", ", "5L", ")" ]
                 } ]
               } ]
             } ]
@@ -5806,7 +6662,7 @@ module.exports['NotEqual'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "367",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }, {
@@ -5816,7 +6672,7 @@ module.exports['NotEqual'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "369",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             } ],
@@ -5833,24 +6689,24 @@ module.exports['NotEqual'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "360",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "356",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 1,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "357",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 5,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "5",
                 "annotation" : [ ]
               }
             }, {
@@ -5866,24 +6722,24 @@ module.exports['NotEqual'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "365",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "361",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 1,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "362",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 5,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "5",
                 "annotation" : [ ]
               }
             } ]
@@ -5892,7 +6748,7 @@ module.exports['NotEqual'] = {
       }, {
         "localId" : "374",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualQuantityOpenClosed",
+        "name" : "EqualLongOpenClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -5901,48 +6757,22 @@ module.exports['NotEqual'] = {
           "s" : {
             "r" : "374",
             "s" : [ {
-              "value" : [ "", "define ", "EqualQuantityOpenClosed", ": " ]
+              "value" : [ "", "define ", "EqualLongOpenClosed", ": " ]
             }, {
               "r" : "390",
               "s" : [ {
                 "r" : "378",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "376",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "377",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "1L", ", ", "5L", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
                 "r" : "383",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "381",
-                  "s" : [ {
-                    "value" : [ "2 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "382",
-                  "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                 } ]
               } ]
             } ]
@@ -5971,7 +6801,7 @@ module.exports['NotEqual'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "387",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }, {
@@ -5981,7 +6811,7 @@ module.exports['NotEqual'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "389",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             } ],
@@ -5998,24 +6828,24 @@ module.exports['NotEqual'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "380",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "376",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 1,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "377",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 5,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "5",
                 "annotation" : [ ]
               }
             }, {
@@ -6031,24 +6861,24 @@ module.exports['NotEqual'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "385",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "381",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "382",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "4",
                 "annotation" : [ ]
               }
             } ]
@@ -6057,7 +6887,7 @@ module.exports['NotEqual'] = {
       }, {
         "localId" : "394",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnequalQuantityClosed",
+        "name" : "UnequalLongClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -6066,48 +6896,22 @@ module.exports['NotEqual'] = {
           "s" : {
             "r" : "394",
             "s" : [ {
-              "value" : [ "", "define ", "UnequalQuantityClosed", ": " ]
+              "value" : [ "", "define ", "UnequalLongClosed", ": " ]
             }, {
               "r" : "410",
               "s" : [ {
                 "r" : "398",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "396",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "397",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
                 "r" : "403",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "401",
-                  "s" : [ {
-                    "value" : [ "2 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "402",
-                  "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                 } ]
               } ]
             } ]
@@ -6136,7 +6940,7 @@ module.exports['NotEqual'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "407",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }, {
@@ -6146,7 +6950,7 @@ module.exports['NotEqual'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "409",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             } ],
@@ -6163,24 +6967,24 @@ module.exports['NotEqual'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "400",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "396",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 1,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "397",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 5,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "5",
                 "annotation" : [ ]
               }
             }, {
@@ -6196,24 +7000,24 @@ module.exports['NotEqual'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "405",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "401",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "402",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "4",
                 "annotation" : [ ]
               }
             } ]
@@ -6222,7 +7026,7 @@ module.exports['NotEqual'] = {
       }, {
         "localId" : "414",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnequalQuantityOpen",
+        "name" : "UnequalLongOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -6231,48 +7035,22 @@ module.exports['NotEqual'] = {
           "s" : {
             "r" : "414",
             "s" : [ {
-              "value" : [ "", "define ", "UnequalQuantityOpen", ": " ]
+              "value" : [ "", "define ", "UnequalLongOpen", ": " ]
             }, {
               "r" : "430",
               "s" : [ {
                 "r" : "418",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "416",
-                  "s" : [ {
-                    "value" : [ "1 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "417",
-                  "s" : [ {
-                    "value" : [ "5 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "1L", ", ", "5L", ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
                 "r" : "423",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
                   "r" : "421",
-                  "s" : [ {
-                    "value" : [ "2 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "422",
-                  "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "Interval(", "2L", ", ", "4L", ")" ]
                 } ]
               } ]
             } ]
@@ -6301,7 +7079,7 @@ module.exports['NotEqual'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "427",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }, {
@@ -6311,7 +7089,7 @@ module.exports['NotEqual'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "429",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             } ],
@@ -6328,24 +7106,24 @@ module.exports['NotEqual'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "420",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "416",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 1,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "417",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 5,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "5",
                 "annotation" : [ ]
               }
             }, {
@@ -6361,24 +7139,24 @@ module.exports['NotEqual'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "425",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "421",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
+                "type" : "Literal",
                 "localId" : "422",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "mg",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "4",
                 "annotation" : [ ]
               }
             } ]
@@ -6387,7 +7165,7 @@ module.exports['NotEqual'] = {
       }, {
         "localId" : "434",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnequalQuantityClosedOpen",
+        "name" : "UnequalLongClosedOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -6396,22 +7174,161 @@ module.exports['NotEqual'] = {
           "s" : {
             "r" : "434",
             "s" : [ {
-              "value" : [ "", "define ", "UnequalQuantityClosedOpen", ": " ]
+              "value" : [ "", "define ", "UnequalLongClosedOpen", ": " ]
             }, {
               "r" : "450",
               "s" : [ {
                 "r" : "438",
+                "s" : [ {
+                  "r" : "436",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "value" : [ " ", "!=", " " ]
+              }, {
+                "r" : "443",
+                "s" : [ {
+                  "r" : "441",
+                  "value" : [ "Interval(", "2L", ", ", "4L", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "450",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "451",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "435",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "446",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "447",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "448",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "449",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            } ],
+            "operand" : [ {
+              "type" : "Interval",
+              "localId" : "438",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "439",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "440",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Literal",
+                "localId" : "436",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Literal",
+                "localId" : "437",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "5",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "443",
+              "lowClosed" : false,
+              "highClosed" : false,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "444",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "445",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Literal",
+                "localId" : "441",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Literal",
+                "localId" : "442",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "4",
+                "annotation" : [ ]
+              }
+            } ]
+          }
+        }
+      }, {
+        "localId" : "454",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqualQuantityClosed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "454",
+            "s" : [ {
+              "value" : [ "", "define ", "EqualQuantityClosed", ": " ]
+            }, {
+              "r" : "470",
+              "s" : [ {
+                "r" : "458",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "436",
+                  "r" : "456",
                   "s" : [ {
                     "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "437",
+                  "r" : "457",
                   "s" : [ {
                     "value" : [ "5 ", "'mg'" ]
                   } ]
@@ -6421,23 +7338,23 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "443",
+                "r" : "463",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "441",
+                  "r" : "461",
                   "s" : [ {
-                    "value" : [ "2 ", "'mg'" ]
+                    "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "442",
+                  "r" : "462",
                   "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
+                    "value" : [ "5 ", "'mg'" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -6445,61 +7362,61 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "450",
+          "localId" : "470",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "451",
+            "localId" : "471",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "435",
+            "localId" : "455",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "446",
+              "localId" : "466",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "447",
+                "localId" : "467",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }, {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "448",
+              "localId" : "468",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "449",
+                "localId" : "469",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "Interval",
-              "localId" : "438",
+              "localId" : "458",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "439",
+                "localId" : "459",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "440",
+                  "localId" : "460",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Quantity",
-                "localId" : "436",
+                "localId" : "456",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "value" : 1,
                 "unit" : "mg",
@@ -6507,7 +7424,7 @@ module.exports['NotEqual'] = {
               },
               "high" : {
                 "type" : "Quantity",
-                "localId" : "437",
+                "localId" : "457",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "value" : 5,
                 "unit" : "mg",
@@ -6515,34 +7432,34 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "Interval",
-              "localId" : "443",
-              "lowClosed" : false,
-              "highClosed" : false,
+              "localId" : "463",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "444",
+                "localId" : "464",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "445",
+                  "localId" : "465",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Quantity",
-                "localId" : "441",
+                "localId" : "461",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
+                "value" : 1,
                 "unit" : "mg",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Quantity",
-                "localId" : "442",
+                "localId" : "462",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
+                "value" : 5,
                 "unit" : "mg",
                 "annotation" : [ ]
               }
@@ -6550,37 +7467,35 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "454",
+        "localId" : "474",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualDates",
+        "name" : "EqualQuantityOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "454",
+            "r" : "474",
             "s" : [ {
-              "value" : [ "", "define ", "EqualDates", ": " ]
+              "value" : [ "", "define ", "EqualQuantityOpen", ": " ]
             }, {
-              "r" : "562",
+              "r" : "490",
               "s" : [ {
-                "r" : "504",
+                "r" : "478",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "Interval(" ]
                 }, {
-                  "r" : "472",
+                  "r" : "476",
                   "s" : [ {
-                    "r" : "456",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "496",
+                  "r" : "477",
                   "s" : [ {
-                    "r" : "480",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "5 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
@@ -6588,22 +7503,20 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "555",
+                "r" : "483",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "Interval(" ]
                 }, {
-                  "r" : "523",
+                  "r" : "481",
                   "s" : [ {
-                    "r" : "507",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "547",
+                  "r" : "482",
                   "s" : [ {
-                    "r" : "531",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "5 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
@@ -6614,502 +7527,470 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "562",
+          "localId" : "490",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "563",
+            "localId" : "491",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "455",
+            "localId" : "475",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "558",
+              "localId" : "486",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "559",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "487",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }, {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "560",
+              "localId" : "488",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "561",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "489",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "Interval",
-              "localId" : "504",
-              "lowClosed" : true,
+              "localId" : "478",
+              "lowClosed" : false,
               "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "505",
+                "localId" : "479",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "506",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "480",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "472",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Quantity",
+                "localId" : "476",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1,
+                "unit" : "mg",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "477",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 5,
+                "unit" : "mg",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "483",
+              "lowClosed" : false,
+              "highClosed" : false,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "484",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "473",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "474",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "475",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "476",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "477",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "478",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
+                "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "479",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "456",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "457",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "458",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "459",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "460",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "461",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "462",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "localId" : "485",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
+              "low" : {
+                "type" : "Quantity",
+                "localId" : "481",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1,
+                "unit" : "mg",
+                "annotation" : [ ]
+              },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "496",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "497",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                "type" : "Quantity",
+                "localId" : "482",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 5,
+                "unit" : "mg",
+                "annotation" : [ ]
+              }
+            } ]
+          }
+        }
+      }, {
+        "localId" : "494",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqualQuantityOpenClosed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "494",
+            "s" : [ {
+              "value" : [ "", "define ", "EqualQuantityOpenClosed", ": " ]
+            }, {
+              "r" : "510",
+              "s" : [ {
+                "r" : "498",
+                "s" : [ {
+                  "value" : [ "Interval(" ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "498",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "r" : "496",
+                  "s" : [ {
+                    "value" : [ "1.99999999 ", "'mg'" ]
+                  } ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "499",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "value" : [ ", " ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "500",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "r" : "497",
+                  "s" : [ {
+                    "value" : [ "4.00000001 ", "'mg'" ]
+                  } ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "501",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " ", "!=", " " ]
+              }, {
+                "r" : "503",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "502",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "r" : "501",
+                  "s" : [ {
+                    "value" : [ "2 ", "'mg'" ]
+                  } ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "503",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "480",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2013",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "481",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "482",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "483",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "484",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "485",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "486",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "502",
+                  "s" : [ {
+                    "value" : [ "4 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "510",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "511",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "495",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "506",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "507",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
               }
             }, {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "508",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "509",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            } ],
+            "operand" : [ {
               "type" : "Interval",
-              "localId" : "555",
-              "lowClosed" : true,
+              "localId" : "498",
+              "lowClosed" : false,
               "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "556",
+                "localId" : "499",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "557",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "500",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "523",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Quantity",
+                "localId" : "496",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1.99999999,
+                "unit" : "mg",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "497",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4.00000001,
+                "unit" : "mg",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "503",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "504",
                 "annotation" : [ ],
-                "signature" : [ {
+                "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "524",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "505",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Quantity",
+                "localId" : "501",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "mg",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "502",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "mg",
+                "annotation" : [ ]
+              }
+            } ]
+          }
+        }
+      }, {
+        "localId" : "514",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnequalQuantityClosed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "514",
+            "s" : [ {
+              "value" : [ "", "define ", "UnequalQuantityClosed", ": " ]
+            }, {
+              "r" : "530",
+              "s" : [ {
+                "r" : "518",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "525",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "r" : "516",
+                  "s" : [ {
+                    "value" : [ "1 ", "'mg'" ]
+                  } ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "526",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "value" : [ ", " ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "527",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "r" : "517",
+                  "s" : [ {
+                    "value" : [ "5 ", "'mg'" ]
+                  } ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "528",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ " ", "!=", " " ]
+              }, {
+                "r" : "523",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "529",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "r" : "521",
+                  "s" : [ {
+                    "value" : [ "2 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "522",
+                  "s" : [ {
+                    "value" : [ "4 ", "'mg'" ]
+                  } ]
                 }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "530",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "531",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "515",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "526",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "527",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "528",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "529",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            } ],
+            "operand" : [ {
+              "type" : "Interval",
+              "localId" : "518",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "519",
+                "annotation" : [ ],
+                "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "530",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "507",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "508",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "509",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "510",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "511",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "512",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "513",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "localId" : "520",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
+              "low" : {
+                "type" : "Quantity",
+                "localId" : "516",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1,
+                "unit" : "mg",
+                "annotation" : [ ]
+              },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "547",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Quantity",
+                "localId" : "517",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 5,
+                "unit" : "mg",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "523",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "524",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "548",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "549",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "550",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "551",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "552",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "553",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
+                "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "554",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "531",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2013",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "532",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "533",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "534",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "535",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "536",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "537",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "localId" : "525",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
+              },
+              "low" : {
+                "type" : "Quantity",
+                "localId" : "521",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "mg",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "522",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "mg",
+                "annotation" : [ ]
               }
             } ]
           }
         }
       }, {
-        "localId" : "566",
+        "localId" : "534",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualDatesOpenClosed",
+        "name" : "UnequalQuantityOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "566",
+            "r" : "534",
             "s" : [ {
-              "value" : [ "", "define ", "EqualDatesOpenClosed", ": " ]
+              "value" : [ "", "define ", "UnequalQuantityOpen", ": " ]
             }, {
-              "r" : "674",
+              "r" : "550",
               "s" : [ {
-                "r" : "616",
+                "r" : "538",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "Interval(" ]
                 }, {
-                  "r" : "584",
+                  "r" : "536",
                   "s" : [ {
-                    "r" : "568",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "608",
+                  "r" : "537",
                   "s" : [ {
-                    "r" : "592",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "5 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
@@ -7117,25 +7998,23 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "667",
+                "r" : "543",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "Interval(" ]
                 }, {
-                  "r" : "635",
+                  "r" : "541",
                   "s" : [ {
-                    "r" : "619",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "2 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "659",
+                  "r" : "542",
                   "s" : [ {
-                    "r" : "643",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "value" : [ "4 ", "'mg'" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -7143,102 +8022,436 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "674",
+          "localId" : "550",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "675",
+            "localId" : "551",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "567",
+            "localId" : "535",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "670",
+              "localId" : "546",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "671",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "547",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }, {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "672",
+              "localId" : "548",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "673",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "549",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "Interval",
-              "localId" : "616",
-              "lowClosed" : true,
+              "localId" : "538",
+              "lowClosed" : false,
               "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "617",
+                "localId" : "539",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "618",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "540",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "584",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "585",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "586",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                "type" : "Quantity",
+                "localId" : "536",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1,
+                "unit" : "mg",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "537",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 5,
+                "unit" : "mg",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "543",
+              "lowClosed" : false,
+              "highClosed" : false,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "544",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "545",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Quantity",
+                "localId" : "541",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "mg",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "542",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "mg",
+                "annotation" : [ ]
+              }
+            } ]
+          }
+        }
+      }, {
+        "localId" : "554",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnequalQuantityClosedOpen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "554",
+            "s" : [ {
+              "value" : [ "", "define ", "UnequalQuantityClosedOpen", ": " ]
+            }, {
+              "r" : "570",
+              "s" : [ {
+                "r" : "558",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "556",
+                  "s" : [ {
+                    "value" : [ "1 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "557",
+                  "s" : [ {
+                    "value" : [ "5 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ " ", "!=", " " ]
+              }, {
+                "r" : "563",
+                "s" : [ {
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "561",
+                  "s" : [ {
+                    "value" : [ "2 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
                 }, {
+                  "r" : "562",
+                  "s" : [ {
+                    "value" : [ "4 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "570",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "571",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "555",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "566",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "567",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "568",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "569",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            } ],
+            "operand" : [ {
+              "type" : "Interval",
+              "localId" : "558",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "559",
+                "annotation" : [ ],
+                "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "587",
+                  "localId" : "560",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Quantity",
+                "localId" : "556",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 1,
+                "unit" : "mg",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "557",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 5,
+                "unit" : "mg",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "563",
+              "lowClosed" : false,
+              "highClosed" : false,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "564",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "565",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Quantity",
+                "localId" : "561",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "mg",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "562",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "mg",
+                "annotation" : [ ]
+              }
+            } ]
+          }
+        }
+      }, {
+        "localId" : "574",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqualDates",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "574",
+            "s" : [ {
+              "value" : [ "", "define ", "EqualDates", ": " ]
+            }, {
+              "r" : "682",
+              "s" : [ {
+                "r" : "624",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "592",
+                  "s" : [ {
+                    "r" : "576",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "616",
+                  "s" : [ {
+                    "r" : "600",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "value" : [ " ", "!=", " " ]
+              }, {
+                "r" : "675",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "643",
+                  "s" : [ {
+                    "r" : "627",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "667",
+                  "s" : [ {
+                    "r" : "651",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "682",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "683",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "575",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "678",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "679",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "680",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "681",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            } ],
+            "operand" : [ {
+              "type" : "Interval",
+              "localId" : "624",
+              "lowClosed" : true,
+              "highClosed" : false,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "625",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "626",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "592",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "593",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "588",
+                  "localId" : "594",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "589",
+                  "localId" : "595",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "590",
+                  "localId" : "596",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "591",
+                  "localId" : "597",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "598",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "599",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "568",
+                  "localId" : "576",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2012",
@@ -7246,7 +8459,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "569",
+                  "localId" : "577",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7254,7 +8467,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "570",
+                  "localId" : "578",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7262,7 +8475,7 @@ module.exports['NotEqual'] = {
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "571",
+                  "localId" : "579",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7270,7 +8483,7 @@ module.exports['NotEqual'] = {
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "572",
+                  "localId" : "580",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7278,7 +8491,7 @@ module.exports['NotEqual'] = {
                 },
                 "second" : {
                   "type" : "Literal",
-                  "localId" : "573",
+                  "localId" : "581",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7286,7 +8499,7 @@ module.exports['NotEqual'] = {
                 },
                 "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "574",
+                  "localId" : "582",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7295,48 +8508,48 @@ module.exports['NotEqual'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "608",
+                "localId" : "616",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "609",
+                  "localId" : "617",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "610",
+                  "localId" : "618",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "611",
+                  "localId" : "619",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "612",
+                  "localId" : "620",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "613",
+                  "localId" : "621",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "614",
+                  "localId" : "622",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "615",
+                  "localId" : "623",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "592",
+                  "localId" : "600",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2013",
@@ -7344,7 +8557,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "593",
+                  "localId" : "601",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7352,7 +8565,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "594",
+                  "localId" : "602",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7360,7 +8573,7 @@ module.exports['NotEqual'] = {
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "595",
+                  "localId" : "603",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7368,7 +8581,7 @@ module.exports['NotEqual'] = {
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "596",
+                  "localId" : "604",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7376,7 +8589,7 @@ module.exports['NotEqual'] = {
                 },
                 "second" : {
                   "type" : "Literal",
-                  "localId" : "597",
+                  "localId" : "605",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7384,7 +8597,7 @@ module.exports['NotEqual'] = {
                 },
                 "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "598",
+                  "localId" : "606",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7393,65 +8606,65 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "Interval",
-              "localId" : "667",
+              "localId" : "675",
               "lowClosed" : true,
-              "highClosed" : true,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "668",
+                "localId" : "676",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "669",
+                  "localId" : "677",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "635",
+                "localId" : "643",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "636",
+                  "localId" : "644",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "637",
+                  "localId" : "645",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "638",
+                  "localId" : "646",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "639",
+                  "localId" : "647",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "640",
+                  "localId" : "648",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "641",
+                  "localId" : "649",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "642",
+                  "localId" : "650",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "619",
+                  "localId" : "627",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2012",
@@ -7459,7 +8672,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "620",
+                  "localId" : "628",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7467,7 +8680,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "621",
+                  "localId" : "629",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7475,7 +8688,7 @@ module.exports['NotEqual'] = {
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "622",
+                  "localId" : "630",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7483,7 +8696,7 @@ module.exports['NotEqual'] = {
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "623",
+                  "localId" : "631",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7491,7 +8704,7 @@ module.exports['NotEqual'] = {
                 },
                 "second" : {
                   "type" : "Literal",
-                  "localId" : "624",
+                  "localId" : "632",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7499,7 +8712,7 @@ module.exports['NotEqual'] = {
                 },
                 "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "625",
+                  "localId" : "633",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
@@ -7508,99 +8721,99 @@ module.exports['NotEqual'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "659",
+                "localId" : "667",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "660",
+                  "localId" : "668",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "661",
+                  "localId" : "669",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "662",
+                  "localId" : "670",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "663",
+                  "localId" : "671",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "664",
+                  "localId" : "672",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "665",
+                  "localId" : "673",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "666",
+                  "localId" : "674",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "643",
+                  "localId" : "651",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
+                  "value" : "2013",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "644",
+                  "localId" : "652",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "12",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "645",
+                  "localId" : "653",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "31",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "646",
+                  "localId" : "654",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "23",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "647",
+                  "localId" : "655",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "59",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
                 "second" : {
                   "type" : "Literal",
-                  "localId" : "648",
+                  "localId" : "656",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "59",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
                 "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "649",
+                  "localId" : "657",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "999",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               }
@@ -7608,37 +8821,37 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "678",
+        "localId" : "686",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "SameDays",
+        "name" : "EqualDatesOpenClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "678",
+            "r" : "686",
             "s" : [ {
-              "value" : [ "", "define ", "SameDays", ": " ]
+              "value" : [ "", "define ", "EqualDatesOpenClosed", ": " ]
             }, {
-              "r" : "738",
+              "r" : "794",
               "s" : [ {
-                "r" : "704",
+                "r" : "736",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "688",
+                  "r" : "704",
                   "s" : [ {
-                    "r" : "680",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                    "r" : "688",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "700",
+                  "r" : "728",
                   "s" : [ {
-                    "r" : "692",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                    "r" : "712",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
@@ -7646,25 +8859,25 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "731",
+                "r" : "787",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "715",
+                  "r" : "755",
                   "s" : [ {
-                    "r" : "707",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                    "r" : "739",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "727",
+                  "r" : "779",
                   "s" : [ {
-                    "r" : "719",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                    "r" : "763",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -7672,82 +8885,102 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "738",
+          "localId" : "794",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "739",
+            "localId" : "795",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "679",
+            "localId" : "687",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "734",
+              "localId" : "790",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "735",
+                "localId" : "791",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }, {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "736",
+              "localId" : "792",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "737",
+                "localId" : "793",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "Interval",
-              "localId" : "704",
+              "localId" : "736",
               "lowClosed" : true,
               "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "705",
+                "localId" : "737",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "706",
+                  "localId" : "738",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "688",
+                "localId" : "704",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "689",
+                  "localId" : "705",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "690",
+                  "localId" : "706",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "691",
+                  "localId" : "707",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "708",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "709",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "710",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "711",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "680",
+                  "localId" : "688",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2012",
@@ -7755,7 +8988,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "681",
+                  "localId" : "689",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7763,37 +8996,89 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "682",
+                  "localId" : "690",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "691",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "692",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "693",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "694",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "700",
+                "localId" : "728",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "701",
+                  "localId" : "729",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "702",
+                  "localId" : "730",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "703",
+                  "localId" : "731",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "732",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "733",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "734",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "735",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "692",
+                  "localId" : "712",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2013",
@@ -7801,7 +9086,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "693",
+                  "localId" : "713",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7809,54 +9094,106 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "694",
+                  "localId" : "714",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "715",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "716",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "717",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "718",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
                 }
               }
             }, {
               "type" : "Interval",
-              "localId" : "731",
+              "localId" : "787",
               "lowClosed" : true,
-              "highClosed" : false,
+              "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "732",
+                "localId" : "788",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "733",
+                  "localId" : "789",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "715",
+                "localId" : "755",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "716",
+                  "localId" : "756",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "717",
+                  "localId" : "757",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "718",
+                  "localId" : "758",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "759",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "760",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "761",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "762",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "707",
+                  "localId" : "739",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2012",
@@ -7864,7 +9201,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "708",
+                  "localId" : "740",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -7872,56 +9209,140 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "709",
+                  "localId" : "741",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "742",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "743",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "744",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "745",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "727",
+                "localId" : "779",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "728",
+                  "localId" : "780",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "729",
+                  "localId" : "781",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "730",
+                  "localId" : "782",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "783",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "784",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "785",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "786",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "719",
+                  "localId" : "763",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2013",
+                  "value" : "2012",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "720",
+                  "localId" : "764",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "12",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "721",
+                  "localId" : "765",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "31",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "766",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "23",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "767",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "59",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "768",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "59",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "769",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "999",
                   "annotation" : [ ]
                 }
               }
@@ -7929,36 +9350,36 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "742",
+        "localId" : "798",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DifferentDays",
+        "name" : "SameDays",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "742",
+            "r" : "798",
             "s" : [ {
-              "value" : [ "", "define ", "DifferentDays", ": " ]
+              "value" : [ "", "define ", "SameDays", ": " ]
             }, {
-              "r" : "802",
+              "r" : "858",
               "s" : [ {
-                "r" : "768",
+                "r" : "824",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "752",
+                  "r" : "808",
                   "s" : [ {
-                    "r" : "744",
+                    "r" : "800",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "764",
+                  "r" : "820",
                   "s" : [ {
-                    "r" : "756",
+                    "r" : "812",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
@@ -7967,22 +9388,22 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "795",
+                "r" : "851",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "779",
+                  "r" : "835",
                   "s" : [ {
-                    "r" : "771",
+                    "r" : "827",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "791",
+                  "r" : "847",
                   "s" : [ {
-                    "r" : "783",
-                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ")" ]
+                    "r" : "839",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
@@ -7993,82 +9414,82 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "802",
+          "localId" : "858",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "803",
+            "localId" : "859",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "743",
+            "localId" : "799",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "798",
+              "localId" : "854",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "799",
+                "localId" : "855",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }, {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "800",
+              "localId" : "856",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "801",
+                "localId" : "857",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "Interval",
-              "localId" : "768",
+              "localId" : "824",
               "lowClosed" : true,
               "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "769",
+                "localId" : "825",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "770",
+                  "localId" : "826",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "752",
+                "localId" : "808",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "753",
+                  "localId" : "809",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "754",
+                  "localId" : "810",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "755",
+                  "localId" : "811",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "744",
+                  "localId" : "800",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2012",
@@ -8076,7 +9497,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "745",
+                  "localId" : "801",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8084,7 +9505,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "746",
+                  "localId" : "802",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8093,28 +9514,28 @@ module.exports['NotEqual'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "764",
+                "localId" : "820",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "765",
+                  "localId" : "821",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "766",
+                  "localId" : "822",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "767",
+                  "localId" : "823",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "756",
+                  "localId" : "812",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2013",
@@ -8122,7 +9543,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "757",
+                  "localId" : "813",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8130,7 +9551,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "758",
+                  "localId" : "814",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8139,45 +9560,45 @@ module.exports['NotEqual'] = {
               }
             }, {
               "type" : "Interval",
-              "localId" : "795",
+              "localId" : "851",
               "lowClosed" : true,
               "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "796",
+                "localId" : "852",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "797",
+                  "localId" : "853",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "779",
+                "localId" : "835",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "780",
+                  "localId" : "836",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "781",
+                  "localId" : "837",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "782",
+                  "localId" : "838",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "771",
+                  "localId" : "827",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2012",
@@ -8185,7 +9606,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "772",
+                  "localId" : "828",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8193,7 +9614,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "773",
+                  "localId" : "829",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8202,44 +9623,44 @@ module.exports['NotEqual'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "791",
+                "localId" : "847",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "792",
+                  "localId" : "848",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "793",
+                  "localId" : "849",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "794",
+                  "localId" : "850",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "783",
+                  "localId" : "839",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
+                  "value" : "2013",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "784",
+                  "localId" : "840",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "7",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "785",
+                  "localId" : "841",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8250,63 +9671,63 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "806",
+        "localId" : "862",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DifferingPrecision",
+        "name" : "DifferentDays",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "806",
+            "r" : "862",
             "s" : [ {
-              "value" : [ "", "define ", "DifferingPrecision", ": " ]
+              "value" : [ "", "define ", "DifferentDays", ": " ]
             }, {
-              "r" : "896",
+              "r" : "922",
               "s" : [ {
-                "r" : "850",
+                "r" : "888",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "822",
+                  "r" : "872",
                   "s" : [ {
-                    "r" : "808",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ", ", "21", ")" ]
+                    "r" : "864",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "843",
+                  "r" : "884",
                   "s" : [ {
-                    "r" : "829",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ", ", "21", ")" ]
+                    "r" : "876",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "889",
+                "r" : "915",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "865",
+                  "r" : "899",
                   "s" : [ {
-                    "r" : "853",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ")" ]
+                    "r" : "891",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "883",
+                  "r" : "911",
                   "s" : [ {
-                    "r" : "871",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ")" ]
+                    "r" : "903",
+                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -8314,97 +9735,82 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "896",
+          "localId" : "922",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "897",
+            "localId" : "923",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "807",
+            "localId" : "863",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "892",
+              "localId" : "918",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "893",
+                "localId" : "919",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }, {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "894",
+              "localId" : "920",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "895",
+                "localId" : "921",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "Interval",
-              "localId" : "850",
+              "localId" : "888",
               "lowClosed" : true,
-              "highClosed" : true,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "851",
+                "localId" : "889",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "852",
+                  "localId" : "890",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "822",
+                "localId" : "872",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "823",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "824",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "825",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "826",
+                  "localId" : "873",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "827",
+                  "localId" : "874",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "828",
+                  "localId" : "875",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "808",
+                  "localId" : "864",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2012",
@@ -8412,7 +9818,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "809",
+                  "localId" : "865",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8420,76 +9826,37 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "810",
+                  "localId" : "866",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "811",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "12",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "812",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "30",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "813",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "21",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "843",
+                "localId" : "884",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "844",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "845",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "846",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "847",
+                  "localId" : "885",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "848",
+                  "localId" : "886",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "849",
+                  "localId" : "887",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "829",
+                  "localId" : "876",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2013",
@@ -8497,7 +9864,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "830",
+                  "localId" : "877",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8505,88 +9872,54 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "831",
+                  "localId" : "878",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "832",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "12",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "833",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "30",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "834",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "21",
-                  "annotation" : [ ]
                 }
               }
             }, {
               "type" : "Interval",
-              "localId" : "889",
+              "localId" : "915",
               "lowClosed" : true,
-              "highClosed" : true,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "890",
+                "localId" : "916",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "891",
+                  "localId" : "917",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "865",
+                "localId" : "899",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "866",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "867",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "868",
+                  "localId" : "900",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "869",
+                  "localId" : "901",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "870",
+                  "localId" : "902",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "853",
+                  "localId" : "891",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2012",
@@ -8594,7 +9927,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "854",
+                  "localId" : "892",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8602,7 +9935,234 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "855",
+                  "localId" : "893",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "911",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "912",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "913",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "914",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "903",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "904",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "7",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "905",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }
+        }
+      }, {
+        "localId" : "926",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DifferingPrecision",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "926",
+            "s" : [ {
+              "value" : [ "", "define ", "DifferingPrecision", ": " ]
+            }, {
+              "r" : "1016",
+              "s" : [ {
+                "r" : "970",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "942",
+                  "s" : [ {
+                    "r" : "928",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ", ", "21", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "963",
+                  "s" : [ {
+                    "r" : "949",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ", ", "21", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ " ", "!=", " " ]
+              }, {
+                "r" : "1009",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "985",
+                  "s" : [ {
+                    "r" : "973",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1003",
+                  "s" : [ {
+                    "r" : "991",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "12", ", ", "30", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "1016",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1017",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "927",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1012",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1013",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1014",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1015",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            } ],
+            "operand" : [ {
+              "type" : "Interval",
+              "localId" : "970",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "971",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "972",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "942",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "943",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "944",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "945",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "946",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "947",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "948",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "928",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "929",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "930",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8610,7 +10170,7 @@ module.exports['NotEqual'] = {
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "856",
+                  "localId" : "931",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "12",
@@ -8618,47 +10178,60 @@ module.exports['NotEqual'] = {
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "857",
+                  "localId" : "932",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "30",
                   "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "933",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "21",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "883",
+                "localId" : "963",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "884",
+                  "localId" : "964",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "885",
+                  "localId" : "965",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "886",
+                  "localId" : "966",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "887",
+                  "localId" : "967",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "968",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "888",
+                  "localId" : "969",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "871",
+                  "localId" : "949",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2013",
@@ -8666,7 +10239,7 @@ module.exports['NotEqual'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "872",
+                  "localId" : "950",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8674,7 +10247,7 @@ module.exports['NotEqual'] = {
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "873",
+                  "localId" : "951",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8682,7 +10255,7 @@ module.exports['NotEqual'] = {
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "874",
+                  "localId" : "952",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "12",
@@ -8690,7 +10263,176 @@ module.exports['NotEqual'] = {
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "875",
+                  "localId" : "953",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "30",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "954",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "21",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "1009",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1010",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1011",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "985",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "986",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "987",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "988",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "989",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "990",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "973",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "974",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "975",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "976",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "12",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "977",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "30",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "1003",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1004",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1005",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1006",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1007",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1008",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "991",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2013",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "992",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "993",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "994",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "12",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "995",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "30",
@@ -8711,6 +10453,8 @@ using Simple version '1.0.0'
 context Patient
 define ContainsInt: Interval[1, 5] contains 3
 define NotContainsInt: Interval(1, 5] contains 1
+define ContainsLong: Interval[1L, 5L] contains 3L
+define NotContainsLong: Interval(1L, 5L] contains 1L
 define ContainsReal: Interval[1.234, 3.456] contains 2.345
 define NotContainsReal: Interval[1.234, 3.456] contains 4.567
 define ContainsQuantity: Interval[1 'mg', 5 'mg'] contains 3 'mg'
@@ -8746,26 +10490,32 @@ define ImpreciseNotContainsDate: ImpDateIvl contains DateTime(2012, 9, 1, 0, 0,
 define ImpreciseMayContainDate: ImpDateIvl contains DateTime(2012, 3, 15, 0, 0, 0, 0)
 define NegInfBegContainsInt: Interval[null, 5] contains -7
 define NegInfBegNotContainsInt: Interval[null, 5] contains 7
-define UnknownOpenBegContainsInt: Interval(null, 5] contains 5
-define UnknownClosedBegContainsInt: Interval[null, 5] contains 5
+define UnknownBegContainsInt: Interval(null, 5] contains 5
 define UnknownBegMayContainInt: Interval(null, 5] contains -7
 define UnknownBegNotContainsInt: Interval(null, 5] contains 7
 define PosInfEndContainsInt: Interval[0, null] contains 123456789
 define PosInfEndNotContainsInt: Interval[0, null] contains -1
-define UnknownOpenEndContainsInt: Interval[0, null) contains 0
-define UnknownClosedEndContainsInt: Interval[0, null] contains 0
+define UnknownEndContainsInt: Interval[0, null) contains 0
 define UnknownEndMayContainInt: Interval[0, null) contains 123456789
 define UnknownEndNotContainsInt: Interval[0, null) contains -1
+define NegInfBegContainsLong: Interval[null, 5L] contains -7L
+define NegInfBegNotContainsLong: Interval[null, 5L] contains 7L
+define UnknownBegContainsLong: Interval(null, 5L] contains 5L
+define UnknownBegMayContainLong: Interval(null, 5L] contains -7L
+define UnknownBegNotContainsLong: Interval(null, 5L] contains 7L
+define PosInfEndContainsLong: Interval[0L, null] contains 123456789L
+define PosInfEndNotContainsLong: Interval[0L, null] contains -1L
+define UnknownEndContainsLong: Interval[0L, null) contains 0L
+define UnknownEndMayContainLong: Interval[0L, null) contains 123456789L
+define UnknownEndNotContainsLong: Interval[0L, null) contains -1L
 define NegInfBegContainsDate: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(1, 1, 1, 0, 0, 0, 0)
 define NegInfBegNotContainsDate: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(2013, 1, 2, 0, 0, 0, 0)
-define UnknownOpenBegMayContainDate: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(2012, 12, 31, 23, 59, 59, 999)
-define UnknownClosedBegContainsDate: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(2012, 12, 31, 23, 59, 59, 999)
+define UnknownBegContainsDate: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)] contains DateTime(2013, 1, 1, 0, 0, 0, 0)
 define UnknownBegMayContainDate: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(1, 1, 1, 0, 0, 0, 0)
 define UnknownBegNotContainsDate: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) contains DateTime(2013, 1, 2, 0, 0, 0, 0)
 define PosInfEndContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] contains DateTime(2014, 1, 1, 0, 0, 0, 0)
 define PosInfEndNotContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] contains DateTime(2012, 1, 1, 0, 0, 0, 0)
-define UnknownOpenEndContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) contains DateTime(2013, 1, 1, 0, 0, 0, 0)
-define UnknownClosedEndContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] contains DateTime(2013, 1, 1, 0, 0, 0, 0)
+define UnknownEndContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) contains DateTime(2013, 1, 1, 0, 0, 0, 0)
 define UnknownEndMayContainDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) contains DateTime(2014, 1, 1, 0, 0, 0, 0)
 define UnknownEndNotContainsDate: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) contains DateTime(2012, 1, 1, 0, 0, 0, 0)
 */
@@ -8782,7 +10532,7 @@ module.exports['Contains'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "1975",
+        "r" : "2001",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -9039,7 +10789,7 @@ module.exports['Contains'] = {
       }, {
         "localId" : "240",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ContainsReal",
+        "name" : "ContainsLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -9048,18 +10798,18 @@ module.exports['Contains'] = {
           "s" : {
             "r" : "240",
             "s" : [ {
-              "value" : [ "", "define ", "ContainsReal", ": " ]
+              "value" : [ "", "define ", "ContainsLong", ": " ]
             }, {
               "r" : "247",
               "s" : [ {
                 "r" : "243",
                 "s" : [ {
                   "r" : "241",
-                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
                 "r" : "246",
-                "value" : [ " contains ", "2.345" ]
+                "value" : [ " contains ", "3L" ]
               } ]
             } ]
           }
@@ -9076,13 +10826,13 @@ module.exports['Contains'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "249",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
             "localId" : "250",
-            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : [ {
@@ -9098,13 +10848,195 @@ module.exports['Contains'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "245",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "246",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "3",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "253",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "253",
+            "s" : [ {
+              "value" : [ "", "define ", "NotContainsLong", ": " ]
+            }, {
+              "r" : "260",
+              "s" : [ {
+                "r" : "256",
+                "s" : [ {
+                  "r" : "254",
+                  "value" : [ "Interval(", "1L", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "259",
+                "value" : [ " contains ", "1L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "260",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "261",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "262",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "263",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "256",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "257",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "258",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "254",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "255",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "259",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "1",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "266",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ContainsReal",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "266",
+            "s" : [ {
+              "value" : [ "", "define ", "ContainsReal", ": " ]
+            }, {
+              "r" : "273",
+              "s" : [ {
+                "r" : "269",
+                "s" : [ {
+                  "r" : "267",
+                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
+                } ]
+              }, {
+                "r" : "272",
+                "value" : [ " contains ", "2.345" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "273",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "274",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "275",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "276",
+            "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "269",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "270",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "271",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "267",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.234",
@@ -9112,7 +11044,7 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "242",
+              "localId" : "268",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "3.456",
@@ -9120,7 +11052,7 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Literal",
-            "localId" : "246",
+            "localId" : "272",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
             "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "value" : "2.345",
@@ -9128,7 +11060,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "253",
+        "localId" : "279",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsReal",
         "context" : "Patient",
@@ -9137,19 +11069,19 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "253",
+            "r" : "279",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsReal", ": " ]
             }, {
-              "r" : "260",
+              "r" : "286",
               "s" : [ {
-                "r" : "256",
+                "r" : "282",
                 "s" : [ {
-                  "r" : "254",
+                  "r" : "280",
                   "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
                 } ]
               }, {
-                "r" : "259",
+                "r" : "285",
                 "value" : [ " contains ", "4.567" ]
               } ]
             } ]
@@ -9157,45 +11089,45 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "260",
+          "localId" : "286",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "261",
+            "localId" : "287",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "262",
+              "localId" : "288",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "263",
+            "localId" : "289",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "256",
+            "localId" : "282",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "257",
+              "localId" : "283",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "258",
+                "localId" : "284",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "254",
+              "localId" : "280",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.234",
@@ -9203,7 +11135,7 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "255",
+              "localId" : "281",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "3.456",
@@ -9211,7 +11143,7 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Literal",
-            "localId" : "259",
+            "localId" : "285",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
             "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "value" : "4.567",
@@ -9219,7 +11151,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "266",
+        "localId" : "292",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsQuantity",
         "context" : "Patient",
@@ -9228,24 +11160,24 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "266",
+            "r" : "292",
             "s" : [ {
               "value" : [ "", "define ", "ContainsQuantity", ": " ]
             }, {
-              "r" : "273",
+              "r" : "299",
               "s" : [ {
-                "r" : "269",
+                "r" : "295",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "267",
+                  "r" : "293",
                   "s" : [ {
                     "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "268",
+                  "r" : "294",
                   "s" : [ {
                     "value" : [ "5 ", "'mg'" ]
                   } ]
@@ -9255,7 +11187,7 @@ module.exports['Contains'] = {
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "272",
+                "r" : "298",
                 "s" : [ {
                   "value" : [ "3 ", "'mg'" ]
                 } ]
@@ -9265,45 +11197,45 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "273",
+          "localId" : "299",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "274",
+            "localId" : "300",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "275",
+              "localId" : "301",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "276",
+            "localId" : "302",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "269",
+            "localId" : "295",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "270",
+              "localId" : "296",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "271",
+                "localId" : "297",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "267",
+              "localId" : "293",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "mg",
@@ -9311,7 +11243,7 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "268",
+              "localId" : "294",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "mg",
@@ -9319,7 +11251,7 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Quantity",
-            "localId" : "272",
+            "localId" : "298",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 3,
             "unit" : "mg",
@@ -9327,7 +11259,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "279",
+        "localId" : "305",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsQuantityInclusiveEdge",
         "context" : "Patient",
@@ -9336,24 +11268,24 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "279",
+            "r" : "305",
             "s" : [ {
               "value" : [ "", "define ", "ContainsQuantityInclusiveEdge", ": " ]
             }, {
-              "r" : "286",
+              "r" : "312",
               "s" : [ {
-                "r" : "282",
+                "r" : "308",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "280",
+                  "r" : "306",
                   "s" : [ {
                     "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "281",
+                  "r" : "307",
                   "s" : [ {
                     "value" : [ "5 ", "'mg'" ]
                   } ]
@@ -9363,7 +11295,7 @@ module.exports['Contains'] = {
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "285",
+                "r" : "311",
                 "s" : [ {
                   "value" : [ "5 ", "'mg'" ]
                 } ]
@@ -9373,45 +11305,45 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "286",
+          "localId" : "312",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "287",
+            "localId" : "313",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "288",
+              "localId" : "314",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "289",
+            "localId" : "315",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "282",
+            "localId" : "308",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "283",
+              "localId" : "309",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "284",
+                "localId" : "310",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "280",
+              "localId" : "306",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "mg",
@@ -9419,7 +11351,7 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "281",
+              "localId" : "307",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "mg",
@@ -9427,7 +11359,7 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Quantity",
-            "localId" : "285",
+            "localId" : "311",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "mg",
@@ -9435,7 +11367,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "292",
+        "localId" : "318",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsQuantity",
         "context" : "Patient",
@@ -9444,24 +11376,24 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "292",
+            "r" : "318",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsQuantity", ": " ]
             }, {
-              "r" : "299",
+              "r" : "325",
               "s" : [ {
-                "r" : "295",
+                "r" : "321",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "293",
+                  "r" : "319",
                   "s" : [ {
                     "value" : [ "2 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "294",
+                  "r" : "320",
                   "s" : [ {
                     "value" : [ "5 ", "'mg'" ]
                   } ]
@@ -9471,7 +11403,7 @@ module.exports['Contains'] = {
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "298",
+                "r" : "324",
                 "s" : [ {
                   "value" : [ "1 ", "'mg'" ]
                 } ]
@@ -9481,45 +11413,45 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "299",
+          "localId" : "325",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "300",
+            "localId" : "326",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "301",
+              "localId" : "327",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "302",
+            "localId" : "328",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "295",
+            "localId" : "321",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "296",
+              "localId" : "322",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "297",
+                "localId" : "323",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "293",
+              "localId" : "319",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 2,
               "unit" : "mg",
@@ -9527,7 +11459,7 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "294",
+              "localId" : "320",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "mg",
@@ -9535,7 +11467,7 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Quantity",
-            "localId" : "298",
+            "localId" : "324",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
             "unit" : "mg",
@@ -9543,7 +11475,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "305",
+        "localId" : "331",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsQuantityExclusiveEdge",
         "context" : "Patient",
@@ -9552,24 +11484,24 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "305",
+            "r" : "331",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsQuantityExclusiveEdge", ": " ]
             }, {
-              "r" : "312",
+              "r" : "338",
               "s" : [ {
-                "r" : "308",
+                "r" : "334",
                 "s" : [ {
                   "value" : [ "Interval(" ]
                 }, {
-                  "r" : "306",
+                  "r" : "332",
                   "s" : [ {
                     "value" : [ "1 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "307",
+                  "r" : "333",
                   "s" : [ {
                     "value" : [ "5 ", "'mg'" ]
                   } ]
@@ -9579,7 +11511,7 @@ module.exports['Contains'] = {
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "311",
+                "r" : "337",
                 "s" : [ {
                   "value" : [ "1 ", "'mg'" ]
                 } ]
@@ -9589,45 +11521,45 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "312",
+          "localId" : "338",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "313",
+            "localId" : "339",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "314",
+              "localId" : "340",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "315",
+            "localId" : "341",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "308",
+            "localId" : "334",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "309",
+              "localId" : "335",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "310",
+                "localId" : "336",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "306",
+              "localId" : "332",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 1,
               "unit" : "mg",
@@ -9635,7 +11567,7 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "307",
+              "localId" : "333",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5,
               "unit" : "mg",
@@ -9643,7 +11575,7 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Quantity",
-            "localId" : "311",
+            "localId" : "337",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
             "unit" : "mg",
@@ -9651,7 +11583,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "318",
+        "localId" : "344",
         "name" : "DateIvlHighOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -9659,25 +11591,25 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "318",
+            "r" : "344",
             "s" : [ {
               "value" : [ "", "define ", "DateIvlHighOpen", ": " ]
             }, {
-              "r" : "367",
+              "r" : "393",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "335",
+                "r" : "361",
                 "s" : [ {
-                  "r" : "319",
+                  "r" : "345",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "359",
+                "r" : "385",
                 "s" : [ {
-                  "r" : "343",
+                  "r" : "369",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
@@ -9688,76 +11620,76 @@ module.exports['Contains'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "370",
+          "localId" : "396",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "371",
+            "localId" : "397",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "367",
+          "localId" : "393",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "368",
+            "localId" : "394",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "369",
+              "localId" : "395",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "335",
+            "localId" : "361",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "336",
+              "localId" : "362",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "337",
+              "localId" : "363",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "338",
+              "localId" : "364",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "339",
+              "localId" : "365",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "340",
+              "localId" : "366",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "341",
+              "localId" : "367",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "342",
+              "localId" : "368",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "319",
+              "localId" : "345",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -9765,7 +11697,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "320",
+              "localId" : "346",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -9773,7 +11705,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "321",
+              "localId" : "347",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -9781,7 +11713,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "322",
+              "localId" : "348",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -9789,7 +11721,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "323",
+              "localId" : "349",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -9797,7 +11729,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "324",
+              "localId" : "350",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -9805,7 +11737,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "325",
+              "localId" : "351",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -9814,48 +11746,48 @@ module.exports['Contains'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "359",
+            "localId" : "385",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "360",
+              "localId" : "386",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "361",
+              "localId" : "387",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "362",
+              "localId" : "388",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "363",
+              "localId" : "389",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "364",
+              "localId" : "390",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "365",
+              "localId" : "391",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "366",
+              "localId" : "392",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "343",
+              "localId" : "369",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -9863,7 +11795,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "344",
+              "localId" : "370",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -9871,7 +11803,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "345",
+              "localId" : "371",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -9879,7 +11811,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "346",
+              "localId" : "372",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -9887,7 +11819,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "347",
+              "localId" : "373",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -9895,7 +11827,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "348",
+              "localId" : "374",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -9903,7 +11835,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "349",
+              "localId" : "375",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -9912,7 +11844,7 @@ module.exports['Contains'] = {
           }
         }
       }, {
-        "localId" : "374",
+        "localId" : "400",
         "name" : "DateIvlHighClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -9920,25 +11852,25 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "374",
+            "r" : "400",
             "s" : [ {
               "value" : [ "", "define ", "DateIvlHighClosed", ": " ]
             }, {
-              "r" : "423",
+              "r" : "449",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "391",
+                "r" : "417",
                 "s" : [ {
-                  "r" : "375",
+                  "r" : "401",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "415",
+                "r" : "441",
                 "s" : [ {
-                  "r" : "399",
+                  "r" : "425",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
@@ -9949,76 +11881,76 @@ module.exports['Contains'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "426",
+          "localId" : "452",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "427",
+            "localId" : "453",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "423",
+          "localId" : "449",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "424",
+            "localId" : "450",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "425",
+              "localId" : "451",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "391",
+            "localId" : "417",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "392",
+              "localId" : "418",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "393",
+              "localId" : "419",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "394",
+              "localId" : "420",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "395",
+              "localId" : "421",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "396",
+              "localId" : "422",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "397",
+              "localId" : "423",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "398",
+              "localId" : "424",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "375",
+              "localId" : "401",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -10026,7 +11958,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "376",
+              "localId" : "402",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -10034,7 +11966,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "377",
+              "localId" : "403",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -10042,7 +11974,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "378",
+              "localId" : "404",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10050,7 +11982,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "379",
+              "localId" : "405",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10058,7 +11990,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "380",
+              "localId" : "406",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10066,7 +11998,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "381",
+              "localId" : "407",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10075,48 +12007,48 @@ module.exports['Contains'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "415",
+            "localId" : "441",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "416",
+              "localId" : "442",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "417",
+              "localId" : "443",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "418",
+              "localId" : "444",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "419",
+              "localId" : "445",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "420",
+              "localId" : "446",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "421",
+              "localId" : "447",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "422",
+              "localId" : "448",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "399",
+              "localId" : "425",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -10124,7 +12056,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "400",
+              "localId" : "426",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -10132,7 +12064,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "401",
+              "localId" : "427",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -10140,7 +12072,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "402",
+              "localId" : "428",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10148,7 +12080,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "403",
+              "localId" : "429",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10156,7 +12088,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "404",
+              "localId" : "430",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10164,7 +12096,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "405",
+              "localId" : "431",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10173,7 +12105,7 @@ module.exports['Contains'] = {
           }
         }
       }, {
-        "localId" : "430",
+        "localId" : "456",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsDate",
         "context" : "Patient",
@@ -10182,22 +12114,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "430",
+            "r" : "456",
             "s" : [ {
               "value" : [ "", "define ", "ContainsDate", ": " ]
             }, {
-              "r" : "458",
+              "r" : "484",
               "s" : [ {
-                "r" : "431",
+                "r" : "457",
                 "s" : [ {
                   "value" : [ "DateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "450",
+                "r" : "476",
                 "s" : [ {
-                  "r" : "434",
+                  "r" : "460",
                   "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -10206,85 +12138,85 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "458",
+          "localId" : "484",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "459",
+            "localId" : "485",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "460",
+              "localId" : "486",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "461",
+            "localId" : "487",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "431",
+            "localId" : "457",
             "name" : "DateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "432",
+              "localId" : "458",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "433",
+                "localId" : "459",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "450",
+            "localId" : "476",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "451",
+              "localId" : "477",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "452",
+              "localId" : "478",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "453",
+              "localId" : "479",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "454",
+              "localId" : "480",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "455",
+              "localId" : "481",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "456",
+              "localId" : "482",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "457",
+              "localId" : "483",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "434",
+              "localId" : "460",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -10292,7 +12224,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "435",
+              "localId" : "461",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "6",
@@ -10300,7 +12232,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "436",
+              "localId" : "462",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -10308,7 +12240,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "437",
+              "localId" : "463",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10316,7 +12248,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "438",
+              "localId" : "464",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10324,7 +12256,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "439",
+              "localId" : "465",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10332,7 +12264,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "440",
+              "localId" : "466",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10341,7 +12273,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "464",
+        "localId" : "490",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDate",
         "context" : "Patient",
@@ -10350,22 +12282,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "464",
+            "r" : "490",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDate", ": " ]
             }, {
-              "r" : "492",
+              "r" : "518",
               "s" : [ {
-                "r" : "465",
+                "r" : "491",
                 "s" : [ {
                   "value" : [ "DateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "484",
+                "r" : "510",
                 "s" : [ {
-                  "r" : "468",
+                  "r" : "494",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -10374,85 +12306,85 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "492",
+          "localId" : "518",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "493",
+            "localId" : "519",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "494",
+              "localId" : "520",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "495",
+            "localId" : "521",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "465",
+            "localId" : "491",
             "name" : "DateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "466",
+              "localId" : "492",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "467",
+                "localId" : "493",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "484",
+            "localId" : "510",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "485",
+              "localId" : "511",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "486",
+              "localId" : "512",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "487",
+              "localId" : "513",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "488",
+              "localId" : "514",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "489",
+              "localId" : "515",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "490",
+              "localId" : "516",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "491",
+              "localId" : "517",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "468",
+              "localId" : "494",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -10460,7 +12392,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "469",
+              "localId" : "495",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -10468,7 +12400,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "470",
+              "localId" : "496",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -10476,7 +12408,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "471",
+              "localId" : "497",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10484,7 +12416,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "472",
+              "localId" : "498",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10492,7 +12424,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "473",
+              "localId" : "499",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10500,7 +12432,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "474",
+              "localId" : "500",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -10509,7 +12441,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "498",
+        "localId" : "524",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsImpreciseDate",
         "context" : "Patient",
@@ -10518,22 +12450,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "498",
+            "r" : "524",
             "s" : [ {
               "value" : [ "", "define ", "ContainsImpreciseDate", ": " ]
             }, {
-              "r" : "511",
+              "r" : "537",
               "s" : [ {
-                "r" : "499",
+                "r" : "525",
                 "s" : [ {
                   "value" : [ "DateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "508",
+                "r" : "534",
                 "s" : [ {
-                  "r" : "502",
+                  "r" : "528",
                   "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
                 } ]
               } ]
@@ -10542,60 +12474,60 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "511",
+          "localId" : "537",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "512",
+            "localId" : "538",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "513",
+              "localId" : "539",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "514",
+            "localId" : "540",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "499",
+            "localId" : "525",
             "name" : "DateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "500",
+              "localId" : "526",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "501",
+                "localId" : "527",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "508",
+            "localId" : "534",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "509",
+              "localId" : "535",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "510",
+              "localId" : "536",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "502",
+              "localId" : "528",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -10603,7 +12535,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "503",
+              "localId" : "529",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -10612,7 +12544,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "517",
+        "localId" : "543",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsImpreciseDate",
         "context" : "Patient",
@@ -10621,22 +12553,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "517",
+            "r" : "543",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsImpreciseDate", ": " ]
             }, {
-              "r" : "530",
+              "r" : "556",
               "s" : [ {
-                "r" : "518",
+                "r" : "544",
                 "s" : [ {
                   "value" : [ "DateIvlHighClosed" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "527",
+                "r" : "553",
                 "s" : [ {
-                  "r" : "521",
+                  "r" : "547",
                   "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
                 } ]
               } ]
@@ -10645,60 +12577,60 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "530",
+          "localId" : "556",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "531",
+            "localId" : "557",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "532",
+              "localId" : "558",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "533",
+            "localId" : "559",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "518",
+            "localId" : "544",
             "name" : "DateIvlHighClosed",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "519",
+              "localId" : "545",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "520",
+                "localId" : "546",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "527",
+            "localId" : "553",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "528",
+              "localId" : "554",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "529",
+              "localId" : "555",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "521",
+              "localId" : "547",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -10706,7 +12638,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "522",
+              "localId" : "548",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -10715,7 +12647,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "536",
+        "localId" : "562",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayContainImpreciseDate",
         "context" : "Patient",
@@ -10724,22 +12656,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "536",
+            "r" : "562",
             "s" : [ {
               "value" : [ "", "define ", "MayContainImpreciseDate", ": " ]
             }, {
-              "r" : "546",
+              "r" : "572",
               "s" : [ {
-                "r" : "537",
+                "r" : "563",
                 "s" : [ {
                   "value" : [ "DateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "544",
+                "r" : "570",
                 "s" : [ {
-                  "r" : "540",
+                  "r" : "566",
                   "value" : [ "DateTime", "(", "2012", ")" ]
                 } ]
               } ]
@@ -10748,55 +12680,55 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "546",
+          "localId" : "572",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "547",
+            "localId" : "573",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "548",
+              "localId" : "574",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "549",
+            "localId" : "575",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "537",
+            "localId" : "563",
             "name" : "DateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "538",
+              "localId" : "564",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "539",
+                "localId" : "565",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "544",
+            "localId" : "570",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "545",
+              "localId" : "571",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "540",
+              "localId" : "566",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -10805,7 +12737,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "552",
+        "localId" : "578",
         "name" : "PrecisionDateIvlHighOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -10813,25 +12745,25 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "552",
+            "r" : "578",
             "s" : [ {
               "value" : [ "", "define ", "PrecisionDateIvlHighOpen", ": " ]
             }, {
-              "r" : "601",
+              "r" : "627",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "569",
+                "r" : "595",
                 "s" : [ {
-                  "r" : "553",
+                  "r" : "579",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "593",
+                "r" : "619",
                 "s" : [ {
-                  "r" : "577",
+                  "r" : "603",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
               }, {
@@ -10842,76 +12774,76 @@ module.exports['Contains'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "604",
+          "localId" : "630",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "605",
+            "localId" : "631",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "601",
+          "localId" : "627",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "602",
+            "localId" : "628",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "603",
+              "localId" : "629",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "569",
+            "localId" : "595",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "570",
+              "localId" : "596",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "571",
+              "localId" : "597",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "572",
+              "localId" : "598",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "573",
+              "localId" : "599",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "574",
+              "localId" : "600",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "575",
+              "localId" : "601",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "576",
+              "localId" : "602",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "553",
+              "localId" : "579",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -10919,7 +12851,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "554",
+              "localId" : "580",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -10927,7 +12859,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "555",
+              "localId" : "581",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -10935,7 +12867,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "556",
+              "localId" : "582",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -10943,7 +12875,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "557",
+              "localId" : "583",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "34",
@@ -10951,7 +12883,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "558",
+              "localId" : "584",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "56",
@@ -10959,7 +12891,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "559",
+              "localId" : "585",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "789",
@@ -10968,48 +12900,48 @@ module.exports['Contains'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "593",
+            "localId" : "619",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "594",
+              "localId" : "620",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "595",
+              "localId" : "621",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "596",
+              "localId" : "622",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "597",
+              "localId" : "623",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "598",
+              "localId" : "624",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "599",
+              "localId" : "625",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "600",
+              "localId" : "626",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "577",
+              "localId" : "603",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -11017,7 +12949,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "578",
+              "localId" : "604",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -11025,7 +12957,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "579",
+              "localId" : "605",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -11033,7 +12965,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "580",
+              "localId" : "606",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -11041,7 +12973,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "581",
+              "localId" : "607",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -11049,7 +12981,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "582",
+              "localId" : "608",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "45",
@@ -11057,7 +12989,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "583",
+              "localId" : "609",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "678",
@@ -11066,7 +12998,7 @@ module.exports['Contains'] = {
           }
         }
       }, {
-        "localId" : "608",
+        "localId" : "634",
         "name" : "PrecisionDateIvlHighClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -11074,25 +13006,25 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "608",
+            "r" : "634",
             "s" : [ {
               "value" : [ "", "define ", "PrecisionDateIvlHighClosed", ": " ]
             }, {
-              "r" : "657",
+              "r" : "683",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "625",
+                "r" : "651",
                 "s" : [ {
-                  "r" : "609",
+                  "r" : "635",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "649",
+                "r" : "675",
                 "s" : [ {
-                  "r" : "633",
+                  "r" : "659",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
               }, {
@@ -11103,146 +13035,38 @@ module.exports['Contains'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "660",
+          "localId" : "686",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "661",
+            "localId" : "687",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "657",
+          "localId" : "683",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "658",
+            "localId" : "684",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "659",
+              "localId" : "685",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "625",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "626",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "627",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "628",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "629",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "630",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "631",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "632",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "609",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "610",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "611",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "612",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "613",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "34",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "614",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "56",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "615",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "789",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "649",
+            "localId" : "651",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "650",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "651",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
               "type" : "NamedTypeSpecifier",
               "localId" : "652",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
@@ -11267,10 +13091,20 @@ module.exports['Contains'] = {
               "localId" : "656",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "657",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "658",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "633",
+              "localId" : "635",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -11278,15 +13112,15 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "634",
+              "localId" : "636",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
+              "value" : "3",
               "annotation" : [ ]
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "635",
+              "localId" : "637",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -11294,152 +13128,81 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "636",
+              "localId" : "638",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "12",
               "annotation" : [ ]
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "637",
+              "localId" : "639",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
+              "value" : "34",
               "annotation" : [ ]
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "638",
+              "localId" : "640",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "45",
+              "value" : "56",
               "annotation" : [ ]
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "639",
+              "localId" : "641",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "678",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "664",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ContainsDayOfDateLowEdge",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "664",
-            "s" : [ {
-              "value" : [ "", "define ", "ContainsDayOfDateLowEdge", ": " ]
-            }, {
-              "r" : "665",
-              "s" : [ {
-                "r" : "666",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvlHighOpen" ]
-                } ]
-              }, {
-                "value" : [ " contains day of " ]
-              }, {
-                "r" : "685",
-                "s" : [ {
-                  "r" : "669",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Contains",
-          "localId" : "665",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "693",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "694",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "value" : "789",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "695",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "666",
-            "name" : "PrecisionDateIvlHighOpen",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "667",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "668",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
+          },
+          "high" : {
             "type" : "DateTime",
-            "localId" : "685",
+            "localId" : "675",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "686",
+              "localId" : "676",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "687",
+              "localId" : "677",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "688",
+              "localId" : "678",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "689",
+              "localId" : "679",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "690",
+              "localId" : "680",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "691",
+              "localId" : "681",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "692",
+              "localId" : "682",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "669",
+              "localId" : "659",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -11447,15 +13210,15 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "670",
+              "localId" : "660",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "9",
               "annotation" : [ ]
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "671",
+              "localId" : "661",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -11463,65 +13226,65 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "672",
+              "localId" : "662",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "1",
               "annotation" : [ ]
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "673",
+              "localId" : "663",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "23",
               "annotation" : [ ]
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "674",
+              "localId" : "664",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "45",
               "annotation" : [ ]
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "675",
+              "localId" : "665",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "678",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "698",
+        "localId" : "690",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotContainsDayOfDateHighEdgeOpen",
+        "name" : "ContainsDayOfDateLowEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "698",
+            "r" : "690",
             "s" : [ {
-              "value" : [ "", "define ", "NotContainsDayOfDateHighEdgeOpen", ": " ]
+              "value" : [ "", "define ", "ContainsDayOfDateLowEdge", ": " ]
             }, {
-              "r" : "699",
+              "r" : "691",
               "s" : [ {
-                "r" : "700",
+                "r" : "692",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "719",
+                "r" : "711",
                 "s" : [ {
-                  "r" : "703",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  "r" : "695",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
             } ]
@@ -11529,86 +13292,86 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "699",
+          "localId" : "691",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "727",
+            "localId" : "719",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "728",
+              "localId" : "720",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "729",
+            "localId" : "721",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "700",
+            "localId" : "692",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "701",
+              "localId" : "693",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "702",
+                "localId" : "694",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "719",
+            "localId" : "711",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "720",
+              "localId" : "712",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "721",
+              "localId" : "713",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "722",
+              "localId" : "714",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "723",
+              "localId" : "715",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "724",
+              "localId" : "716",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "725",
+              "localId" : "717",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "726",
+              "localId" : "718",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "703",
+              "localId" : "695",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -11616,15 +13379,15 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "704",
+              "localId" : "696",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
+              "value" : "3",
               "annotation" : [ ]
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "705",
+              "localId" : "697",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -11632,64 +13395,64 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "706",
+              "localId" : "698",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
+              "value" : "0",
               "annotation" : [ ]
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "707",
+              "localId" : "699",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
+              "value" : "0",
               "annotation" : [ ]
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "708",
+              "localId" : "700",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
+              "value" : "0",
               "annotation" : [ ]
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "709",
+              "localId" : "701",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "999",
+              "value" : "0",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "732",
+        "localId" : "724",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ContainsDayOfDateHighEdgeClosed",
+        "name" : "NotContainsDayOfDateHighEdgeOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "732",
+            "r" : "724",
             "s" : [ {
-              "value" : [ "", "define ", "ContainsDayOfDateHighEdgeClosed", ": " ]
+              "value" : [ "", "define ", "NotContainsDayOfDateHighEdgeOpen", ": " ]
             }, {
-              "r" : "733",
+              "r" : "725",
               "s" : [ {
-                "r" : "734",
+                "r" : "726",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvlHighClosed" ]
+                  "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "753",
+                "r" : "745",
                 "s" : [ {
-                  "r" : "737",
+                  "r" : "729",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                 } ]
               } ]
@@ -11698,86 +13461,86 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "733",
+          "localId" : "725",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "761",
+            "localId" : "753",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "762",
+              "localId" : "754",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "763",
+            "localId" : "755",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "734",
-            "name" : "PrecisionDateIvlHighClosed",
+            "localId" : "726",
+            "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "735",
+              "localId" : "727",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "736",
+                "localId" : "728",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "753",
+            "localId" : "745",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "754",
+              "localId" : "746",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "755",
+              "localId" : "747",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "756",
+              "localId" : "748",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "757",
+              "localId" : "749",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "758",
+              "localId" : "750",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "759",
+              "localId" : "751",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "760",
+              "localId" : "752",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "737",
+              "localId" : "729",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -11785,7 +13548,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "738",
+              "localId" : "730",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -11793,7 +13556,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "739",
+              "localId" : "731",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -11801,7 +13564,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "740",
+              "localId" : "732",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -11809,7 +13572,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "741",
+              "localId" : "733",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "59",
@@ -11817,7 +13580,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "742",
+              "localId" : "734",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "59",
@@ -11825,7 +13588,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "743",
+              "localId" : "735",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "999",
@@ -11834,32 +13597,32 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "766",
+        "localId" : "758",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotContainsDayOfDateLowEdge",
+        "name" : "ContainsDayOfDateHighEdgeClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "766",
+            "r" : "758",
             "s" : [ {
-              "value" : [ "", "define ", "NotContainsDayOfDateLowEdge", ": " ]
+              "value" : [ "", "define ", "ContainsDayOfDateHighEdgeClosed", ": " ]
             }, {
-              "r" : "767",
+              "r" : "759",
               "s" : [ {
-                "r" : "768",
+                "r" : "760",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvlHighOpen" ]
+                  "value" : [ "PrecisionDateIvlHighClosed" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "787",
+                "r" : "779",
                 "s" : [ {
-                  "r" : "771",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  "r" : "763",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                 } ]
               } ]
             } ]
@@ -11867,86 +13630,86 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "767",
+          "localId" : "759",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "795",
+            "localId" : "787",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "796",
+              "localId" : "788",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "797",
+            "localId" : "789",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "768",
-            "name" : "PrecisionDateIvlHighOpen",
+            "localId" : "760",
+            "name" : "PrecisionDateIvlHighClosed",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "769",
+              "localId" : "761",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "770",
+                "localId" : "762",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "787",
+            "localId" : "779",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "788",
+              "localId" : "780",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "789",
+              "localId" : "781",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "790",
+              "localId" : "782",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "791",
+              "localId" : "783",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "792",
+              "localId" : "784",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "793",
+              "localId" : "785",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "794",
+              "localId" : "786",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "771",
+              "localId" : "763",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -11954,23 +13717,23 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "772",
+              "localId" : "764",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "9",
               "annotation" : [ ]
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "773",
+              "localId" : "765",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "2",
               "annotation" : [ ]
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "774",
+              "localId" : "766",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -11978,7 +13741,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "775",
+              "localId" : "767",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "59",
@@ -11986,7 +13749,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "776",
+              "localId" : "768",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "59",
@@ -11994,7 +13757,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "777",
+              "localId" : "769",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "999",
@@ -12003,32 +13766,32 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "800",
+        "localId" : "792",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotContainsDayOfDateBeyondHighEdge",
+        "name" : "NotContainsDayOfDateLowEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "800",
+            "r" : "792",
             "s" : [ {
-              "value" : [ "", "define ", "NotContainsDayOfDateBeyondHighEdge", ": " ]
+              "value" : [ "", "define ", "NotContainsDayOfDateLowEdge", ": " ]
             }, {
-              "r" : "801",
+              "r" : "793",
               "s" : [ {
-                "r" : "802",
+                "r" : "794",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "821",
+                "r" : "813",
                 "s" : [ {
-                  "r" : "805",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "797",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                 } ]
               } ]
             } ]
@@ -12036,86 +13799,86 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "801",
+          "localId" : "793",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "829",
+            "localId" : "821",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "830",
+              "localId" : "822",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "831",
+            "localId" : "823",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "802",
+            "localId" : "794",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "803",
+              "localId" : "795",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "804",
+                "localId" : "796",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "821",
+            "localId" : "813",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "822",
+              "localId" : "814",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "823",
+              "localId" : "815",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "824",
+              "localId" : "816",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "825",
+              "localId" : "817",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "826",
+              "localId" : "818",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "827",
+              "localId" : "819",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "828",
+              "localId" : "820",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "805",
+              "localId" : "797",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -12123,71 +13886,71 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "806",
+              "localId" : "798",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
+              "value" : "3",
               "annotation" : [ ]
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "807",
+              "localId" : "799",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "1",
               "annotation" : [ ]
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "808",
+              "localId" : "800",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "23",
               "annotation" : [ ]
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "809",
+              "localId" : "801",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "59",
               "annotation" : [ ]
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "810",
+              "localId" : "802",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "59",
               "annotation" : [ ]
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "811",
+              "localId" : "803",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "999",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "834",
+        "localId" : "826",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ContainsDayOfDateImpreciseLowEdge",
+        "name" : "NotContainsDayOfDateBeyondHighEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "834",
+            "r" : "826",
             "s" : [ {
-              "value" : [ "", "define ", "ContainsDayOfDateImpreciseLowEdge", ": " ]
+              "value" : [ "", "define ", "NotContainsDayOfDateBeyondHighEdge", ": " ]
             }, {
-              "r" : "835",
+              "r" : "827",
               "s" : [ {
-                "r" : "836",
+                "r" : "828",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -12196,8 +13959,8 @@ module.exports['Contains'] = {
               }, {
                 "r" : "847",
                 "s" : [ {
-                  "r" : "839",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
+                  "r" : "831",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
             } ]
@@ -12205,38 +13968,38 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "835",
+          "localId" : "827",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "851",
+            "localId" : "855",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "852",
+              "localId" : "856",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "853",
+            "localId" : "857",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "836",
+            "localId" : "828",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "837",
+              "localId" : "829",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "838",
+                "localId" : "830",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -12261,10 +14024,30 @@ module.exports['Contains'] = {
               "localId" : "850",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "851",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "852",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "853",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "854",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "839",
+              "localId" : "831",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -12272,7 +14055,156 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "840",
+              "localId" : "832",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "833",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "834",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "835",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "836",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "837",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "860",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ContainsDayOfDateImpreciseLowEdge",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "860",
+            "s" : [ {
+              "value" : [ "", "define ", "ContainsDayOfDateImpreciseLowEdge", ": " ]
+            }, {
+              "r" : "861",
+              "s" : [ {
+                "r" : "862",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvlHighOpen" ]
+                } ]
+              }, {
+                "value" : [ " contains day of " ]
+              }, {
+                "r" : "873",
+                "s" : [ {
+                  "r" : "865",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "861",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "877",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "878",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "879",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "862",
+            "name" : "PrecisionDateIvlHighOpen",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "863",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "864",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "DateTime",
+            "localId" : "873",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "874",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "875",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "876",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "865",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "866",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -12280,7 +14212,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "841",
+              "localId" : "867",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -12289,7 +14221,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "856",
+        "localId" : "882",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDayOfDateImpreciseHighEdgeOpen",
         "context" : "Patient",
@@ -12298,22 +14230,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "856",
+            "r" : "882",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDayOfDateImpreciseHighEdgeOpen", ": " ]
             }, {
-              "r" : "857",
+              "r" : "883",
               "s" : [ {
-                "r" : "858",
+                "r" : "884",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "869",
+                "r" : "895",
                 "s" : [ {
-                  "r" : "861",
+                  "r" : "887",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ")" ]
                 } ]
               } ]
@@ -12322,66 +14254,66 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "857",
+          "localId" : "883",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "873",
+            "localId" : "899",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "874",
+              "localId" : "900",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "875",
+            "localId" : "901",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "858",
+            "localId" : "884",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "859",
+              "localId" : "885",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "860",
+                "localId" : "886",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "869",
+            "localId" : "895",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "870",
+              "localId" : "896",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "871",
+              "localId" : "897",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "872",
+              "localId" : "898",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "861",
+              "localId" : "887",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -12389,7 +14321,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "862",
+              "localId" : "888",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -12397,7 +14329,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "863",
+              "localId" : "889",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -12406,7 +14338,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "878",
+        "localId" : "904",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsDayOfDateImpreciseHighEdgeClosed",
         "context" : "Patient",
@@ -12415,22 +14347,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "878",
+            "r" : "904",
             "s" : [ {
               "value" : [ "", "define ", "ContainsDayOfDateImpreciseHighEdgeClosed", ": " ]
             }, {
-              "r" : "879",
+              "r" : "905",
               "s" : [ {
-                "r" : "880",
+                "r" : "906",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighClosed" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "891",
+                "r" : "917",
                 "s" : [ {
-                  "r" : "883",
+                  "r" : "909",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ")" ]
                 } ]
               } ]
@@ -12439,66 +14371,66 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "879",
+          "localId" : "905",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "895",
+            "localId" : "921",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "896",
+              "localId" : "922",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "897",
+            "localId" : "923",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "880",
+            "localId" : "906",
             "name" : "PrecisionDateIvlHighClosed",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "881",
+              "localId" : "907",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "882",
+                "localId" : "908",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "891",
+            "localId" : "917",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "892",
+              "localId" : "918",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "893",
+              "localId" : "919",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "894",
+              "localId" : "920",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "883",
+              "localId" : "909",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -12506,7 +14438,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "884",
+              "localId" : "910",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -12514,7 +14446,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "885",
+              "localId" : "911",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -12523,7 +14455,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "900",
+        "localId" : "926",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsDayOfDateVeryImpreciseMiddle",
         "context" : "Patient",
@@ -12532,22 +14464,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "900",
+            "r" : "926",
             "s" : [ {
               "value" : [ "", "define ", "ContainsDayOfDateVeryImpreciseMiddle", ": " ]
             }, {
-              "r" : "901",
+              "r" : "927",
               "s" : [ {
-                "r" : "902",
+                "r" : "928",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "911",
+                "r" : "937",
                 "s" : [ {
-                  "r" : "905",
+                  "r" : "931",
                   "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                 } ]
               } ]
@@ -12556,61 +14488,61 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "901",
+          "localId" : "927",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "914",
+            "localId" : "940",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "915",
+              "localId" : "941",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "916",
+            "localId" : "942",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "902",
+            "localId" : "928",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "903",
+              "localId" : "929",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "904",
+                "localId" : "930",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "911",
+            "localId" : "937",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "912",
+              "localId" : "938",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "913",
+              "localId" : "939",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "905",
+              "localId" : "931",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -12618,7 +14550,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "906",
+              "localId" : "932",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "6",
@@ -12627,7 +14559,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "919",
+        "localId" : "945",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDayOfDateVeryImpreciseLow",
         "context" : "Patient",
@@ -12636,22 +14568,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "919",
+            "r" : "945",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDayOfDateVeryImpreciseLow", ": " ]
             }, {
-              "r" : "920",
+              "r" : "946",
               "s" : [ {
-                "r" : "921",
+                "r" : "947",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "930",
+                "r" : "956",
                 "s" : [ {
-                  "r" : "924",
+                  "r" : "950",
                   "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
                 } ]
               } ]
@@ -12660,61 +14592,61 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "920",
+          "localId" : "946",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "933",
+            "localId" : "959",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "934",
+              "localId" : "960",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "935",
+            "localId" : "961",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "921",
+            "localId" : "947",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "922",
+              "localId" : "948",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "923",
+                "localId" : "949",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "930",
+            "localId" : "956",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "931",
+              "localId" : "957",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "932",
+              "localId" : "958",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "924",
+              "localId" : "950",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -12722,7 +14654,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "925",
+              "localId" : "951",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -12731,7 +14663,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "938",
+        "localId" : "964",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDayOfDateVeryImpreciseHighEdgeOpen",
         "context" : "Patient",
@@ -12740,22 +14672,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "938",
+            "r" : "964",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDayOfDateVeryImpreciseHighEdgeOpen", ": " ]
             }, {
-              "r" : "939",
+              "r" : "965",
               "s" : [ {
-                "r" : "940",
+                "r" : "966",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "949",
+                "r" : "975",
                 "s" : [ {
-                  "r" : "943",
+                  "r" : "969",
                   "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
                 } ]
               } ]
@@ -12764,61 +14696,61 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "939",
+          "localId" : "965",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "952",
+            "localId" : "978",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "953",
+              "localId" : "979",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "954",
+            "localId" : "980",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "940",
+            "localId" : "966",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "941",
+              "localId" : "967",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "942",
+                "localId" : "968",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "949",
+            "localId" : "975",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "950",
+              "localId" : "976",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "951",
+              "localId" : "977",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "943",
+              "localId" : "969",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -12826,7 +14758,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "944",
+              "localId" : "970",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -12835,7 +14767,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "957",
+        "localId" : "983",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayContainDayOfDateVeryImpreciseLow",
         "context" : "Patient",
@@ -12844,22 +14776,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "957",
+            "r" : "983",
             "s" : [ {
               "value" : [ "", "define ", "MayContainDayOfDateVeryImpreciseLow", ": " ]
             }, {
-              "r" : "958",
+              "r" : "984",
               "s" : [ {
-                "r" : "959",
+                "r" : "985",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "968",
+                "r" : "994",
                 "s" : [ {
-                  "r" : "962",
+                  "r" : "988",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                 } ]
               } ]
@@ -12868,61 +14800,61 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "958",
+          "localId" : "984",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "971",
+            "localId" : "997",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "972",
+              "localId" : "998",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "973",
+            "localId" : "999",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "959",
+            "localId" : "985",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "960",
+              "localId" : "986",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "961",
+                "localId" : "987",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "968",
+            "localId" : "994",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "969",
+              "localId" : "995",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "970",
+              "localId" : "996",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "962",
+              "localId" : "988",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -12930,7 +14862,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "963",
+              "localId" : "989",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -12939,7 +14871,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "976",
+        "localId" : "1002",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayContainDayOfDateVeryImpreciseHigh",
         "context" : "Patient",
@@ -12948,22 +14880,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "976",
+            "r" : "1002",
             "s" : [ {
               "value" : [ "", "define ", "MayContainDayOfDateVeryImpreciseHigh", ": " ]
             }, {
-              "r" : "977",
+              "r" : "1003",
               "s" : [ {
-                "r" : "978",
+                "r" : "1004",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "987",
+                "r" : "1013",
                 "s" : [ {
-                  "r" : "981",
+                  "r" : "1007",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                 } ]
               } ]
@@ -12972,61 +14904,61 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "977",
+          "localId" : "1003",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "990",
+            "localId" : "1016",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "991",
+              "localId" : "1017",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "992",
+            "localId" : "1018",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "978",
+            "localId" : "1004",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "979",
+              "localId" : "1005",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "980",
+                "localId" : "1006",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "987",
+            "localId" : "1013",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "988",
+              "localId" : "1014",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "989",
+              "localId" : "1015",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "981",
+              "localId" : "1007",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -13034,7 +14966,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "982",
+              "localId" : "1008",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -13043,7 +14975,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "995",
+        "localId" : "1021",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayContainDayOfDateVeryImpreciseSurrounding",
         "context" : "Patient",
@@ -13052,22 +14984,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "995",
+            "r" : "1021",
             "s" : [ {
               "value" : [ "", "define ", "MayContainDayOfDateVeryImpreciseSurrounding", ": " ]
             }, {
-              "r" : "996",
+              "r" : "1022",
               "s" : [ {
-                "r" : "997",
+                "r" : "1023",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
               }, {
                 "value" : [ " contains day of " ]
               }, {
-                "r" : "1004",
+                "r" : "1030",
                 "s" : [ {
-                  "r" : "1000",
+                  "r" : "1026",
                   "value" : [ "DateTime", "(", "2012", ")" ]
                 } ]
               } ]
@@ -13076,56 +15008,56 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "996",
+          "localId" : "1022",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1006",
+            "localId" : "1032",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1007",
+              "localId" : "1033",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1008",
+            "localId" : "1034",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "997",
+            "localId" : "1023",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "998",
+              "localId" : "1024",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "999",
+                "localId" : "1025",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1004",
+            "localId" : "1030",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1005",
+              "localId" : "1031",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1000",
+              "localId" : "1026",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -13134,7 +15066,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1011",
+        "localId" : "1037",
         "name" : "ImpDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -13142,25 +15074,25 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1011",
+            "r" : "1037",
             "s" : [ {
               "value" : [ "", "define ", "ImpDateIvl", ": " ]
             }, {
-              "r" : "1030",
+              "r" : "1056",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "1018",
+                "r" : "1044",
                 "s" : [ {
-                  "r" : "1012",
+                  "r" : "1038",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "1027",
+                "r" : "1053",
                 "s" : [ {
-                  "r" : "1021",
+                  "r" : "1047",
                   "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
                 } ]
               }, {
@@ -13171,51 +15103,51 @@ module.exports['Contains'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1033",
+          "localId" : "1059",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1034",
+            "localId" : "1060",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "1030",
+          "localId" : "1056",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1031",
+            "localId" : "1057",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1032",
+              "localId" : "1058",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "1018",
+            "localId" : "1044",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1019",
+              "localId" : "1045",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1020",
+              "localId" : "1046",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1012",
+              "localId" : "1038",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -13223,7 +15155,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1013",
+              "localId" : "1039",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -13232,23 +15164,23 @@ module.exports['Contains'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "1027",
+            "localId" : "1053",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1028",
+              "localId" : "1054",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1029",
+              "localId" : "1055",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1021",
+              "localId" : "1047",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -13256,7 +15188,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1022",
+              "localId" : "1048",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "8",
@@ -13265,7 +15197,7 @@ module.exports['Contains'] = {
           }
         }
       }, {
-        "localId" : "1037",
+        "localId" : "1063",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpreciseContainsDate",
         "context" : "Patient",
@@ -13274,22 +15206,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1037",
+            "r" : "1063",
             "s" : [ {
               "value" : [ "", "define ", "ImpreciseContainsDate", ": " ]
             }, {
-              "r" : "1065",
+              "r" : "1091",
               "s" : [ {
-                "r" : "1038",
+                "r" : "1064",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1057",
+                "r" : "1083",
                 "s" : [ {
-                  "r" : "1041",
+                  "r" : "1067",
                   "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -13298,85 +15230,85 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1065",
+          "localId" : "1091",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1066",
+            "localId" : "1092",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1067",
+              "localId" : "1093",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1068",
+            "localId" : "1094",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1038",
+            "localId" : "1064",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1039",
+              "localId" : "1065",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1040",
+                "localId" : "1066",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1057",
+            "localId" : "1083",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1058",
+              "localId" : "1084",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1059",
+              "localId" : "1085",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1060",
+              "localId" : "1086",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1061",
+              "localId" : "1087",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1062",
+              "localId" : "1088",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1063",
+              "localId" : "1089",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1064",
+              "localId" : "1090",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1041",
+              "localId" : "1067",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -13384,7 +15316,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1042",
+              "localId" : "1068",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "6",
@@ -13392,7 +15324,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1043",
+              "localId" : "1069",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -13400,7 +15332,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1044",
+              "localId" : "1070",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13408,7 +15340,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1045",
+              "localId" : "1071",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13416,7 +15348,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1046",
+              "localId" : "1072",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13424,7 +15356,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1047",
+              "localId" : "1073",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13433,7 +15365,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1071",
+        "localId" : "1097",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpreciseNotContainsDate",
         "context" : "Patient",
@@ -13442,22 +15374,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1071",
+            "r" : "1097",
             "s" : [ {
               "value" : [ "", "define ", "ImpreciseNotContainsDate", ": " ]
             }, {
-              "r" : "1099",
+              "r" : "1125",
               "s" : [ {
-                "r" : "1072",
+                "r" : "1098",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1091",
+                "r" : "1117",
                 "s" : [ {
-                  "r" : "1075",
+                  "r" : "1101",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -13466,85 +15398,85 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1099",
+          "localId" : "1125",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1100",
+            "localId" : "1126",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1101",
+              "localId" : "1127",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1102",
+            "localId" : "1128",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1072",
+            "localId" : "1098",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1073",
+              "localId" : "1099",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1074",
+                "localId" : "1100",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1091",
+            "localId" : "1117",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1092",
+              "localId" : "1118",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1093",
+              "localId" : "1119",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1094",
+              "localId" : "1120",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1095",
+              "localId" : "1121",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1096",
+              "localId" : "1122",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1097",
+              "localId" : "1123",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1098",
+              "localId" : "1124",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1075",
+              "localId" : "1101",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -13552,7 +15484,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1076",
+              "localId" : "1102",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -13560,7 +15492,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1077",
+              "localId" : "1103",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -13568,7 +15500,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1078",
+              "localId" : "1104",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13576,7 +15508,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1079",
+              "localId" : "1105",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13584,7 +15516,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1080",
+              "localId" : "1106",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13592,7 +15524,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1081",
+              "localId" : "1107",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13601,7 +15533,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1105",
+        "localId" : "1131",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpreciseMayContainDate",
         "context" : "Patient",
@@ -13610,22 +15542,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1105",
+            "r" : "1131",
             "s" : [ {
               "value" : [ "", "define ", "ImpreciseMayContainDate", ": " ]
             }, {
-              "r" : "1133",
+              "r" : "1159",
               "s" : [ {
-                "r" : "1106",
+                "r" : "1132",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1125",
+                "r" : "1151",
                 "s" : [ {
-                  "r" : "1109",
+                  "r" : "1135",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -13634,85 +15566,85 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1133",
+          "localId" : "1159",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1134",
+            "localId" : "1160",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1135",
+              "localId" : "1161",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1136",
+            "localId" : "1162",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1106",
+            "localId" : "1132",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1107",
+              "localId" : "1133",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1108",
+                "localId" : "1134",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1125",
+            "localId" : "1151",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1126",
+              "localId" : "1152",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1127",
+              "localId" : "1153",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1128",
+              "localId" : "1154",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1129",
+              "localId" : "1155",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1130",
+              "localId" : "1156",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1131",
+              "localId" : "1157",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1132",
+              "localId" : "1158",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1109",
+              "localId" : "1135",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -13720,7 +15652,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1110",
+              "localId" : "1136",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -13728,7 +15660,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1111",
+              "localId" : "1137",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -13736,7 +15668,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1112",
+              "localId" : "1138",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13744,7 +15676,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1113",
+              "localId" : "1139",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13752,7 +15684,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1114",
+              "localId" : "1140",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13760,7 +15692,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1115",
+              "localId" : "1141",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -13769,7 +15701,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1139",
+        "localId" : "1165",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NegInfBegContainsInt",
         "context" : "Patient",
@@ -13778,23 +15710,23 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1139",
+            "r" : "1165",
             "s" : [ {
               "value" : [ "", "define ", "NegInfBegContainsInt", ": " ]
             }, {
-              "r" : "1149",
+              "r" : "1175",
               "s" : [ {
-                "r" : "1142",
+                "r" : "1168",
                 "s" : [ {
-                  "r" : "1140",
+                  "r" : "1166",
                   "value" : [ "Interval[", "null", ", ", "5", "]" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1146",
+                "r" : "1172",
                 "s" : [ {
-                  "r" : "1147",
+                  "r" : "1173",
                   "value" : [ "-", "7" ]
                 } ]
               } ]
@@ -13803,58 +15735,58 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1149",
+          "localId" : "1175",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1150",
+            "localId" : "1176",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1151",
+              "localId" : "1177",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1152",
+            "localId" : "1178",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1142",
+            "localId" : "1168",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1144",
+              "localId" : "1170",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1145",
+                "localId" : "1171",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1143",
+              "localId" : "1169",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1140",
+                "localId" : "1166",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1141",
+              "localId" : "1167",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -13862,18 +15794,18 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Negate",
-            "localId" : "1146",
+            "localId" : "1172",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1148",
+              "localId" : "1174",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "1147",
+              "localId" : "1173",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "7",
@@ -13882,7 +15814,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1155",
+        "localId" : "1181",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NegInfBegNotContainsInt",
         "context" : "Patient",
@@ -13891,19 +15823,19 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1155",
+            "r" : "1181",
             "s" : [ {
               "value" : [ "", "define ", "NegInfBegNotContainsInt", ": " ]
             }, {
-              "r" : "1163",
+              "r" : "1189",
               "s" : [ {
-                "r" : "1158",
+                "r" : "1184",
                 "s" : [ {
-                  "r" : "1156",
+                  "r" : "1182",
                   "value" : [ "Interval[", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1162",
+                "r" : "1188",
                 "value" : [ " contains ", "7" ]
               } ]
             } ]
@@ -13911,58 +15843,58 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1163",
+          "localId" : "1189",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1164",
+            "localId" : "1190",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1165",
+              "localId" : "1191",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1166",
+            "localId" : "1192",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1158",
+            "localId" : "1184",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1160",
+              "localId" : "1186",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1161",
+                "localId" : "1187",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1159",
+              "localId" : "1185",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1156",
+                "localId" : "1182",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1157",
+              "localId" : "1183",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -13970,7 +15902,7 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Literal",
-            "localId" : "1162",
+            "localId" : "1188",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "7",
@@ -13978,28 +15910,28 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1169",
+        "localId" : "1195",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownOpenBegContainsInt",
+        "name" : "UnknownBegContainsInt",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1169",
+            "r" : "1195",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownOpenBegContainsInt", ": " ]
+              "value" : [ "", "define ", "UnknownBegContainsInt", ": " ]
             }, {
-              "r" : "1177",
+              "r" : "1203",
               "s" : [ {
-                "r" : "1172",
+                "r" : "1198",
                 "s" : [ {
-                  "r" : "1170",
+                  "r" : "1196",
                   "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1176",
+                "r" : "1202",
                 "value" : [ " contains ", "5" ]
               } ]
             } ]
@@ -14007,154 +15939,58 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1177",
+          "localId" : "1203",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1178",
+            "localId" : "1204",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1179",
+              "localId" : "1205",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1180",
+            "localId" : "1206",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1172",
+            "localId" : "1198",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1174",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1175",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1173",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1170",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1171",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Literal",
-            "localId" : "1176",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "5",
-            "annotation" : [ ]
-          } ]
-        }
-      }, {
-        "localId" : "1183",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownClosedBegContainsInt",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1183",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownClosedBegContainsInt", ": " ]
-            }, {
-              "r" : "1191",
-              "s" : [ {
-                "r" : "1186",
-                "s" : [ {
-                  "r" : "1184",
-                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
-                } ]
-              }, {
-                "r" : "1190",
-                "value" : [ " contains ", "5" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Contains",
-          "localId" : "1191",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1192",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1193",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1194",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1186",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1188",
+              "localId" : "1200",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1189",
+                "localId" : "1201",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1187",
+              "localId" : "1199",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1184",
+                "localId" : "1196",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1185",
+              "localId" : "1197",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -14162,7 +15998,7 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Literal",
-            "localId" : "1190",
+            "localId" : "1202",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "5",
@@ -14170,7 +16006,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1197",
+        "localId" : "1209",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownBegMayContainInt",
         "context" : "Patient",
@@ -14179,23 +16015,23 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1197",
+            "r" : "1209",
             "s" : [ {
               "value" : [ "", "define ", "UnknownBegMayContainInt", ": " ]
             }, {
-              "r" : "1207",
+              "r" : "1219",
               "s" : [ {
-                "r" : "1200",
+                "r" : "1212",
                 "s" : [ {
-                  "r" : "1198",
+                  "r" : "1210",
                   "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1204",
+                "r" : "1216",
                 "s" : [ {
-                  "r" : "1205",
+                  "r" : "1217",
                   "value" : [ "-", "7" ]
                 } ]
               } ]
@@ -14204,58 +16040,58 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1207",
+          "localId" : "1219",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1208",
+            "localId" : "1220",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1209",
+              "localId" : "1221",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1210",
+            "localId" : "1222",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1200",
+            "localId" : "1212",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1202",
+              "localId" : "1214",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1203",
+                "localId" : "1215",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1201",
+              "localId" : "1213",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1198",
+                "localId" : "1210",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1199",
+              "localId" : "1211",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -14263,18 +16099,18 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Negate",
-            "localId" : "1204",
+            "localId" : "1216",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1206",
+              "localId" : "1218",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "1205",
+              "localId" : "1217",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "7",
@@ -14283,7 +16119,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1213",
+        "localId" : "1225",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownBegNotContainsInt",
         "context" : "Patient",
@@ -14292,19 +16128,19 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1213",
+            "r" : "1225",
             "s" : [ {
               "value" : [ "", "define ", "UnknownBegNotContainsInt", ": " ]
             }, {
-              "r" : "1221",
+              "r" : "1233",
               "s" : [ {
-                "r" : "1216",
+                "r" : "1228",
                 "s" : [ {
-                  "r" : "1214",
+                  "r" : "1226",
                   "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1220",
+                "r" : "1232",
                 "value" : [ " contains ", "7" ]
               } ]
             } ]
@@ -14312,58 +16148,58 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1221",
+          "localId" : "1233",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1222",
+            "localId" : "1234",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1223",
+              "localId" : "1235",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1224",
+            "localId" : "1236",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1216",
+            "localId" : "1228",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1218",
+              "localId" : "1230",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1219",
+                "localId" : "1231",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1217",
+              "localId" : "1229",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1214",
+                "localId" : "1226",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1215",
+              "localId" : "1227",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -14371,7 +16207,7 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Literal",
-            "localId" : "1220",
+            "localId" : "1232",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "7",
@@ -14379,7 +16215,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1227",
+        "localId" : "1239",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PosInfEndContainsInt",
         "context" : "Patient",
@@ -14388,19 +16224,19 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1227",
+            "r" : "1239",
             "s" : [ {
               "value" : [ "", "define ", "PosInfEndContainsInt", ": " ]
             }, {
-              "r" : "1235",
+              "r" : "1247",
               "s" : [ {
-                "r" : "1230",
+                "r" : "1242",
                 "s" : [ {
-                  "r" : "1228",
+                  "r" : "1240",
                   "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1234",
+                "r" : "1246",
                 "value" : [ " contains ", "123456789" ]
               } ]
             } ]
@@ -14408,45 +16244,45 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1235",
+          "localId" : "1247",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1236",
+            "localId" : "1248",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1237",
+              "localId" : "1249",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1238",
+            "localId" : "1250",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1230",
+            "localId" : "1242",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1232",
+              "localId" : "1244",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1233",
+                "localId" : "1245",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1228",
+              "localId" : "1240",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -14454,20 +16290,20 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1231",
+              "localId" : "1243",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1229",
+                "localId" : "1241",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Literal",
-            "localId" : "1234",
+            "localId" : "1246",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "123456789",
@@ -14475,7 +16311,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1241",
+        "localId" : "1253",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PosInfEndNotContainsInt",
         "context" : "Patient",
@@ -14484,23 +16320,23 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1241",
+            "r" : "1253",
             "s" : [ {
               "value" : [ "", "define ", "PosInfEndNotContainsInt", ": " ]
             }, {
-              "r" : "1251",
+              "r" : "1263",
               "s" : [ {
-                "r" : "1244",
+                "r" : "1256",
                 "s" : [ {
-                  "r" : "1242",
+                  "r" : "1254",
                   "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1248",
+                "r" : "1260",
                 "s" : [ {
-                  "r" : "1249",
+                  "r" : "1261",
                   "value" : [ "-", "1" ]
                 } ]
               } ]
@@ -14509,45 +16345,45 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1251",
+          "localId" : "1263",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1252",
+            "localId" : "1264",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1253",
+              "localId" : "1265",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1254",
+            "localId" : "1266",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1244",
+            "localId" : "1256",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1246",
+              "localId" : "1258",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1247",
+                "localId" : "1259",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1242",
+              "localId" : "1254",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -14555,31 +16391,31 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1245",
+              "localId" : "1257",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1243",
+                "localId" : "1255",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Negate",
-            "localId" : "1248",
+            "localId" : "1260",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1250",
+              "localId" : "1262",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "1249",
+              "localId" : "1261",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -14588,28 +16424,28 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1257",
+        "localId" : "1269",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownOpenEndContainsInt",
+        "name" : "UnknownEndContainsInt",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1257",
+            "r" : "1269",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownOpenEndContainsInt", ": " ]
+              "value" : [ "", "define ", "UnknownEndContainsInt", ": " ]
             }, {
-              "r" : "1265",
+              "r" : "1277",
               "s" : [ {
-                "r" : "1260",
+                "r" : "1272",
                 "s" : [ {
-                  "r" : "1258",
+                  "r" : "1270",
                   "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1264",
+                "r" : "1276",
                 "value" : [ " contains ", "0" ]
               } ]
             } ]
@@ -14617,45 +16453,45 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1265",
+          "localId" : "1277",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1266",
+            "localId" : "1278",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1267",
+              "localId" : "1279",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1268",
+            "localId" : "1280",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1260",
+            "localId" : "1272",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1262",
+              "localId" : "1274",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1263",
+                "localId" : "1275",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1258",
+              "localId" : "1270",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -14663,20 +16499,20 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1261",
+              "localId" : "1273",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1259",
+                "localId" : "1271",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Literal",
-            "localId" : "1264",
+            "localId" : "1276",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "0",
@@ -14684,74 +16520,74 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1271",
+        "localId" : "1283",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownClosedEndContainsInt",
+        "name" : "UnknownEndMayContainInt",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1271",
+            "r" : "1283",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownClosedEndContainsInt", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayContainInt", ": " ]
             }, {
-              "r" : "1279",
+              "r" : "1291",
               "s" : [ {
-                "r" : "1274",
+                "r" : "1286",
                 "s" : [ {
-                  "r" : "1272",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                  "r" : "1284",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1278",
-                "value" : [ " contains ", "0" ]
+                "r" : "1290",
+                "value" : [ " contains ", "123456789" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1279",
+          "localId" : "1291",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1280",
+            "localId" : "1292",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1281",
+              "localId" : "1293",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1282",
+            "localId" : "1294",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1274",
+            "localId" : "1286",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1276",
+              "localId" : "1288",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1277",
+                "localId" : "1289",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1272",
+              "localId" : "1284",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -14759,95 +16595,100 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1275",
+              "localId" : "1287",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1273",
+                "localId" : "1285",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Literal",
-            "localId" : "1278",
+            "localId" : "1290",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "0",
+            "value" : "123456789",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1285",
+        "localId" : "1297",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayContainInt",
+        "name" : "UnknownEndNotContainsInt",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1285",
+            "r" : "1297",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayContainInt", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotContainsInt", ": " ]
             }, {
-              "r" : "1293",
+              "r" : "1307",
               "s" : [ {
-                "r" : "1288",
+                "r" : "1300",
                 "s" : [ {
-                  "r" : "1286",
+                  "r" : "1298",
                   "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1292",
-                "value" : [ " contains ", "123456789" ]
+                "value" : [ " contains " ]
+              }, {
+                "r" : "1304",
+                "s" : [ {
+                  "r" : "1305",
+                  "value" : [ "-", "1" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1293",
+          "localId" : "1307",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1294",
+            "localId" : "1308",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1295",
+              "localId" : "1309",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1296",
+            "localId" : "1310",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1288",
+            "localId" : "1300",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1290",
+              "localId" : "1302",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1291",
+                "localId" : "1303",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1286",
+              "localId" : "1298",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -14855,54 +16696,66 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1289",
+              "localId" : "1301",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1287",
+                "localId" : "1299",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Literal",
-            "localId" : "1292",
+            "type" : "Negate",
+            "localId" : "1304",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "123456789",
-            "annotation" : [ ]
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1306",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "1305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "1299",
+        "localId" : "1313",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotContainsInt",
+        "name" : "NegInfBegContainsLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1299",
+            "r" : "1313",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotContainsInt", ": " ]
+              "value" : [ "", "define ", "NegInfBegContainsLong", ": " ]
             }, {
-              "r" : "1309",
+              "r" : "1323",
               "s" : [ {
-                "r" : "1302",
+                "r" : "1316",
                 "s" : [ {
-                  "r" : "1300",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                  "r" : "1314",
+                  "value" : [ "Interval[", "null", ", ", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1306",
+                "r" : "1320",
                 "s" : [ {
-                  "r" : "1307",
-                  "value" : [ "-", "1" ]
+                  "r" : "1321",
+                  "value" : [ "-", "7L" ]
                 } ]
               } ]
             } ]
@@ -14910,108 +16763,1023 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1309",
+          "localId" : "1323",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1310",
+            "localId" : "1324",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1311",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1325",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1312",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "1326",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1302",
+            "localId" : "1316",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1304",
+              "localId" : "1318",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1305",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1319",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1300",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
               "type" : "As",
-              "localId" : "1303",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1317",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1301",
+                "localId" : "1314",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1315",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Negate",
-            "localId" : "1306",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "1320",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1308",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1322",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "1307",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "localId" : "1321",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1315",
+        "localId" : "1329",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegContainsDate",
+        "name" : "NegInfBegNotContainsLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1315",
+            "r" : "1329",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegContainsDate", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotContainsLong", ": " ]
             }, {
-              "r" : "1369",
+              "r" : "1337",
               "s" : [ {
-                "r" : "1341",
+                "r" : "1332",
                 "s" : [ {
-                  "r" : "1316",
+                  "r" : "1330",
+                  "value" : [ "Interval[", "null", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "1336",
+                "value" : [ " contains ", "7L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "1337",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1338",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1339",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1340",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1332",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1334",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1335",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1333",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1330",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1331",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "1336",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "7",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1343",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1343",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegContainsLong", ": " ]
+            }, {
+              "r" : "1351",
+              "s" : [ {
+                "r" : "1346",
+                "s" : [ {
+                  "r" : "1344",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "1350",
+                "value" : [ " contains ", "5L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "1351",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1352",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1353",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1354",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1346",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1348",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1349",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1347",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1344",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "1350",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1357",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegMayContainLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1357",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegMayContainLong", ": " ]
+            }, {
+              "r" : "1367",
+              "s" : [ {
+                "r" : "1360",
+                "s" : [ {
+                  "r" : "1358",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "value" : [ " contains " ]
+              }, {
+                "r" : "1364",
+                "s" : [ {
+                  "r" : "1365",
+                  "value" : [ "-", "7L" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "1367",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1368",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1369",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1370",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1360",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1362",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1363",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1361",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1358",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1359",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Negate",
+            "localId" : "1364",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1366",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "1365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1373",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegNotContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1373",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegNotContainsLong", ": " ]
+            }, {
+              "r" : "1381",
+              "s" : [ {
+                "r" : "1376",
+                "s" : [ {
+                  "r" : "1374",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "1380",
+                "value" : [ " contains ", "7L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "1381",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1382",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1383",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1384",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1376",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1378",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1379",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1377",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1374",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1375",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "1380",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "7",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1387",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1387",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndContainsLong", ": " ]
+            }, {
+              "r" : "1395",
+              "s" : [ {
+                "r" : "1390",
+                "s" : [ {
+                  "r" : "1388",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "1394",
+                "value" : [ " contains ", "123456789L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "1395",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1396",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1397",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1398",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1390",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1392",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1393",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1388",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1391",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1389",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "1394",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "123456789",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1401",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndNotContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1401",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndNotContainsLong", ": " ]
+            }, {
+              "r" : "1411",
+              "s" : [ {
+                "r" : "1404",
+                "s" : [ {
+                  "r" : "1402",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              }, {
+                "value" : [ " contains " ]
+              }, {
+                "r" : "1408",
+                "s" : [ {
+                  "r" : "1409",
+                  "value" : [ "-", "1L" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "1411",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1412",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1413",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1414",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1404",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1406",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1407",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1402",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1405",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1403",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Negate",
+            "localId" : "1408",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1410",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "1409",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1417",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1417",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndContainsLong", ": " ]
+            }, {
+              "r" : "1425",
+              "s" : [ {
+                "r" : "1420",
+                "s" : [ {
+                  "r" : "1418",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "1424",
+                "value" : [ " contains ", "0L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "1425",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1426",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1427",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1428",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1420",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1422",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1423",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1418",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1421",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1419",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "1424",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1431",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayContainLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1431",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMayContainLong", ": " ]
+            }, {
+              "r" : "1439",
+              "s" : [ {
+                "r" : "1434",
+                "s" : [ {
+                  "r" : "1432",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "1438",
+                "value" : [ " contains ", "123456789L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "1439",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1440",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1441",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1442",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1434",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1436",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1437",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1432",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1435",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1433",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Literal",
+            "localId" : "1438",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "123456789",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1445",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1445",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotContainsLong", ": " ]
+            }, {
+              "r" : "1455",
+              "s" : [ {
+                "r" : "1448",
+                "s" : [ {
+                  "r" : "1446",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "value" : [ " contains " ]
+              }, {
+                "r" : "1452",
+                "s" : [ {
+                  "r" : "1453",
+                  "value" : [ "-", "1L" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "1455",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1456",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1457",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1458",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1448",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1450",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1451",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1446",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1449",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1447",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Negate",
+            "localId" : "1452",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1454",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "1453",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1461",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegContainsDate",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1461",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegContainsDate", ": " ]
+            }, {
+              "r" : "1515",
+              "s" : [ {
+                "r" : "1487",
+                "s" : [ {
+                  "r" : "1462",
                   "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "1333",
+                  "r" : "1479",
                   "s" : [ {
-                    "r" : "1317",
+                    "r" : "1463",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -15020,9 +17788,9 @@ module.exports['Contains'] = {
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1361",
+                "r" : "1507",
                 "s" : [ {
-                  "r" : "1345",
+                  "r" : "1491",
                   "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -15031,99 +17799,99 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1369",
+          "localId" : "1515",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1370",
+            "localId" : "1516",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1371",
+              "localId" : "1517",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1372",
+            "localId" : "1518",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1341",
+            "localId" : "1487",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1343",
+              "localId" : "1489",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1344",
+                "localId" : "1490",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1342",
+              "localId" : "1488",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1316",
+                "localId" : "1462",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1333",
+              "localId" : "1479",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1334",
+                "localId" : "1480",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1335",
+                "localId" : "1481",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1336",
+                "localId" : "1482",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1337",
+                "localId" : "1483",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1338",
+                "localId" : "1484",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1339",
+                "localId" : "1485",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1340",
+                "localId" : "1486",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1317",
+                "localId" : "1463",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -15131,7 +17899,7 @@ module.exports['Contains'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1318",
+                "localId" : "1464",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -15139,7 +17907,7 @@ module.exports['Contains'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1319",
+                "localId" : "1465",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -15147,7 +17915,7 @@ module.exports['Contains'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1320",
+                "localId" : "1466",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15155,7 +17923,7 @@ module.exports['Contains'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1321",
+                "localId" : "1467",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15163,7 +17931,7 @@ module.exports['Contains'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1322",
+                "localId" : "1468",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15171,7 +17939,7 @@ module.exports['Contains'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1323",
+                "localId" : "1469",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15180,48 +17948,48 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1361",
+            "localId" : "1507",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1362",
+              "localId" : "1508",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1363",
+              "localId" : "1509",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1364",
+              "localId" : "1510",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1365",
+              "localId" : "1511",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1366",
+              "localId" : "1512",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1367",
+              "localId" : "1513",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1368",
+              "localId" : "1514",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1345",
+              "localId" : "1491",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -15229,7 +17997,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1346",
+              "localId" : "1492",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -15237,7 +18005,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1347",
+              "localId" : "1493",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -15245,7 +18013,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1348",
+              "localId" : "1494",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -15253,7 +18021,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1349",
+              "localId" : "1495",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -15261,7 +18029,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1350",
+              "localId" : "1496",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -15269,7 +18037,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1351",
+              "localId" : "1497",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -15278,7 +18046,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1375",
+        "localId" : "1521",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NegInfBegNotContainsDate",
         "context" : "Patient",
@@ -15287,20 +18055,20 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1375",
+            "r" : "1521",
             "s" : [ {
               "value" : [ "", "define ", "NegInfBegNotContainsDate", ": " ]
             }, {
-              "r" : "1429",
+              "r" : "1575",
               "s" : [ {
-                "r" : "1401",
+                "r" : "1547",
                 "s" : [ {
-                  "r" : "1376",
+                  "r" : "1522",
                   "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "1393",
+                  "r" : "1539",
                   "s" : [ {
-                    "r" : "1377",
+                    "r" : "1523",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -15309,9 +18077,9 @@ module.exports['Contains'] = {
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1421",
+                "r" : "1567",
                 "s" : [ {
-                  "r" : "1405",
+                  "r" : "1551",
                   "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -15320,99 +18088,99 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1429",
+          "localId" : "1575",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1430",
+            "localId" : "1576",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1431",
+              "localId" : "1577",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1432",
+            "localId" : "1578",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1401",
+            "localId" : "1547",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1403",
+              "localId" : "1549",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1404",
+                "localId" : "1550",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1402",
+              "localId" : "1548",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1376",
+                "localId" : "1522",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1393",
+              "localId" : "1539",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1394",
+                "localId" : "1540",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1395",
+                "localId" : "1541",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1396",
+                "localId" : "1542",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1397",
+                "localId" : "1543",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1398",
+                "localId" : "1544",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1399",
+                "localId" : "1545",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1400",
+                "localId" : "1546",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1377",
+                "localId" : "1523",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -15420,7 +18188,7 @@ module.exports['Contains'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1378",
+                "localId" : "1524",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -15428,7 +18196,7 @@ module.exports['Contains'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1379",
+                "localId" : "1525",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -15436,7 +18204,7 @@ module.exports['Contains'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1380",
+                "localId" : "1526",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15444,7 +18212,7 @@ module.exports['Contains'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1381",
+                "localId" : "1527",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15452,7 +18220,7 @@ module.exports['Contains'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1382",
+                "localId" : "1528",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15460,7 +18228,7 @@ module.exports['Contains'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1383",
+                "localId" : "1529",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15469,48 +18237,48 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1421",
+            "localId" : "1567",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1422",
+              "localId" : "1568",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1423",
+              "localId" : "1569",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1424",
+              "localId" : "1570",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1425",
+              "localId" : "1571",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1426",
+              "localId" : "1572",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1427",
+              "localId" : "1573",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1428",
+              "localId" : "1574",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1405",
+              "localId" : "1551",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2013",
@@ -15518,7 +18286,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1406",
+              "localId" : "1552",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -15526,7 +18294,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1407",
+              "localId" : "1553",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -15534,7 +18302,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1408",
+              "localId" : "1554",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -15542,7 +18310,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1409",
+              "localId" : "1555",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -15550,7 +18318,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1410",
+              "localId" : "1556",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -15558,7 +18326,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1411",
+              "localId" : "1557",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -15567,41 +18335,41 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1435",
+        "localId" : "1581",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownOpenBegMayContainDate",
+        "name" : "UnknownBegContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1435",
+            "r" : "1581",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownOpenBegMayContainDate", ": " ]
+              "value" : [ "", "define ", "UnknownBegContainsDate", ": " ]
             }, {
-              "r" : "1489",
+              "r" : "1635",
               "s" : [ {
-                "r" : "1461",
+                "r" : "1607",
                 "s" : [ {
-                  "r" : "1436",
+                  "r" : "1582",
                   "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "1453",
+                  "r" : "1599",
                   "s" : [ {
-                    "r" : "1437",
+                    "r" : "1583",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1481",
+                "r" : "1627",
                 "s" : [ {
-                  "r" : "1465",
-                  "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  "r" : "1611",
+                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
             } ]
@@ -15609,99 +18377,99 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1489",
+          "localId" : "1635",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1490",
+            "localId" : "1636",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1491",
+              "localId" : "1637",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1492",
+            "localId" : "1638",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1461",
+            "localId" : "1607",
             "lowClosed" : false,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1463",
+              "localId" : "1609",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1464",
+                "localId" : "1610",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1462",
+              "localId" : "1608",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1436",
+                "localId" : "1582",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1453",
+              "localId" : "1599",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1454",
+                "localId" : "1600",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1455",
+                "localId" : "1601",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1456",
+                "localId" : "1602",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1457",
+                "localId" : "1603",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1458",
+                "localId" : "1604",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1459",
+                "localId" : "1605",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1460",
+                "localId" : "1606",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1437",
+                "localId" : "1583",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -15709,7 +18477,7 @@ module.exports['Contains'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1438",
+                "localId" : "1584",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -15717,7 +18485,7 @@ module.exports['Contains'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1439",
+                "localId" : "1585",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -15725,7 +18493,7 @@ module.exports['Contains'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1440",
+                "localId" : "1586",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15733,7 +18501,7 @@ module.exports['Contains'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1441",
+                "localId" : "1587",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15741,7 +18509,7 @@ module.exports['Contains'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1442",
+                "localId" : "1588",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15749,7 +18517,7 @@ module.exports['Contains'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1443",
+                "localId" : "1589",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -15758,127 +18526,127 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1481",
+            "localId" : "1627",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1482",
+              "localId" : "1628",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1483",
+              "localId" : "1629",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1484",
+              "localId" : "1630",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1485",
+              "localId" : "1631",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1486",
+              "localId" : "1632",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1487",
+              "localId" : "1633",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1488",
+              "localId" : "1634",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1465",
+              "localId" : "1611",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "2013",
               "annotation" : [ ]
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1466",
+              "localId" : "1612",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
+              "value" : "1",
               "annotation" : [ ]
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1467",
+              "localId" : "1613",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "31",
+              "value" : "1",
               "annotation" : [ ]
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1468",
+              "localId" : "1614",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
+              "value" : "0",
               "annotation" : [ ]
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1469",
+              "localId" : "1615",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
+              "value" : "0",
               "annotation" : [ ]
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1470",
+              "localId" : "1616",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
+              "value" : "0",
               "annotation" : [ ]
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1471",
+              "localId" : "1617",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "999",
+              "value" : "0",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1495",
+        "localId" : "1641",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownClosedBegContainsDate",
+        "name" : "UnknownBegMayContainDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1495",
+            "r" : "1641",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownClosedBegContainsDate", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayContainDate", ": " ]
             }, {
-              "r" : "1549",
+              "r" : "1695",
               "s" : [ {
-                "r" : "1521",
+                "r" : "1667",
                 "s" : [ {
-                  "r" : "1496",
-                  "value" : [ "Interval[", "null", ", " ]
+                  "r" : "1642",
+                  "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "1513",
+                  "r" : "1659",
                   "s" : [ {
-                    "r" : "1497",
+                    "r" : "1643",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -15887,10 +18655,10 @@ module.exports['Contains'] = {
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1541",
+                "r" : "1687",
                 "s" : [ {
-                  "r" : "1525",
-                  "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  "r" : "1671",
+                  "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
             } ]
@@ -15898,388 +18666,99 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1549",
+          "localId" : "1695",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1550",
+            "localId" : "1696",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1551",
+              "localId" : "1697",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1552",
+            "localId" : "1698",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1521",
-            "lowClosed" : true,
+            "localId" : "1667",
+            "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1523",
+              "localId" : "1669",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1524",
+                "localId" : "1670",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1522",
+              "localId" : "1668",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1496",
+                "localId" : "1642",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1513",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1514",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1515",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1516",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1517",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1518",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1519",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1520",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1497",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1498",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1499",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1500",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1501",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1502",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1503",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "DateTime",
-            "localId" : "1541",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1542",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1543",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1544",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1545",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1546",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1547",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1548",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1525",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1526",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1527",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "31",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1528",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1529",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1530",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1531",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "999",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1555",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayContainDate",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1555",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayContainDate", ": " ]
-            }, {
-              "r" : "1609",
-              "s" : [ {
-                "r" : "1581",
-                "s" : [ {
-                  "r" : "1556",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "1573",
-                  "s" : [ {
-                    "r" : "1557",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "value" : [ " contains " ]
-              }, {
-                "r" : "1601",
-                "s" : [ {
-                  "r" : "1585",
-                  "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Contains",
-          "localId" : "1609",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1610",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1611",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1612",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1581",
-            "lowClosed" : false,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1583",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1584",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1582",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1556",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1573",
+              "localId" : "1659",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1574",
+                "localId" : "1660",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1575",
+                "localId" : "1661",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1576",
+                "localId" : "1662",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1577",
+                "localId" : "1663",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1578",
+                "localId" : "1664",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1579",
+                "localId" : "1665",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1580",
+                "localId" : "1666",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1557",
+                "localId" : "1643",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -16287,7 +18766,7 @@ module.exports['Contains'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1558",
+                "localId" : "1644",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -16295,7 +18774,7 @@ module.exports['Contains'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1559",
+                "localId" : "1645",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -16303,7 +18782,7 @@ module.exports['Contains'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1560",
+                "localId" : "1646",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16311,7 +18790,7 @@ module.exports['Contains'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1561",
+                "localId" : "1647",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16319,7 +18798,7 @@ module.exports['Contains'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1562",
+                "localId" : "1648",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16327,7 +18806,7 @@ module.exports['Contains'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1563",
+                "localId" : "1649",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16336,48 +18815,48 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1601",
+            "localId" : "1687",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1602",
+              "localId" : "1688",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1603",
+              "localId" : "1689",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1604",
+              "localId" : "1690",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1605",
+              "localId" : "1691",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1606",
+              "localId" : "1692",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1607",
+              "localId" : "1693",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1608",
+              "localId" : "1694",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1585",
+              "localId" : "1671",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -16385,7 +18864,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1586",
+              "localId" : "1672",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -16393,7 +18872,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1587",
+              "localId" : "1673",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -16401,7 +18880,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1588",
+              "localId" : "1674",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -16409,7 +18888,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1589",
+              "localId" : "1675",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -16417,7 +18896,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1590",
+              "localId" : "1676",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -16425,7 +18904,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1591",
+              "localId" : "1677",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -16434,7 +18913,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1615",
+        "localId" : "1701",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownBegNotContainsDate",
         "context" : "Patient",
@@ -16443,20 +18922,20 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1615",
+            "r" : "1701",
             "s" : [ {
               "value" : [ "", "define ", "UnknownBegNotContainsDate", ": " ]
             }, {
-              "r" : "1669",
+              "r" : "1755",
               "s" : [ {
-                "r" : "1641",
+                "r" : "1727",
                 "s" : [ {
-                  "r" : "1616",
+                  "r" : "1702",
                   "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "1633",
+                  "r" : "1719",
                   "s" : [ {
-                    "r" : "1617",
+                    "r" : "1703",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -16465,9 +18944,9 @@ module.exports['Contains'] = {
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1661",
+                "r" : "1747",
                 "s" : [ {
-                  "r" : "1645",
+                  "r" : "1731",
                   "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -16476,99 +18955,99 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1669",
+          "localId" : "1755",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1670",
+            "localId" : "1756",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1671",
+              "localId" : "1757",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1672",
+            "localId" : "1758",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1641",
+            "localId" : "1727",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1643",
+              "localId" : "1729",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1644",
+                "localId" : "1730",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1642",
+              "localId" : "1728",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1616",
+                "localId" : "1702",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1633",
+              "localId" : "1719",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1634",
+                "localId" : "1720",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1635",
+                "localId" : "1721",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1636",
+                "localId" : "1722",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1637",
+                "localId" : "1723",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1638",
+                "localId" : "1724",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1639",
+                "localId" : "1725",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1640",
+                "localId" : "1726",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1617",
+                "localId" : "1703",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -16576,7 +19055,7 @@ module.exports['Contains'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1618",
+                "localId" : "1704",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -16584,7 +19063,7 @@ module.exports['Contains'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1619",
+                "localId" : "1705",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -16592,7 +19071,7 @@ module.exports['Contains'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1620",
+                "localId" : "1706",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16600,7 +19079,7 @@ module.exports['Contains'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1621",
+                "localId" : "1707",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16608,7 +19087,7 @@ module.exports['Contains'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1622",
+                "localId" : "1708",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16616,7 +19095,7 @@ module.exports['Contains'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1623",
+                "localId" : "1709",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16625,48 +19104,48 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1661",
+            "localId" : "1747",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1662",
+              "localId" : "1748",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1663",
+              "localId" : "1749",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1664",
+              "localId" : "1750",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1665",
+              "localId" : "1751",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1666",
+              "localId" : "1752",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1667",
+              "localId" : "1753",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1668",
+              "localId" : "1754",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1645",
+              "localId" : "1731",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2013",
@@ -16674,7 +19153,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1646",
+              "localId" : "1732",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -16682,7 +19161,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1647",
+              "localId" : "1733",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -16690,7 +19169,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1648",
+              "localId" : "1734",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -16698,7 +19177,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1649",
+              "localId" : "1735",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -16706,7 +19185,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1650",
+              "localId" : "1736",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -16714,7 +19193,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1651",
+              "localId" : "1737",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -16723,7 +19202,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1675",
+        "localId" : "1761",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PosInfEndContainsDate",
         "context" : "Patient",
@@ -16732,31 +19211,31 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1675",
+            "r" : "1761",
             "s" : [ {
               "value" : [ "", "define ", "PosInfEndContainsDate", ": " ]
             }, {
-              "r" : "1729",
+              "r" : "1815",
               "s" : [ {
-                "r" : "1701",
+                "r" : "1787",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1692",
+                  "r" : "1778",
                   "s" : [ {
-                    "r" : "1676",
+                    "r" : "1762",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1700",
+                  "r" : "1786",
                   "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1721",
+                "r" : "1807",
                 "s" : [ {
-                  "r" : "1705",
+                  "r" : "1791",
                   "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -16765,86 +19244,86 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1729",
+          "localId" : "1815",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1730",
+            "localId" : "1816",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1731",
+              "localId" : "1817",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1732",
+            "localId" : "1818",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1701",
+            "localId" : "1787",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1703",
+              "localId" : "1789",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1704",
+                "localId" : "1790",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1692",
+              "localId" : "1778",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1693",
+                "localId" : "1779",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1694",
+                "localId" : "1780",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1695",
+                "localId" : "1781",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1696",
+                "localId" : "1782",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1697",
+                "localId" : "1783",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1698",
+                "localId" : "1784",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1699",
+                "localId" : "1785",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1676",
+                "localId" : "1762",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -16852,7 +19331,7 @@ module.exports['Contains'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1677",
+                "localId" : "1763",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -16860,7 +19339,7 @@ module.exports['Contains'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1678",
+                "localId" : "1764",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -16868,7 +19347,7 @@ module.exports['Contains'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1679",
+                "localId" : "1765",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16876,7 +19355,7 @@ module.exports['Contains'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1680",
+                "localId" : "1766",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16884,7 +19363,7 @@ module.exports['Contains'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1681",
+                "localId" : "1767",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16892,7 +19371,7 @@ module.exports['Contains'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1682",
+                "localId" : "1768",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -16901,61 +19380,61 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1702",
+              "localId" : "1788",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1700",
+                "localId" : "1786",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1721",
+            "localId" : "1807",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1722",
+              "localId" : "1808",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1723",
+              "localId" : "1809",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1724",
+              "localId" : "1810",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1725",
+              "localId" : "1811",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1726",
+              "localId" : "1812",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1727",
+              "localId" : "1813",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1728",
+              "localId" : "1814",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1705",
+              "localId" : "1791",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2014",
@@ -16963,7 +19442,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1706",
+              "localId" : "1792",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -16971,7 +19450,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1707",
+              "localId" : "1793",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -16979,7 +19458,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1708",
+              "localId" : "1794",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -16987,7 +19466,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1709",
+              "localId" : "1795",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -16995,7 +19474,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1710",
+              "localId" : "1796",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17003,7 +19482,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1711",
+              "localId" : "1797",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17012,7 +19491,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1735",
+        "localId" : "1821",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PosInfEndNotContainsDate",
         "context" : "Patient",
@@ -17021,31 +19500,31 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1735",
+            "r" : "1821",
             "s" : [ {
               "value" : [ "", "define ", "PosInfEndNotContainsDate", ": " ]
             }, {
-              "r" : "1789",
+              "r" : "1875",
               "s" : [ {
-                "r" : "1761",
+                "r" : "1847",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1752",
+                  "r" : "1838",
                   "s" : [ {
-                    "r" : "1736",
+                    "r" : "1822",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1760",
+                  "r" : "1846",
                   "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1781",
+                "r" : "1867",
                 "s" : [ {
-                  "r" : "1765",
+                  "r" : "1851",
                   "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -17054,86 +19533,86 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1789",
+          "localId" : "1875",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1790",
+            "localId" : "1876",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1791",
+              "localId" : "1877",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1792",
+            "localId" : "1878",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1761",
+            "localId" : "1847",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1763",
+              "localId" : "1849",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1764",
+                "localId" : "1850",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1752",
+              "localId" : "1838",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1753",
+                "localId" : "1839",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1754",
+                "localId" : "1840",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1755",
+                "localId" : "1841",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1756",
+                "localId" : "1842",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1757",
+                "localId" : "1843",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1758",
+                "localId" : "1844",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1759",
+                "localId" : "1845",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1736",
+                "localId" : "1822",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -17141,7 +19620,7 @@ module.exports['Contains'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1737",
+                "localId" : "1823",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -17149,7 +19628,7 @@ module.exports['Contains'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1738",
+                "localId" : "1824",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -17157,7 +19636,7 @@ module.exports['Contains'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1739",
+                "localId" : "1825",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17165,7 +19644,7 @@ module.exports['Contains'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1740",
+                "localId" : "1826",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17173,7 +19652,7 @@ module.exports['Contains'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1741",
+                "localId" : "1827",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17181,7 +19660,7 @@ module.exports['Contains'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1742",
+                "localId" : "1828",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17190,61 +19669,61 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1762",
+              "localId" : "1848",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1760",
+                "localId" : "1846",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1781",
+            "localId" : "1867",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1782",
+              "localId" : "1868",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1783",
+              "localId" : "1869",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1784",
+              "localId" : "1870",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1785",
+              "localId" : "1871",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1786",
+              "localId" : "1872",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1787",
+              "localId" : "1873",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1788",
+              "localId" : "1874",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1765",
+              "localId" : "1851",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -17252,7 +19731,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1766",
+              "localId" : "1852",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17260,7 +19739,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1767",
+              "localId" : "1853",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17268,7 +19747,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1768",
+              "localId" : "1854",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17276,7 +19755,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1769",
+              "localId" : "1855",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17284,7 +19763,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1770",
+              "localId" : "1856",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17292,7 +19771,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1771",
+              "localId" : "1857",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17301,40 +19780,40 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1795",
+        "localId" : "1881",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownOpenEndContainsDate",
+        "name" : "UnknownEndContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1795",
+            "r" : "1881",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownOpenEndContainsDate", ": " ]
+              "value" : [ "", "define ", "UnknownEndContainsDate", ": " ]
             }, {
-              "r" : "1849",
+              "r" : "1935",
               "s" : [ {
-                "r" : "1821",
+                "r" : "1907",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1812",
+                  "r" : "1898",
                   "s" : [ {
-                    "r" : "1796",
+                    "r" : "1882",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1820",
+                  "r" : "1906",
                   "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1841",
+                "r" : "1927",
                 "s" : [ {
-                  "r" : "1825",
+                  "r" : "1911",
                   "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
@@ -17343,86 +19822,86 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1849",
+          "localId" : "1935",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1850",
+            "localId" : "1936",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1851",
+              "localId" : "1937",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1852",
+            "localId" : "1938",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1821",
+            "localId" : "1907",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1823",
+              "localId" : "1909",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1824",
+                "localId" : "1910",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1812",
+              "localId" : "1898",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1813",
+                "localId" : "1899",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1814",
+                "localId" : "1900",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1815",
+                "localId" : "1901",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1816",
+                "localId" : "1902",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1817",
+                "localId" : "1903",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1818",
+                "localId" : "1904",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1819",
+                "localId" : "1905",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1796",
+                "localId" : "1882",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -17430,7 +19909,7 @@ module.exports['Contains'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1797",
+                "localId" : "1883",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -17438,7 +19917,7 @@ module.exports['Contains'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1798",
+                "localId" : "1884",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -17446,7 +19925,7 @@ module.exports['Contains'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1799",
+                "localId" : "1885",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17454,7 +19933,7 @@ module.exports['Contains'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1800",
+                "localId" : "1886",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17462,7 +19941,7 @@ module.exports['Contains'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1801",
+                "localId" : "1887",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17470,7 +19949,7 @@ module.exports['Contains'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1802",
+                "localId" : "1888",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17479,61 +19958,61 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1822",
+              "localId" : "1908",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1820",
+                "localId" : "1906",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1841",
+            "localId" : "1927",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1842",
+              "localId" : "1928",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1843",
+              "localId" : "1929",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1844",
+              "localId" : "1930",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1845",
+              "localId" : "1931",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1846",
+              "localId" : "1932",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1847",
+              "localId" : "1933",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1848",
+              "localId" : "1934",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1825",
+              "localId" : "1911",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2013",
@@ -17541,7 +20020,7 @@ module.exports['Contains'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1826",
+              "localId" : "1912",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17549,7 +20028,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1827",
+              "localId" : "1913",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17557,7 +20036,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1828",
+              "localId" : "1914",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17565,7 +20044,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1829",
+              "localId" : "1915",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17573,7 +20052,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1830",
+              "localId" : "1916",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17581,7 +20060,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1831",
+              "localId" : "1917",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17590,41 +20069,41 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1855",
+        "localId" : "1941",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownClosedEndContainsDate",
+        "name" : "UnknownEndMayContainDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1855",
+            "r" : "1941",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownClosedEndContainsDate", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayContainDate", ": " ]
             }, {
-              "r" : "1909",
+              "r" : "1995",
               "s" : [ {
-                "r" : "1881",
+                "r" : "1967",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1872",
+                  "r" : "1958",
                   "s" : [ {
-                    "r" : "1856",
+                    "r" : "1942",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1880",
-                  "value" : [ ", ", "null", "]" ]
+                  "r" : "1966",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1901",
+                "r" : "1987",
                 "s" : [ {
-                  "r" : "1885",
-                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1971",
+                  "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
             } ]
@@ -17632,86 +20111,86 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1909",
+          "localId" : "1995",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1910",
+            "localId" : "1996",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1911",
+              "localId" : "1997",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1912",
+            "localId" : "1998",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1881",
+            "localId" : "1967",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1883",
+              "localId" : "1969",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1884",
+                "localId" : "1970",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1872",
+              "localId" : "1958",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1873",
+                "localId" : "1959",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1874",
+                "localId" : "1960",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1875",
+                "localId" : "1961",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1876",
+                "localId" : "1962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1877",
+                "localId" : "1963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1878",
+                "localId" : "1964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1879",
+                "localId" : "1965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1856",
+                "localId" : "1942",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -17719,7 +20198,7 @@ module.exports['Contains'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1857",
+                "localId" : "1943",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -17727,7 +20206,7 @@ module.exports['Contains'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1858",
+                "localId" : "1944",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -17735,7 +20214,7 @@ module.exports['Contains'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1859",
+                "localId" : "1945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17743,7 +20222,7 @@ module.exports['Contains'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1860",
+                "localId" : "1946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17751,7 +20230,7 @@ module.exports['Contains'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1861",
+                "localId" : "1947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17759,7 +20238,7 @@ module.exports['Contains'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1862",
+                "localId" : "1948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -17768,69 +20247,69 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1882",
+              "localId" : "1968",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1880",
+                "localId" : "1966",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1901",
+            "localId" : "1987",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1902",
+              "localId" : "1988",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1903",
+              "localId" : "1989",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1904",
+              "localId" : "1990",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1905",
+              "localId" : "1991",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1906",
+              "localId" : "1992",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1907",
+              "localId" : "1993",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1908",
+              "localId" : "1994",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1885",
+              "localId" : "1971",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
+              "value" : "2014",
               "annotation" : [ ]
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1886",
+              "localId" : "1972",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17838,7 +20317,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1887",
+              "localId" : "1973",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -17846,7 +20325,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1888",
+              "localId" : "1974",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17854,7 +20333,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1889",
+              "localId" : "1975",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17862,7 +20341,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1890",
+              "localId" : "1976",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17870,7 +20349,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1891",
+              "localId" : "1977",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -17879,41 +20358,41 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "1915",
+        "localId" : "2001",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayContainDate",
+        "name" : "UnknownEndNotContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1915",
+            "r" : "2001",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayContainDate", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotContainsDate", ": " ]
             }, {
-              "r" : "1969",
+              "r" : "2055",
               "s" : [ {
-                "r" : "1941",
+                "r" : "2027",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1932",
+                  "r" : "2018",
                   "s" : [ {
-                    "r" : "1916",
+                    "r" : "2002",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1940",
+                  "r" : "2026",
                   "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "1961",
+                "r" : "2047",
                 "s" : [ {
-                  "r" : "1945",
-                  "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "2031",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
             } ]
@@ -17921,86 +20400,86 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "1969",
+          "localId" : "2055",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1970",
+            "localId" : "2056",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1971",
+              "localId" : "2057",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1972",
+            "localId" : "2058",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1941",
+            "localId" : "2027",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1943",
+              "localId" : "2029",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1944",
+                "localId" : "2030",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1932",
+              "localId" : "2018",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1933",
+                "localId" : "2019",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1934",
+                "localId" : "2020",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1935",
+                "localId" : "2021",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1936",
+                "localId" : "2022",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1937",
+                "localId" : "2023",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1938",
+                "localId" : "2024",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1939",
+                "localId" : "2025",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1916",
+                "localId" : "2002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -18008,7 +20487,7 @@ module.exports['Contains'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1917",
+                "localId" : "2003",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -18016,7 +20495,7 @@ module.exports['Contains'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1918",
+                "localId" : "2004",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -18024,7 +20503,7 @@ module.exports['Contains'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1919",
+                "localId" : "2005",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -18032,7 +20511,7 @@ module.exports['Contains'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1920",
+                "localId" : "2006",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -18040,7 +20519,7 @@ module.exports['Contains'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1921",
+                "localId" : "2007",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -18048,7 +20527,7 @@ module.exports['Contains'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1922",
+                "localId" : "2008",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -18057,69 +20536,69 @@ module.exports['Contains'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1942",
+              "localId" : "2028",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1940",
+                "localId" : "2026",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "DateTime",
-            "localId" : "1961",
+            "localId" : "2047",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1962",
+              "localId" : "2048",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1963",
+              "localId" : "2049",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1964",
+              "localId" : "2050",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1965",
+              "localId" : "2051",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1966",
+              "localId" : "2052",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1967",
+              "localId" : "2053",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1968",
+              "localId" : "2054",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1945",
+              "localId" : "2031",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2014",
+              "value" : "2012",
               "annotation" : [ ]
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1946",
+              "localId" : "2032",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -18127,7 +20606,7 @@ module.exports['Contains'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1947",
+              "localId" : "2033",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -18135,7 +20614,7 @@ module.exports['Contains'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1948",
+              "localId" : "2034",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -18143,7 +20622,7 @@ module.exports['Contains'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1949",
+              "localId" : "2035",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -18151,7 +20630,7 @@ module.exports['Contains'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1950",
+              "localId" : "2036",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -18159,7 +20638,7 @@ module.exports['Contains'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1951",
+              "localId" : "2037",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -18167,472 +20646,379 @@ module.exports['Contains'] = {
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* In
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define ContainsInt: 3 in Interval[1, 5]
+define NotContainsInt: 1 in Interval(1, 5]
+define ContainsLong: 3L in Interval[1L, 5L]
+define NotContainsLong: 1L in Interval(1L, 5L]
+define ContainsReal: 2.345 in Interval[1.234, 3.456]
+define NotContainsReal: 4.567 in Interval[1.234, 3.456]
+define ContainsQuantity: 5 'mg' in Interval[4 'mg', 6 'mg']
+define ContainsQuantityInclusiveEdge: 6 'mg' in Interval[4 'mg', 6 'mg']
+define NotContainsQuantity: 3 'mg' in Interval[4 'mg', 6 'mg']
+define NotContainsQuantityExclusiveEdge: 6 'mg' in Interval[4 'mg', 6 'mg')
+define DateIvlHighOpen: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
+define DateIvlHighClosed: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)]
+define ContainsDate: DateTime(2012, 6, 1, 0, 0, 0, 0) in DateIvlHighClosed
+define NotContainsDate: DateTime(2012, 9, 1, 0, 0, 0, 0) in DateIvlHighOpen
+define ContainsImpreciseDate: DateTime(2012, 4) in DateIvlHighClosed
+define NotContainsImpreciseDate: DateTime(2012, 10) in DateIvlHighClosed
+define MayContainImpreciseDate: DateTime(2012) in DateIvlHighClosed
+define PrecisionDateIvlHighOpen: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
+define PrecisionDateIvlHighClosed: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678)]
+define ContainsDayOfDateLowEdge: DateTime(2012, 3, 2, 0, 0, 0, 0) in day of PrecisionDateIvlHighOpen
+define NotContainsDayOfDateHighEdgeOpen: DateTime(2012, 9, 2, 23, 59, 59, 999) in day of PrecisionDateIvlHighOpen
+define ContainsDayOfDateHighEdgeClosed: DateTime(2012, 9, 2, 23, 59, 59, 999) in day of PrecisionDateIvlHighClosed
+define NotContainsDayOfDateLowEdge: DateTime(2012, 3, 1, 23, 59, 59, 999) in day of PrecisionDateIvlHighOpen
+define NotContainsDayOfDateBeyondHighEdge: DateTime(2012, 9, 3, 0, 0, 0, 0) in day of PrecisionDateIvlHighOpen
+define ContainsDayOfDateImpreciseLowEdge: DateTime(2012, 3, 2) in day of PrecisionDateIvlHighOpen
+define NotContainsDayOfDateImpreciseHighEdgeOpen: DateTime(2012, 9, 2) in day of PrecisionDateIvlHighOpen
+define ContainsDayOfDateImpreciseHighEdgeClosed: DateTime(2012, 9, 2) in day of PrecisionDateIvlHighClosed
+define ContainsDayOfDateVeryImpreciseMiddle: DateTime(2012, 6) in day of PrecisionDateIvlHighOpen
+define NotContainsDayOfDateVeryImpreciseLow: DateTime(2012, 2) in day of PrecisionDateIvlHighOpen
+define NotContainsDayOfDateVeryImpreciseHighEdgeOpen: DateTime(2012, 10) in day of PrecisionDateIvlHighOpen
+define MayContainDayOfDateVeryImpreciseLow: DateTime(2012, 3) in day of PrecisionDateIvlHighOpen
+define MayContainDayOfDateVeryImpreciseHigh: DateTime(2012, 9) in day of PrecisionDateIvlHighOpen
+define MayContainDayOfDateVeryImpreciseSurrounding: DateTime(2012) in day of PrecisionDateIvlHighOpen
+define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
+define ImpreciseContainsDate: DateTime(2012, 6, 1, 0, 0, 0, 0) in ImpDateIvl
+define ImpreciseNotContainsDate: DateTime(2012, 9, 1, 0, 0, 0, 0) in ImpDateIvl
+define ImpreciseMayContainDate: DateTime(2012, 3, 15, 0, 0, 0, 0) in ImpDateIvl
+define NegInfBegContainsInt: -7 in Interval[null, 5]
+define NegInfBegNotContainsInt: 7 in Interval[null, 5]
+define UnknownBegContainsInt: 5 in Interval(null, 5]
+define UnknownClosedBegContainsInt: 5 in Interval[null, 5]
+define UnknownBegMayContainInt: -7 in Interval(null, 5]
+define UnknownBegNotContainsInt: 7 in Interval(null, 5]
+define PosInfEndContainsInt: 123456789 in Interval[0, null]
+define PosInfEndNotContainsInt: -1 in Interval[0, null]
+define UnknownEndContainsInt: 0 in Interval[0, null)
+define UnknownClosedEndContainsInt: 0 in Interval[0, null]
+define UnknownEndMayContainInt: 123456789 in Interval[0, null)
+define UnknownEndNotContainsInt: -1 in Interval[0, null)
+define NegInfBegContainsLong: -7L in Interval[null, 5L]
+define NegInfBegNotContainsLong: 7L in Interval[null, 5L]
+define UnknownBegContainsLong: 5L in Interval(null, 5L]
+define UnknownClosedBegContainsLong: 5L in Interval[null, 5L]
+define UnknownBegMayContainLong: -7L in Interval(null, 5L]
+define UnknownBegNotContainsLong: 7L in Interval(null, 5L]
+define PosInfEndContainsLong: 123456789L in Interval[0L, null]
+define PosInfEndNotContainsLong: -1L in Interval[0L, null]
+define UnknownEndContainsLong: 0L in Interval[0L, null)
+define UnknownClosedEndContainsLong: 0L in Interval[0L, null]
+define UnknownEndMayContainLong: 123456789L in Interval[0L, null)
+define UnknownEndNotContainsLong: -1L in Interval[0L, null)
+define NegInfBegContainsDate: DateTime(1, 1, 1, 0, 0, 0, 0) in Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define NegInfBegNotContainsDate: DateTime(2013, 1, 2, 0, 0, 0, 0) in Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define UnknownBegContainsDate: DateTime(2013, 1, 1, 0, 0, 0, 0) in Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define UnknownClosedBegContainsDate: DateTime(2012, 12, 31, 23, 59, 59, 999) in Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define UnknownBegMayContainDate: DateTime(1, 1, 1, 0, 0, 0, 0) in Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define UnknownBegNotContainsDate: DateTime(2013, 1, 2, 0, 0, 0, 0) in Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define PosInfEndContainsDate:  DateTime(2014, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
+define PosInfEndNotContainsDate: DateTime(2012, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
+define UnknownEndContainsDate: DateTime(2013, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
+define UnknownClosedEndContainsDate: DateTime(2013, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
+define UnknownEndMayContainDate: DateTime(2014, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
+define UnknownEndNotContainsDate: DateTime(2012, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
+*/
+
+module.exports['In'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "2177",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "1975",
+        "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotContainsDate",
+        "name" : "ContainsInt",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1975",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotContainsDate", ": " ]
+              "value" : [ "", "define ", "ContainsInt", ": " ]
             }, {
-              "r" : "2029",
+              "r" : "221",
               "s" : [ {
-                "r" : "2001",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1992",
-                  "s" : [ {
-                    "r" : "1976",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2000",
-                  "value" : [ ", ", "null", ")" ]
-                } ]
-              }, {
-                "value" : [ " contains " ]
+                "r" : "215",
+                "value" : [ "3", " in " ]
               }, {
-                "r" : "2021",
+                "r" : "218",
                 "s" : [ {
-                  "r" : "2005",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "216",
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Contains",
-          "localId" : "2029",
+          "type" : "In",
+          "localId" : "221",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "222",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2030",
+            "localId" : "223",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2031",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "224",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "2032",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
           } ],
           "operand" : [ {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "3",
+            "annotation" : [ ]
+          }, {
             "type" : "Interval",
-            "localId" : "2001",
+            "localId" : "218",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2003",
+              "localId" : "219",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2004",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "220",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1992",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1993",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1994",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1995",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1996",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1997",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1998",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1999",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1976",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1977",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1978",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1979",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1980",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1981",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1982",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2002",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2000",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "DateTime",
-            "localId" : "2021",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2022",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2023",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2024",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2025",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2026",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2027",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2028",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "2005",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "2006",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
               "type" : "Literal",
-              "localId" : "2007",
+              "localId" : "216",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "2008",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "2009",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "2010",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "2011",
+              "localId" : "217",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* In
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define ContainsInt: 3 in Interval[1, 5]
-define NotContainsInt: 1 in Interval(1, 5]
-define ContainsReal: 2.345 in Interval[1.234, 3.456]
-define NotContainsReal: 4.567 in Interval[1.234, 3.456]
-define ContainsQuantity: 5 'mg' in Interval[4 'mg', 6 'mg']
-define ContainsQuantityInclusiveEdge: 6 'mg' in Interval[4 'mg', 6 'mg']
-define NotContainsQuantity: 3 'mg' in Interval[4 'mg', 6 'mg']
-define NotContainsQuantityExclusiveEdge: 6 'mg' in Interval[4 'mg', 6 'mg')
-define DateIvlHighOpen: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define DateIvlHighClosed: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)]
-define ContainsDate: DateTime(2012, 6, 1, 0, 0, 0, 0) in DateIvlHighClosed
-define NotContainsDate: DateTime(2012, 9, 1, 0, 0, 0, 0) in DateIvlHighOpen
-define ContainsImpreciseDate: DateTime(2012, 4) in DateIvlHighClosed
-define NotContainsImpreciseDate: DateTime(2012, 10) in DateIvlHighClosed
-define MayContainImpreciseDate: DateTime(2012) in DateIvlHighClosed
-define PrecisionDateIvlHighOpen: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define PrecisionDateIvlHighClosed: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678)]
-define ContainsDayOfDateLowEdge: DateTime(2012, 3, 2, 0, 0, 0, 0) in day of PrecisionDateIvlHighOpen
-define NotContainsDayOfDateHighEdgeOpen: DateTime(2012, 9, 2, 23, 59, 59, 999) in day of PrecisionDateIvlHighOpen
-define ContainsDayOfDateHighEdgeClosed: DateTime(2012, 9, 2, 23, 59, 59, 999) in day of PrecisionDateIvlHighClosed
-define NotContainsDayOfDateLowEdge: DateTime(2012, 3, 1, 23, 59, 59, 999) in day of PrecisionDateIvlHighOpen
-define NotContainsDayOfDateBeyondHighEdge: DateTime(2012, 9, 3, 0, 0, 0, 0) in day of PrecisionDateIvlHighOpen
-define ContainsDayOfDateImpreciseLowEdge: DateTime(2012, 3, 2) in day of PrecisionDateIvlHighOpen
-define NotContainsDayOfDateImpreciseHighEdgeOpen: DateTime(2012, 9, 2) in day of PrecisionDateIvlHighOpen
-define ContainsDayOfDateImpreciseHighEdgeClosed: DateTime(2012, 9, 2) in day of PrecisionDateIvlHighClosed
-define ContainsDayOfDateVeryImpreciseMiddle: DateTime(2012, 6) in day of PrecisionDateIvlHighOpen
-define NotContainsDayOfDateVeryImpreciseLow: DateTime(2012, 2) in day of PrecisionDateIvlHighOpen
-define NotContainsDayOfDateVeryImpreciseHighEdgeOpen: DateTime(2012, 10) in day of PrecisionDateIvlHighOpen
-define MayContainDayOfDateVeryImpreciseLow: DateTime(2012, 3) in day of PrecisionDateIvlHighOpen
-define MayContainDayOfDateVeryImpreciseHigh: DateTime(2012, 9) in day of PrecisionDateIvlHighOpen
-define MayContainDayOfDateVeryImpreciseSurrounding: DateTime(2012) in day of PrecisionDateIvlHighOpen
-define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
-define ImpreciseContainsDate: DateTime(2012, 6, 1, 0, 0, 0, 0) in ImpDateIvl
-define ImpreciseNotContainsDate: DateTime(2012, 9, 1, 0, 0, 0, 0) in ImpDateIvl
-define ImpreciseMayContainDate: DateTime(2012, 3, 15, 0, 0, 0, 0) in ImpDateIvl
-define NegInfBegContainsInt: -7 in Interval[null, 5]
-define NegInfBegNotContainsInt: 7 in Interval[null, 5]
-define UnknownOpenBegContainsInt: 5 in Interval(null, 5]
-define UnknownClosedBegContainsInt: 5 in Interval[null, 5]
-define UnknownBegMayContainInt: -7 in Interval(null, 5]
-define UnknownBegNotContainsInt: 7 in Interval(null, 5]
-define PosInfEndContainsInt: 123456789 in Interval[0, null]
-define PosInfEndNotContainsInt: -1 in Interval[0, null]
-define UnknownOpenEndContainsInt: 0 in Interval[0, null)
-define UnknownClosedEndContainsInt: 0 in Interval[0, null]
-define UnknownEndMayContainInt: 123456789 in Interval[0, null)
-define UnknownEndNotContainsInt: -1 in Interval[0, null)
-define NegInfBegContainsDate: DateTime(1, 1, 1, 0, 0, 0, 0) in Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define NegInfBegNotContainsDate: DateTime(2013, 1, 2, 0, 0, 0, 0) in Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownOpenBegMayContainDate: DateTime(2012, 12, 31, 23, 59, 59, 999) in Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownClosedBegContainsDate: DateTime(2012, 12, 31, 23, 59, 59, 999) in Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownBegMayContainDate: DateTime(1, 1, 1, 0, 0, 0, 0) in Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownBegNotContainsDate: DateTime(2013, 1, 2, 0, 0, 0, 0) in Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define PosInfEndContainsDate:  DateTime(2014, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
-define PosInfEndNotContainsDate: DateTime(2012, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
-define UnknownOpenEndContainsDate: DateTime(2013, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
-define UnknownClosedEndContainsDate: DateTime(2013, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
-define UnknownEndMayContainDate: DateTime(2014, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
-define UnknownEndNotContainsDate: DateTime(2012, 1, 1, 0, 0, 0, 0) in Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
-*/
-
-module.exports['In'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "1975",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "227",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotContainsInt",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "227",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "NotContainsInt", ": " ]
             }, {
+              "r" : "234",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "228",
+                "value" : [ "1", " in " ]
+              }, {
+                "r" : "231",
+                "s" : [ {
+                  "r" : "229",
+                  "value" : [ "Interval(", "1", ", ", "5", "]" ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "In",
+          "localId" : "234",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "235",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "236",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "237",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "228",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          }, {
+            "type" : "Interval",
+            "localId" : "231",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "232",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "233",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "229",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "230",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "240",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ContainsInt",
+        "name" : "ContainsLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "240",
             "s" : [ {
-              "value" : [ "", "define ", "ContainsInt", ": " ]
+              "value" : [ "", "define ", "ContainsLong", ": " ]
             }, {
-              "r" : "221",
+              "r" : "247",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "3", " in " ]
+                "r" : "241",
+                "value" : [ "3L", " in " ]
               }, {
-                "r" : "218",
+                "r" : "244",
                 "s" : [ {
-                  "r" : "216",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "r" : "242",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -18640,90 +21026,90 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "221",
+          "localId" : "247",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "222",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "248",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "223",
+            "localId" : "249",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "224",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "250",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "3",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "218",
+            "localId" : "244",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "219",
+              "localId" : "245",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "220",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "246",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "243",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "227",
+        "localId" : "253",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotContainsInt",
+        "name" : "NotContainsLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "227",
+            "r" : "253",
             "s" : [ {
-              "value" : [ "", "define ", "NotContainsInt", ": " ]
+              "value" : [ "", "define ", "NotContainsLong", ": " ]
             }, {
-              "r" : "234",
+              "r" : "260",
               "s" : [ {
-                "r" : "228",
-                "value" : [ "1", " in " ]
+                "r" : "254",
+                "value" : [ "1L", " in " ]
               }, {
-                "r" : "231",
+                "r" : "257",
                 "s" : [ {
-                  "r" : "229",
-                  "value" : [ "Interval(", "1", ", ", "5", "]" ]
+                  "r" : "255",
+                  "value" : [ "Interval(", "1L", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -18731,69 +21117,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "234",
+          "localId" : "260",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "235",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "261",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "236",
+            "localId" : "262",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "237",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "263",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "228",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "254",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "1",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "231",
+            "localId" : "257",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "232",
+              "localId" : "258",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "233",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "259",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "229",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "255",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "230",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "240",
+        "localId" : "266",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsReal",
         "context" : "Patient",
@@ -18802,18 +21188,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "240",
+            "r" : "266",
             "s" : [ {
               "value" : [ "", "define ", "ContainsReal", ": " ]
             }, {
-              "r" : "247",
+              "r" : "273",
               "s" : [ {
-                "r" : "241",
+                "r" : "267",
                 "value" : [ "2.345", " in " ]
               }, {
-                "r" : "244",
+                "r" : "270",
                 "s" : [ {
-                  "r" : "242",
+                  "r" : "268",
                   "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
                 } ]
               } ]
@@ -18822,52 +21208,52 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "247",
+          "localId" : "273",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "248",
+            "localId" : "274",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "249",
+            "localId" : "275",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "250",
+              "localId" : "276",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "241",
+            "localId" : "267",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
             "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "value" : "2.345",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "244",
+            "localId" : "270",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "245",
+              "localId" : "271",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "246",
+                "localId" : "272",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "242",
+              "localId" : "268",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.234",
@@ -18875,7 +21261,7 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "243",
+              "localId" : "269",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "3.456",
@@ -18884,7 +21270,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "253",
+        "localId" : "279",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsReal",
         "context" : "Patient",
@@ -18893,18 +21279,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "253",
+            "r" : "279",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsReal", ": " ]
             }, {
-              "r" : "260",
+              "r" : "286",
               "s" : [ {
-                "r" : "254",
+                "r" : "280",
                 "value" : [ "4.567", " in " ]
               }, {
-                "r" : "257",
+                "r" : "283",
                 "s" : [ {
-                  "r" : "255",
+                  "r" : "281",
                   "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
                 } ]
               } ]
@@ -18913,52 +21299,52 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "260",
+          "localId" : "286",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "261",
+            "localId" : "287",
             "name" : "{urn:hl7-org:elm-types:r1}Decimal",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "262",
+            "localId" : "288",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "263",
+              "localId" : "289",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "254",
+            "localId" : "280",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
             "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "value" : "4.567",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "257",
+            "localId" : "283",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "258",
+              "localId" : "284",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "259",
+                "localId" : "285",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "255",
+              "localId" : "281",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.234",
@@ -18966,7 +21352,7 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "256",
+              "localId" : "282",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "3.456",
@@ -18975,7 +21361,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "266",
+        "localId" : "292",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsQuantity",
         "context" : "Patient",
@@ -18984,31 +21370,31 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "266",
+            "r" : "292",
             "s" : [ {
               "value" : [ "", "define ", "ContainsQuantity", ": " ]
             }, {
-              "r" : "273",
+              "r" : "299",
               "s" : [ {
-                "r" : "267",
+                "r" : "293",
                 "s" : [ {
                   "value" : [ "5 ", "'mg'" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "270",
+                "r" : "296",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "268",
+                  "r" : "294",
                   "s" : [ {
                     "value" : [ "4 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "269",
+                  "r" : "295",
                   "s" : [ {
                     "value" : [ "6 ", "'mg'" ]
                   } ]
@@ -19021,52 +21407,52 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "273",
+          "localId" : "299",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "274",
+            "localId" : "300",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "275",
+            "localId" : "301",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "276",
+              "localId" : "302",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "267",
+            "localId" : "293",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
             "unit" : "mg",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "270",
+            "localId" : "296",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "271",
+              "localId" : "297",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "272",
+                "localId" : "298",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "268",
+              "localId" : "294",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "mg",
@@ -19074,7 +21460,7 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "269",
+              "localId" : "295",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 6,
               "unit" : "mg",
@@ -19083,7 +21469,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "279",
+        "localId" : "305",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsQuantityInclusiveEdge",
         "context" : "Patient",
@@ -19092,31 +21478,31 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "279",
+            "r" : "305",
             "s" : [ {
               "value" : [ "", "define ", "ContainsQuantityInclusiveEdge", ": " ]
             }, {
-              "r" : "286",
+              "r" : "312",
               "s" : [ {
-                "r" : "280",
+                "r" : "306",
                 "s" : [ {
                   "value" : [ "6 ", "'mg'" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "283",
+                "r" : "309",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "281",
+                  "r" : "307",
                   "s" : [ {
                     "value" : [ "4 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "282",
+                  "r" : "308",
                   "s" : [ {
                     "value" : [ "6 ", "'mg'" ]
                   } ]
@@ -19129,52 +21515,52 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "286",
+          "localId" : "312",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "287",
+            "localId" : "313",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "288",
+            "localId" : "314",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "289",
+              "localId" : "315",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "280",
+            "localId" : "306",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 6,
             "unit" : "mg",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "283",
+            "localId" : "309",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "284",
+              "localId" : "310",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "285",
+                "localId" : "311",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "281",
+              "localId" : "307",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "mg",
@@ -19182,7 +21568,7 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "282",
+              "localId" : "308",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 6,
               "unit" : "mg",
@@ -19191,7 +21577,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "292",
+        "localId" : "318",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsQuantity",
         "context" : "Patient",
@@ -19200,31 +21586,31 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "292",
+            "r" : "318",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsQuantity", ": " ]
             }, {
-              "r" : "299",
+              "r" : "325",
               "s" : [ {
-                "r" : "293",
+                "r" : "319",
                 "s" : [ {
                   "value" : [ "3 ", "'mg'" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "296",
+                "r" : "322",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "294",
+                  "r" : "320",
                   "s" : [ {
                     "value" : [ "4 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "295",
+                  "r" : "321",
                   "s" : [ {
                     "value" : [ "6 ", "'mg'" ]
                   } ]
@@ -19237,52 +21623,52 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "299",
+          "localId" : "325",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "300",
+            "localId" : "326",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "301",
+            "localId" : "327",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "302",
+              "localId" : "328",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "293",
+            "localId" : "319",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 3,
             "unit" : "mg",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "296",
+            "localId" : "322",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "297",
+              "localId" : "323",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "298",
+                "localId" : "324",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "294",
+              "localId" : "320",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "mg",
@@ -19290,7 +21676,7 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "295",
+              "localId" : "321",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 6,
               "unit" : "mg",
@@ -19299,7 +21685,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "305",
+        "localId" : "331",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsQuantityExclusiveEdge",
         "context" : "Patient",
@@ -19308,31 +21694,31 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "305",
+            "r" : "331",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsQuantityExclusiveEdge", ": " ]
             }, {
-              "r" : "312",
+              "r" : "338",
               "s" : [ {
-                "r" : "306",
+                "r" : "332",
                 "s" : [ {
                   "value" : [ "6 ", "'mg'" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "309",
+                "r" : "335",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "307",
+                  "r" : "333",
                   "s" : [ {
                     "value" : [ "4 ", "'mg'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "308",
+                  "r" : "334",
                   "s" : [ {
                     "value" : [ "6 ", "'mg'" ]
                   } ]
@@ -19345,52 +21731,52 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "312",
+          "localId" : "338",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "313",
+            "localId" : "339",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "314",
+            "localId" : "340",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "315",
+              "localId" : "341",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Quantity",
-            "localId" : "306",
+            "localId" : "332",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 6,
             "unit" : "mg",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "309",
+            "localId" : "335",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "310",
+              "localId" : "336",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "311",
+                "localId" : "337",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "307",
+              "localId" : "333",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 4,
               "unit" : "mg",
@@ -19398,7 +21784,7 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "308",
+              "localId" : "334",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 6,
               "unit" : "mg",
@@ -19407,7 +21793,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "318",
+        "localId" : "344",
         "name" : "DateIvlHighOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -19415,25 +21801,25 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "318",
+            "r" : "344",
             "s" : [ {
               "value" : [ "", "define ", "DateIvlHighOpen", ": " ]
             }, {
-              "r" : "367",
+              "r" : "393",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "335",
+                "r" : "361",
                 "s" : [ {
-                  "r" : "319",
+                  "r" : "345",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "359",
+                "r" : "385",
                 "s" : [ {
-                  "r" : "343",
+                  "r" : "369",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
@@ -19444,76 +21830,76 @@ module.exports['In'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "370",
+          "localId" : "396",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "371",
+            "localId" : "397",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "367",
+          "localId" : "393",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "368",
+            "localId" : "394",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "369",
+              "localId" : "395",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "335",
+            "localId" : "361",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "336",
+              "localId" : "362",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "337",
+              "localId" : "363",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "338",
+              "localId" : "364",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "339",
+              "localId" : "365",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "340",
+              "localId" : "366",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "341",
+              "localId" : "367",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "342",
+              "localId" : "368",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "319",
+              "localId" : "345",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -19521,7 +21907,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "320",
+              "localId" : "346",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -19529,7 +21915,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "321",
+              "localId" : "347",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -19537,7 +21923,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "322",
+              "localId" : "348",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19545,7 +21931,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "323",
+              "localId" : "349",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19553,7 +21939,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "324",
+              "localId" : "350",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19561,7 +21947,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "325",
+              "localId" : "351",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19570,48 +21956,48 @@ module.exports['In'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "359",
+            "localId" : "385",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "360",
+              "localId" : "386",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "361",
+              "localId" : "387",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "362",
+              "localId" : "388",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "363",
+              "localId" : "389",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "364",
+              "localId" : "390",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "365",
+              "localId" : "391",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "366",
+              "localId" : "392",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "343",
+              "localId" : "369",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -19619,7 +22005,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "344",
+              "localId" : "370",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -19627,7 +22013,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "345",
+              "localId" : "371",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -19635,7 +22021,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "346",
+              "localId" : "372",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19643,7 +22029,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "347",
+              "localId" : "373",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19651,7 +22037,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "348",
+              "localId" : "374",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19659,7 +22045,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "349",
+              "localId" : "375",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19668,7 +22054,7 @@ module.exports['In'] = {
           }
         }
       }, {
-        "localId" : "374",
+        "localId" : "400",
         "name" : "DateIvlHighClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -19676,25 +22062,25 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "374",
+            "r" : "400",
             "s" : [ {
               "value" : [ "", "define ", "DateIvlHighClosed", ": " ]
             }, {
-              "r" : "423",
+              "r" : "449",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "391",
+                "r" : "417",
                 "s" : [ {
-                  "r" : "375",
+                  "r" : "401",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "415",
+                "r" : "441",
                 "s" : [ {
-                  "r" : "399",
+                  "r" : "425",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
@@ -19705,76 +22091,76 @@ module.exports['In'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "426",
+          "localId" : "452",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "427",
+            "localId" : "453",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "423",
+          "localId" : "449",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "424",
+            "localId" : "450",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "425",
+              "localId" : "451",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "391",
+            "localId" : "417",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "392",
+              "localId" : "418",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "393",
+              "localId" : "419",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "394",
+              "localId" : "420",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "395",
+              "localId" : "421",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "396",
+              "localId" : "422",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "397",
+              "localId" : "423",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "398",
+              "localId" : "424",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "375",
+              "localId" : "401",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -19782,7 +22168,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "376",
+              "localId" : "402",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -19790,7 +22176,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "377",
+              "localId" : "403",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -19798,7 +22184,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "378",
+              "localId" : "404",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19806,7 +22192,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "379",
+              "localId" : "405",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19814,7 +22200,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "380",
+              "localId" : "406",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19822,7 +22208,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "381",
+              "localId" : "407",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19831,48 +22217,48 @@ module.exports['In'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "415",
+            "localId" : "441",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "416",
+              "localId" : "442",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "417",
+              "localId" : "443",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "418",
+              "localId" : "444",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "419",
+              "localId" : "445",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "420",
+              "localId" : "446",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "421",
+              "localId" : "447",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "422",
+              "localId" : "448",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "399",
+              "localId" : "425",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -19880,7 +22266,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "400",
+              "localId" : "426",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -19888,7 +22274,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "401",
+              "localId" : "427",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -19896,7 +22282,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "402",
+              "localId" : "428",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19904,7 +22290,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "403",
+              "localId" : "429",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19912,7 +22298,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "404",
+              "localId" : "430",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19920,7 +22306,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "405",
+              "localId" : "431",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -19929,7 +22315,7 @@ module.exports['In'] = {
           }
         }
       }, {
-        "localId" : "430",
+        "localId" : "456",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsDate",
         "context" : "Patient",
@@ -19938,21 +22324,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "430",
+            "r" : "456",
             "s" : [ {
               "value" : [ "", "define ", "ContainsDate", ": " ]
             }, {
-              "r" : "458",
+              "r" : "484",
               "s" : [ {
-                "r" : "447",
+                "r" : "473",
                 "s" : [ {
-                  "r" : "431",
+                  "r" : "457",
                   "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "455",
+                "r" : "481",
                 "s" : [ {
                   "value" : [ "DateIvlHighClosed" ]
                 } ]
@@ -19962,69 +22348,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "458",
+          "localId" : "484",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "459",
+            "localId" : "485",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "460",
+            "localId" : "486",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "461",
+              "localId" : "487",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "447",
+            "localId" : "473",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "448",
+              "localId" : "474",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "449",
+              "localId" : "475",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "450",
+              "localId" : "476",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "451",
+              "localId" : "477",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "452",
+              "localId" : "478",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "453",
+              "localId" : "479",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "454",
+              "localId" : "480",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "431",
+              "localId" : "457",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -20032,7 +22418,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "432",
+              "localId" : "458",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "6",
@@ -20040,7 +22426,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "433",
+              "localId" : "459",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -20048,7 +22434,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "434",
+              "localId" : "460",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -20056,7 +22442,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "435",
+              "localId" : "461",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -20064,7 +22450,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "436",
+              "localId" : "462",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -20072,7 +22458,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "437",
+              "localId" : "463",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -20080,16 +22466,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "455",
+            "localId" : "481",
             "name" : "DateIvlHighClosed",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "456",
+              "localId" : "482",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "457",
+                "localId" : "483",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -20097,7 +22483,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "464",
+        "localId" : "490",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDate",
         "context" : "Patient",
@@ -20106,21 +22492,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "464",
+            "r" : "490",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDate", ": " ]
             }, {
-              "r" : "492",
+              "r" : "518",
               "s" : [ {
-                "r" : "481",
+                "r" : "507",
                 "s" : [ {
-                  "r" : "465",
+                  "r" : "491",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "489",
+                "r" : "515",
                 "s" : [ {
                   "value" : [ "DateIvlHighOpen" ]
                 } ]
@@ -20130,69 +22516,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "492",
+          "localId" : "518",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "493",
+            "localId" : "519",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "494",
+            "localId" : "520",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "495",
+              "localId" : "521",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "481",
+            "localId" : "507",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "482",
+              "localId" : "508",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "483",
+              "localId" : "509",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "484",
+              "localId" : "510",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "485",
+              "localId" : "511",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "486",
+              "localId" : "512",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "487",
+              "localId" : "513",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "488",
+              "localId" : "514",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "465",
+              "localId" : "491",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -20200,7 +22586,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "466",
+              "localId" : "492",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -20208,7 +22594,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "467",
+              "localId" : "493",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -20216,7 +22602,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "468",
+              "localId" : "494",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -20224,7 +22610,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "469",
+              "localId" : "495",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -20232,7 +22618,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "470",
+              "localId" : "496",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -20240,7 +22626,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "471",
+              "localId" : "497",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -20248,16 +22634,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "489",
+            "localId" : "515",
             "name" : "DateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "490",
+              "localId" : "516",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "491",
+                "localId" : "517",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -20265,7 +22651,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "498",
+        "localId" : "524",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsImpreciseDate",
         "context" : "Patient",
@@ -20274,21 +22660,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "498",
+            "r" : "524",
             "s" : [ {
               "value" : [ "", "define ", "ContainsImpreciseDate", ": " ]
             }, {
-              "r" : "511",
+              "r" : "537",
               "s" : [ {
-                "r" : "505",
+                "r" : "531",
                 "s" : [ {
-                  "r" : "499",
+                  "r" : "525",
                   "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "508",
+                "r" : "534",
                 "s" : [ {
                   "value" : [ "DateIvlHighClosed" ]
                 } ]
@@ -20298,44 +22684,44 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "511",
+          "localId" : "537",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "512",
+            "localId" : "538",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "513",
+            "localId" : "539",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "514",
+              "localId" : "540",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "505",
+            "localId" : "531",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "506",
+              "localId" : "532",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "507",
+              "localId" : "533",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "499",
+              "localId" : "525",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -20343,7 +22729,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "500",
+              "localId" : "526",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -20351,16 +22737,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "508",
+            "localId" : "534",
             "name" : "DateIvlHighClosed",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "509",
+              "localId" : "535",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "510",
+                "localId" : "536",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -20368,7 +22754,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "517",
+        "localId" : "543",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsImpreciseDate",
         "context" : "Patient",
@@ -20377,21 +22763,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "517",
+            "r" : "543",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsImpreciseDate", ": " ]
             }, {
-              "r" : "530",
+              "r" : "556",
               "s" : [ {
-                "r" : "524",
+                "r" : "550",
                 "s" : [ {
-                  "r" : "518",
+                  "r" : "544",
                   "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "527",
+                "r" : "553",
                 "s" : [ {
                   "value" : [ "DateIvlHighClosed" ]
                 } ]
@@ -20401,44 +22787,44 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "530",
+          "localId" : "556",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "531",
+            "localId" : "557",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "532",
+            "localId" : "558",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "533",
+              "localId" : "559",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "524",
+            "localId" : "550",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "525",
+              "localId" : "551",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "526",
+              "localId" : "552",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "518",
+              "localId" : "544",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -20446,7 +22832,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "519",
+              "localId" : "545",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -20454,16 +22840,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "527",
+            "localId" : "553",
             "name" : "DateIvlHighClosed",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "528",
+              "localId" : "554",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "529",
+                "localId" : "555",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -20471,7 +22857,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "536",
+        "localId" : "562",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayContainImpreciseDate",
         "context" : "Patient",
@@ -20480,21 +22866,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "536",
+            "r" : "562",
             "s" : [ {
               "value" : [ "", "define ", "MayContainImpreciseDate", ": " ]
             }, {
-              "r" : "546",
+              "r" : "572",
               "s" : [ {
-                "r" : "541",
+                "r" : "567",
                 "s" : [ {
-                  "r" : "537",
+                  "r" : "563",
                   "value" : [ "DateTime", "(", "2012", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "543",
+                "r" : "569",
                 "s" : [ {
                   "value" : [ "DateIvlHighClosed" ]
                 } ]
@@ -20504,39 +22890,39 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "546",
+          "localId" : "572",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "547",
+            "localId" : "573",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "548",
+            "localId" : "574",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "549",
+              "localId" : "575",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "541",
+            "localId" : "567",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "542",
+              "localId" : "568",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "537",
+              "localId" : "563",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -20544,16 +22930,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "543",
+            "localId" : "569",
             "name" : "DateIvlHighClosed",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "544",
+              "localId" : "570",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "545",
+                "localId" : "571",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -20561,7 +22947,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "552",
+        "localId" : "578",
         "name" : "PrecisionDateIvlHighOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -20569,25 +22955,25 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "552",
+            "r" : "578",
             "s" : [ {
               "value" : [ "", "define ", "PrecisionDateIvlHighOpen", ": " ]
             }, {
-              "r" : "601",
+              "r" : "627",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "569",
+                "r" : "595",
                 "s" : [ {
-                  "r" : "553",
+                  "r" : "579",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "593",
+                "r" : "619",
                 "s" : [ {
-                  "r" : "577",
+                  "r" : "603",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
               }, {
@@ -20598,76 +22984,76 @@ module.exports['In'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "604",
+          "localId" : "630",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "605",
+            "localId" : "631",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "601",
+          "localId" : "627",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "602",
+            "localId" : "628",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "603",
+              "localId" : "629",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "569",
+            "localId" : "595",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "570",
+              "localId" : "596",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "571",
+              "localId" : "597",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "572",
+              "localId" : "598",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "573",
+              "localId" : "599",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "574",
+              "localId" : "600",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "575",
+              "localId" : "601",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "576",
+              "localId" : "602",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "553",
+              "localId" : "579",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -20675,7 +23061,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "554",
+              "localId" : "580",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20683,7 +23069,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "555",
+              "localId" : "581",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -20691,7 +23077,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "556",
+              "localId" : "582",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -20699,7 +23085,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "557",
+              "localId" : "583",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "34",
@@ -20707,7 +23093,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "558",
+              "localId" : "584",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "56",
@@ -20715,7 +23101,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "559",
+              "localId" : "585",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "789",
@@ -20724,48 +23110,48 @@ module.exports['In'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "593",
+            "localId" : "619",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "594",
+              "localId" : "620",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "595",
+              "localId" : "621",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "596",
+              "localId" : "622",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "597",
+              "localId" : "623",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "598",
+              "localId" : "624",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "599",
+              "localId" : "625",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "600",
+              "localId" : "626",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "577",
+              "localId" : "603",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -20773,7 +23159,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "578",
+              "localId" : "604",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -20781,7 +23167,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "579",
+              "localId" : "605",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -20789,7 +23175,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "580",
+              "localId" : "606",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -20797,7 +23183,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "581",
+              "localId" : "607",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -20805,7 +23191,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "582",
+              "localId" : "608",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "45",
@@ -20813,7 +23199,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "583",
+              "localId" : "609",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "678",
@@ -20822,7 +23208,7 @@ module.exports['In'] = {
           }
         }
       }, {
-        "localId" : "608",
+        "localId" : "634",
         "name" : "PrecisionDateIvlHighClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -20830,25 +23216,25 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "608",
+            "r" : "634",
             "s" : [ {
               "value" : [ "", "define ", "PrecisionDateIvlHighClosed", ": " ]
             }, {
-              "r" : "657",
+              "r" : "683",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "625",
+                "r" : "651",
                 "s" : [ {
-                  "r" : "609",
+                  "r" : "635",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "649",
+                "r" : "675",
                 "s" : [ {
-                  "r" : "633",
+                  "r" : "659",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
               }, {
@@ -20859,76 +23245,76 @@ module.exports['In'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "660",
+          "localId" : "686",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "661",
+            "localId" : "687",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "657",
+          "localId" : "683",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "658",
+            "localId" : "684",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "659",
+              "localId" : "685",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "625",
+            "localId" : "651",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "626",
+              "localId" : "652",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "627",
+              "localId" : "653",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "628",
+              "localId" : "654",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "629",
+              "localId" : "655",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "630",
+              "localId" : "656",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "631",
+              "localId" : "657",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "632",
+              "localId" : "658",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "609",
+              "localId" : "635",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -20936,7 +23322,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "610",
+              "localId" : "636",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20944,7 +23330,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "611",
+              "localId" : "637",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -20952,7 +23338,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "612",
+              "localId" : "638",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -20960,7 +23346,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "613",
+              "localId" : "639",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "34",
@@ -20968,7 +23354,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "614",
+              "localId" : "640",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "56",
@@ -20976,7 +23362,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "615",
+              "localId" : "641",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "789",
@@ -20985,48 +23371,48 @@ module.exports['In'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "649",
+            "localId" : "675",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "650",
+              "localId" : "676",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "651",
+              "localId" : "677",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "652",
+              "localId" : "678",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "653",
+              "localId" : "679",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "654",
+              "localId" : "680",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "655",
+              "localId" : "681",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "656",
+              "localId" : "682",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "633",
+              "localId" : "659",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -21034,7 +23420,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "634",
+              "localId" : "660",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -21042,7 +23428,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "635",
+              "localId" : "661",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -21050,7 +23436,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "636",
+              "localId" : "662",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -21058,7 +23444,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "637",
+              "localId" : "663",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -21066,7 +23452,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "638",
+              "localId" : "664",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "45",
@@ -21074,7 +23460,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "639",
+              "localId" : "665",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "678",
@@ -21083,7 +23469,7 @@ module.exports['In'] = {
           }
         }
       }, {
-        "localId" : "664",
+        "localId" : "690",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsDayOfDateLowEdge",
         "context" : "Patient",
@@ -21092,21 +23478,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "664",
+            "r" : "690",
             "s" : [ {
               "value" : [ "", "define ", "ContainsDayOfDateLowEdge", ": " ]
             }, {
-              "r" : "665",
+              "r" : "691",
               "s" : [ {
-                "r" : "682",
+                "r" : "708",
                 "s" : [ {
-                  "r" : "666",
+                  "r" : "692",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "690",
+                "r" : "716",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -21116,70 +23502,70 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "665",
+          "localId" : "691",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "693",
+            "localId" : "719",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "694",
+            "localId" : "720",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "695",
+              "localId" : "721",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "682",
+            "localId" : "708",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "683",
+              "localId" : "709",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "684",
+              "localId" : "710",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "685",
+              "localId" : "711",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "686",
+              "localId" : "712",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "687",
+              "localId" : "713",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "688",
+              "localId" : "714",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "689",
+              "localId" : "715",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "666",
+              "localId" : "692",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -21187,7 +23573,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "667",
+              "localId" : "693",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -21195,7 +23581,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "668",
+              "localId" : "694",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -21203,7 +23589,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "669",
+              "localId" : "695",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -21211,7 +23597,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "670",
+              "localId" : "696",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -21219,7 +23605,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "671",
+              "localId" : "697",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -21227,7 +23613,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "672",
+              "localId" : "698",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -21235,16 +23621,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "690",
+            "localId" : "716",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "691",
+              "localId" : "717",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "692",
+                "localId" : "718",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -21252,7 +23638,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "698",
+        "localId" : "724",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDayOfDateHighEdgeOpen",
         "context" : "Patient",
@@ -21261,21 +23647,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "698",
+            "r" : "724",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDayOfDateHighEdgeOpen", ": " ]
             }, {
-              "r" : "699",
+              "r" : "725",
               "s" : [ {
-                "r" : "716",
+                "r" : "742",
                 "s" : [ {
-                  "r" : "700",
+                  "r" : "726",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "724",
+                "r" : "750",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -21285,70 +23671,70 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "699",
+          "localId" : "725",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "727",
+            "localId" : "753",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "728",
+            "localId" : "754",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "729",
+              "localId" : "755",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "716",
+            "localId" : "742",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "717",
+              "localId" : "743",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "718",
+              "localId" : "744",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "719",
+              "localId" : "745",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "720",
+              "localId" : "746",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "721",
+              "localId" : "747",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "722",
+              "localId" : "748",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "723",
+              "localId" : "749",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "700",
+              "localId" : "726",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -21356,7 +23742,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "701",
+              "localId" : "727",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -21364,7 +23750,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "702",
+              "localId" : "728",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -21372,7 +23758,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "703",
+              "localId" : "729",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -21380,7 +23766,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "704",
+              "localId" : "730",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "59",
@@ -21388,7 +23774,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "705",
+              "localId" : "731",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "59",
@@ -21396,7 +23782,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "706",
+              "localId" : "732",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "999",
@@ -21404,16 +23790,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "724",
+            "localId" : "750",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "725",
+              "localId" : "751",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "726",
+                "localId" : "752",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -21421,7 +23807,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "732",
+        "localId" : "758",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsDayOfDateHighEdgeClosed",
         "context" : "Patient",
@@ -21430,21 +23816,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "732",
+            "r" : "758",
             "s" : [ {
               "value" : [ "", "define ", "ContainsDayOfDateHighEdgeClosed", ": " ]
             }, {
-              "r" : "733",
+              "r" : "759",
               "s" : [ {
-                "r" : "750",
+                "r" : "776",
                 "s" : [ {
-                  "r" : "734",
+                  "r" : "760",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "758",
+                "r" : "784",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighClosed" ]
                 } ]
@@ -21454,70 +23840,70 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "733",
+          "localId" : "759",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "761",
+            "localId" : "787",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "762",
+            "localId" : "788",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "763",
+              "localId" : "789",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "750",
+            "localId" : "776",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "751",
+              "localId" : "777",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "752",
+              "localId" : "778",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "753",
+              "localId" : "779",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "754",
+              "localId" : "780",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "755",
+              "localId" : "781",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "756",
+              "localId" : "782",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "757",
+              "localId" : "783",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "734",
+              "localId" : "760",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -21525,7 +23911,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "735",
+              "localId" : "761",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -21533,7 +23919,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "736",
+              "localId" : "762",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -21541,7 +23927,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "737",
+              "localId" : "763",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -21549,7 +23935,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "738",
+              "localId" : "764",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "59",
@@ -21557,7 +23943,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "739",
+              "localId" : "765",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "59",
@@ -21565,7 +23951,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "740",
+              "localId" : "766",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "999",
@@ -21573,16 +23959,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "758",
+            "localId" : "784",
             "name" : "PrecisionDateIvlHighClosed",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "759",
+              "localId" : "785",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "760",
+                "localId" : "786",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -21590,7 +23976,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "766",
+        "localId" : "792",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDayOfDateLowEdge",
         "context" : "Patient",
@@ -21599,21 +23985,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "766",
+            "r" : "792",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDayOfDateLowEdge", ": " ]
             }, {
-              "r" : "767",
+              "r" : "793",
               "s" : [ {
-                "r" : "784",
+                "r" : "810",
                 "s" : [ {
-                  "r" : "768",
+                  "r" : "794",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "792",
+                "r" : "818",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -21623,70 +24009,70 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "767",
+          "localId" : "793",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "795",
+            "localId" : "821",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "796",
+            "localId" : "822",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "797",
+              "localId" : "823",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "784",
+            "localId" : "810",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "785",
+              "localId" : "811",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "786",
+              "localId" : "812",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "787",
+              "localId" : "813",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "788",
+              "localId" : "814",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "789",
+              "localId" : "815",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "790",
+              "localId" : "816",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "791",
+              "localId" : "817",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "768",
+              "localId" : "794",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -21694,7 +24080,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "769",
+              "localId" : "795",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -21702,7 +24088,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "770",
+              "localId" : "796",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -21710,7 +24096,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "771",
+              "localId" : "797",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -21718,7 +24104,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "772",
+              "localId" : "798",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "59",
@@ -21726,7 +24112,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "773",
+              "localId" : "799",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "59",
@@ -21734,7 +24120,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "774",
+              "localId" : "800",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "999",
@@ -21742,16 +24128,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "792",
+            "localId" : "818",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "793",
+              "localId" : "819",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "794",
+                "localId" : "820",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -21759,7 +24145,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "800",
+        "localId" : "826",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDayOfDateBeyondHighEdge",
         "context" : "Patient",
@@ -21768,21 +24154,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "800",
+            "r" : "826",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDayOfDateBeyondHighEdge", ": " ]
             }, {
-              "r" : "801",
+              "r" : "827",
               "s" : [ {
-                "r" : "818",
+                "r" : "844",
                 "s" : [ {
-                  "r" : "802",
+                  "r" : "828",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "826",
+                "r" : "852",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -21792,70 +24178,70 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "801",
+          "localId" : "827",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "829",
+            "localId" : "855",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "830",
+            "localId" : "856",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "831",
+              "localId" : "857",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "818",
+            "localId" : "844",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "819",
+              "localId" : "845",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "820",
+              "localId" : "846",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "821",
+              "localId" : "847",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "822",
+              "localId" : "848",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "823",
+              "localId" : "849",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "824",
+              "localId" : "850",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "825",
+              "localId" : "851",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "802",
+              "localId" : "828",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -21863,7 +24249,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "803",
+              "localId" : "829",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -21871,7 +24257,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "804",
+              "localId" : "830",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -21879,7 +24265,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "805",
+              "localId" : "831",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -21887,7 +24273,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "806",
+              "localId" : "832",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -21895,7 +24281,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "807",
+              "localId" : "833",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -21903,7 +24289,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "808",
+              "localId" : "834",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -21911,16 +24297,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "826",
+            "localId" : "852",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "827",
+              "localId" : "853",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "828",
+                "localId" : "854",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -21928,7 +24314,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "834",
+        "localId" : "860",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsDayOfDateImpreciseLowEdge",
         "context" : "Patient",
@@ -21937,21 +24323,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "834",
+            "r" : "860",
             "s" : [ {
               "value" : [ "", "define ", "ContainsDayOfDateImpreciseLowEdge", ": " ]
             }, {
-              "r" : "835",
+              "r" : "861",
               "s" : [ {
-                "r" : "844",
+                "r" : "870",
                 "s" : [ {
-                  "r" : "836",
+                  "r" : "862",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "848",
+                "r" : "874",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -21961,50 +24347,50 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "835",
+          "localId" : "861",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "851",
+            "localId" : "877",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "852",
+            "localId" : "878",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "853",
+              "localId" : "879",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "844",
+            "localId" : "870",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "845",
+              "localId" : "871",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "846",
+              "localId" : "872",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "847",
+              "localId" : "873",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "836",
+              "localId" : "862",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22012,7 +24398,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "837",
+              "localId" : "863",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -22020,7 +24406,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "838",
+              "localId" : "864",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -22028,16 +24414,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "848",
+            "localId" : "874",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "849",
+              "localId" : "875",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "850",
+                "localId" : "876",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -22045,7 +24431,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "856",
+        "localId" : "882",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDayOfDateImpreciseHighEdgeOpen",
         "context" : "Patient",
@@ -22054,21 +24440,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "856",
+            "r" : "882",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDayOfDateImpreciseHighEdgeOpen", ": " ]
             }, {
-              "r" : "857",
+              "r" : "883",
               "s" : [ {
-                "r" : "866",
+                "r" : "892",
                 "s" : [ {
-                  "r" : "858",
+                  "r" : "884",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "870",
+                "r" : "896",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -22078,50 +24464,50 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "857",
+          "localId" : "883",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "873",
+            "localId" : "899",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "874",
+            "localId" : "900",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "875",
+              "localId" : "901",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "866",
+            "localId" : "892",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "867",
+              "localId" : "893",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "868",
+              "localId" : "894",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "869",
+              "localId" : "895",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "858",
+              "localId" : "884",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22129,7 +24515,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "859",
+              "localId" : "885",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -22137,7 +24523,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "860",
+              "localId" : "886",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -22145,16 +24531,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "870",
+            "localId" : "896",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "871",
+              "localId" : "897",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "872",
+                "localId" : "898",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -22162,7 +24548,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "878",
+        "localId" : "904",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsDayOfDateImpreciseHighEdgeClosed",
         "context" : "Patient",
@@ -22171,21 +24557,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "878",
+            "r" : "904",
             "s" : [ {
               "value" : [ "", "define ", "ContainsDayOfDateImpreciseHighEdgeClosed", ": " ]
             }, {
-              "r" : "879",
+              "r" : "905",
               "s" : [ {
-                "r" : "888",
+                "r" : "914",
                 "s" : [ {
-                  "r" : "880",
+                  "r" : "906",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "892",
+                "r" : "918",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighClosed" ]
                 } ]
@@ -22195,50 +24581,50 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "879",
+          "localId" : "905",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "895",
+            "localId" : "921",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "896",
+            "localId" : "922",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "897",
+              "localId" : "923",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "888",
+            "localId" : "914",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "889",
+              "localId" : "915",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "890",
+              "localId" : "916",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "891",
+              "localId" : "917",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "880",
+              "localId" : "906",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22246,7 +24632,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "881",
+              "localId" : "907",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -22254,7 +24640,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "882",
+              "localId" : "908",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -22262,16 +24648,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "892",
+            "localId" : "918",
             "name" : "PrecisionDateIvlHighClosed",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "893",
+              "localId" : "919",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "894",
+                "localId" : "920",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -22279,7 +24665,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "900",
+        "localId" : "926",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ContainsDayOfDateVeryImpreciseMiddle",
         "context" : "Patient",
@@ -22288,21 +24674,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "900",
+            "r" : "926",
             "s" : [ {
               "value" : [ "", "define ", "ContainsDayOfDateVeryImpreciseMiddle", ": " ]
             }, {
-              "r" : "901",
+              "r" : "927",
               "s" : [ {
-                "r" : "908",
+                "r" : "934",
                 "s" : [ {
-                  "r" : "902",
+                  "r" : "928",
                   "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "911",
+                "r" : "937",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -22312,45 +24698,45 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "901",
+          "localId" : "927",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "914",
+            "localId" : "940",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "915",
+            "localId" : "941",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "916",
+              "localId" : "942",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "908",
+            "localId" : "934",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "909",
+              "localId" : "935",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "910",
+              "localId" : "936",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "902",
+              "localId" : "928",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22358,7 +24744,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "903",
+              "localId" : "929",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "6",
@@ -22366,16 +24752,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "911",
+            "localId" : "937",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "912",
+              "localId" : "938",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "913",
+                "localId" : "939",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -22383,7 +24769,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "919",
+        "localId" : "945",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDayOfDateVeryImpreciseLow",
         "context" : "Patient",
@@ -22392,21 +24778,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "919",
+            "r" : "945",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDayOfDateVeryImpreciseLow", ": " ]
             }, {
-              "r" : "920",
+              "r" : "946",
               "s" : [ {
-                "r" : "927",
+                "r" : "953",
                 "s" : [ {
-                  "r" : "921",
+                  "r" : "947",
                   "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "930",
+                "r" : "956",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -22416,45 +24802,45 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "920",
+          "localId" : "946",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "933",
+            "localId" : "959",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "934",
+            "localId" : "960",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "935",
+              "localId" : "961",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "927",
+            "localId" : "953",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "928",
+              "localId" : "954",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "929",
+              "localId" : "955",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "921",
+              "localId" : "947",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22462,7 +24848,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "922",
+              "localId" : "948",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -22470,16 +24856,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "930",
+            "localId" : "956",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "931",
+              "localId" : "957",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "932",
+                "localId" : "958",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -22487,7 +24873,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "938",
+        "localId" : "964",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotContainsDayOfDateVeryImpreciseHighEdgeOpen",
         "context" : "Patient",
@@ -22496,21 +24882,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "938",
+            "r" : "964",
             "s" : [ {
               "value" : [ "", "define ", "NotContainsDayOfDateVeryImpreciseHighEdgeOpen", ": " ]
             }, {
-              "r" : "939",
+              "r" : "965",
               "s" : [ {
-                "r" : "946",
+                "r" : "972",
                 "s" : [ {
-                  "r" : "940",
+                  "r" : "966",
                   "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "949",
+                "r" : "975",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -22520,45 +24906,45 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "939",
+          "localId" : "965",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "952",
+            "localId" : "978",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "953",
+            "localId" : "979",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "954",
+              "localId" : "980",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "946",
+            "localId" : "972",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "947",
+              "localId" : "973",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "948",
+              "localId" : "974",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "940",
+              "localId" : "966",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22566,7 +24952,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "941",
+              "localId" : "967",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -22574,16 +24960,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "949",
+            "localId" : "975",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "950",
+              "localId" : "976",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "951",
+                "localId" : "977",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -22591,7 +24977,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "957",
+        "localId" : "983",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayContainDayOfDateVeryImpreciseLow",
         "context" : "Patient",
@@ -22600,21 +24986,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "957",
+            "r" : "983",
             "s" : [ {
               "value" : [ "", "define ", "MayContainDayOfDateVeryImpreciseLow", ": " ]
             }, {
-              "r" : "958",
+              "r" : "984",
               "s" : [ {
-                "r" : "965",
+                "r" : "991",
                 "s" : [ {
-                  "r" : "959",
+                  "r" : "985",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "968",
+                "r" : "994",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -22624,45 +25010,45 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "958",
+          "localId" : "984",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "971",
+            "localId" : "997",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "972",
+            "localId" : "998",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "973",
+              "localId" : "999",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "965",
+            "localId" : "991",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "966",
+              "localId" : "992",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "967",
+              "localId" : "993",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "959",
+              "localId" : "985",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22670,7 +25056,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "960",
+              "localId" : "986",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -22678,16 +25064,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "968",
+            "localId" : "994",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "969",
+              "localId" : "995",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "970",
+                "localId" : "996",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -22695,7 +25081,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "976",
+        "localId" : "1002",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayContainDayOfDateVeryImpreciseHigh",
         "context" : "Patient",
@@ -22704,21 +25090,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "976",
+            "r" : "1002",
             "s" : [ {
               "value" : [ "", "define ", "MayContainDayOfDateVeryImpreciseHigh", ": " ]
             }, {
-              "r" : "977",
+              "r" : "1003",
               "s" : [ {
-                "r" : "984",
+                "r" : "1010",
                 "s" : [ {
-                  "r" : "978",
+                  "r" : "1004",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "987",
+                "r" : "1013",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -22728,45 +25114,45 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "977",
+          "localId" : "1003",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "990",
+            "localId" : "1016",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "991",
+            "localId" : "1017",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "992",
+              "localId" : "1018",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "984",
+            "localId" : "1010",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "985",
+              "localId" : "1011",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "986",
+              "localId" : "1012",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "978",
+              "localId" : "1004",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22774,7 +25160,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "979",
+              "localId" : "1005",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -22782,16 +25168,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "987",
+            "localId" : "1013",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "988",
+              "localId" : "1014",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "989",
+                "localId" : "1015",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -22799,7 +25185,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "995",
+        "localId" : "1021",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayContainDayOfDateVeryImpreciseSurrounding",
         "context" : "Patient",
@@ -22808,21 +25194,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "995",
+            "r" : "1021",
             "s" : [ {
               "value" : [ "", "define ", "MayContainDayOfDateVeryImpreciseSurrounding", ": " ]
             }, {
-              "r" : "996",
+              "r" : "1022",
               "s" : [ {
-                "r" : "1001",
+                "r" : "1027",
                 "s" : [ {
-                  "r" : "997",
+                  "r" : "1023",
                   "value" : [ "DateTime", "(", "2012", ")" ]
                 } ]
               }, {
                 "value" : [ " in day of " ]
               }, {
-                "r" : "1003",
+                "r" : "1029",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvlHighOpen" ]
                 } ]
@@ -22832,40 +25218,40 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "996",
+          "localId" : "1022",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1006",
+            "localId" : "1032",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1007",
+            "localId" : "1033",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1008",
+              "localId" : "1034",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1001",
+            "localId" : "1027",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1002",
+              "localId" : "1028",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "997",
+              "localId" : "1023",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22873,16 +25259,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "1003",
+            "localId" : "1029",
             "name" : "PrecisionDateIvlHighOpen",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1004",
+              "localId" : "1030",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1005",
+                "localId" : "1031",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -22890,7 +25276,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1011",
+        "localId" : "1037",
         "name" : "ImpDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -22898,25 +25284,25 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1011",
+            "r" : "1037",
             "s" : [ {
               "value" : [ "", "define ", "ImpDateIvl", ": " ]
             }, {
-              "r" : "1030",
+              "r" : "1056",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "1018",
+                "r" : "1044",
                 "s" : [ {
-                  "r" : "1012",
+                  "r" : "1038",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "1027",
+                "r" : "1053",
                 "s" : [ {
-                  "r" : "1021",
+                  "r" : "1047",
                   "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
                 } ]
               }, {
@@ -22927,51 +25313,51 @@ module.exports['In'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1033",
+          "localId" : "1059",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1034",
+            "localId" : "1060",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "1030",
+          "localId" : "1056",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1031",
+            "localId" : "1057",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1032",
+              "localId" : "1058",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "1018",
+            "localId" : "1044",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1019",
+              "localId" : "1045",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1020",
+              "localId" : "1046",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1012",
+              "localId" : "1038",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22979,7 +25365,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1013",
+              "localId" : "1039",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -22988,23 +25374,23 @@ module.exports['In'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "1027",
+            "localId" : "1053",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1028",
+              "localId" : "1054",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1029",
+              "localId" : "1055",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1021",
+              "localId" : "1047",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -23012,7 +25398,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1022",
+              "localId" : "1048",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "8",
@@ -23021,7 +25407,7 @@ module.exports['In'] = {
           }
         }
       }, {
-        "localId" : "1037",
+        "localId" : "1063",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpreciseContainsDate",
         "context" : "Patient",
@@ -23030,21 +25416,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1037",
+            "r" : "1063",
             "s" : [ {
               "value" : [ "", "define ", "ImpreciseContainsDate", ": " ]
             }, {
-              "r" : "1065",
+              "r" : "1091",
               "s" : [ {
-                "r" : "1054",
+                "r" : "1080",
                 "s" : [ {
-                  "r" : "1038",
+                  "r" : "1064",
                   "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1062",
+                "r" : "1088",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
@@ -23054,69 +25440,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1065",
+          "localId" : "1091",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1066",
+            "localId" : "1092",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1067",
+            "localId" : "1093",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1068",
+              "localId" : "1094",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1054",
+            "localId" : "1080",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1055",
+              "localId" : "1081",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1056",
+              "localId" : "1082",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1057",
+              "localId" : "1083",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1058",
+              "localId" : "1084",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1059",
+              "localId" : "1085",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1060",
+              "localId" : "1086",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1061",
+              "localId" : "1087",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1038",
+              "localId" : "1064",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -23124,7 +25510,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1039",
+              "localId" : "1065",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "6",
@@ -23132,7 +25518,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1040",
+              "localId" : "1066",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -23140,7 +25526,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1041",
+              "localId" : "1067",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23148,7 +25534,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1042",
+              "localId" : "1068",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23156,7 +25542,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1043",
+              "localId" : "1069",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23164,7 +25550,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1044",
+              "localId" : "1070",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23172,16 +25558,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "1062",
+            "localId" : "1088",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1063",
+              "localId" : "1089",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1064",
+                "localId" : "1090",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -23189,7 +25575,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1071",
+        "localId" : "1097",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpreciseNotContainsDate",
         "context" : "Patient",
@@ -23198,21 +25584,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1071",
+            "r" : "1097",
             "s" : [ {
               "value" : [ "", "define ", "ImpreciseNotContainsDate", ": " ]
             }, {
-              "r" : "1099",
+              "r" : "1125",
               "s" : [ {
-                "r" : "1088",
+                "r" : "1114",
                 "s" : [ {
-                  "r" : "1072",
+                  "r" : "1098",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1096",
+                "r" : "1122",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
@@ -23222,69 +25608,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1099",
+          "localId" : "1125",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1100",
+            "localId" : "1126",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1101",
+            "localId" : "1127",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1102",
+              "localId" : "1128",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1088",
+            "localId" : "1114",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1089",
+              "localId" : "1115",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1090",
+              "localId" : "1116",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1091",
+              "localId" : "1117",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1092",
+              "localId" : "1118",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1093",
+              "localId" : "1119",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1094",
+              "localId" : "1120",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1095",
+              "localId" : "1121",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1072",
+              "localId" : "1098",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -23292,7 +25678,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1073",
+              "localId" : "1099",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -23300,7 +25686,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1074",
+              "localId" : "1100",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -23308,7 +25694,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1075",
+              "localId" : "1101",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23316,7 +25702,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1076",
+              "localId" : "1102",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23324,7 +25710,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1077",
+              "localId" : "1103",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23332,7 +25718,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1078",
+              "localId" : "1104",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23340,16 +25726,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "1096",
+            "localId" : "1122",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1097",
+              "localId" : "1123",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1098",
+                "localId" : "1124",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -23357,7 +25743,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1105",
+        "localId" : "1131",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpreciseMayContainDate",
         "context" : "Patient",
@@ -23366,21 +25752,21 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1105",
+            "r" : "1131",
             "s" : [ {
               "value" : [ "", "define ", "ImpreciseMayContainDate", ": " ]
             }, {
-              "r" : "1133",
+              "r" : "1159",
               "s" : [ {
-                "r" : "1122",
+                "r" : "1148",
                 "s" : [ {
-                  "r" : "1106",
+                  "r" : "1132",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1130",
+                "r" : "1156",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
@@ -23390,69 +25776,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1133",
+          "localId" : "1159",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1134",
+            "localId" : "1160",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1135",
+            "localId" : "1161",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1136",
+              "localId" : "1162",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1122",
+            "localId" : "1148",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1123",
+              "localId" : "1149",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1124",
+              "localId" : "1150",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1125",
+              "localId" : "1151",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1126",
+              "localId" : "1152",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1127",
+              "localId" : "1153",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1128",
+              "localId" : "1154",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1129",
+              "localId" : "1155",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1106",
+              "localId" : "1132",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -23460,7 +25846,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1107",
+              "localId" : "1133",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -23468,7 +25854,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1108",
+              "localId" : "1134",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -23476,7 +25862,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1109",
+              "localId" : "1135",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23484,7 +25870,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1110",
+              "localId" : "1136",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23492,7 +25878,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1111",
+              "localId" : "1137",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23500,7 +25886,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1112",
+              "localId" : "1138",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -23508,16 +25894,16 @@ module.exports['In'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "1130",
+            "localId" : "1156",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1131",
+              "localId" : "1157",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1132",
+                "localId" : "1158",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -23525,7 +25911,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1139",
+        "localId" : "1165",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NegInfBegContainsInt",
         "context" : "Patient",
@@ -23534,23 +25920,23 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1139",
+            "r" : "1165",
             "s" : [ {
               "value" : [ "", "define ", "NegInfBegContainsInt", ": " ]
             }, {
-              "r" : "1149",
+              "r" : "1175",
               "s" : [ {
-                "r" : "1140",
+                "r" : "1166",
                 "s" : [ {
-                  "r" : "1141",
+                  "r" : "1167",
                   "value" : [ "-", "7" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1145",
+                "r" : "1171",
                 "s" : [ {
-                  "r" : "1143",
+                  "r" : "1169",
                   "value" : [ "Interval[", "null", ", ", "5", "]" ]
                 } ]
               } ]
@@ -23559,39 +25945,39 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1149",
+          "localId" : "1175",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1150",
+            "localId" : "1176",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1151",
+            "localId" : "1177",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1152",
+              "localId" : "1178",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Negate",
-            "localId" : "1140",
+            "localId" : "1166",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1142",
+              "localId" : "1168",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "1141",
+              "localId" : "1167",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "7",
@@ -23599,37 +25985,37 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1145",
+            "localId" : "1171",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1147",
+              "localId" : "1173",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1148",
+                "localId" : "1174",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1146",
+              "localId" : "1172",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1143",
+                "localId" : "1169",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1144",
+              "localId" : "1170",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -23638,7 +26024,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1155",
+        "localId" : "1181",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NegInfBegNotContainsInt",
         "context" : "Patient",
@@ -23647,18 +26033,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1155",
+            "r" : "1181",
             "s" : [ {
               "value" : [ "", "define ", "NegInfBegNotContainsInt", ": " ]
             }, {
-              "r" : "1163",
+              "r" : "1189",
               "s" : [ {
-                "r" : "1156",
+                "r" : "1182",
                 "value" : [ "7", " in " ]
               }, {
-                "r" : "1159",
+                "r" : "1185",
                 "s" : [ {
-                  "r" : "1157",
+                  "r" : "1183",
                   "value" : [ "Interval[", "null", ", ", "5", "]" ]
                 } ]
               } ]
@@ -23667,65 +26053,65 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1163",
+          "localId" : "1189",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1164",
+            "localId" : "1190",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1165",
+            "localId" : "1191",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1166",
+              "localId" : "1192",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "1156",
+            "localId" : "1182",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "7",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "1159",
+            "localId" : "1185",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1161",
+              "localId" : "1187",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1162",
+                "localId" : "1188",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1160",
+              "localId" : "1186",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1157",
+                "localId" : "1183",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1158",
+              "localId" : "1184",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -23734,27 +26120,27 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1169",
+        "localId" : "1195",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownOpenBegContainsInt",
+        "name" : "UnknownBegContainsInt",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1169",
+            "r" : "1195",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownOpenBegContainsInt", ": " ]
+              "value" : [ "", "define ", "UnknownBegContainsInt", ": " ]
             }, {
-              "r" : "1177",
+              "r" : "1203",
               "s" : [ {
-                "r" : "1170",
+                "r" : "1196",
                 "value" : [ "5", " in " ]
               }, {
-                "r" : "1173",
+                "r" : "1199",
                 "s" : [ {
-                  "r" : "1171",
+                  "r" : "1197",
                   "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               } ]
@@ -23763,65 +26149,65 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1177",
+          "localId" : "1203",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1178",
+            "localId" : "1204",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1179",
+            "localId" : "1205",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1180",
+              "localId" : "1206",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "1170",
+            "localId" : "1196",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "5",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "1173",
+            "localId" : "1199",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1175",
+              "localId" : "1201",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1176",
+                "localId" : "1202",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1174",
+              "localId" : "1200",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1171",
+                "localId" : "1197",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1172",
+              "localId" : "1198",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -23830,7 +26216,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1183",
+        "localId" : "1209",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownClosedBegContainsInt",
         "context" : "Patient",
@@ -23839,18 +26225,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1183",
+            "r" : "1209",
             "s" : [ {
               "value" : [ "", "define ", "UnknownClosedBegContainsInt", ": " ]
             }, {
-              "r" : "1191",
+              "r" : "1217",
               "s" : [ {
-                "r" : "1184",
+                "r" : "1210",
                 "value" : [ "5", " in " ]
               }, {
-                "r" : "1187",
+                "r" : "1213",
                 "s" : [ {
-                  "r" : "1185",
+                  "r" : "1211",
                   "value" : [ "Interval[", "null", ", ", "5", "]" ]
                 } ]
               } ]
@@ -23859,65 +26245,65 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1191",
+          "localId" : "1217",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1192",
+            "localId" : "1218",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1193",
+            "localId" : "1219",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1194",
+              "localId" : "1220",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "1184",
+            "localId" : "1210",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "5",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "1187",
+            "localId" : "1213",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1189",
+              "localId" : "1215",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1190",
+                "localId" : "1216",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1188",
+              "localId" : "1214",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1185",
+                "localId" : "1211",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1186",
+              "localId" : "1212",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -23926,7 +26312,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1197",
+        "localId" : "1223",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownBegMayContainInt",
         "context" : "Patient",
@@ -23935,23 +26321,23 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1197",
+            "r" : "1223",
             "s" : [ {
               "value" : [ "", "define ", "UnknownBegMayContainInt", ": " ]
             }, {
-              "r" : "1207",
+              "r" : "1233",
               "s" : [ {
-                "r" : "1198",
+                "r" : "1224",
                 "s" : [ {
-                  "r" : "1199",
+                  "r" : "1225",
                   "value" : [ "-", "7" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1203",
+                "r" : "1229",
                 "s" : [ {
-                  "r" : "1201",
+                  "r" : "1227",
                   "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               } ]
@@ -23960,39 +26346,39 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1207",
+          "localId" : "1233",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1208",
+            "localId" : "1234",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1209",
+            "localId" : "1235",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1210",
+              "localId" : "1236",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Negate",
-            "localId" : "1198",
+            "localId" : "1224",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1200",
+              "localId" : "1226",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "1199",
+              "localId" : "1225",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "7",
@@ -24000,37 +26386,37 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1203",
+            "localId" : "1229",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1205",
+              "localId" : "1231",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1206",
+                "localId" : "1232",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1204",
+              "localId" : "1230",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1201",
+                "localId" : "1227",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1202",
+              "localId" : "1228",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -24039,7 +26425,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1213",
+        "localId" : "1239",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownBegNotContainsInt",
         "context" : "Patient",
@@ -24048,18 +26434,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1213",
+            "r" : "1239",
             "s" : [ {
               "value" : [ "", "define ", "UnknownBegNotContainsInt", ": " ]
             }, {
-              "r" : "1221",
+              "r" : "1247",
               "s" : [ {
-                "r" : "1214",
+                "r" : "1240",
                 "value" : [ "7", " in " ]
               }, {
-                "r" : "1217",
+                "r" : "1243",
                 "s" : [ {
-                  "r" : "1215",
+                  "r" : "1241",
                   "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               } ]
@@ -24068,65 +26454,65 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1221",
+          "localId" : "1247",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1222",
+            "localId" : "1248",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1223",
+            "localId" : "1249",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1224",
+              "localId" : "1250",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "1214",
+            "localId" : "1240",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "7",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "1217",
+            "localId" : "1243",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1219",
+              "localId" : "1245",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1220",
+                "localId" : "1246",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1218",
+              "localId" : "1244",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1215",
+                "localId" : "1241",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1216",
+              "localId" : "1242",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -24135,7 +26521,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1227",
+        "localId" : "1253",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PosInfEndContainsInt",
         "context" : "Patient",
@@ -24144,18 +26530,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1227",
+            "r" : "1253",
             "s" : [ {
               "value" : [ "", "define ", "PosInfEndContainsInt", ": " ]
             }, {
-              "r" : "1235",
+              "r" : "1261",
               "s" : [ {
-                "r" : "1228",
+                "r" : "1254",
                 "value" : [ "123456789", " in " ]
               }, {
-                "r" : "1231",
+                "r" : "1257",
                 "s" : [ {
-                  "r" : "1229",
+                  "r" : "1255",
                   "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               } ]
@@ -24164,52 +26550,52 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1235",
+          "localId" : "1261",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1236",
+            "localId" : "1262",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1237",
+            "localId" : "1263",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1238",
+              "localId" : "1264",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "1228",
+            "localId" : "1254",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "123456789",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "1231",
+            "localId" : "1257",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1233",
+              "localId" : "1259",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1234",
+                "localId" : "1260",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1229",
+              "localId" : "1255",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -24217,13 +26603,13 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1232",
+              "localId" : "1258",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1230",
+                "localId" : "1256",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -24231,7 +26617,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1241",
+        "localId" : "1267",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PosInfEndNotContainsInt",
         "context" : "Patient",
@@ -24240,23 +26626,23 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1241",
+            "r" : "1267",
             "s" : [ {
               "value" : [ "", "define ", "PosInfEndNotContainsInt", ": " ]
             }, {
-              "r" : "1251",
+              "r" : "1277",
               "s" : [ {
-                "r" : "1242",
+                "r" : "1268",
                 "s" : [ {
-                  "r" : "1243",
+                  "r" : "1269",
                   "value" : [ "-", "1" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1247",
+                "r" : "1273",
                 "s" : [ {
-                  "r" : "1245",
+                  "r" : "1271",
                   "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               } ]
@@ -24265,39 +26651,39 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1251",
+          "localId" : "1277",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1252",
+            "localId" : "1278",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1253",
+            "localId" : "1279",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1254",
+              "localId" : "1280",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Negate",
-            "localId" : "1242",
+            "localId" : "1268",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1244",
+              "localId" : "1270",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "1243",
+              "localId" : "1269",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -24305,24 +26691,24 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1247",
+            "localId" : "1273",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1249",
+              "localId" : "1275",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1250",
+                "localId" : "1276",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1245",
+              "localId" : "1271",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -24330,13 +26716,13 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1248",
+              "localId" : "1274",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1246",
+                "localId" : "1272",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -24344,27 +26730,27 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1257",
+        "localId" : "1283",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownOpenEndContainsInt",
+        "name" : "UnknownEndContainsInt",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1257",
+            "r" : "1283",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownOpenEndContainsInt", ": " ]
+              "value" : [ "", "define ", "UnknownEndContainsInt", ": " ]
             }, {
-              "r" : "1265",
+              "r" : "1291",
               "s" : [ {
-                "r" : "1258",
+                "r" : "1284",
                 "value" : [ "0", " in " ]
               }, {
-                "r" : "1261",
+                "r" : "1287",
                 "s" : [ {
-                  "r" : "1259",
+                  "r" : "1285",
                   "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               } ]
@@ -24373,52 +26759,52 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1265",
+          "localId" : "1291",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1266",
+            "localId" : "1292",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1267",
+            "localId" : "1293",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1268",
+              "localId" : "1294",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "1258",
+            "localId" : "1284",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "0",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "1261",
+            "localId" : "1287",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1263",
+              "localId" : "1289",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1264",
+                "localId" : "1290",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1259",
+              "localId" : "1285",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -24426,13 +26812,13 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1262",
+              "localId" : "1288",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1260",
+                "localId" : "1286",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -24440,7 +26826,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1271",
+        "localId" : "1297",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownClosedEndContainsInt",
         "context" : "Patient",
@@ -24449,18 +26835,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1271",
+            "r" : "1297",
             "s" : [ {
               "value" : [ "", "define ", "UnknownClosedEndContainsInt", ": " ]
             }, {
-              "r" : "1279",
+              "r" : "1305",
               "s" : [ {
-                "r" : "1272",
+                "r" : "1298",
                 "value" : [ "0", " in " ]
               }, {
-                "r" : "1275",
+                "r" : "1301",
                 "s" : [ {
-                  "r" : "1273",
+                  "r" : "1299",
                   "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               } ]
@@ -24469,52 +26855,52 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1279",
+          "localId" : "1305",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1280",
+            "localId" : "1306",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1281",
+            "localId" : "1307",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1282",
+              "localId" : "1308",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "1272",
+            "localId" : "1298",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "0",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "1275",
+            "localId" : "1301",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1277",
+              "localId" : "1303",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1278",
+                "localId" : "1304",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1273",
+              "localId" : "1299",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -24522,13 +26908,13 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1276",
+              "localId" : "1302",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1274",
+                "localId" : "1300",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -24536,7 +26922,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1285",
+        "localId" : "1311",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownEndMayContainInt",
         "context" : "Patient",
@@ -24545,18 +26931,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1285",
+            "r" : "1311",
             "s" : [ {
               "value" : [ "", "define ", "UnknownEndMayContainInt", ": " ]
             }, {
-              "r" : "1293",
+              "r" : "1319",
               "s" : [ {
-                "r" : "1286",
+                "r" : "1312",
                 "value" : [ "123456789", " in " ]
               }, {
-                "r" : "1289",
+                "r" : "1315",
                 "s" : [ {
-                  "r" : "1287",
+                  "r" : "1313",
                   "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               } ]
@@ -24565,52 +26951,52 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1293",
+          "localId" : "1319",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1294",
+            "localId" : "1320",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1295",
+            "localId" : "1321",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1296",
+              "localId" : "1322",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "1286",
+            "localId" : "1312",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "123456789",
             "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "1289",
+            "localId" : "1315",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1291",
+              "localId" : "1317",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1292",
+                "localId" : "1318",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1287",
+              "localId" : "1313",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -24618,13 +27004,13 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1290",
+              "localId" : "1316",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1288",
+                "localId" : "1314",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -24632,7 +27018,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1299",
+        "localId" : "1325",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownEndNotContainsInt",
         "context" : "Patient",
@@ -24641,23 +27027,23 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1299",
+            "r" : "1325",
             "s" : [ {
               "value" : [ "", "define ", "UnknownEndNotContainsInt", ": " ]
             }, {
-              "r" : "1309",
+              "r" : "1335",
               "s" : [ {
-                "r" : "1300",
+                "r" : "1326",
                 "s" : [ {
-                  "r" : "1301",
+                  "r" : "1327",
                   "value" : [ "-", "1" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1305",
+                "r" : "1331",
                 "s" : [ {
-                  "r" : "1303",
+                  "r" : "1329",
                   "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               } ]
@@ -24666,39 +27052,39 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1309",
+          "localId" : "1335",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1310",
+            "localId" : "1336",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1311",
+            "localId" : "1337",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1312",
+              "localId" : "1338",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Negate",
-            "localId" : "1300",
+            "localId" : "1326",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1302",
+              "localId" : "1328",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "1301",
+              "localId" : "1327",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -24706,24 +27092,24 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1305",
+            "localId" : "1331",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1307",
+              "localId" : "1333",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1308",
+                "localId" : "1334",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1303",
+              "localId" : "1329",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -24731,13 +27117,13 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1306",
+              "localId" : "1332",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1304",
+                "localId" : "1330",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -24745,41 +27131,33 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1315",
+        "localId" : "1341",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegContainsDate",
+        "name" : "NegInfBegContainsLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1315",
+            "r" : "1341",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegContainsDate", ": " ]
+              "value" : [ "", "define ", "NegInfBegContainsLong", ": " ]
             }, {
-              "r" : "1369",
+              "r" : "1351",
               "s" : [ {
-                "r" : "1332",
+                "r" : "1342",
                 "s" : [ {
-                  "r" : "1316",
-                  "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1343",
+                  "value" : [ "-", "7L" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1365",
+                "r" : "1347",
                 "s" : [ {
-                  "r" : "1340",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1357",
-                  "s" : [ {
-                    "r" : "1341",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1345",
+                  "value" : [ "Interval[", "null", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -24787,288 +27165,203 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1369",
+          "localId" : "1351",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1370",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "1352",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1371",
+            "localId" : "1353",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1372",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1354",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "DateTime",
-            "localId" : "1332",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Negate",
+            "localId" : "1342",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1333",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1334",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1335",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1336",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1337",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1338",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1339",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1344",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1316",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1317",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1318",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1319",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1320",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1321",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "1322",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "1343",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1365",
+            "localId" : "1347",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1367",
+              "localId" : "1349",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1368",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1350",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1366",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1348",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1340",
+                "localId" : "1345",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1357",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1358",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1359",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1360",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1361",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1362",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1363",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "1346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1357",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegNotContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1357",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegNotContainsLong", ": " ]
+            }, {
+              "r" : "1365",
+              "s" : [ {
+                "r" : "1358",
+                "value" : [ "7L", " in " ]
               }, {
+                "r" : "1361",
+                "s" : [ {
+                  "r" : "1359",
+                  "value" : [ "Interval[", "null", ", ", "5L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1365",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1366",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1367",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1368",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "1358",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "7",
+            "annotation" : [ ]
+          }, {
+            "type" : "Interval",
+            "localId" : "1361",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1363",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "1364",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1341",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1342",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1343",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1344",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1345",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1346",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1347",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1362",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1359",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1360",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1375",
+        "localId" : "1371",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotContainsDate",
+        "name" : "UnknownBegContainsLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1375",
+            "r" : "1371",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotContainsDate", ": " ]
+              "value" : [ "", "define ", "UnknownBegContainsLong", ": " ]
             }, {
-              "r" : "1429",
+              "r" : "1379",
               "s" : [ {
-                "r" : "1392",
-                "s" : [ {
-                  "r" : "1376",
-                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "value" : [ " in " ]
+                "r" : "1372",
+                "value" : [ "5L", " in " ]
               }, {
-                "r" : "1425",
+                "r" : "1375",
                 "s" : [ {
-                  "r" : "1400",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1417",
-                  "s" : [ {
-                    "r" : "1401",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1373",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -25076,288 +27369,196 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1429",
+          "localId" : "1379",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1430",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "1380",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1431",
+            "localId" : "1381",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1432",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1382",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "DateTime",
-            "localId" : "1392",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Literal",
+            "localId" : "1372",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }, {
+            "type" : "Interval",
+            "localId" : "1375",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1393",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1394",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1395",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1396",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1397",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1398",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1399",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1376",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
               "localId" : "1377",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1378",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1379",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1378",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1380",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "As",
+              "localId" : "1376",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1373",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1381",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "1374",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1382",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1385",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownClosedBegContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1385",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownClosedBegContainsLong", ": " ]
+            }, {
+              "r" : "1393",
+              "s" : [ {
+                "r" : "1386",
+                "value" : [ "5L", " in " ]
+              }, {
+                "r" : "1389",
+                "s" : [ {
+                  "r" : "1387",
+                  "value" : [ "Interval[", "null", ", ", "5L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1393",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1394",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1395",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1396",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "1386",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "1425",
+            "localId" : "1389",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1427",
+              "localId" : "1391",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1428",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1392",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1426",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1390",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1400",
+                "localId" : "1387",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1417",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1418",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1419",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1420",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1421",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1422",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1423",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1424",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1401",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1402",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1403",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1404",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1405",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1406",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1407",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1388",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1435",
+        "localId" : "1399",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownOpenBegMayContainDate",
+        "name" : "UnknownBegMayContainLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1435",
+            "r" : "1399",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownOpenBegMayContainDate", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayContainLong", ": " ]
             }, {
-              "r" : "1489",
+              "r" : "1409",
               "s" : [ {
-                "r" : "1452",
+                "r" : "1400",
                 "s" : [ {
-                  "r" : "1436",
-                  "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  "r" : "1401",
+                  "value" : [ "-", "7L" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1485",
+                "r" : "1405",
                 "s" : [ {
-                  "r" : "1460",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "1477",
-                  "s" : [ {
-                    "r" : "1461",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1403",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -25365,288 +27566,107 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1489",
+          "localId" : "1409",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1490",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "1410",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1491",
+            "localId" : "1411",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1492",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1412",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "DateTime",
-            "localId" : "1452",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Negate",
+            "localId" : "1400",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1453",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1454",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1455",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1456",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1457",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1458",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1459",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1402",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1436",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1437",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1438",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "31",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1439",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1440",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1441",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "1442",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "999",
+              "localId" : "1401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1485",
+            "localId" : "1405",
             "lowClosed" : false,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1487",
+              "localId" : "1407",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1488",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1408",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1486",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1406",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1460",
+                "localId" : "1403",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1477",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1478",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1479",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1480",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1481",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1482",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1483",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1484",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1461",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1462",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1463",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1464",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1465",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1466",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1467",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1495",
+        "localId" : "1415",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownClosedBegContainsDate",
+        "name" : "UnknownBegNotContainsLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1495",
+            "r" : "1415",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownClosedBegContainsDate", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotContainsLong", ": " ]
             }, {
-              "r" : "1549",
+              "r" : "1423",
               "s" : [ {
-                "r" : "1512",
-                "s" : [ {
-                  "r" : "1496",
-                  "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
-                } ]
-              }, {
-                "value" : [ " in " ]
+                "r" : "1416",
+                "value" : [ "7L", " in " ]
               }, {
-                "r" : "1545",
+                "r" : "1419",
                 "s" : [ {
-                  "r" : "1520",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1537",
-                  "s" : [ {
-                    "r" : "1521",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1417",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -25654,284 +27674,714 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1549",
+          "localId" : "1423",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1550",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "1424",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1551",
+            "localId" : "1425",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1552",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1426",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "DateTime",
-            "localId" : "1512",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Literal",
+            "localId" : "1416",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "7",
+            "annotation" : [ ]
+          }, {
+            "type" : "Interval",
+            "localId" : "1419",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1513",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1514",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1515",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1516",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1517",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1518",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1421",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1422",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1420",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1417",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1418",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1429",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1429",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndContainsLong", ": " ]
             }, {
+              "r" : "1437",
+              "s" : [ {
+                "r" : "1430",
+                "value" : [ "123456789L", " in " ]
+              }, {
+                "r" : "1433",
+                "s" : [ {
+                  "r" : "1431",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1437",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1438",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1439",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1519",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1496",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "localId" : "1440",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "1430",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "123456789",
+            "annotation" : [ ]
+          }, {
+            "type" : "Interval",
+            "localId" : "1433",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1435",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1436",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "month" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "1497",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
+              "localId" : "1431",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1498",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "31",
+            "high" : {
+              "type" : "As",
+              "localId" : "1434",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1432",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1443",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndNotContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1443",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndNotContainsLong", ": " ]
+            }, {
+              "r" : "1453",
+              "s" : [ {
+                "r" : "1444",
+                "s" : [ {
+                  "r" : "1445",
+                  "value" : [ "-", "1L" ]
+                } ]
+              }, {
+                "value" : [ " in " ]
+              }, {
+                "r" : "1449",
+                "s" : [ {
+                  "r" : "1447",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1453",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1454",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1455",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1456",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1499",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Negate",
+            "localId" : "1444",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1446",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
-            },
-            "minute" : {
+            } ],
+            "operand" : {
               "type" : "Literal",
-              "localId" : "1500",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
+              "localId" : "1445",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1449",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1451",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1452",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "1501",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "59",
+              "localId" : "1447",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1502",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "999",
+            "high" : {
+              "type" : "As",
+              "localId" : "1450",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1448",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1459",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1459",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndContainsLong", ": " ]
+            }, {
+              "r" : "1467",
+              "s" : [ {
+                "r" : "1460",
+                "value" : [ "0L", " in " ]
+              }, {
+                "r" : "1463",
+                "s" : [ {
+                  "r" : "1461",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1467",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1468",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1469",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1470",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "1460",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
           }, {
             "type" : "Interval",
-            "localId" : "1545",
+            "localId" : "1463",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1547",
+              "localId" : "1465",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1548",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1466",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "Literal",
+              "localId" : "1461",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "1546",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1464",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1520",
+                "localId" : "1462",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1537",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1538",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1473",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownClosedEndContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1473",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownClosedEndContainsLong", ": " ]
+            }, {
+              "r" : "1481",
+              "s" : [ {
+                "r" : "1474",
+                "value" : [ "0L", " in " ]
               }, {
+                "r" : "1477",
+                "s" : [ {
+                  "r" : "1475",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1481",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1482",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1483",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1484",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "1474",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
+          }, {
+            "type" : "Interval",
+            "localId" : "1477",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1479",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1539",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1480",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1540",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1475",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1478",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1476",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1487",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayContainLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1487",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMayContainLong", ": " ]
+            }, {
+              "r" : "1495",
+              "s" : [ {
+                "r" : "1488",
+                "value" : [ "123456789L", " in " ]
               }, {
+                "r" : "1491",
+                "s" : [ {
+                  "r" : "1489",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1495",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1496",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1497",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1498",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "1488",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "123456789",
+            "annotation" : [ ]
+          }, {
+            "type" : "Interval",
+            "localId" : "1491",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1493",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1541",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1494",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1542",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1489",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1492",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1490",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1501",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotContainsLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1501",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotContainsLong", ": " ]
+            }, {
+              "r" : "1511",
+              "s" : [ {
+                "r" : "1502",
+                "s" : [ {
+                  "r" : "1503",
+                  "value" : [ "-", "1L" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1543",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ " in " ]
               }, {
+                "r" : "1507",
+                "s" : [ {
+                  "r" : "1505",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1511",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1512",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1513",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1514",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Negate",
+            "localId" : "1502",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1504",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "1503",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1507",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1509",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1544",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1521",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1522",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1523",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1524",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1525",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1526",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1510",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1527",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1505",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1508",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1506",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1555",
+        "localId" : "1517",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayContainDate",
+        "name" : "NegInfBegContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1555",
+            "r" : "1517",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayContainDate", ": " ]
+              "value" : [ "", "define ", "NegInfBegContainsDate", ": " ]
             }, {
-              "r" : "1609",
+              "r" : "1571",
               "s" : [ {
-                "r" : "1572",
+                "r" : "1534",
                 "s" : [ {
-                  "r" : "1556",
+                  "r" : "1518",
                   "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1605",
+                "r" : "1567",
                 "s" : [ {
-                  "r" : "1580",
-                  "value" : [ "Interval(", "null", ", " ]
+                  "r" : "1542",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "1597",
+                  "r" : "1559",
                   "s" : [ {
-                    "r" : "1581",
+                    "r" : "1543",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -25943,69 +28393,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1609",
+          "localId" : "1571",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1610",
+            "localId" : "1572",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1611",
+            "localId" : "1573",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1612",
+              "localId" : "1574",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1572",
+            "localId" : "1534",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1573",
+              "localId" : "1535",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1574",
+              "localId" : "1536",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1575",
+              "localId" : "1537",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1576",
+              "localId" : "1538",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1577",
+              "localId" : "1539",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1578",
+              "localId" : "1540",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1579",
+              "localId" : "1541",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1556",
+              "localId" : "1518",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -26013,7 +28463,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1557",
+              "localId" : "1519",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -26021,7 +28471,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1558",
+              "localId" : "1520",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -26029,7 +28479,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1559",
+              "localId" : "1521",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26037,7 +28487,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1560",
+              "localId" : "1522",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26045,7 +28495,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1561",
+              "localId" : "1523",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26053,7 +28503,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1562",
+              "localId" : "1524",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26061,78 +28511,78 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1605",
-            "lowClosed" : false,
+            "localId" : "1567",
+            "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1607",
+              "localId" : "1569",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1608",
+                "localId" : "1570",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1606",
+              "localId" : "1568",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1580",
+                "localId" : "1542",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1597",
+              "localId" : "1559",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1598",
+                "localId" : "1560",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1599",
+                "localId" : "1561",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1600",
+                "localId" : "1562",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1601",
+                "localId" : "1563",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1602",
+                "localId" : "1564",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1603",
+                "localId" : "1565",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1604",
+                "localId" : "1566",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1581",
+                "localId" : "1543",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -26140,7 +28590,7 @@ module.exports['In'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1582",
+                "localId" : "1544",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -26148,7 +28598,7 @@ module.exports['In'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1583",
+                "localId" : "1545",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -26156,7 +28606,7 @@ module.exports['In'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1584",
+                "localId" : "1546",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26164,7 +28614,7 @@ module.exports['In'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1585",
+                "localId" : "1547",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26172,7 +28622,7 @@ module.exports['In'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1586",
+                "localId" : "1548",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26180,7 +28630,7 @@ module.exports['In'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1587",
+                "localId" : "1549",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26190,37 +28640,37 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1615",
+        "localId" : "1577",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotContainsDate",
+        "name" : "NegInfBegNotContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1615",
+            "r" : "1577",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotContainsDate", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotContainsDate", ": " ]
             }, {
-              "r" : "1669",
+              "r" : "1631",
               "s" : [ {
-                "r" : "1632",
+                "r" : "1594",
                 "s" : [ {
-                  "r" : "1616",
+                  "r" : "1578",
                   "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1665",
+                "r" : "1627",
                 "s" : [ {
-                  "r" : "1640",
-                  "value" : [ "Interval(", "null", ", " ]
+                  "r" : "1602",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "1657",
+                  "r" : "1619",
                   "s" : [ {
-                    "r" : "1641",
+                    "r" : "1603",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -26232,69 +28682,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1669",
+          "localId" : "1631",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1670",
+            "localId" : "1632",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1671",
+            "localId" : "1633",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1672",
+              "localId" : "1634",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1632",
+            "localId" : "1594",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1633",
+              "localId" : "1595",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1634",
+              "localId" : "1596",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1635",
+              "localId" : "1597",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1636",
+              "localId" : "1598",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1637",
+              "localId" : "1599",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1638",
+              "localId" : "1600",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1639",
+              "localId" : "1601",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1616",
+              "localId" : "1578",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2013",
@@ -26302,7 +28752,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1617",
+              "localId" : "1579",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -26310,7 +28760,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1618",
+              "localId" : "1580",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -26318,7 +28768,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1619",
+              "localId" : "1581",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26326,7 +28776,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1620",
+              "localId" : "1582",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26334,7 +28784,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1621",
+              "localId" : "1583",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26342,7 +28792,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1622",
+              "localId" : "1584",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26350,78 +28800,78 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1665",
-            "lowClosed" : false,
+            "localId" : "1627",
+            "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1667",
+              "localId" : "1629",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1668",
+                "localId" : "1630",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1666",
+              "localId" : "1628",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1640",
+                "localId" : "1602",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1657",
+              "localId" : "1619",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1658",
+                "localId" : "1620",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1659",
+                "localId" : "1621",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1660",
+                "localId" : "1622",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1661",
+                "localId" : "1623",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1662",
+                "localId" : "1624",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1663",
+                "localId" : "1625",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1664",
+                "localId" : "1626",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1641",
+                "localId" : "1603",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -26429,7 +28879,7 @@ module.exports['In'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1642",
+                "localId" : "1604",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -26437,7 +28887,7 @@ module.exports['In'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1643",
+                "localId" : "1605",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -26445,7 +28895,7 @@ module.exports['In'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1644",
+                "localId" : "1606",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26453,7 +28903,7 @@ module.exports['In'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1645",
+                "localId" : "1607",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26461,7 +28911,7 @@ module.exports['In'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1646",
+                "localId" : "1608",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26469,7 +28919,7 @@ module.exports['In'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1647",
+                "localId" : "1609",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26479,41 +28929,41 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1675",
+        "localId" : "1637",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndContainsDate",
+        "name" : "UnknownBegContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1675",
+            "r" : "1637",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndContainsDate", ":  " ]
+              "value" : [ "", "define ", "UnknownBegContainsDate", ": " ]
             }, {
-              "r" : "1729",
+              "r" : "1691",
               "s" : [ {
-                "r" : "1692",
+                "r" : "1654",
                 "s" : [ {
-                  "r" : "1676",
-                  "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1638",
+                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1725",
+                "r" : "1687",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "r" : "1662",
+                  "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "1716",
+                  "r" : "1679",
                   "s" : [ {
-                    "r" : "1700",
+                    "r" : "1663",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1724",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -26521,77 +28971,77 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1729",
+          "localId" : "1691",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1730",
+            "localId" : "1692",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1731",
+            "localId" : "1693",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1732",
+              "localId" : "1694",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1692",
+            "localId" : "1654",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1693",
+              "localId" : "1655",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1694",
+              "localId" : "1656",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1695",
+              "localId" : "1657",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1696",
+              "localId" : "1658",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1697",
+              "localId" : "1659",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1698",
+              "localId" : "1660",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1699",
+              "localId" : "1661",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1676",
+              "localId" : "1638",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2014",
+              "value" : "2013",
               "annotation" : [ ]
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1677",
+              "localId" : "1639",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -26599,7 +29049,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1678",
+              "localId" : "1640",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -26607,7 +29057,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1679",
+              "localId" : "1641",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26615,7 +29065,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1680",
+              "localId" : "1642",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26623,7 +29073,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1681",
+              "localId" : "1643",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26631,7 +29081,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1682",
+              "localId" : "1644",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -26639,65 +29089,78 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1725",
-            "lowClosed" : true,
+            "localId" : "1687",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1727",
+              "localId" : "1689",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1728",
+                "localId" : "1690",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "1688",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1662",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "1716",
+              "localId" : "1679",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1717",
+                "localId" : "1680",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1718",
+                "localId" : "1681",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1719",
+                "localId" : "1682",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1720",
+                "localId" : "1683",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1721",
+                "localId" : "1684",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1722",
+                "localId" : "1685",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1723",
+                "localId" : "1686",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1700",
+                "localId" : "1663",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -26705,7 +29168,7 @@ module.exports['In'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1701",
+                "localId" : "1664",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -26713,7 +29176,7 @@ module.exports['In'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1702",
+                "localId" : "1665",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -26721,7 +29184,7 @@ module.exports['In'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1703",
+                "localId" : "1666",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26729,7 +29192,7 @@ module.exports['In'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1704",
+                "localId" : "1667",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26737,7 +29200,7 @@ module.exports['In'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1705",
+                "localId" : "1668",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -26745,64 +29208,51 @@ module.exports['In'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1706",
+                "localId" : "1669",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1726",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1724",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           } ]
         }
       }, {
-        "localId" : "1735",
+        "localId" : "1697",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotContainsDate",
+        "name" : "UnknownClosedBegContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1735",
+            "r" : "1697",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotContainsDate", ": " ]
+              "value" : [ "", "define ", "UnknownClosedBegContainsDate", ": " ]
             }, {
-              "r" : "1789",
+              "r" : "1751",
               "s" : [ {
-                "r" : "1752",
+                "r" : "1714",
                 "s" : [ {
-                  "r" : "1736",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1698",
+                  "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1785",
+                "r" : "1747",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "r" : "1722",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "1776",
+                  "r" : "1739",
                   "s" : [ {
-                    "r" : "1760",
+                    "r" : "1723",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1784",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -26810,69 +29260,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1789",
+          "localId" : "1751",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1790",
+            "localId" : "1752",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1791",
+            "localId" : "1753",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1792",
+              "localId" : "1754",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1752",
+            "localId" : "1714",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1753",
+              "localId" : "1715",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1754",
+              "localId" : "1716",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1755",
+              "localId" : "1717",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1756",
+              "localId" : "1718",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1757",
+              "localId" : "1719",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1758",
+              "localId" : "1720",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1759",
+              "localId" : "1721",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1736",
+              "localId" : "1698",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -26880,113 +29330,126 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1737",
+              "localId" : "1699",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "12",
               "annotation" : [ ]
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1738",
+              "localId" : "1700",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "31",
               "annotation" : [ ]
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1739",
+              "localId" : "1701",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "23",
               "annotation" : [ ]
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1740",
+              "localId" : "1702",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "59",
               "annotation" : [ ]
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1741",
+              "localId" : "1703",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "59",
               "annotation" : [ ]
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1742",
+              "localId" : "1704",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "999",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1785",
+            "localId" : "1747",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1787",
+              "localId" : "1749",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1788",
+                "localId" : "1750",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "1748",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1722",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "1776",
+              "localId" : "1739",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1777",
+                "localId" : "1740",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1778",
+                "localId" : "1741",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1779",
+                "localId" : "1742",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1780",
+                "localId" : "1743",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1781",
+                "localId" : "1744",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1782",
+                "localId" : "1745",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1783",
+                "localId" : "1746",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1760",
+                "localId" : "1723",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -26994,7 +29457,7 @@ module.exports['In'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1761",
+                "localId" : "1724",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -27002,7 +29465,7 @@ module.exports['In'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1762",
+                "localId" : "1725",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -27010,7 +29473,7 @@ module.exports['In'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1763",
+                "localId" : "1726",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27018,7 +29481,7 @@ module.exports['In'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1764",
+                "localId" : "1727",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27026,7 +29489,7 @@ module.exports['In'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1765",
+                "localId" : "1728",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27034,64 +29497,51 @@ module.exports['In'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1766",
+                "localId" : "1729",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1786",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1784",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           } ]
         }
       }, {
-        "localId" : "1795",
+        "localId" : "1757",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownOpenEndContainsDate",
+        "name" : "UnknownBegMayContainDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1795",
+            "r" : "1757",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownOpenEndContainsDate", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayContainDate", ": " ]
             }, {
-              "r" : "1849",
+              "r" : "1811",
               "s" : [ {
-                "r" : "1812",
+                "r" : "1774",
                 "s" : [ {
-                  "r" : "1796",
-                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1758",
+                  "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1845",
+                "r" : "1807",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "r" : "1782",
+                  "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "1836",
+                  "r" : "1799",
                   "s" : [ {
-                    "r" : "1820",
+                    "r" : "1783",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1844",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -27099,77 +29549,77 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1849",
+          "localId" : "1811",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1850",
+            "localId" : "1812",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1851",
+            "localId" : "1813",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1852",
+              "localId" : "1814",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1812",
+            "localId" : "1774",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1813",
+              "localId" : "1775",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1814",
+              "localId" : "1776",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1815",
+              "localId" : "1777",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1816",
+              "localId" : "1778",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1817",
+              "localId" : "1779",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1818",
+              "localId" : "1780",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1819",
+              "localId" : "1781",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1796",
+              "localId" : "1758",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
+              "value" : "1",
               "annotation" : [ ]
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1797",
+              "localId" : "1759",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -27177,7 +29627,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1798",
+              "localId" : "1760",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -27185,7 +29635,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1799",
+              "localId" : "1761",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27193,7 +29643,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1800",
+              "localId" : "1762",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27201,7 +29651,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1801",
+              "localId" : "1763",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27209,7 +29659,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1802",
+              "localId" : "1764",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27217,65 +29667,78 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1845",
-            "lowClosed" : true,
+            "localId" : "1807",
+            "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1847",
+              "localId" : "1809",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1848",
+                "localId" : "1810",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "1808",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1782",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "1836",
+              "localId" : "1799",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1837",
+                "localId" : "1800",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1838",
+                "localId" : "1801",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1839",
+                "localId" : "1802",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1840",
+                "localId" : "1803",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1841",
+                "localId" : "1804",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1842",
+                "localId" : "1805",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1843",
+                "localId" : "1806",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1820",
+                "localId" : "1783",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -27283,7 +29746,7 @@ module.exports['In'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1821",
+                "localId" : "1784",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -27291,7 +29754,7 @@ module.exports['In'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1822",
+                "localId" : "1785",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -27299,7 +29762,7 @@ module.exports['In'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1823",
+                "localId" : "1786",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27307,7 +29770,7 @@ module.exports['In'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1824",
+                "localId" : "1787",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27315,7 +29778,7 @@ module.exports['In'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1825",
+                "localId" : "1788",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27323,64 +29786,51 @@ module.exports['In'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1826",
+                "localId" : "1789",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1846",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1844",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           } ]
         }
       }, {
-        "localId" : "1855",
+        "localId" : "1817",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownClosedEndContainsDate",
+        "name" : "UnknownBegNotContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1855",
+            "r" : "1817",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownClosedEndContainsDate", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotContainsDate", ": " ]
             }, {
-              "r" : "1909",
+              "r" : "1871",
               "s" : [ {
-                "r" : "1872",
+                "r" : "1834",
                 "s" : [ {
-                  "r" : "1856",
-                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1818",
+                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1905",
+                "r" : "1867",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "r" : "1842",
+                  "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "1896",
+                  "r" : "1859",
                   "s" : [ {
-                    "r" : "1880",
+                    "r" : "1843",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1904",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -27388,69 +29838,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1909",
+          "localId" : "1871",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1910",
+            "localId" : "1872",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1911",
+            "localId" : "1873",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1912",
+              "localId" : "1874",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1872",
+            "localId" : "1834",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1873",
+              "localId" : "1835",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1874",
+              "localId" : "1836",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1875",
+              "localId" : "1837",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1876",
+              "localId" : "1838",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1877",
+              "localId" : "1839",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1878",
+              "localId" : "1840",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1879",
+              "localId" : "1841",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1856",
+              "localId" : "1818",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2013",
@@ -27458,7 +29908,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1857",
+              "localId" : "1819",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -27466,15 +29916,15 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1858",
+              "localId" : "1820",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "2",
               "annotation" : [ ]
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1859",
+              "localId" : "1821",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27482,7 +29932,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1860",
+              "localId" : "1822",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27490,7 +29940,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1861",
+              "localId" : "1823",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27498,7 +29948,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1862",
+              "localId" : "1824",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27506,65 +29956,78 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1905",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "1867",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1907",
+              "localId" : "1869",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1908",
+                "localId" : "1870",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "1868",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1842",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "1896",
+              "localId" : "1859",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1897",
+                "localId" : "1860",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1898",
+                "localId" : "1861",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1899",
+                "localId" : "1862",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1900",
+                "localId" : "1863",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1901",
+                "localId" : "1864",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1902",
+                "localId" : "1865",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1903",
+                "localId" : "1866",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1880",
+                "localId" : "1843",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -27572,7 +30035,7 @@ module.exports['In'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1881",
+                "localId" : "1844",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -27580,7 +30043,7 @@ module.exports['In'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1882",
+                "localId" : "1845",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -27588,7 +30051,7 @@ module.exports['In'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1883",
+                "localId" : "1846",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27596,7 +30059,7 @@ module.exports['In'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1884",
+                "localId" : "1847",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27604,7 +30067,7 @@ module.exports['In'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1885",
+                "localId" : "1848",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27612,64 +30075,51 @@ module.exports['In'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1886",
+                "localId" : "1849",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1906",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1904",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           } ]
         }
       }, {
-        "localId" : "1915",
+        "localId" : "1877",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayContainDate",
+        "name" : "PosInfEndContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1915",
+            "r" : "1877",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayContainDate", ": " ]
+              "value" : [ "", "define ", "PosInfEndContainsDate", ":  " ]
             }, {
-              "r" : "1969",
+              "r" : "1931",
               "s" : [ {
-                "r" : "1932",
+                "r" : "1894",
                 "s" : [ {
-                  "r" : "1916",
+                  "r" : "1878",
                   "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "1965",
+                "r" : "1927",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1956",
+                  "r" : "1918",
                   "s" : [ {
-                    "r" : "1940",
+                    "r" : "1902",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1964",
-                  "value" : [ ", ", "null", ")" ]
+                  "r" : "1926",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
             } ]
@@ -27677,69 +30127,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "1969",
+          "localId" : "1931",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1970",
+            "localId" : "1932",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1971",
+            "localId" : "1933",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1972",
+              "localId" : "1934",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1932",
+            "localId" : "1894",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1933",
+              "localId" : "1895",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1934",
+              "localId" : "1896",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1935",
+              "localId" : "1897",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1936",
+              "localId" : "1898",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1937",
+              "localId" : "1899",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1938",
+              "localId" : "1900",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1939",
+              "localId" : "1901",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1916",
+              "localId" : "1878",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2014",
@@ -27747,7 +30197,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1917",
+              "localId" : "1879",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -27755,7 +30205,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1918",
+              "localId" : "1880",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -27763,7 +30213,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1919",
+              "localId" : "1881",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27771,7 +30221,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1920",
+              "localId" : "1882",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27779,7 +30229,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1921",
+              "localId" : "1883",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27787,7 +30237,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1922",
+              "localId" : "1884",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -27795,65 +30245,65 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1965",
+            "localId" : "1927",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1967",
+              "localId" : "1929",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1968",
+                "localId" : "1930",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1956",
+              "localId" : "1918",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1957",
+                "localId" : "1919",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1958",
+                "localId" : "1920",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1959",
+                "localId" : "1921",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1960",
+                "localId" : "1922",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1961",
+                "localId" : "1923",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1962",
+                "localId" : "1924",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1963",
+                "localId" : "1925",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1940",
+                "localId" : "1902",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -27861,7 +30311,7 @@ module.exports['In'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1941",
+                "localId" : "1903",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -27869,7 +30319,7 @@ module.exports['In'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1942",
+                "localId" : "1904",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -27877,7 +30327,7 @@ module.exports['In'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1943",
+                "localId" : "1905",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27885,7 +30335,7 @@ module.exports['In'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1944",
+                "localId" : "1906",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27893,7 +30343,7 @@ module.exports['In'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1945",
+                "localId" : "1907",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27901,7 +30351,7 @@ module.exports['In'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1946",
+                "localId" : "1908",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -27910,13 +30360,13 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1966",
+              "localId" : "1928",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1964",
+                "localId" : "1926",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -27924,41 +30374,41 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "1975",
+        "localId" : "1937",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotContainsDate",
+        "name" : "PosInfEndNotContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1975",
+            "r" : "1937",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotContainsDate", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotContainsDate", ": " ]
             }, {
-              "r" : "2029",
+              "r" : "1991",
               "s" : [ {
-                "r" : "1992",
+                "r" : "1954",
                 "s" : [ {
-                  "r" : "1976",
+                  "r" : "1938",
                   "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "2025",
+                "r" : "1987",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2016",
+                  "r" : "1978",
                   "s" : [ {
-                    "r" : "2000",
+                    "r" : "1962",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2024",
-                  "value" : [ ", ", "null", ")" ]
+                  "r" : "1986",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
             } ]
@@ -27966,69 +30416,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "2029",
+          "localId" : "1991",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2030",
+            "localId" : "1992",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2031",
+            "localId" : "1993",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2032",
+              "localId" : "1994",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "1992",
+            "localId" : "1954",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1993",
+              "localId" : "1955",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1994",
+              "localId" : "1956",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1995",
+              "localId" : "1957",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1996",
+              "localId" : "1958",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1997",
+              "localId" : "1959",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1998",
+              "localId" : "1960",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1999",
+              "localId" : "1961",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1976",
+              "localId" : "1938",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -28036,7 +30486,7 @@ module.exports['In'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1977",
+              "localId" : "1939",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -28044,7 +30494,7 @@ module.exports['In'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "1978",
+              "localId" : "1940",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -28052,7 +30502,7 @@ module.exports['In'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "1979",
+              "localId" : "1941",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -28060,7 +30510,7 @@ module.exports['In'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "1980",
+              "localId" : "1942",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -28068,7 +30518,7 @@ module.exports['In'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "1981",
+              "localId" : "1943",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -28076,7 +30526,7 @@ module.exports['In'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "1982",
+              "localId" : "1944",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -28084,65 +30534,65 @@ module.exports['In'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "2025",
+            "localId" : "1987",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2027",
+              "localId" : "1989",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2028",
+                "localId" : "1990",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2016",
+              "localId" : "1978",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2017",
+                "localId" : "1979",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2018",
+                "localId" : "1980",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2019",
+                "localId" : "1981",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2020",
+                "localId" : "1982",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2021",
+                "localId" : "1983",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2022",
+                "localId" : "1984",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2023",
+                "localId" : "1985",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2000",
+                "localId" : "1962",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -28150,7 +30600,7 @@ module.exports['In'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2001",
+                "localId" : "1963",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -28158,7 +30608,7 @@ module.exports['In'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2002",
+                "localId" : "1964",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -28166,7 +30616,7 @@ module.exports['In'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2003",
+                "localId" : "1965",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -28174,7 +30624,7 @@ module.exports['In'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2004",
+                "localId" : "1966",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -28182,7 +30632,7 @@ module.exports['In'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2005",
+                "localId" : "1967",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -28190,7 +30640,7 @@ module.exports['In'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2006",
+                "localId" : "1968",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -28199,801 +30649,719 @@ module.exports['In'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "2026",
+              "localId" : "1988",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2024",
+                "localId" : "1986",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Includes
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define IncludesIntIvl: Interval[1, 5] includes Interval[1, 4]
-define NotIncludesIntIvl: Interval(1, 5] includes Interval[1, 4]
-define IncludesRealIvl: Interval[1.234, 3.456] includes Interval[2.34, 2.56]
-define NotIncludesRealIvl: Interval[1.234, 3.456] includes Interval[1.23, 2.56]
-define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define IncludesDateIvl: DateIvl includes Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
-define NotIncludesDateIvl: DateIvl includes Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)]
-define IncludesImpreciseDateIvl: DateIvl includes Interval[DateTime(2012, 4), DateTime(2012, 6)]
-define NotIncludesImpreciseDateIvl: DateIvl includes Interval[DateTime(2012, 4), DateTime(2012, 9)]
-define MayIncludeImpreciseDateIvl: DateIvl includes Interval[DateTime(2012), DateTime(2012)]
-define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define IncludesDayOfIvlLowEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
-define IncludesDayOfIvlHighEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 2, 23, 59, 59, 999))
-define NotIncludesDayOfIvlLowEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)]
-define NotIncludesDayOfIvlHighEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 3, 0, 0, 0, 0)]
-define IncludesDayOfIvlImpreciseLowEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 3, 2), DateTime(2012, 6, 1)]
-define IncludesDayOfIvlImpreciseHighEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 6, 1), DateTime(2012, 9, 2)]
-define IncludesDayOfIvlVeryImpreciseMiddle: PrecisionDateIvl includes day of Interval[DateTime(2012, 5), DateTime(2012, 6)]
-define NotIncludesDayOfIvlVeryImpreciseLow: PrecisionDateIvl includes day of Interval[DateTime(2012, 2), DateTime(2012, 6)]
-define NotIncludesDayOfIvlVeryImpreciseHigh: PrecisionDateIvl includes day of Interval[DateTime(2012, 6), DateTime(2012, 10)]
-define MayIncludeDayOfIvlVeryImpreciseLow: PrecisionDateIvl includes day of Interval[DateTime(2012, 3), DateTime(2012, 6)]
-define MayIncludeDayOfIvlVeryImpreciseHigh: PrecisionDateIvl includes day of Interval[DateTime(2012, 6), DateTime(2012, 9)]
-define MayIncludeDayOfIvlVeryImpreciseSurrounding: PrecisionDateIvl includes day of Interval[DateTime(2012), DateTime(2012)]
-define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
-define ImpreciseIncludesDateIvl: ImpDateIvl includes Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
-define ImpreciseIncludesDate: ImpDateIvl includes DateTime(2012, 4, 1, 0, 0, 0, 0)
-define ImpreciseDoesntIncludeDate: ImpDateIvl includes DateTime(2016, 4, 1, 0, 0, 0, 0)
-define IntervalIncludesQuantity: Interval[4 'mg', 6 'mg'] includes 5 'mg'
-define IntervalDoesntIncludeQuantity: Interval[4 'mg', 6 'mg'] includes 50 'mg'
-define ImpreciseNotIncludesDateIvl: ImpDateIvl includes Interval[DateTime(2012, 2, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
-define ImpreciseMayIncludeDateIvl: ImpDateIvl includes Interval[DateTime(2012, 3, 15, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
-define NegInfBegIncludesIntIvl: Interval[null, 5] includes Interval[-7, 2]
-define NegInfBegNotIncludesIntIvl: Interval[null, 5] includes Interval[4, 7]
-define UnknownBegIncludesIntIvl: Interval(null, 5] includes Interval[5, 5]
-define UnknownBegMayIncludeIntIvl: Interval(null, 5] includes Interval[-7, 2]
-define UnknownBegNotIncludesIntIvl: Interval(null, 5] includes Interval[4, 7]
-define PosInfEndIncludesIntIvl: Interval[0, null] includes Interval[1234, 5678]
-define PosInfEndNotIncludesIntIvl: Interval[0, null] includes Interval[-1234, 5678]
-define UnknownEndIncludesIntIvl: Interval[0, null) includes Interval[0, 0]
-define UnknownEndMayIncludeIntIvl: Interval[0, null) includes Interval[1234, 5678]
-define UnknownEndNotIncludesIntIvl: Interval[0, null) includes Interval[-1234, 5678]
-define NegInfBegIncludesDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2000, 1, 1, 0, 0, 0, 0)]
-define NegInfBegNotIncludesDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define UnknownBegIncludesDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(2012, 12, 31, 23, 59, 59, 999), DateTime(2012, 12, 31, 23, 59, 59, 999)]
-define UnknownBegMayIncludeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2000, 1, 1, 0, 0, 0, 0)]
-define UnknownBegNotIncludesDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define PosInfEndIncludesDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] includes Interval[DateTime(2014, 1, 1, 0, 0, 0, 0), DateTime(2015, 1, 1, 0, 0, 0, 0)]
-define PosInfEndNotIncludesDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] includes Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2014, 1, 1, 0, 0, 0, 0)]
-define UnknownEndIncludesDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) includes Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define UnknownEndMayIncludeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) includes Interval[DateTime(2014, 1, 1, 0, 0, 0, 0), DateTime(2015, 1, 1, 0, 0, 0, 0)]
-define UnknownEndNotIncludesDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) includes Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2014, 1, 1, 0, 0, 0, 0)]
-*/
-
-module.exports['Includes'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "2723",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
       }, {
-        "localId" : "214",
+        "localId" : "1997",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesIntIvl",
+        "name" : "UnknownEndContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "1997",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndContainsDate", ": " ]
             }, {
-              "r" : "225",
+              "r" : "2051",
               "s" : [ {
-                "r" : "217",
+                "r" : "2014",
                 "s" : [ {
-                  "r" : "215",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "r" : "1998",
+                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "r" : "225",
-                "value" : [ " ", "includes", " " ]
+                "value" : [ " in " ]
               }, {
-                "r" : "222",
+                "r" : "2047",
                 "s" : [ {
-                  "r" : "220",
-                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2038",
+                  "s" : [ {
+                    "r" : "2022",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2046",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Includes",
-          "localId" : "225",
+          "type" : "In",
+          "localId" : "2051",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "226",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "227",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
+            "type" : "NamedTypeSpecifier",
+            "localId" : "2052",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "228",
+            "localId" : "2053",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2054",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "217",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "DateTime",
+            "localId" : "2014",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "218",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "219",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2015",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2016",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2017",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2018",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2019",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2020",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2021",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1998",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2013",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "215",
+              "localId" : "1999",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "216",
+              "localId" : "2000",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "2001",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "2002",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "2003",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "2004",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "222",
+            "localId" : "2047",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "223",
+              "localId" : "2049",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "224",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2050",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2038",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2039",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2040",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2041",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2042",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2043",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2044",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2045",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2022",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2023",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2024",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2025",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2026",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2027",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2028",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "2048",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2046",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "239",
+        "localId" : "2057",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesIntIvl",
+        "name" : "UnknownClosedEndContainsDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "239",
+            "r" : "2057",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownClosedEndContainsDate", ": " ]
             }, {
-              "r" : "250",
+              "r" : "2111",
               "s" : [ {
-                "r" : "242",
+                "r" : "2074",
                 "s" : [ {
-                  "r" : "240",
-                  "value" : [ "Interval(", "1", ", ", "5", "]" ]
+                  "r" : "2058",
+                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "r" : "250",
-                "value" : [ " ", "includes", " " ]
+                "value" : [ " in " ]
               }, {
-                "r" : "247",
+                "r" : "2107",
                 "s" : [ {
-                  "r" : "245",
-                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2098",
+                  "s" : [ {
+                    "r" : "2082",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2106",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Includes",
-          "localId" : "250",
+          "type" : "In",
+          "localId" : "2111",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "251",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "252",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
+            "type" : "NamedTypeSpecifier",
+            "localId" : "2112",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "253",
+            "localId" : "2113",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "254",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2114",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "242",
-            "lowClosed" : false,
-            "highClosed" : true,
+            "type" : "DateTime",
+            "localId" : "2074",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "243",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "244",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2075",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2076",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2077",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2078",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2079",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2080",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2081",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "2058",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2013",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "240",
+              "localId" : "2059",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "241",
+              "localId" : "2060",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "1",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "247",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "248",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "249",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "245",
+              "localId" : "2061",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "246",
+              "localId" : "2062",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "0",
               "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "264",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesRealIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "264",
-            "s" : [ {
-              "value" : [ "", "define ", "IncludesRealIvl", ": " ]
-            }, {
-              "r" : "275",
-              "s" : [ {
-                "r" : "267",
-                "s" : [ {
-                  "r" : "265",
-                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
-                } ]
-              }, {
-                "r" : "275",
-                "value" : [ " ", "includes", " " ]
-              }, {
-                "r" : "272",
-                "s" : [ {
-                  "r" : "270",
-                  "value" : [ "Interval[", "2.34", ", ", "2.56", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Includes",
-          "localId" : "275",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "276",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "277",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "2063",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "278",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "279",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "2064",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ],
-          "operand" : [ {
+          }, {
             "type" : "Interval",
-            "localId" : "267",
+            "localId" : "2107",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "268",
+              "localId" : "2109",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "269",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "2110",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "265",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "266",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "3.456",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "272",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "273",
+              "type" : "DateTime",
+              "localId" : "2098",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "274",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "2099",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.34",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "271",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.56",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "289",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesRealIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "289",
-            "s" : [ {
-              "value" : [ "", "define ", "NotIncludesRealIvl", ": " ]
-            }, {
-              "r" : "300",
-              "s" : [ {
-                "r" : "292",
-                "s" : [ {
-                  "r" : "290",
-                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
-                } ]
               }, {
-                "r" : "300",
-                "value" : [ " ", "includes", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2100",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "297",
-                "s" : [ {
-                  "r" : "295",
-                  "value" : [ "Interval[", "1.23", ", ", "2.56", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Includes",
-          "localId" : "300",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "301",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "302",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "303",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "304",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "292",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "293",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "294",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "2101",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2102",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2103",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2104",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2105",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2082",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2083",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2084",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2085",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2086",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2087",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2088",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "290",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
-            },
             "high" : {
-              "type" : "Literal",
-              "localId" : "291",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "3.456",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "297",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "298",
+              "type" : "As",
+              "localId" : "2108",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "299",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2106",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "295",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.56",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "314",
-        "name" : "DateIvl",
+        "localId" : "2117",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayContainDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "314",
+            "r" : "2117",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayContainDate", ": " ]
             }, {
-              "r" : "363",
+              "r" : "2171",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "331",
+                "r" : "2134",
                 "s" : [ {
-                  "r" : "315",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "2118",
+                  "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "value" : [ " in " ]
               }, {
-                "r" : "355",
+                "r" : "2167",
                 "s" : [ {
-                  "r" : "339",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2158",
+                  "s" : [ {
+                    "r" : "2142",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2166",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
-              }, {
-                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "366",
+        "expression" : {
+          "type" : "In",
+          "localId" : "2171",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "pointType" : {
+          "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "367",
+            "localId" : "2172",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "363",
-          "lowClosed" : true,
-          "highClosed" : false,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "364",
+            "localId" : "2173",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "365",
+              "localId" : "2174",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          },
-          "low" : {
+          } ],
+          "operand" : [ {
             "type" : "DateTime",
-            "localId" : "331",
+            "localId" : "2134",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "332",
+              "localId" : "2135",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "333",
+              "localId" : "2136",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "334",
+              "localId" : "2137",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "335",
+              "localId" : "2138",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "336",
+              "localId" : "2139",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "337",
+              "localId" : "2140",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "338",
+              "localId" : "2141",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "315",
+              "localId" : "2118",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "2014",
               "annotation" : [ ]
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "316",
+              "localId" : "2119",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "1",
               "annotation" : [ ]
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "317",
+              "localId" : "2120",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -29001,7 +31369,7 @@ module.exports['Includes'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "318",
+              "localId" : "2121",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -29009,7 +31377,7 @@ module.exports['Includes'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "319",
+              "localId" : "2122",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -29017,7 +31385,7 @@ module.exports['Includes'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "320",
+              "localId" : "2123",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -29025,57 +31393,248 @@ module.exports['Includes'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "321",
+              "localId" : "2124",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             }
-          },
-          "high" : {
+          }, {
+            "type" : "Interval",
+            "localId" : "2167",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2169",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2170",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2158",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2159",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2160",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2161",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2162",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2163",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2164",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2165",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2142",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2143",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2144",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2145",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2146",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2147",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2148",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2168",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2166",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2177",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotContainsDate",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2177",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotContainsDate", ": " ]
+            }, {
+              "r" : "2231",
+              "s" : [ {
+                "r" : "2194",
+                "s" : [ {
+                  "r" : "2178",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ " in " ]
+              }, {
+                "r" : "2227",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2218",
+                  "s" : [ {
+                    "r" : "2202",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2226",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "2231",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "2232",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2233",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2234",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "DateTime",
-            "localId" : "355",
+            "localId" : "2194",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "356",
+              "localId" : "2195",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "357",
+              "localId" : "2196",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "358",
+              "localId" : "2197",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "359",
+              "localId" : "2198",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "360",
+              "localId" : "2199",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "361",
+              "localId" : "2200",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "362",
+              "localId" : "2201",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "339",
+              "localId" : "2178",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -29083,15 +31642,15 @@ module.exports['Includes'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "340",
+              "localId" : "2179",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
+              "value" : "1",
               "annotation" : [ ]
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "341",
+              "localId" : "2180",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -29099,7 +31658,7 @@ module.exports['Includes'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "342",
+              "localId" : "2181",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -29107,7 +31666,7 @@ module.exports['Includes'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "343",
+              "localId" : "2182",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -29115,7 +31674,7 @@ module.exports['Includes'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "344",
+              "localId" : "2183",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -29123,181 +31682,89 @@ module.exports['Includes'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "345",
+              "localId" : "2184",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             }
-          }
-        }
-      }, {
-        "localId" : "370",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "370",
-            "s" : [ {
-              "value" : [ "", "define ", "IncludesDateIvl", ": " ]
-            }, {
-              "r" : "425",
-              "s" : [ {
-                "r" : "371",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              }, {
-                "r" : "425",
-                "value" : [ " ", "includes", " " ]
-              }, {
-                "r" : "422",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "390",
-                  "s" : [ {
-                    "r" : "374",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "414",
-                  "s" : [ {
-                    "r" : "398",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Includes",
-          "localId" : "425",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "426",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "427",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "428",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "429",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "371",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "372",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "373",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           }, {
             "type" : "Interval",
-            "localId" : "422",
+            "localId" : "2227",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "423",
+              "localId" : "2229",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "424",
+                "localId" : "2230",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "390",
+              "localId" : "2218",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "391",
+                "localId" : "2219",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "392",
+                "localId" : "2220",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "393",
+                "localId" : "2221",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "394",
+                "localId" : "2222",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "395",
+                "localId" : "2223",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "396",
+                "localId" : "2224",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "397",
+                "localId" : "2225",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "374",
+                "localId" : "2202",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "375",
+                "localId" : "2203",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "376",
+                "localId" : "2204",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -29305,7 +31772,7 @@ module.exports['Includes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "377",
+                "localId" : "2205",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -29313,7 +31780,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "378",
+                "localId" : "2206",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -29321,7 +31788,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "379",
+                "localId" : "2207",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -29329,7 +31796,7 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "380",
+                "localId" : "2208",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -29337,148 +31804,207 @@ module.exports['Includes'] = {
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "414",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "2228",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "415",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "416",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "417",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "418",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "419",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "420",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "421",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "398",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "399",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "400",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "401",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "402",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "403",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "404",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2226",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* Includes
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define IncludesIntIvl: Interval[1, 5] includes Interval[1, 4]
+define NotIncludesIntIvl: Interval(1, 5] includes Interval[1, 4]
+define IncludesLongIvl: Interval[1L, 5L] includes Interval[1L, 4L]
+define NotIncludesLongIvl: Interval(1L, 5L] includes Interval[1L, 4L]
+define IncludesRealIvl: Interval[1.234, 3.456] includes Interval[2.34, 2.56]
+define NotIncludesRealIvl: Interval[1.234, 3.456] includes Interval[1.23, 2.56]
+define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
+define IncludesDateIvl: DateIvl includes Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
+define NotIncludesDateIvl: DateIvl includes Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)]
+define IncludesImpreciseDateIvl: DateIvl includes Interval[DateTime(2012, 4), DateTime(2012, 6)]
+define NotIncludesImpreciseDateIvl: DateIvl includes Interval[DateTime(2012, 4), DateTime(2012, 9)]
+define MayIncludeImpreciseDateIvl: DateIvl includes Interval[DateTime(2012), DateTime(2012)]
+define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
+define IncludesDayOfIvlLowEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
+define IncludesDayOfIvlHighEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 2, 23, 59, 59, 999))
+define NotIncludesDayOfIvlLowEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)]
+define NotIncludesDayOfIvlHighEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 3, 0, 0, 0, 0)]
+define IncludesDayOfIvlImpreciseLowEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 3, 2), DateTime(2012, 6, 1)]
+define IncludesDayOfIvlImpreciseHighEdge: PrecisionDateIvl includes day of Interval[DateTime(2012, 6, 1), DateTime(2012, 9, 2)]
+define IncludesDayOfIvlVeryImpreciseMiddle: PrecisionDateIvl includes day of Interval[DateTime(2012, 5), DateTime(2012, 6)]
+define NotIncludesDayOfIvlVeryImpreciseLow: PrecisionDateIvl includes day of Interval[DateTime(2012, 2), DateTime(2012, 6)]
+define NotIncludesDayOfIvlVeryImpreciseHigh: PrecisionDateIvl includes day of Interval[DateTime(2012, 6), DateTime(2012, 10)]
+define MayIncludeDayOfIvlVeryImpreciseLow: PrecisionDateIvl includes day of Interval[DateTime(2012, 3), DateTime(2012, 6)]
+define MayIncludeDayOfIvlVeryImpreciseHigh: PrecisionDateIvl includes day of Interval[DateTime(2012, 6), DateTime(2012, 9)]
+define MayIncludeDayOfIvlVeryImpreciseSurrounding: PrecisionDateIvl includes day of Interval[DateTime(2012), DateTime(2012)]
+define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
+define ImpreciseIncludesDateIvl: ImpDateIvl includes Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
+define ImpreciseIncludesDate: ImpDateIvl includes DateTime(2012, 4, 1, 0, 0, 0, 0)
+define ImpreciseDoesntIncludeDate: ImpDateIvl includes DateTime(2016, 4, 1, 0, 0, 0, 0)
+define IntervalIncludesQuantity: Interval[4 'mg', 6 'mg'] includes 5 'mg'
+define IntervalDoesntIncludeQuantity: Interval[4 'mg', 6 'mg'] includes 50 'mg'
+define ImpreciseNotIncludesDateIvl: ImpDateIvl includes Interval[DateTime(2012, 2, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
+define ImpreciseMayIncludeDateIvl: ImpDateIvl includes Interval[DateTime(2012, 3, 15, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
+define NegInfBegIncludesIntIvl: Interval[null, 5] includes Interval[-7, 2]
+define NegInfBegNotIncludesIntIvl: Interval[null, 5] includes Interval[4, 7]
+define UnknownBegIncludesIntIvl: Interval(null, 5] includes Interval[5, 5]
+define UnknownBegMayIncludeIntIvl: Interval(null, 5] includes Interval[-7, 2]
+define UnknownBegNotIncludesIntIvl: Interval(null, 5] includes Interval[4, 7]
+define PosInfEndIncludesIntIvl: Interval[0, null] includes Interval[1234, 5678]
+define PosInfEndNotIncludesIntIvl: Interval[0, null] includes Interval[-1234, 5678]
+define UnknownEndIncludesIntIvl: Interval[0, null) includes Interval[0, 0]
+define UnknownEndMayIncludeIntIvl: Interval[0, null) includes Interval[1234, 5678]
+define UnknownEndNotIncludesIntIvl: Interval[0, null) includes Interval[-1234, 5678]
+define NegInfBegIncludesLongIvl: Interval[null, 5L] includes Interval[-7L, 2L]
+define NegInfBegNotIncludesLongIvl: Interval[null, 5L] includes Interval[4L, 7L]
+define UnknownBegIncludesLongIvl: Interval(null, 5L] includes Interval[5L, 5L]
+define UnknownBegMayIncludeLongIvl: Interval(null, 5L] includes Interval[-7L, 2L]
+define UnknownBegNotIncludesLongIvl: Interval(null, 5L] includes Interval[4L, 7L]
+define PosInfEndIncludesLongIvl: Interval[0L, null] includes Interval[1234L, 5678L]
+define PosInfEndNotIncludesLongIvl: Interval[0L, null] includes Interval[-1234L, 5678L]
+define UnknownEndIncludesLongIvl: Interval[0L, null) includes Interval[0L, 0L]
+define UnknownEndMayIncludeLongIvl: Interval[0L, null) includes Interval[1234L, 5678L]
+define UnknownEndNotIncludesLongIvl: Interval[0L, null) includes Interval[-1234L, 5678L]
+define NegInfBegIncludesDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2000, 1, 1, 0, 0, 0, 0)]
+define NegInfBegNotIncludesDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define UnknownBegIncludesDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(2012, 12, 31, 23, 59, 59, 999), DateTime(2012, 12, 31, 23, 59, 59, 999)]
+define UnknownBegMayIncludeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2000, 1, 1, 0, 0, 0, 0)]
+define UnknownBegNotIncludesDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) includes Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define PosInfEndIncludesDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] includes Interval[DateTime(2014, 1, 1, 0, 0, 0, 0), DateTime(2015, 1, 1, 0, 0, 0, 0)]
+define PosInfEndNotIncludesDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] includes Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2014, 1, 1, 0, 0, 0, 0)]
+define UnknownEndIncludesDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) includes Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define UnknownEndMayIncludeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) includes Interval[DateTime(2014, 1, 1, 0, 0, 0, 0), DateTime(2015, 1, 1, 0, 0, 0, 0)]
+define UnknownEndNotIncludesDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) includes Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2014, 1, 1, 0, 0, 0, 0)]
+*/
+
+module.exports['Includes'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "3041",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
       }, {
-        "localId" : "439",
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesDateIvl",
+        "name" : "IncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "439",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "IncludesIntIvl", ": " ]
             }, {
-              "r" : "494",
+              "r" : "225",
               "s" : [ {
-                "r" : "440",
+                "r" : "217",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "215",
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "494",
+                "r" : "225",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "491",
+                "r" : "222",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "459",
-                  "s" : [ {
-                    "r" : "443",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "483",
-                  "s" : [ {
-                    "r" : "467",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "220",
+                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
                 } ]
               } ]
             } ]
@@ -29486,304 +32012,255 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "494",
+          "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "495",
+            "localId" : "226",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "496",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "227",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "497",
+            "localId" : "228",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "498",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "440",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "217",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "441",
+              "localId" : "218",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "442",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "219",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "491",
+            "localId" : "222",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "492",
+              "localId" : "223",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "493",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "459",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "460",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "461",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "462",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "463",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "464",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "239",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotIncludesIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "239",
+            "s" : [ {
+              "value" : [ "", "define ", "NotIncludesIntIvl", ": " ]
+            }, {
+              "r" : "250",
+              "s" : [ {
+                "r" : "242",
+                "s" : [ {
+                  "r" : "240",
+                  "value" : [ "Interval(", "1", ", ", "5", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "465",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "250",
+                "value" : [ " ", "includes", " " ]
               }, {
+                "r" : "247",
+                "s" : [ {
+                  "r" : "245",
+                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "251",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "252",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "253",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "254",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "242",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "243",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "466",
+                "localId" : "244",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "443",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "444",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "445",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "446",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "447",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "448",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "449",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "483",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "247",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "248",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "484",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "485",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "486",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "487",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "488",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "489",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "490",
+                "localId" : "249",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "467",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "468",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "469",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "470",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "471",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "472",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "473",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "246",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "508",
+        "localId" : "264",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesImpreciseDateIvl",
+        "name" : "IncludesLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "508",
+            "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "IncludesLongIvl", ": " ]
             }, {
-              "r" : "533",
+              "r" : "275",
               "s" : [ {
-                "r" : "509",
+                "r" : "267",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "265",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "533",
+                "r" : "275",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "530",
+                "r" : "272",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "518",
-                  "s" : [ {
-                    "r" : "512",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "527",
-                  "s" : [ {
-                    "r" : "521",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "270",
+                  "value" : [ "Interval[", "1L", ", ", "4L", "]" ]
                 } ]
               } ]
             } ]
@@ -29791,174 +32268,127 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "533",
+          "localId" : "275",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "534",
+            "localId" : "276",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "535",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "277",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "536",
+            "localId" : "278",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "537",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "279",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "509",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "267",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "510",
+              "localId" : "268",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "511",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "269",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "265",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "530",
+            "localId" : "272",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "531",
+              "localId" : "273",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "532",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "274",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "518",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "519",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "520",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "512",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "513",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "527",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "528",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "529",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "521",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "522",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "271",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "547",
+        "localId" : "289",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesImpreciseDateIvl",
+        "name" : "NotIncludesLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "547",
+            "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "NotIncludesLongIvl", ": " ]
             }, {
-              "r" : "572",
+              "r" : "300",
               "s" : [ {
-                "r" : "548",
+                "r" : "292",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "290",
+                  "value" : [ "Interval(", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "572",
+                "r" : "300",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "569",
+                "r" : "297",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "557",
-                  "s" : [ {
-                    "r" : "551",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "566",
-                  "s" : [ {
-                    "r" : "560",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "295",
+                  "value" : [ "Interval[", "1L", ", ", "4L", "]" ]
                 } ]
               } ]
             } ]
@@ -29966,174 +32396,127 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "572",
+          "localId" : "300",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "573",
+            "localId" : "301",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "574",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "302",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "575",
+            "localId" : "303",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "576",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "304",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "548",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "292",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "549",
+              "localId" : "293",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "550",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "294",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "290",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "569",
+            "localId" : "297",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "570",
+              "localId" : "298",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "571",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "299",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "557",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "558",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "559",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "551",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "552",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "295",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "566",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "567",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "568",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "560",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "561",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "586",
+        "localId" : "314",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayIncludeImpreciseDateIvl",
+        "name" : "IncludesRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "586",
+            "r" : "314",
             "s" : [ {
-              "value" : [ "", "define ", "MayIncludeImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "IncludesRealIvl", ": " ]
             }, {
-              "r" : "605",
+              "r" : "325",
               "s" : [ {
-                "r" : "587",
+                "r" : "317",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "315",
+                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
                 } ]
               }, {
-                "r" : "605",
+                "r" : "325",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "602",
+                "r" : "322",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "594",
-                  "s" : [ {
-                    "r" : "590",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "600",
-                  "s" : [ {
-                    "r" : "596",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "320",
+                  "value" : [ "Interval[", "2.34", ", ", "2.56", "]" ]
                 } ]
               } ]
             } ]
@@ -30141,134 +32524,255 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "605",
+          "localId" : "325",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "606",
+            "localId" : "326",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "607",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "327",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "608",
+            "localId" : "328",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "609",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "329",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "587",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "317",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "588",
+              "localId" : "318",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "589",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "319",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "315",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "316",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.456",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "602",
+            "localId" : "322",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "603",
+              "localId" : "323",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "604",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "324",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "594",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "320",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.34",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "321",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.56",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "339",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotIncludesRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "339",
+            "s" : [ {
+              "value" : [ "", "define ", "NotIncludesRealIvl", ": " ]
+            }, {
+              "r" : "350",
+              "s" : [ {
+                "r" : "342",
+                "s" : [ {
+                  "r" : "340",
+                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
+                } ]
+              }, {
+                "r" : "350",
+                "value" : [ " ", "includes", " " ]
+              }, {
+                "r" : "347",
+                "s" : [ {
+                  "r" : "345",
+                  "value" : [ "Interval[", "1.23", ", ", "2.56", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "350",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "351",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "352",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "353",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "354",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "342",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "343",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "595",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "590",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "localId" : "344",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "340",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "600",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.456",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "347",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "348",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "601",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "596",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "localId" : "349",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.56",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "619",
-        "name" : "PrecisionDateIvl",
+        "localId" : "364",
+        "name" : "DateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "619",
+            "r" : "364",
             "s" : [ {
-              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
+              "value" : [ "", "define ", "DateIvl", ": " ]
             }, {
-              "r" : "668",
+              "r" : "413",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "636",
+                "r" : "381",
                 "s" : [ {
-                  "r" : "620",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
+                  "r" : "365",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "660",
+                "r" : "405",
                 "s" : [ {
-                  "r" : "644",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
+                  "r" : "389",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -30278,76 +32782,76 @@ module.exports['Includes'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "671",
+          "localId" : "416",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "672",
+            "localId" : "417",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "668",
+          "localId" : "413",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "669",
+            "localId" : "414",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "670",
+              "localId" : "415",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "636",
+            "localId" : "381",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "637",
+              "localId" : "382",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "638",
+              "localId" : "383",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "639",
+              "localId" : "384",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "640",
+              "localId" : "385",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "641",
+              "localId" : "386",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "642",
+              "localId" : "387",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "643",
+              "localId" : "388",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "620",
+              "localId" : "365",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -30355,7 +32859,7 @@ module.exports['Includes'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "621",
+              "localId" : "366",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -30363,89 +32867,89 @@ module.exports['Includes'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "622",
+              "localId" : "367",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "623",
+              "localId" : "368",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
+              "value" : "0",
               "annotation" : [ ]
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "624",
+              "localId" : "369",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "34",
+              "value" : "0",
               "annotation" : [ ]
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "625",
+              "localId" : "370",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "56",
+              "value" : "0",
               "annotation" : [ ]
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "626",
+              "localId" : "371",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "789",
+              "value" : "0",
               "annotation" : [ ]
             }
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "660",
+            "localId" : "405",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "661",
+              "localId" : "406",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "662",
+              "localId" : "407",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "663",
+              "localId" : "408",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "664",
+              "localId" : "409",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "665",
+              "localId" : "410",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "666",
+              "localId" : "411",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "667",
+              "localId" : "412",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "644",
+              "localId" : "389",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -30453,7 +32957,7 @@ module.exports['Includes'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "645",
+              "localId" : "390",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -30461,85 +32965,85 @@ module.exports['Includes'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "646",
+              "localId" : "391",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "647",
+              "localId" : "392",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "648",
+              "localId" : "393",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
+              "value" : "0",
               "annotation" : [ ]
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "649",
+              "localId" : "394",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "45",
+              "value" : "0",
               "annotation" : [ ]
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "650",
+              "localId" : "395",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "678",
+              "value" : "0",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "675",
+        "localId" : "420",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayOfIvlLowEdge",
+        "name" : "IncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "675",
+            "r" : "420",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayOfIvlLowEdge", ": " ]
+              "value" : [ "", "define ", "IncludesDateIvl", ": " ]
             }, {
-              "r" : "730",
+              "r" : "475",
               "s" : [ {
-                "r" : "676",
+                "r" : "421",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "730",
-                "value" : [ " ", "includes day of", " " ]
+                "r" : "475",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "727",
+                "r" : "472",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "695",
+                  "r" : "440",
                   "s" : [ {
-                    "r" : "679",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "424",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "719",
+                  "r" : "464",
                   "s" : [ {
-                    "r" : "703",
+                    "r" : "448",
                     "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -30551,108 +33055,107 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "730",
+          "localId" : "475",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "731",
+            "localId" : "476",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "732",
+              "localId" : "477",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "733",
+            "localId" : "478",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "734",
+              "localId" : "479",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "676",
-            "name" : "PrecisionDateIvl",
+            "localId" : "421",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "677",
+              "localId" : "422",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "678",
+                "localId" : "423",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "727",
+            "localId" : "472",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "728",
+              "localId" : "473",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "729",
+                "localId" : "474",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "695",
+              "localId" : "440",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "696",
+                "localId" : "441",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "697",
+                "localId" : "442",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "698",
+                "localId" : "443",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "699",
+                "localId" : "444",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "700",
+                "localId" : "445",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "701",
+                "localId" : "446",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "702",
+                "localId" : "447",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "679",
+                "localId" : "424",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -30660,23 +33163,23 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "680",
+                "localId" : "425",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "4",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "681",
+                "localId" : "426",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "682",
+                "localId" : "427",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -30684,7 +33187,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "683",
+                "localId" : "428",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -30692,7 +33195,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "684",
+                "localId" : "429",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -30700,7 +33203,7 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "685",
+                "localId" : "430",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -30709,48 +33212,48 @@ module.exports['Includes'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "719",
+              "localId" : "464",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "720",
+                "localId" : "465",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "721",
+                "localId" : "466",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "722",
+                "localId" : "467",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "723",
+                "localId" : "468",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "724",
+                "localId" : "469",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "725",
+                "localId" : "470",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "726",
+                "localId" : "471",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "703",
+                "localId" : "448",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -30758,7 +33261,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "704",
+                "localId" : "449",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -30766,7 +33269,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "705",
+                "localId" : "450",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -30774,7 +33277,7 @@ module.exports['Includes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "706",
+                "localId" : "451",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -30782,7 +33285,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "707",
+                "localId" : "452",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -30790,7 +33293,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "708",
+                "localId" : "453",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -30798,7 +33301,7 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "709",
+                "localId" : "454",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -30808,48 +33311,48 @@ module.exports['Includes'] = {
           } ]
         }
       }, {
-        "localId" : "744",
+        "localId" : "489",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayOfIvlHighEdge",
+        "name" : "NotIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "744",
+            "r" : "489",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayOfIvlHighEdge", ": " ]
+              "value" : [ "", "define ", "NotIncludesDateIvl", ": " ]
             }, {
-              "r" : "799",
+              "r" : "544",
               "s" : [ {
-                "r" : "745",
+                "r" : "490",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "799",
-                "value" : [ " ", "includes day of", " " ]
+                "r" : "544",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "796",
+                "r" : "541",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "764",
+                  "r" : "509",
                   "s" : [ {
-                    "r" : "748",
+                    "r" : "493",
                     "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "788",
+                  "r" : "533",
                   "s" : [ {
-                    "r" : "772",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "517",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -30857,108 +33360,107 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "799",
+          "localId" : "544",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "800",
+            "localId" : "545",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "801",
+              "localId" : "546",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "802",
+            "localId" : "547",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "803",
+              "localId" : "548",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "745",
-            "name" : "PrecisionDateIvl",
+            "localId" : "490",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "746",
+              "localId" : "491",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "747",
+                "localId" : "492",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "796",
+            "localId" : "541",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "797",
+              "localId" : "542",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "798",
+                "localId" : "543",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "764",
+              "localId" : "509",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "765",
+                "localId" : "510",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
+                "localId" : "511",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "767",
+                "localId" : "512",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "768",
+                "localId" : "513",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "769",
+                "localId" : "514",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "770",
+                "localId" : "515",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "771",
+                "localId" : "516",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "748",
+                "localId" : "493",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -30966,7 +33468,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "749",
+                "localId" : "494",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -30974,7 +33476,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "750",
+                "localId" : "495",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -30982,7 +33484,7 @@ module.exports['Includes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "751",
+                "localId" : "496",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -30990,7 +33492,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "752",
+                "localId" : "497",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -30998,7 +33500,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "753",
+                "localId" : "498",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -31006,7 +33508,7 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "754",
+                "localId" : "499",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -31015,48 +33517,48 @@ module.exports['Includes'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "788",
+              "localId" : "533",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "789",
+                "localId" : "534",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "790",
+                "localId" : "535",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "791",
+                "localId" : "536",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "792",
+                "localId" : "537",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "793",
+                "localId" : "538",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "794",
+                "localId" : "539",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "795",
+                "localId" : "540",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "772",
+                "localId" : "517",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -31064,7 +33566,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "773",
+                "localId" : "518",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -31072,87 +33574,87 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "774",
+                "localId" : "519",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "775",
+                "localId" : "520",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "776",
+                "localId" : "521",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "777",
+                "localId" : "522",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "778",
+                "localId" : "523",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "813",
+        "localId" : "558",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesDayOfIvlLowEdge",
+        "name" : "IncludesImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "813",
+            "r" : "558",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesDayOfIvlLowEdge", ": " ]
+              "value" : [ "", "define ", "IncludesImpreciseDateIvl", ": " ]
             }, {
-              "r" : "868",
+              "r" : "583",
               "s" : [ {
-                "r" : "814",
+                "r" : "559",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "868",
-                "value" : [ " ", "includes day of", " " ]
+                "r" : "583",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "865",
+                "r" : "580",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "833",
+                  "r" : "568",
                   "s" : [ {
-                    "r" : "817",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "562",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "857",
+                  "r" : "577",
                   "s" : [ {
-                    "r" : "841",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "571",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -31163,108 +33665,82 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "868",
+          "localId" : "583",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "869",
+            "localId" : "584",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "870",
+              "localId" : "585",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "871",
+            "localId" : "586",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "872",
+              "localId" : "587",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "814",
-            "name" : "PrecisionDateIvl",
+            "localId" : "559",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "815",
+              "localId" : "560",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "816",
+                "localId" : "561",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "865",
+            "localId" : "580",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "866",
+              "localId" : "581",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "867",
+                "localId" : "582",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "833",
+              "localId" : "568",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "834",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "835",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "836",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "837",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "838",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "839",
+                "localId" : "569",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "840",
+                "localId" : "570",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "817",
+                "localId" : "562",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -31272,97 +33748,32 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "818",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "819",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "820",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "821",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "822",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "823",
+                "localId" : "563",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "4",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "857",
+              "localId" : "577",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "858",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "859",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "860",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "861",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "862",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "863",
+                "localId" : "578",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "864",
+                "localId" : "579",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "841",
+                "localId" : "571",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -31370,95 +33781,55 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "842",
+                "localId" : "572",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
                 "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "843",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "844",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "845",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "846",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "847",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "882",
+        "localId" : "597",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesDayOfIvlHighEdge",
+        "name" : "NotIncludesImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "882",
+            "r" : "597",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesDayOfIvlHighEdge", ": " ]
+              "value" : [ "", "define ", "NotIncludesImpreciseDateIvl", ": " ]
             }, {
-              "r" : "937",
+              "r" : "622",
               "s" : [ {
-                "r" : "883",
+                "r" : "598",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "937",
-                "value" : [ " ", "includes day of", " " ]
+                "r" : "622",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "934",
+                "r" : "619",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "902",
+                  "r" : "607",
                   "s" : [ {
-                    "r" : "886",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "601",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "926",
+                  "r" : "616",
                   "s" : [ {
-                    "r" : "910",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "610",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -31469,108 +33840,82 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "937",
+          "localId" : "622",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "938",
+            "localId" : "623",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "939",
+              "localId" : "624",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "940",
+            "localId" : "625",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "941",
+              "localId" : "626",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "883",
-            "name" : "PrecisionDateIvl",
+            "localId" : "598",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "884",
+              "localId" : "599",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "885",
+                "localId" : "600",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "934",
+            "localId" : "619",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "935",
+              "localId" : "620",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "936",
+                "localId" : "621",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "902",
+              "localId" : "607",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "903",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "904",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "905",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "906",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "907",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "908",
+                "localId" : "608",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "909",
+                "localId" : "609",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "886",
+                "localId" : "601",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -31578,97 +33923,32 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "887",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "888",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "889",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "890",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "891",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "892",
+                "localId" : "602",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "4",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "926",
+              "localId" : "616",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "927",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "928",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "929",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "930",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "931",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "932",
+                "localId" : "617",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "933",
+                "localId" : "618",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "910",
+                "localId" : "610",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -31676,95 +33956,55 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "911",
+                "localId" : "611",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
                 "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "912",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "913",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "914",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "915",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "916",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "951",
+        "localId" : "636",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayOfIvlImpreciseLowEdge",
+        "name" : "MayIncludeImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "951",
+            "r" : "636",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayOfIvlImpreciseLowEdge", ": " ]
+              "value" : [ "", "define ", "MayIncludeImpreciseDateIvl", ": " ]
             }, {
-              "r" : "982",
+              "r" : "655",
               "s" : [ {
-                "r" : "952",
+                "r" : "637",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "982",
-                "value" : [ " ", "includes day of", " " ]
+                "r" : "655",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "979",
+                "r" : "652",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "963",
+                  "r" : "644",
                   "s" : [ {
-                    "r" : "955",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
+                    "r" : "640",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "975",
+                  "r" : "650",
                   "s" : [ {
-                    "r" : "967",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ")" ]
+                    "r" : "646",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -31775,201 +34015,409 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "982",
+          "localId" : "655",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "983",
+            "localId" : "656",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "984",
+              "localId" : "657",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "985",
+            "localId" : "658",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "986",
+              "localId" : "659",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "952",
-            "name" : "PrecisionDateIvl",
+            "localId" : "637",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "953",
+              "localId" : "638",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "954",
+                "localId" : "639",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "979",
+            "localId" : "652",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "980",
+              "localId" : "653",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "981",
+                "localId" : "654",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "963",
+              "localId" : "644",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "964",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "965",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "966",
+                "localId" : "645",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "955",
+                "localId" : "640",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "956",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "957",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "975",
+              "localId" : "650",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "976",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "977",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "978",
+                "localId" : "651",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "967",
+                "localId" : "646",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "968",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "969",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "996",
+        "localId" : "669",
+        "name" : "PrecisionDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "669",
+            "s" : [ {
+              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
+            }, {
+              "r" : "718",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "686",
+                "s" : [ {
+                  "r" : "670",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "710",
+                "s" : [ {
+                  "r" : "694",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "721",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "722",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "718",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "719",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "720",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "686",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "687",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "688",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "689",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "690",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "691",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "692",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "693",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "670",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "671",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "672",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "673",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "674",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "34",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "675",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "56",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "676",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "789",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "710",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "711",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "712",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "713",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "714",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "715",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "716",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "717",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "694",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "695",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "696",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "697",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "698",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "23",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "699",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "45",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "700",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "678",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "725",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayOfIvlImpreciseHighEdge",
+        "name" : "IncludesDayOfIvlLowEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "996",
+            "r" : "725",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayOfIvlImpreciseHighEdge", ": " ]
+              "value" : [ "", "define ", "IncludesDayOfIvlLowEdge", ": " ]
             }, {
-              "r" : "1027",
+              "r" : "780",
               "s" : [ {
-                "r" : "997",
+                "r" : "726",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1027",
+                "r" : "780",
                 "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1024",
+                "r" : "777",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1008",
+                  "r" : "745",
                   "s" : [ {
-                    "r" : "1000",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ")" ]
+                    "r" : "729",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1020",
+                  "r" : "769",
                   "s" : [ {
-                    "r" : "1012",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ")" ]
+                    "r" : "753",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -31977,88 +34425,108 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1027",
+          "localId" : "780",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1028",
+            "localId" : "781",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1029",
+              "localId" : "782",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1030",
+            "localId" : "783",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1031",
+              "localId" : "784",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "997",
+            "localId" : "726",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "998",
+              "localId" : "727",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "999",
+                "localId" : "728",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1024",
+            "localId" : "777",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1025",
+              "localId" : "778",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1026",
+                "localId" : "779",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1008",
+              "localId" : "745",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1009",
+                "localId" : "746",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1010",
+                "localId" : "747",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1011",
+                "localId" : "748",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "749",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "750",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "751",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "752",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1000",
+                "localId" : "729",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -32066,112 +34534,196 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1001",
+                "localId" : "730",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1002",
+                "localId" : "731",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "732",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "733",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "734",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "735",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1020",
+              "localId" : "769",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1021",
+                "localId" : "770",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1022",
+                "localId" : "771",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1023",
+                "localId" : "772",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1012",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "773",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "774",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "775",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "776",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "753",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1013",
+                "localId" : "754",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1014",
+                "localId" : "755",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "756",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "757",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "758",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "759",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1041",
+        "localId" : "794",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayOfIvlVeryImpreciseMiddle",
+        "name" : "IncludesDayOfIvlHighEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1041",
+            "r" : "794",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayOfIvlVeryImpreciseMiddle", ": " ]
+              "value" : [ "", "define ", "IncludesDayOfIvlHighEdge", ": " ]
             }, {
-              "r" : "1066",
+              "r" : "849",
               "s" : [ {
-                "r" : "1042",
+                "r" : "795",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1066",
+                "r" : "849",
                 "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1063",
+                "r" : "846",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1051",
+                  "r" : "814",
                   "s" : [ {
-                    "r" : "1045",
-                    "value" : [ "DateTime", "(", "2012", ", ", "5", ")" ]
+                    "r" : "798",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1060",
+                  "r" : "838",
                   "s" : [ {
-                    "r" : "1054",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
+                    "r" : "822",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -32179,83 +34731,108 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1066",
+          "localId" : "849",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1067",
+            "localId" : "850",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1068",
+              "localId" : "851",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1069",
+            "localId" : "852",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1070",
+              "localId" : "853",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1042",
+            "localId" : "795",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1043",
+              "localId" : "796",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1044",
+                "localId" : "797",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1063",
+            "localId" : "846",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1064",
+              "localId" : "847",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1065",
+                "localId" : "848",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1051",
+              "localId" : "814",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1052",
+                "localId" : "815",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1053",
+                "localId" : "816",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "817",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "818",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "819",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "820",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1045",
+                "localId" : "798",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -32263,32 +34840,97 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1046",
+                "localId" : "799",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "800",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "801",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "802",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "803",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "804",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1060",
+              "localId" : "838",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1061",
+                "localId" : "839",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1062",
+                "localId" : "840",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "841",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "842",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "843",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "844",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "845",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1054",
+                "localId" : "822",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -32296,55 +34938,95 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1055",
+                "localId" : "823",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "824",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "825",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "826",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "827",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "828",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1080",
+        "localId" : "863",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesDayOfIvlVeryImpreciseLow",
+        "name" : "NotIncludesDayOfIvlLowEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1080",
+            "r" : "863",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesDayOfIvlVeryImpreciseLow", ": " ]
+              "value" : [ "", "define ", "NotIncludesDayOfIvlLowEdge", ": " ]
             }, {
-              "r" : "1105",
+              "r" : "918",
               "s" : [ {
-                "r" : "1081",
+                "r" : "864",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1105",
+                "r" : "918",
                 "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1102",
+                "r" : "915",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1090",
+                  "r" : "883",
                   "s" : [ {
-                    "r" : "1084",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                    "r" : "867",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1099",
+                  "r" : "907",
                   "s" : [ {
-                    "r" : "1093",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
+                    "r" : "891",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -32355,83 +35037,108 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1105",
+          "localId" : "918",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1106",
+            "localId" : "919",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1107",
+              "localId" : "920",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1108",
+            "localId" : "921",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1109",
+              "localId" : "922",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1081",
+            "localId" : "864",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1082",
+              "localId" : "865",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1083",
+                "localId" : "866",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1102",
+            "localId" : "915",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1103",
+              "localId" : "916",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1104",
+                "localId" : "917",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1090",
+              "localId" : "883",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1091",
+                "localId" : "884",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1092",
+                "localId" : "885",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "886",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "887",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "888",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "889",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "890",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1084",
+                "localId" : "867",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -32439,32 +35146,97 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1085",
+                "localId" : "868",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "869",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "870",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "871",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "872",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "873",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1099",
+              "localId" : "907",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1100",
+                "localId" : "908",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1101",
+                "localId" : "909",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "910",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "911",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "912",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "913",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "914",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1093",
+                "localId" : "891",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -32472,55 +35244,95 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1094",
+                "localId" : "892",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
                 "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "893",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "894",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "895",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "896",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "897",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1119",
+        "localId" : "932",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesDayOfIvlVeryImpreciseHigh",
+        "name" : "NotIncludesDayOfIvlHighEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1119",
+            "r" : "932",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesDayOfIvlVeryImpreciseHigh", ": " ]
+              "value" : [ "", "define ", "NotIncludesDayOfIvlHighEdge", ": " ]
             }, {
-              "r" : "1144",
+              "r" : "987",
               "s" : [ {
-                "r" : "1120",
+                "r" : "933",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1144",
+                "r" : "987",
                 "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1141",
+                "r" : "984",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1129",
+                  "r" : "952",
                   "s" : [ {
-                    "r" : "1123",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
+                    "r" : "936",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1138",
+                  "r" : "976",
                   "s" : [ {
-                    "r" : "1132",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
+                    "r" : "960",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -32531,83 +35343,108 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1144",
+          "localId" : "987",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1145",
+            "localId" : "988",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1146",
+              "localId" : "989",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1147",
+            "localId" : "990",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1148",
+              "localId" : "991",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1120",
+            "localId" : "933",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1121",
+              "localId" : "934",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1122",
+                "localId" : "935",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1141",
+            "localId" : "984",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1142",
+              "localId" : "985",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1143",
+                "localId" : "986",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1129",
+              "localId" : "952",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1130",
+                "localId" : "953",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1131",
+                "localId" : "954",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "955",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "956",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "957",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "958",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "959",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1123",
+                "localId" : "936",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -32615,32 +35452,97 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1124",
+                "localId" : "937",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
                 "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "938",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "939",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "940",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "941",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "942",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1138",
+              "localId" : "976",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1139",
+                "localId" : "977",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1140",
+                "localId" : "978",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "979",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "980",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "981",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "982",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "983",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1132",
+                "localId" : "960",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -32648,55 +35550,95 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1133",
+                "localId" : "961",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "962",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "963",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "964",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "965",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "966",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1158",
+        "localId" : "1001",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayIncludeDayOfIvlVeryImpreciseLow",
+        "name" : "IncludesDayOfIvlImpreciseLowEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1158",
+            "r" : "1001",
             "s" : [ {
-              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseLow", ": " ]
+              "value" : [ "", "define ", "IncludesDayOfIvlImpreciseLowEdge", ": " ]
             }, {
-              "r" : "1183",
+              "r" : "1032",
               "s" : [ {
-                "r" : "1159",
+                "r" : "1002",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1183",
+                "r" : "1032",
                 "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1180",
+                "r" : "1029",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1168",
+                  "r" : "1013",
                   "s" : [ {
-                    "r" : "1162",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                    "r" : "1005",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1177",
+                  "r" : "1025",
                   "s" : [ {
-                    "r" : "1171",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
+                    "r" : "1017",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -32707,83 +35649,88 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1183",
+          "localId" : "1032",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1184",
+            "localId" : "1033",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1185",
+              "localId" : "1034",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1186",
+            "localId" : "1035",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1187",
+              "localId" : "1036",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1159",
+            "localId" : "1002",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1160",
+              "localId" : "1003",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1161",
+                "localId" : "1004",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1180",
+            "localId" : "1029",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1181",
+              "localId" : "1030",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1182",
+                "localId" : "1031",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1168",
+              "localId" : "1013",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1169",
+                "localId" : "1014",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1170",
+                "localId" : "1015",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1016",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1162",
+                "localId" : "1005",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -32791,32 +35738,45 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1163",
+                "localId" : "1006",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
                 "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1007",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1177",
+              "localId" : "1025",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1178",
+                "localId" : "1026",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1179",
+                "localId" : "1027",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1028",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1171",
+                "localId" : "1017",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -32824,55 +35784,63 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1172",
+                "localId" : "1018",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
                 "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1019",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1197",
+        "localId" : "1046",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayIncludeDayOfIvlVeryImpreciseHigh",
+        "name" : "IncludesDayOfIvlImpreciseHighEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1197",
+            "r" : "1046",
             "s" : [ {
-              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseHigh", ": " ]
+              "value" : [ "", "define ", "IncludesDayOfIvlImpreciseHighEdge", ": " ]
             }, {
-              "r" : "1222",
+              "r" : "1077",
               "s" : [ {
-                "r" : "1198",
+                "r" : "1047",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1222",
+                "r" : "1077",
                 "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1219",
+                "r" : "1074",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1207",
+                  "r" : "1058",
                   "s" : [ {
-                    "r" : "1201",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
+                    "r" : "1050",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1216",
+                  "r" : "1070",
                   "s" : [ {
-                    "r" : "1210",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                    "r" : "1062",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -32883,83 +35851,88 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1222",
+          "localId" : "1077",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1223",
+            "localId" : "1078",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1224",
+              "localId" : "1079",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1225",
+            "localId" : "1080",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1226",
+              "localId" : "1081",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1198",
+            "localId" : "1047",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1199",
+              "localId" : "1048",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1200",
+                "localId" : "1049",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1219",
+            "localId" : "1074",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1220",
+              "localId" : "1075",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1221",
+                "localId" : "1076",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1207",
+              "localId" : "1058",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1208",
+                "localId" : "1059",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1209",
+                "localId" : "1060",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1061",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1201",
+                "localId" : "1050",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -32967,32 +35940,45 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1202",
+                "localId" : "1051",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
                 "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1052",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1216",
+              "localId" : "1070",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1217",
+                "localId" : "1071",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1218",
+                "localId" : "1072",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1073",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1210",
+                "localId" : "1062",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -33000,55 +35986,63 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1211",
+                "localId" : "1063",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
                 "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1064",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1236",
+        "localId" : "1091",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayIncludeDayOfIvlVeryImpreciseSurrounding",
+        "name" : "IncludesDayOfIvlVeryImpreciseMiddle",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1236",
+            "r" : "1091",
             "s" : [ {
-              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseSurrounding", ": " ]
+              "value" : [ "", "define ", "IncludesDayOfIvlVeryImpreciseMiddle", ": " ]
             }, {
-              "r" : "1255",
+              "r" : "1116",
               "s" : [ {
-                "r" : "1237",
+                "r" : "1092",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1255",
+                "r" : "1116",
                 "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1252",
+                "r" : "1113",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1244",
+                  "r" : "1101",
                   "s" : [ {
-                    "r" : "1240",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
+                    "r" : "1095",
+                    "value" : [ "DateTime", "(", "2012", ", ", "5", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1250",
+                  "r" : "1110",
                   "s" : [ {
-                    "r" : "1246",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
+                    "r" : "1104",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -33059,280 +36053,175 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1255",
+          "localId" : "1116",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1256",
+            "localId" : "1117",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1257",
+              "localId" : "1118",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1258",
+            "localId" : "1119",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1259",
+              "localId" : "1120",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1237",
+            "localId" : "1092",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1238",
+              "localId" : "1093",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1239",
+                "localId" : "1094",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1252",
+            "localId" : "1113",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1253",
+              "localId" : "1114",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1254",
+                "localId" : "1115",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1244",
+              "localId" : "1101",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1245",
+                "localId" : "1102",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1103",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1240",
+                "localId" : "1095",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
                 "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1096",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
+                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1250",
+              "localId" : "1110",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1251",
+                "localId" : "1111",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1112",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1246",
+                "localId" : "1104",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
                 "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1105",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1269",
-        "name" : "ImpDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1269",
-            "s" : [ {
-              "value" : [ "", "define ", "ImpDateIvl", ": " ]
-            }, {
-              "r" : "1288",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "1276",
-                "s" : [ {
-                  "r" : "1270",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "1285",
-                "s" : [ {
-                  "r" : "1279",
-                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
-                } ]
-              }, {
-                "value" : [ "]" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1291",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1292",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "1288",
-          "lowClosed" : true,
-          "highClosed" : true,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1289",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1290",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "1276",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1277",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1278",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1271",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "1285",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1286",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1287",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1279",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1280",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "1295",
+        "localId" : "1130",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseIncludesDateIvl",
+        "name" : "NotIncludesDayOfIvlVeryImpreciseLow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1295",
+            "r" : "1130",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "NotIncludesDayOfIvlVeryImpreciseLow", ": " ]
             }, {
-              "r" : "1350",
+              "r" : "1155",
               "s" : [ {
-                "r" : "1296",
+                "r" : "1131",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1350",
-                "value" : [ " ", "includes", " " ]
+                "r" : "1155",
+                "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1347",
+                "r" : "1152",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1315",
+                  "r" : "1140",
                   "s" : [ {
-                    "r" : "1299",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1134",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1339",
+                  "r" : "1149",
                   "s" : [ {
-                    "r" : "1323",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1143",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -33340,107 +36229,83 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1350",
+          "localId" : "1155",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1351",
+            "localId" : "1156",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1352",
+              "localId" : "1157",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1353",
+            "localId" : "1158",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1354",
+              "localId" : "1159",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1296",
-            "name" : "ImpDateIvl",
+            "localId" : "1131",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1297",
+              "localId" : "1132",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1298",
+                "localId" : "1133",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1347",
+            "localId" : "1152",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1348",
+              "localId" : "1153",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1349",
+                "localId" : "1154",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1315",
+              "localId" : "1140",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1316",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1317",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1318",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1319",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1320",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1321",
+                "localId" : "1141",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1322",
+                "localId" : "1142",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1299",
+                "localId" : "1134",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -33448,97 +36313,32 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1300",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1301",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1302",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1303",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1304",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1305",
+                "localId" : "1135",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "2",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1339",
+              "localId" : "1149",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1340",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1341",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1342",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1343",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1344",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1345",
+                "localId" : "1150",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1346",
+                "localId" : "1151",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1323",
+                "localId" : "1143",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -33546,654 +36346,410 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1324",
+                "localId" : "1144",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
                 "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1325",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1326",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1327",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1328",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1329",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1364",
+        "localId" : "1169",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseIncludesDate",
+        "name" : "NotIncludesDayOfIvlVeryImpreciseHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1364",
+            "r" : "1169",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseIncludesDate", ": " ]
+              "value" : [ "", "define ", "NotIncludesDayOfIvlVeryImpreciseHigh", ": " ]
             }, {
-              "r" : "1393",
+              "r" : "1194",
               "s" : [ {
-                "r" : "1365",
+                "r" : "1170",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1393",
-                "value" : [ " ", "includes", " " ]
+                "r" : "1194",
+                "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1384",
+                "r" : "1191",
                 "s" : [ {
-                  "r" : "1368",
-                  "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1179",
+                  "s" : [ {
+                    "r" : "1173",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1188",
+                  "s" : [ {
+                    "r" : "1182",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Contains",
-          "localId" : "1393",
+          "type" : "Includes",
+          "localId" : "1194",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1394",
+            "localId" : "1195",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1395",
+              "localId" : "1196",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1396",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1365",
-            "name" : "ImpDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1366",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1367",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "DateTime",
-            "localId" : "1384",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1385",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1386",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1387",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1388",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1389",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1390",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1391",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1368",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1369",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1370",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1371",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1372",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1373",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1374",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1399",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseDoesntIncludeDate",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1399",
-            "s" : [ {
-              "value" : [ "", "define ", "ImpreciseDoesntIncludeDate", ": " ]
-            }, {
-              "r" : "1428",
-              "s" : [ {
-                "r" : "1400",
-                "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
-                } ]
-              }, {
-                "r" : "1428",
-                "value" : [ " ", "includes", " " ]
-              }, {
-                "r" : "1419",
-                "s" : [ {
-                  "r" : "1403",
-                  "value" : [ "DateTime", "(", "2016", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Contains",
-          "localId" : "1428",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1429",
+            "localId" : "1197",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1430",
+              "localId" : "1198",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1431",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1400",
-            "name" : "ImpDateIvl",
+            "localId" : "1170",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1401",
+              "localId" : "1171",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1402",
+                "localId" : "1172",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "DateTime",
-            "localId" : "1419",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1420",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1421",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1422",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1423",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1424",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1425",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1426",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1403",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2016",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1404",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1405",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1406",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1407",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1408",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1409",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1434",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntervalIncludesQuantity",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1434",
-            "s" : [ {
-              "value" : [ "", "define ", "IntervalIncludesQuantity", ": " ]
-            }, {
-              "r" : "1442",
-              "s" : [ {
-                "r" : "1437",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1435",
-                  "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1436",
-                  "s" : [ {
-                    "value" : [ "6 ", "'mg'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "r" : "1442",
-                "value" : [ " ", "includes", " " ]
-              }, {
-                "r" : "1440",
-                "s" : [ {
-                  "value" : [ "5 ", "'mg'" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Contains",
-          "localId" : "1442",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1443",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1444",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1445",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1437",
+            "localId" : "1191",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1438",
+              "localId" : "1192",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1439",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1193",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
-              "localId" : "1435",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "mg",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1179",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1180",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1181",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1173",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1174",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Quantity",
-              "localId" : "1436",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 6,
-              "unit" : "mg",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1188",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1189",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1190",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1182",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1183",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              }
             }
-          }, {
-            "type" : "Quantity",
-            "localId" : "1440",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 5,
-            "unit" : "mg",
-            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1448",
+        "localId" : "1208",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntervalDoesntIncludeQuantity",
+        "name" : "MayIncludeDayOfIvlVeryImpreciseLow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1448",
+            "r" : "1208",
             "s" : [ {
-              "value" : [ "", "define ", "IntervalDoesntIncludeQuantity", ": " ]
+              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseLow", ": " ]
             }, {
-              "r" : "1456",
+              "r" : "1233",
               "s" : [ {
-                "r" : "1451",
+                "r" : "1209",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "1233",
+                "value" : [ " ", "includes day of", " " ]
+              }, {
+                "r" : "1230",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1449",
+                  "r" : "1218",
                   "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
+                    "r" : "1212",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1450",
+                  "r" : "1227",
                   "s" : [ {
-                    "value" : [ "6 ", "'mg'" ]
+                    "r" : "1221",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
-              }, {
-                "r" : "1456",
-                "value" : [ " ", "includes", " " ]
-              }, {
-                "r" : "1454",
-                "s" : [ {
-                  "value" : [ "50 ", "'mg'" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Contains",
-          "localId" : "1456",
+          "type" : "Includes",
+          "localId" : "1233",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1457",
+            "localId" : "1234",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1458",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1235",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1459",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1236",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1237",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1209",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1210",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1211",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "1451",
+            "localId" : "1230",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1452",
+              "localId" : "1231",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1453",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1232",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
-              "localId" : "1449",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "mg",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1219",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1220",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1212",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1213",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Quantity",
-              "localId" : "1450",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 6,
-              "unit" : "mg",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1227",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1228",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1229",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1221",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1222",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              }
             }
-          }, {
-            "type" : "Quantity",
-            "localId" : "1454",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 50,
-            "unit" : "mg",
-            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1462",
+        "localId" : "1247",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseNotIncludesDateIvl",
+        "name" : "MayIncludeDayOfIvlVeryImpreciseHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1462",
+            "r" : "1247",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseNotIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseHigh", ": " ]
             }, {
-              "r" : "1517",
+              "r" : "1272",
               "s" : [ {
-                "r" : "1463",
+                "r" : "1248",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1517",
-                "value" : [ " ", "includes", " " ]
+                "r" : "1272",
+                "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1514",
+                "r" : "1269",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1482",
+                  "r" : "1257",
                   "s" : [ {
-                    "r" : "1466",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1251",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1506",
+                  "r" : "1266",
                   "s" : [ {
-                    "r" : "1490",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1260",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -34201,107 +36757,83 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1517",
+          "localId" : "1272",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1518",
+            "localId" : "1273",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1519",
+              "localId" : "1274",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1520",
+            "localId" : "1275",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1521",
+              "localId" : "1276",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1463",
-            "name" : "ImpDateIvl",
+            "localId" : "1248",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1464",
+              "localId" : "1249",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1465",
+                "localId" : "1250",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1514",
+            "localId" : "1269",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1515",
+              "localId" : "1270",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1516",
+                "localId" : "1271",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1482",
+              "localId" : "1257",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1483",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1484",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1485",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1486",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1487",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1488",
+                "localId" : "1258",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1489",
+                "localId" : "1259",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1466",
+                "localId" : "1251",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -34309,97 +36841,32 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1467",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1468",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1469",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1470",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1471",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1472",
+                "localId" : "1252",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "6",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1506",
+              "localId" : "1266",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1507",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1508",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1509",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1510",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1511",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1512",
+                "localId" : "1267",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1513",
+                "localId" : "1268",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1490",
+                "localId" : "1260",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -34407,98 +36874,58 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1491",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1492",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1493",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1494",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1495",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1496",
+                "localId" : "1261",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "9",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1531",
+        "localId" : "1286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayIncludeDateIvl",
+        "name" : "MayIncludeDayOfIvlVeryImpreciseSurrounding",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1531",
+            "r" : "1286",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayIncludeDateIvl", ": " ]
+              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseSurrounding", ": " ]
             }, {
-              "r" : "1586",
+              "r" : "1305",
               "s" : [ {
-                "r" : "1532",
+                "r" : "1287",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1586",
-                "value" : [ " ", "includes", " " ]
+                "r" : "1305",
+                "value" : [ " ", "includes day of", " " ]
               }, {
-                "r" : "1583",
+                "r" : "1302",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1551",
+                  "r" : "1294",
                   "s" : [ {
-                    "r" : "1535",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1290",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1575",
+                  "r" : "1300",
                   "s" : [ {
-                    "r" : "1559",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1296",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -34506,107 +36933,388 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1586",
+          "localId" : "1305",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1587",
+            "localId" : "1306",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1588",
+              "localId" : "1307",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1589",
+            "localId" : "1308",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1590",
+              "localId" : "1309",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1532",
-            "name" : "ImpDateIvl",
+            "localId" : "1287",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1533",
+              "localId" : "1288",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1534",
+                "localId" : "1289",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1583",
+            "localId" : "1302",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1584",
+              "localId" : "1303",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1585",
+                "localId" : "1304",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1551",
+              "localId" : "1294",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1552",
+                "localId" : "1295",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1290",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1300",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1301",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1296",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1319",
+        "name" : "ImpDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1319",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpDateIvl", ": " ]
+            }, {
+              "r" : "1338",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "1326",
+                "s" : [ {
+                  "r" : "1320",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "1335",
+                "s" : [ {
+                  "r" : "1329",
+                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1341",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1342",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1338",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1339",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1340",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "1326",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1327",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1328",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1320",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1321",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "1335",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1336",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1337",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1330",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "8",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1345",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseIncludesDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1345",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseIncludesDateIvl", ": " ]
+            }, {
+              "r" : "1400",
+              "s" : [ {
+                "r" : "1346",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1400",
+                "value" : [ " ", "includes", " " ]
               }, {
+                "r" : "1397",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1365",
+                  "s" : [ {
+                    "r" : "1349",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1389",
+                  "s" : [ {
+                    "r" : "1373",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "1400",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1401",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1402",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1403",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1404",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1346",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1347",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1553",
+                "localId" : "1348",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1397",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1398",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1399",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1366",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1554",
+                "localId" : "1367",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1555",
+                "localId" : "1368",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1556",
+                "localId" : "1369",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1557",
+                "localId" : "1370",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1558",
+                "localId" : "1371",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1372",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1535",
+                "localId" : "1349",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -34614,23 +37322,23 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1536",
+                "localId" : "1350",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "4",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1537",
+                "localId" : "1351",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1538",
+                "localId" : "1352",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -34638,7 +37346,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1539",
+                "localId" : "1353",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -34646,7 +37354,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1540",
+                "localId" : "1354",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -34654,7 +37362,7 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1541",
+                "localId" : "1355",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -34663,48 +37371,48 @@ module.exports['Includes'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1575",
+              "localId" : "1389",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1576",
+                "localId" : "1390",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1577",
+                "localId" : "1391",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1578",
+                "localId" : "1392",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1579",
+                "localId" : "1393",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1580",
+                "localId" : "1394",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1581",
+                "localId" : "1395",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1582",
+                "localId" : "1396",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1559",
+                "localId" : "1373",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -34712,7 +37420,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1560",
+                "localId" : "1374",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -34720,7 +37428,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1561",
+                "localId" : "1375",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -34728,7 +37436,7 @@ module.exports['Includes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1562",
+                "localId" : "1376",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -34736,7 +37444,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1563",
+                "localId" : "1377",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -34744,7 +37452,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1564",
+                "localId" : "1378",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -34752,7 +37460,7 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1565",
+                "localId" : "1379",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -34762,606 +37470,604 @@ module.exports['Includes'] = {
           } ]
         }
       }, {
-        "localId" : "1600",
+        "localId" : "1414",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegIncludesIntIvl",
+        "name" : "ImpreciseIncludesDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1600",
+            "r" : "1414",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseIncludesDate", ": " ]
             }, {
-              "r" : "1614",
+              "r" : "1443",
               "s" : [ {
-                "r" : "1603",
+                "r" : "1415",
                 "s" : [ {
-                  "r" : "1601",
-                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
+                  "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "1614",
+                "r" : "1443",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "1611",
+                "r" : "1434",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1607",
-                  "s" : [ {
-                    "r" : "1608",
-                    "value" : [ "-", "7" ]
-                  } ]
-                }, {
-                  "r" : "1610",
-                  "value" : [ ", ", "2", "]" ]
+                  "r" : "1418",
+                  "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Includes",
-          "localId" : "1614",
+          "type" : "Contains",
+          "localId" : "1443",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1615",
+            "localId" : "1444",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1616",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1445",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1617",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1618",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1446",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1603",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "1415",
+            "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1605",
+              "localId" : "1416",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1606",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1417",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            }
+          }, {
+            "type" : "DateTime",
+            "localId" : "1434",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1435",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1436",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1437",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1438",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1439",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1440",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1441",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1418",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
-              "type" : "As",
-              "localId" : "1604",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1601",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1419",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1420",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
               "type" : "Literal",
-              "localId" : "1602",
+              "localId" : "1421",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "0",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1611",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1612",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1613",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1607",
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1422",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1609",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1608",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "7",
-                "annotation" : [ ]
-              }
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
-            "high" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "1610",
+              "localId" : "1423",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1424",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1628",
+        "localId" : "1449",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotIncludesIntIvl",
+        "name" : "ImpreciseDoesntIncludeDate",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1628",
+            "r" : "1449",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseDoesntIncludeDate", ": " ]
             }, {
-              "r" : "1640",
+              "r" : "1478",
               "s" : [ {
-                "r" : "1631",
+                "r" : "1450",
                 "s" : [ {
-                  "r" : "1629",
-                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
+                  "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "1640",
+                "r" : "1478",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "1637",
+                "r" : "1469",
                 "s" : [ {
-                  "r" : "1635",
-                  "value" : [ "Interval[", "4", ", ", "7", "]" ]
+                  "r" : "1453",
+                  "value" : [ "DateTime", "(", "2016", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Includes",
-          "localId" : "1640",
+          "type" : "Contains",
+          "localId" : "1478",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1641",
+            "localId" : "1479",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1642",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1480",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1643",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1644",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1481",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1631",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "1450",
+            "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1633",
+              "localId" : "1451",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1634",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1452",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            }
+          }, {
+            "type" : "DateTime",
+            "localId" : "1469",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1470",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1471",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1472",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1473",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1474",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1475",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1476",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1453",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2016",
+              "annotation" : [ ]
             },
-            "low" : {
-              "type" : "As",
-              "localId" : "1632",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1629",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1454",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "1630",
+              "localId" : "1455",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "1",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1637",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1638",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1639",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "1635",
+              "localId" : "1456",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "1636",
+              "localId" : "1457",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1458",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1459",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1654",
+        "localId" : "1484",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegIncludesIntIvl",
+        "name" : "IntervalIncludesQuantity",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1654",
+            "r" : "1484",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "IntervalIncludesQuantity", ": " ]
             }, {
-              "r" : "1666",
+              "r" : "1492",
               "s" : [ {
-                "r" : "1657",
+                "r" : "1487",
                 "s" : [ {
-                  "r" : "1655",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1485",
+                  "s" : [ {
+                    "value" : [ "4 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1486",
+                  "s" : [ {
+                    "value" : [ "6 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "1666",
+                "r" : "1492",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "1663",
+                "r" : "1490",
                 "s" : [ {
-                  "r" : "1661",
-                  "value" : [ "Interval[", "5", ", ", "5", "]" ]
+                  "value" : [ "5 ", "'mg'" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Includes",
-          "localId" : "1666",
+          "type" : "Contains",
+          "localId" : "1492",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1667",
+            "localId" : "1493",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1668",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1494",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1669",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1670",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1495",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1657",
-            "lowClosed" : false,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1659",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1660",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1658",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1655",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1656",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1663",
+            "localId" : "1487",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1664",
+              "localId" : "1488",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1665",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1489",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1661",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "type" : "Quantity",
+              "localId" : "1485",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "mg",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1662",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "type" : "Quantity",
+              "localId" : "1486",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 6,
+              "unit" : "mg",
               "annotation" : [ ]
             }
+          }, {
+            "type" : "Quantity",
+            "localId" : "1490",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 5,
+            "unit" : "mg",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1680",
+        "localId" : "1498",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayIncludeIntIvl",
+        "name" : "IntervalDoesntIncludeQuantity",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1680",
+            "r" : "1498",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayIncludeIntIvl", ": " ]
+              "value" : [ "", "define ", "IntervalDoesntIncludeQuantity", ": " ]
             }, {
-              "r" : "1694",
+              "r" : "1506",
               "s" : [ {
-                "r" : "1683",
-                "s" : [ {
-                  "r" : "1681",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
-                } ]
-              }, {
-                "r" : "1694",
-                "value" : [ " ", "includes", " " ]
-              }, {
-                "r" : "1691",
+                "r" : "1501",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1687",
+                  "r" : "1499",
                   "s" : [ {
-                    "r" : "1688",
-                    "value" : [ "-", "7" ]
+                    "value" : [ "4 ", "'mg'" ]
                   } ]
                 }, {
-                  "r" : "1690",
-                  "value" : [ ", ", "2", "]" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1500",
+                  "s" : [ {
+                    "value" : [ "6 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1506",
+                "value" : [ " ", "includes", " " ]
+              }, {
+                "r" : "1504",
+                "s" : [ {
+                  "value" : [ "50 ", "'mg'" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Includes",
-          "localId" : "1694",
+          "type" : "Contains",
+          "localId" : "1506",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1695",
+            "localId" : "1507",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1696",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1508",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1697",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1698",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1509",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1683",
-            "lowClosed" : false,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1685",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1686",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1684",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1681",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1682",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1691",
+            "localId" : "1501",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1692",
+              "localId" : "1502",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1693",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1503",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Negate",
-              "localId" : "1687",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1689",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1688",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "7",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "1499",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "mg",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1690",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "type" : "Quantity",
+              "localId" : "1500",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 6,
+              "unit" : "mg",
               "annotation" : [ ]
             }
+          }, {
+            "type" : "Quantity",
+            "localId" : "1504",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 50,
+            "unit" : "mg",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1708",
+        "localId" : "1512",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotIncludesIntIvl",
+        "name" : "ImpreciseNotIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1708",
+            "r" : "1512",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseNotIncludesDateIvl", ": " ]
             }, {
-              "r" : "1720",
+              "r" : "1567",
               "s" : [ {
-                "r" : "1711",
+                "r" : "1513",
                 "s" : [ {
-                  "r" : "1709",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
+                  "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "1720",
+                "r" : "1567",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "1717",
+                "r" : "1564",
                 "s" : [ {
-                  "r" : "1715",
-                  "value" : [ "Interval[", "4", ", ", "7", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1532",
+                  "s" : [ {
+                    "r" : "1516",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1556",
+                  "s" : [ {
+                    "r" : "1540",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -35369,132 +38075,304 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1720",
+          "localId" : "1567",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1721",
+            "localId" : "1568",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1722",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1569",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1723",
+            "localId" : "1570",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1724",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1571",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1711",
-            "lowClosed" : false,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "1513",
+            "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1713",
+              "localId" : "1514",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1714",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1712",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1709",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "1515",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1710",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1717",
+            "localId" : "1564",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1718",
+              "localId" : "1565",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1719",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1566",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1715",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1716",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1734",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndIncludesIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1734",
+              "type" : "DateTime",
+              "localId" : "1532",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1533",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1534",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1535",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1536",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1537",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1538",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1539",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1516",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1517",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1518",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1519",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1520",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1521",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1522",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1556",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1557",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1558",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1559",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1560",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1561",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1562",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1563",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1540",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1541",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1542",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1543",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1544",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1545",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1546",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1581",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseMayIncludeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1581",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseMayIncludeDateIvl", ": " ]
             }, {
-              "r" : "1746",
+              "r" : "1636",
               "s" : [ {
-                "r" : "1737",
+                "r" : "1582",
                 "s" : [ {
-                  "r" : "1735",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                  "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "1746",
+                "r" : "1636",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "1743",
+                "r" : "1633",
                 "s" : [ {
-                  "r" : "1741",
-                  "value" : [ "Interval[", "1234", ", ", "5678", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1601",
+                  "s" : [ {
+                    "r" : "1585",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1625",
+                  "s" : [ {
+                    "r" : "1609",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -35502,140 +38380,298 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1746",
+          "localId" : "1636",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1747",
+            "localId" : "1637",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1748",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1638",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1749",
+            "localId" : "1639",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1750",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1640",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1737",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "1582",
+            "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1739",
+              "localId" : "1583",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1740",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1735",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1738",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1736",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "1584",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1743",
+            "localId" : "1633",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1744",
+              "localId" : "1634",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1745",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1635",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1741",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1234",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1601",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1602",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1603",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1604",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1605",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1606",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1607",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1608",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1585",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1586",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1587",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "15",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1588",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1589",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1590",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1591",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1742",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5678",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1625",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1626",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1627",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1628",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1629",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1630",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1631",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1632",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1609",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1610",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1611",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1612",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1613",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1614",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1615",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "1760",
+        "localId" : "1650",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotIncludesIntIvl",
+        "name" : "NegInfBegIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1760",
+            "r" : "1650",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegIncludesIntIvl", ": " ]
             }, {
-              "r" : "1774",
+              "r" : "1664",
               "s" : [ {
-                "r" : "1763",
+                "r" : "1653",
                 "s" : [ {
-                  "r" : "1761",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                  "r" : "1651",
+                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1774",
+                "r" : "1664",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "1771",
+                "r" : "1661",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1767",
+                  "r" : "1657",
                   "s" : [ {
-                    "r" : "1768",
-                    "value" : [ "-", "1234" ]
+                    "r" : "1658",
+                    "value" : [ "-", "7" ]
                   } ]
                 }, {
-                  "r" : "1770",
-                  "value" : [ ", ", "5678", "]" ]
+                  "r" : "1660",
+                  "value" : [ ", ", "2", "]" ]
                 } ]
               } ]
             } ]
@@ -35643,144 +38679,144 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1774",
+          "localId" : "1664",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1775",
+            "localId" : "1665",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1776",
+              "localId" : "1666",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1777",
+            "localId" : "1667",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1778",
+              "localId" : "1668",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1763",
+            "localId" : "1653",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1765",
+              "localId" : "1655",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1766",
+                "localId" : "1656",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1761",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
               "type" : "As",
-              "localId" : "1764",
+              "localId" : "1654",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1762",
+                "localId" : "1651",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1652",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1771",
+            "localId" : "1661",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1772",
+              "localId" : "1662",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1773",
+                "localId" : "1663",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Negate",
-              "localId" : "1767",
+              "localId" : "1657",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1769",
+                "localId" : "1659",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "1768",
+                "localId" : "1658",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1234",
+                "value" : "7",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1770",
+              "localId" : "1660",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5678",
+              "value" : "2",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1788",
+        "localId" : "1678",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndIncludesIntIvl",
+        "name" : "NegInfBegNotIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1788",
+            "r" : "1678",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotIncludesIntIvl", ": " ]
             }, {
-              "r" : "1800",
+              "r" : "1690",
               "s" : [ {
-                "r" : "1791",
+                "r" : "1681",
                 "s" : [ {
-                  "r" : "1789",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                  "r" : "1679",
+                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1800",
+                "r" : "1690",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "1797",
+                "r" : "1687",
                 "s" : [ {
-                  "r" : "1795",
-                  "value" : [ "Interval[", "0", ", ", "0", "]" ]
+                  "r" : "1685",
+                  "value" : [ "Interval[", "4", ", ", "7", "]" ]
                 } ]
               } ]
             } ]
@@ -35788,132 +38824,132 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1800",
+          "localId" : "1690",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1801",
+            "localId" : "1691",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1802",
+              "localId" : "1692",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1803",
+            "localId" : "1693",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1804",
+              "localId" : "1694",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1791",
+            "localId" : "1681",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1793",
+              "localId" : "1683",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1794",
+                "localId" : "1684",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1789",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
               "type" : "As",
-              "localId" : "1792",
+              "localId" : "1682",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1790",
+                "localId" : "1679",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1680",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1797",
+            "localId" : "1687",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1798",
+              "localId" : "1688",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1799",
+                "localId" : "1689",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1795",
+              "localId" : "1685",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "4",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1796",
+              "localId" : "1686",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "7",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1814",
+        "localId" : "1704",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayIncludeIntIvl",
+        "name" : "UnknownBegIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1814",
+            "r" : "1704",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayIncludeIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegIncludesIntIvl", ": " ]
             }, {
-              "r" : "1826",
+              "r" : "1716",
               "s" : [ {
-                "r" : "1817",
+                "r" : "1707",
                 "s" : [ {
-                  "r" : "1815",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                  "r" : "1705",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1826",
+                "r" : "1716",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "1823",
+                "r" : "1713",
                 "s" : [ {
-                  "r" : "1821",
-                  "value" : [ "Interval[", "1234", ", ", "5678", "]" ]
+                  "r" : "1711",
+                  "value" : [ "Interval[", "5", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
@@ -35921,140 +38957,140 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1826",
+          "localId" : "1716",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1827",
+            "localId" : "1717",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1828",
+              "localId" : "1718",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1829",
+            "localId" : "1719",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1830",
+              "localId" : "1720",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1817",
-            "lowClosed" : true,
-            "highClosed" : false,
+            "localId" : "1707",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1819",
+              "localId" : "1709",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1820",
+                "localId" : "1710",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1815",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
               "type" : "As",
-              "localId" : "1818",
+              "localId" : "1708",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1816",
+                "localId" : "1705",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1706",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1823",
+            "localId" : "1713",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1824",
+              "localId" : "1714",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1825",
+                "localId" : "1715",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1821",
+              "localId" : "1711",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1234",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1822",
+              "localId" : "1712",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5678",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1840",
+        "localId" : "1730",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotIncludesIntIvl",
+        "name" : "UnknownBegMayIncludeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1840",
+            "r" : "1730",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayIncludeIntIvl", ": " ]
             }, {
-              "r" : "1854",
+              "r" : "1744",
               "s" : [ {
-                "r" : "1843",
+                "r" : "1733",
                 "s" : [ {
-                  "r" : "1841",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                  "r" : "1731",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1854",
+                "r" : "1744",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "1851",
+                "r" : "1741",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1847",
+                  "r" : "1737",
                   "s" : [ {
-                    "r" : "1848",
-                    "value" : [ "-", "1234" ]
+                    "r" : "1738",
+                    "value" : [ "-", "7" ]
                   } ]
                 }, {
-                  "r" : "1850",
-                  "value" : [ ", ", "5678", "]" ]
+                  "r" : "1740",
+                  "value" : [ ", ", "2", "]" ]
                 } ]
               } ]
             } ]
@@ -36062,167 +39098,144 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1854",
+          "localId" : "1744",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1855",
+            "localId" : "1745",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1856",
+              "localId" : "1746",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1857",
+            "localId" : "1747",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1858",
+              "localId" : "1748",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1843",
-            "lowClosed" : true,
-            "highClosed" : false,
+            "localId" : "1733",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1845",
+              "localId" : "1735",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1846",
+                "localId" : "1736",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1841",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
               "type" : "As",
-              "localId" : "1844",
+              "localId" : "1734",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1842",
+                "localId" : "1731",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1732",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1851",
+            "localId" : "1741",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1852",
+              "localId" : "1742",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1853",
+                "localId" : "1743",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Negate",
-              "localId" : "1847",
+              "localId" : "1737",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1849",
+                "localId" : "1739",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "1848",
+                "localId" : "1738",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1234",
+                "value" : "7",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1850",
+              "localId" : "1740",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5678",
+              "value" : "2",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1868",
+        "localId" : "1758",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegIncludesDateIvl",
+        "name" : "UnknownBegNotIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1868",
+            "r" : "1758",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotIncludesIntIvl", ": " ]
             }, {
-              "r" : "1949",
+              "r" : "1770",
               "s" : [ {
-                "r" : "1894",
+                "r" : "1761",
                 "s" : [ {
-                  "r" : "1869",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1886",
-                  "s" : [ {
-                    "r" : "1870",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1759",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1949",
+                "r" : "1770",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "1946",
+                "r" : "1767",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1914",
-                  "s" : [ {
-                    "r" : "1898",
-                    "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1938",
-                  "s" : [ {
-                    "r" : "1922",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1765",
+                  "value" : [ "Interval[", "4", ", ", "7", "]" ]
                 } ]
               } ]
             } ]
@@ -36230,425 +39243,273 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "1949",
+          "localId" : "1770",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1950",
+            "localId" : "1771",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1951",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1772",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1952",
+            "localId" : "1773",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1953",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1774",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1894",
-            "lowClosed" : true,
-            "highClosed" : false,
+            "localId" : "1761",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1896",
+              "localId" : "1763",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1897",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1764",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1895",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1762",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1869",
+                "localId" : "1759",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1886",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1760",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1767",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1768",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1887",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1888",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1889",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1890",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1891",
+                "localId" : "1769",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1765",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1766",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "7",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1784",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndIncludesIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1784",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndIncludesIntIvl", ": " ]
+            }, {
+              "r" : "1796",
+              "s" : [ {
+                "r" : "1787",
+                "s" : [ {
+                  "r" : "1785",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1892",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1796",
+                "value" : [ " ", "includes", " " ]
               }, {
+                "r" : "1793",
+                "s" : [ {
+                  "r" : "1791",
+                  "value" : [ "Interval[", "1234", ", ", "5678", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "1796",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1797",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1798",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1799",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1800",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1787",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1789",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1893",
+                "localId" : "1790",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1870",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1871",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1872",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1873",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1874",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1875",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1876",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1785",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1788",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1786",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1946",
+            "localId" : "1793",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1947",
+              "localId" : "1794",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1948",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1795",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1914",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1915",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1916",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1917",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1918",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1919",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1920",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1921",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1898",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1899",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1900",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1901",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1902",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1903",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1904",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1791",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1234",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1938",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1939",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1940",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1941",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1942",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1943",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1944",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1945",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1922",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1923",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1924",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1925",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1926",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1927",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1928",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1792",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5678",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1963",
+        "localId" : "1810",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotIncludesDateIvl",
+        "name" : "PosInfEndNotIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1963",
+            "r" : "1810",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotIncludesIntIvl", ": " ]
             }, {
-              "r" : "2044",
+              "r" : "1824",
               "s" : [ {
-                "r" : "1989",
+                "r" : "1813",
                 "s" : [ {
-                  "r" : "1964",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1981",
-                  "s" : [ {
-                    "r" : "1965",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1811",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "2044",
+                "r" : "1824",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "2041",
+                "r" : "1821",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2009",
-                  "s" : [ {
-                    "r" : "1993",
-                    "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2033",
+                  "r" : "1817",
                   "s" : [ {
-                    "r" : "2017",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1818",
+                    "value" : [ "-", "1234" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "1820",
+                  "value" : [ ", ", "5678", "]" ]
                 } ]
               } ]
             } ]
@@ -36656,425 +39517,144 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "2044",
+          "localId" : "1824",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2045",
+            "localId" : "1825",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2046",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1826",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2047",
+            "localId" : "1827",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2048",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1828",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1989",
+            "localId" : "1813",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1991",
+              "localId" : "1815",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1992",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1816",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "Literal",
+              "localId" : "1811",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "1990",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1814",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1964",
+                "localId" : "1812",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1981",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1982",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1983",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1984",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1985",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1986",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1987",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1988",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1965",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1966",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1967",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1968",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1969",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1970",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1971",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2041",
+            "localId" : "1821",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2042",
+              "localId" : "1822",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2043",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1823",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2009",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1817",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2010",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2011",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2012",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2013",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2014",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2015",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2016",
+                "localId" : "1819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1993",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1994",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1995",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1996",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1997",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1998",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "1999",
+                "localId" : "1818",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "1234",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2033",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2034",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2035",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2036",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2037",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2038",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2039",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2040",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2017",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2018",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2019",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2020",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2021",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2022",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2023",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1820",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5678",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2058",
+        "localId" : "1838",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegIncludesDateIvl",
+        "name" : "UnknownEndIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2058",
+            "r" : "1838",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndIncludesIntIvl", ": " ]
             }, {
-              "r" : "2139",
+              "r" : "1850",
               "s" : [ {
-                "r" : "2084",
+                "r" : "1841",
                 "s" : [ {
-                  "r" : "2059",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "2076",
-                  "s" : [ {
-                    "r" : "2060",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1839",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "2139",
+                "r" : "1850",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "2136",
+                "r" : "1847",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2104",
-                  "s" : [ {
-                    "r" : "2088",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2128",
-                  "s" : [ {
-                    "r" : "2112",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1845",
+                  "value" : [ "Interval[", "0", ", ", "0", "]" ]
                 } ]
               } ]
             } ]
@@ -37082,425 +39662,132 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "2139",
+          "localId" : "1850",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2140",
+            "localId" : "1851",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2141",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1852",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2142",
+            "localId" : "1853",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2143",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1854",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2084",
-            "lowClosed" : false,
+            "localId" : "1841",
+            "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2086",
+              "localId" : "1843",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2087",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1844",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "Literal",
+              "localId" : "1839",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "2085",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1842",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2059",
+                "localId" : "1840",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2076",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2077",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2078",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2079",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2080",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2081",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2082",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2083",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2060",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2061",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2062",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2063",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2064",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2065",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2066",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2136",
+            "localId" : "1847",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2137",
+              "localId" : "1848",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2138",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1849",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2104",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2105",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2106",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2107",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2108",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2109",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2110",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2111",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2088",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2089",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2090",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2091",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2092",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2093",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2094",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1845",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2128",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2129",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2130",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2131",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2132",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2133",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2134",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2135",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2112",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2113",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2114",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2115",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2116",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2117",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2118",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1846",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2153",
+        "localId" : "1864",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayIncludeDateIvl",
+        "name" : "UnknownEndMayIncludeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2153",
+            "r" : "1864",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayIncludeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayIncludeIntIvl", ": " ]
             }, {
-              "r" : "2234",
+              "r" : "1876",
               "s" : [ {
-                "r" : "2179",
+                "r" : "1867",
                 "s" : [ {
-                  "r" : "2154",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "2171",
-                  "s" : [ {
-                    "r" : "2155",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1865",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "2234",
+                "r" : "1876",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "2231",
+                "r" : "1873",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2199",
-                  "s" : [ {
-                    "r" : "2183",
-                    "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2223",
-                  "s" : [ {
-                    "r" : "2207",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1871",
+                  "value" : [ "Interval[", "1234", ", ", "5678", "]" ]
                 } ]
               } ]
             } ]
@@ -37508,425 +39795,140 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "2234",
+          "localId" : "1876",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2235",
+            "localId" : "1877",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2236",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1878",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2237",
+            "localId" : "1879",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2238",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1880",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2179",
-            "lowClosed" : false,
+            "localId" : "1867",
+            "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2181",
+              "localId" : "1869",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2182",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1870",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "Literal",
+              "localId" : "1865",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "2180",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1868",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2154",
+                "localId" : "1866",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2171",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1873",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1874",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2172",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2173",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2174",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2175",
+                "localId" : "1875",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2176",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2177",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2178",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2155",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2156",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2157",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2158",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2159",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2160",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2161",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2231",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2232",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2233",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2199",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2200",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2201",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2202",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2203",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2204",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2205",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2206",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2183",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2184",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2185",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2186",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2187",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2188",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2189",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1871",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1234",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2223",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2224",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2225",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2226",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2227",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2228",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2229",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2230",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2207",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2208",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2209",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2210",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2211",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2212",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2213",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1872",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5678",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2248",
+        "localId" : "1890",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotIncludesDateIvl",
+        "name" : "UnknownEndNotIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2248",
+            "r" : "1890",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotIncludesIntIvl", ": " ]
             }, {
-              "r" : "2329",
+              "r" : "1904",
               "s" : [ {
-                "r" : "2274",
+                "r" : "1893",
                 "s" : [ {
-                  "r" : "2249",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "2266",
-                  "s" : [ {
-                    "r" : "2250",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1891",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "2329",
+                "r" : "1904",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "2326",
+                "r" : "1901",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2294",
-                  "s" : [ {
-                    "r" : "2278",
-                    "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2318",
+                  "r" : "1897",
                   "s" : [ {
-                    "r" : "2302",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1898",
+                    "value" : [ "-", "1234" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "1900",
+                  "value" : [ ", ", "5678", "]" ]
                 } ]
               } ]
             } ]
@@ -37934,425 +39936,152 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "2329",
+          "localId" : "1904",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2330",
+            "localId" : "1905",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2331",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1906",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2332",
+            "localId" : "1907",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2333",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1908",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2274",
-            "lowClosed" : false,
+            "localId" : "1893",
+            "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2276",
+              "localId" : "1895",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2277",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1896",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "Literal",
+              "localId" : "1891",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "2275",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1894",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2249",
+                "localId" : "1892",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2266",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2267",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2268",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2269",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2270",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2271",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2272",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2273",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2250",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2251",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2252",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2253",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2254",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2255",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2256",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2326",
+            "localId" : "1901",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2327",
+              "localId" : "1902",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2328",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1903",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2294",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1897",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2295",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2296",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2297",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2298",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2299",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2300",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2301",
+                "localId" : "1899",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2278",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2279",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2280",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2281",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2282",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2283",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "2284",
+                "localId" : "1898",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "1234",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2318",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2319",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2320",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2321",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2322",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2323",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2324",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2325",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2302",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2303",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2304",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2305",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2306",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2307",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2308",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1900",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5678",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2343",
+        "localId" : "1918",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndIncludesDateIvl",
+        "name" : "NegInfBegIncludesLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2343",
+            "r" : "1918",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegIncludesLongIvl", ": " ]
             }, {
-              "r" : "2424",
+              "r" : "1932",
               "s" : [ {
-                "r" : "2369",
+                "r" : "1921",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2360",
-                  "s" : [ {
-                    "r" : "2344",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2368",
-                  "value" : [ ", ", "null", "]" ]
+                  "r" : "1919",
+                  "value" : [ "Interval[", "null", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "2424",
+                "r" : "1932",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "2421",
+                "r" : "1929",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2389",
-                  "s" : [ {
-                    "r" : "2373",
-                    "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2413",
+                  "r" : "1925",
                   "s" : [ {
-                    "r" : "2397",
-                    "value" : [ "DateTime", "(", "2015", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1926",
+                    "value" : [ "-", "7L" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "1928",
+                  "value" : [ ", ", "2L", "]" ]
                 } ]
               } ]
             } ]
@@ -38360,425 +40089,144 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "2424",
+          "localId" : "1932",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2425",
+            "localId" : "1933",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2426",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1934",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2427",
+            "localId" : "1935",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2428",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1936",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2369",
+            "localId" : "1921",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2371",
+              "localId" : "1923",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2372",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1924",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2360",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2361",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2362",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2363",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2364",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2365",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2366",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2367",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2344",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2345",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2346",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2347",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2348",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2349",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2350",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
               "type" : "As",
-              "localId" : "2370",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1922",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2368",
+                "localId" : "1919",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1920",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "2421",
+            "localId" : "1929",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2422",
+              "localId" : "1930",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2423",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1931",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2389",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1925",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2390",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2391",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2392",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2393",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2394",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2395",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2396",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1927",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2373",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2014",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2374",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2375",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2376",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2377",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2378",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "2379",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1926",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "7",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2413",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2414",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2415",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2416",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2417",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2418",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2419",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2420",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2397",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2015",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2398",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2399",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2400",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2401",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2402",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2403",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1928",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2438",
+        "localId" : "1946",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotIncludesDateIvl",
+        "name" : "NegInfBegNotIncludesLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2438",
+            "r" : "1946",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotIncludesLongIvl", ": " ]
             }, {
-              "r" : "2519",
+              "r" : "1958",
               "s" : [ {
-                "r" : "2464",
+                "r" : "1949",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2455",
-                  "s" : [ {
-                    "r" : "2439",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2463",
-                  "value" : [ ", ", "null", "]" ]
+                  "r" : "1947",
+                  "value" : [ "Interval[", "null", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "2519",
+                "r" : "1958",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "2516",
+                "r" : "1955",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2484",
-                  "s" : [ {
-                    "r" : "2468",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2508",
-                  "s" : [ {
-                    "r" : "2492",
-                    "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1953",
+                  "value" : [ "Interval[", "4L", ", ", "7L", "]" ]
                 } ]
               } ]
             } ]
@@ -38786,425 +40234,273 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "2519",
+          "localId" : "1958",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2520",
+            "localId" : "1959",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2521",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1960",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2522",
+            "localId" : "1961",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2523",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1962",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2464",
+            "localId" : "1949",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2466",
+              "localId" : "1951",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2467",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1952",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2455",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1950",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2456",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2457",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2458",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2459",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1947",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1948",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1955",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1956",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2460",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1957",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1953",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1954",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1972",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegIncludesLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1972",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegIncludesLongIvl", ": " ]
+            }, {
+              "r" : "1984",
+              "s" : [ {
+                "r" : "1975",
+                "s" : [ {
+                  "r" : "1973",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2461",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1984",
+                "value" : [ " ", "includes", " " ]
               }, {
+                "r" : "1981",
+                "s" : [ {
+                  "r" : "1979",
+                  "value" : [ "Interval[", "5L", ", ", "5L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "1984",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1985",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1986",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1987",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1988",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1975",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1977",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2462",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2439",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2440",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2441",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2442",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2443",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2444",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2445",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1978",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
-            "high" : {
+            "low" : {
               "type" : "As",
-              "localId" : "2465",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1976",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2463",
+                "localId" : "1973",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1974",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "2516",
+            "localId" : "1981",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2517",
+              "localId" : "1982",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2518",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1983",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2484",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2485",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2486",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2487",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2488",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2489",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2490",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2491",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2468",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2469",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2470",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2471",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2472",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2473",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2474",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1979",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2508",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2509",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2510",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2511",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2512",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2513",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2514",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2515",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2492",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2014",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2493",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2494",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2495",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2496",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2497",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2498",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1980",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2533",
+        "localId" : "1998",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndIncludesDateIvl",
+        "name" : "UnknownBegMayIncludeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2533",
+            "r" : "1998",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayIncludeLongIvl", ": " ]
             }, {
-              "r" : "2614",
+              "r" : "2012",
               "s" : [ {
-                "r" : "2559",
+                "r" : "2001",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2550",
-                  "s" : [ {
-                    "r" : "2534",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2558",
-                  "value" : [ ", ", "null", ")" ]
+                  "r" : "1999",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "2614",
+                "r" : "2012",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "2611",
+                "r" : "2009",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2579",
-                  "s" : [ {
-                    "r" : "2563",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2603",
+                  "r" : "2005",
                   "s" : [ {
-                    "r" : "2587",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2006",
+                    "value" : [ "-", "7L" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "2008",
+                  "value" : [ ", ", "2L", "]" ]
                 } ]
               } ]
             } ]
@@ -39212,425 +40508,144 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "2614",
+          "localId" : "2012",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2615",
+            "localId" : "2013",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2616",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2014",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2617",
+            "localId" : "2015",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2618",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2016",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2559",
-            "lowClosed" : true,
-            "highClosed" : false,
+            "localId" : "2001",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2561",
+              "localId" : "2003",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2562",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2004",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2550",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2551",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2552",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2553",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2554",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2555",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2556",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2557",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2534",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2535",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2536",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2537",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2538",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2539",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2540",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
               "type" : "As",
-              "localId" : "2560",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2002",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2558",
+                "localId" : "1999",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2000",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "2611",
+            "localId" : "2009",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2612",
+              "localId" : "2010",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2613",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2011",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2579",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "2005",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2580",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2581",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2582",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2583",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2584",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2585",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2586",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2007",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2563",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2564",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2565",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2566",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2567",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2568",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "2569",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "2006",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "7",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2603",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2604",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2605",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2606",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2607",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2608",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2609",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2610",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2587",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2588",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2589",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2590",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2591",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2592",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2593",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "2008",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2628",
+        "localId" : "2026",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayIncludeDateIvl",
+        "name" : "UnknownBegNotIncludesLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2628",
+            "r" : "2026",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayIncludeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotIncludesLongIvl", ": " ]
             }, {
-              "r" : "2709",
+              "r" : "2038",
               "s" : [ {
-                "r" : "2654",
+                "r" : "2029",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2645",
-                  "s" : [ {
-                    "r" : "2629",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2653",
-                  "value" : [ ", ", "null", ")" ]
+                  "r" : "2027",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "2709",
+                "r" : "2038",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "2706",
+                "r" : "2035",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2674",
-                  "s" : [ {
-                    "r" : "2658",
-                    "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2698",
-                  "s" : [ {
-                    "r" : "2682",
-                    "value" : [ "DateTime", "(", "2015", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "2033",
+                  "value" : [ "Interval[", "4L", ", ", "7L", "]" ]
                 } ]
               } ]
             } ]
@@ -39638,227 +40653,973 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "2709",
+          "localId" : "2038",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2710",
+            "localId" : "2039",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2711",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2040",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2712",
+            "localId" : "2041",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2713",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2042",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2654",
-            "lowClosed" : true,
-            "highClosed" : false,
+            "localId" : "2029",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2656",
+              "localId" : "2031",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2657",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2032",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2645",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "2030",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2646",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2647",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2648",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2649",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2027",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2028",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2035",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2036",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2650",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2037",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2033",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2034",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2052",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndIncludesLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2052",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndIncludesLongIvl", ": " ]
+            }, {
+              "r" : "2064",
+              "s" : [ {
+                "r" : "2055",
+                "s" : [ {
+                  "r" : "2053",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2651",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "2064",
+                "value" : [ " ", "includes", " " ]
               }, {
+                "r" : "2061",
+                "s" : [ {
+                  "r" : "2059",
+                  "value" : [ "Interval[", "1234L", ", ", "5678L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "2064",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2065",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2066",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2067",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2068",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2055",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2057",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2652",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2629",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2630",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2631",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2632",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2633",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2634",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2635",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "2058",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2053",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
               "type" : "As",
-              "localId" : "2655",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2056",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2653",
+                "localId" : "2054",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2706",
+            "localId" : "2061",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2707",
+              "localId" : "2062",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2708",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2063",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2674",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2675",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "2059",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2060",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5678",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2078",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndNotIncludesLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2078",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndNotIncludesLongIvl", ": " ]
+            }, {
+              "r" : "2092",
+              "s" : [ {
+                "r" : "2081",
+                "s" : [ {
+                  "r" : "2079",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2676",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "2092",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2677",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "2089",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2085",
+                  "s" : [ {
+                    "r" : "2086",
+                    "value" : [ "-", "1234L" ]
+                  } ]
+                }, {
+                  "r" : "2088",
+                  "value" : [ ", ", "5678L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "2092",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2093",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2094",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2095",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2096",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2081",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2083",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2084",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2079",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2082",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2080",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2089",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2090",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2091",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "2085",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2087",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2086",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1234",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2088",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5678",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2106",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndIncludesLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2106",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndIncludesLongIvl", ": " ]
+            }, {
+              "r" : "2118",
+              "s" : [ {
+                "r" : "2109",
+                "s" : [ {
+                  "r" : "2107",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2118",
+                "value" : [ " ", "includes", " " ]
+              }, {
+                "r" : "2115",
+                "s" : [ {
+                  "r" : "2113",
+                  "value" : [ "Interval[", "0L", ", ", "0L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "2118",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2119",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2120",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2121",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2122",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2109",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2111",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2112",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2107",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2110",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2108",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2115",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2116",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2117",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2113",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2114",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2132",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayIncludeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2132",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMayIncludeLongIvl", ": " ]
+            }, {
+              "r" : "2144",
+              "s" : [ {
+                "r" : "2135",
+                "s" : [ {
+                  "r" : "2133",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2144",
+                "value" : [ " ", "includes", " " ]
+              }, {
+                "r" : "2141",
+                "s" : [ {
+                  "r" : "2139",
+                  "value" : [ "Interval[", "1234L", ", ", "5678L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "2144",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2145",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2146",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2147",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2148",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2135",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2137",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2138",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2133",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2136",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2134",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2141",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2142",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2143",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2139",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2140",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5678",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2158",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotIncludesLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2158",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotIncludesLongIvl", ": " ]
+            }, {
+              "r" : "2172",
+              "s" : [ {
+                "r" : "2161",
+                "s" : [ {
+                  "r" : "2159",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2172",
+                "value" : [ " ", "includes", " " ]
+              }, {
+                "r" : "2169",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2165",
+                  "s" : [ {
+                    "r" : "2166",
+                    "value" : [ "-", "1234L" ]
+                  } ]
+                }, {
+                  "r" : "2168",
+                  "value" : [ ", ", "5678L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "2172",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2173",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2174",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2175",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2176",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2161",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2163",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2164",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2159",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2162",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2160",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2169",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2170",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2171",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "2165",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2167",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2166",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1234",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2168",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5678",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2186",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegIncludesDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2186",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegIncludesDateIvl", ": " ]
+            }, {
+              "r" : "2267",
+              "s" : [ {
+                "r" : "2212",
+                "s" : [ {
+                  "r" : "2187",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "2204",
+                  "s" : [ {
+                    "r" : "2188",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "2267",
+                "value" : [ " ", "includes", " " ]
+              }, {
+                "r" : "2264",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2232",
+                  "s" : [ {
+                    "r" : "2216",
+                    "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2256",
+                  "s" : [ {
+                    "r" : "2240",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "2267",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2268",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2269",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2270",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2271",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2212",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2214",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2215",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "2213",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2187",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2204",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2205",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2678",
+                "localId" : "2206",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2679",
+                "localId" : "2207",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2680",
+                "localId" : "2208",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2681",
+                "localId" : "2209",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2210",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2211",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2658",
+                "localId" : "2188",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2014",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2659",
+                "localId" : "2189",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -39866,7 +41627,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2660",
+                "localId" : "2190",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -39874,7 +41635,7 @@ module.exports['Includes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2661",
+                "localId" : "2191",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -39882,7 +41643,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2662",
+                "localId" : "2192",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -39890,7 +41651,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2663",
+                "localId" : "2193",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -39898,7 +41659,122 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2664",
+                "localId" : "2194",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2264",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2265",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2266",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2232",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2233",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2234",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2235",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2236",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2237",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2238",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2239",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2216",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2217",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2218",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2219",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2220",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2221",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2222",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -39907,56 +41783,56 @@ module.exports['Includes'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2698",
+              "localId" : "2256",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2699",
+                "localId" : "2257",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2700",
+                "localId" : "2258",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2701",
+                "localId" : "2259",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2702",
+                "localId" : "2260",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2703",
+                "localId" : "2261",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2704",
+                "localId" : "2262",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2705",
+                "localId" : "2263",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2682",
+                "localId" : "2240",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2015",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2683",
+                "localId" : "2241",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -39964,7 +41840,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2684",
+                "localId" : "2242",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -39972,7 +41848,7 @@ module.exports['Includes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2685",
+                "localId" : "2243",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -39980,7 +41856,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2686",
+                "localId" : "2244",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -39988,7 +41864,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2687",
+                "localId" : "2245",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -39996,7 +41872,7 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2688",
+                "localId" : "2246",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40006,54 +41882,54 @@ module.exports['Includes'] = {
           } ]
         }
       }, {
-        "localId" : "2723",
+        "localId" : "2281",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotIncludesDateIvl",
+        "name" : "NegInfBegNotIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2723",
+            "r" : "2281",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotIncludesDateIvl", ": " ]
             }, {
-              "r" : "2804",
+              "r" : "2362",
               "s" : [ {
-                "r" : "2749",
+                "r" : "2307",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "r" : "2282",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "2740",
+                  "r" : "2299",
                   "s" : [ {
-                    "r" : "2724",
+                    "r" : "2283",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2748",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "2804",
+                "r" : "2362",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "2801",
+                "r" : "2359",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2769",
+                  "r" : "2327",
                   "s" : [ {
-                    "r" : "2753",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2311",
+                    "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2793",
+                  "r" : "2351",
                   "s" : [ {
-                    "r" : "2777",
-                    "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2335",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -40064,91 +41940,104 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "2804",
+          "localId" : "2362",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2805",
+            "localId" : "2363",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2806",
+              "localId" : "2364",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2807",
+            "localId" : "2365",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2808",
+              "localId" : "2366",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2749",
+            "localId" : "2307",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2751",
+              "localId" : "2309",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2752",
+                "localId" : "2310",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2308",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2282",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "2740",
+              "localId" : "2299",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2741",
+                "localId" : "2300",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2742",
+                "localId" : "2301",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2743",
+                "localId" : "2302",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2744",
+                "localId" : "2303",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2745",
+                "localId" : "2304",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2746",
+                "localId" : "2305",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2747",
+                "localId" : "2306",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2724",
+                "localId" : "2283",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -40156,7 +42045,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2725",
+                "localId" : "2284",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -40164,7 +42053,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2726",
+                "localId" : "2285",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -40172,7 +42061,7 @@ module.exports['Includes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2727",
+                "localId" : "2286",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40180,7 +42069,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2728",
+                "localId" : "2287",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40188,7 +42077,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2729",
+                "localId" : "2288",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40196,95 +42085,82 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2730",
+                "localId" : "2289",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2750",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2748",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2801",
+            "localId" : "2359",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2802",
+              "localId" : "2360",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2803",
+                "localId" : "2361",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2769",
+              "localId" : "2327",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2770",
+                "localId" : "2328",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2771",
+                "localId" : "2329",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2772",
+                "localId" : "2330",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2773",
+                "localId" : "2331",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2774",
+                "localId" : "2332",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2775",
+                "localId" : "2333",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2776",
+                "localId" : "2334",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2753",
+                "localId" : "2311",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2754",
+                "localId" : "2312",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -40292,7 +42168,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2755",
+                "localId" : "2313",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -40300,7 +42176,7 @@ module.exports['Includes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2756",
+                "localId" : "2314",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40308,7 +42184,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2757",
+                "localId" : "2315",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40316,7 +42192,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2758",
+                "localId" : "2316",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40324,7 +42200,7 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2759",
+                "localId" : "2317",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40333,56 +42209,56 @@ module.exports['Includes'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2793",
+              "localId" : "2351",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2794",
+                "localId" : "2352",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2795",
+                "localId" : "2353",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2796",
+                "localId" : "2354",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2797",
+                "localId" : "2355",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2798",
+                "localId" : "2356",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2799",
+                "localId" : "2357",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2800",
+                "localId" : "2358",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2777",
+                "localId" : "2335",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2014",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2778",
+                "localId" : "2336",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -40390,7 +42266,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2779",
+                "localId" : "2337",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -40398,7 +42274,7 @@ module.exports['Includes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2780",
+                "localId" : "2338",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40406,7 +42282,7 @@ module.exports['Includes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2781",
+                "localId" : "2339",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40414,7 +42290,7 @@ module.exports['Includes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2782",
+                "localId" : "2340",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40422,7 +42298,7 @@ module.exports['Includes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2783",
+                "localId" : "2341",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -40431,1318 +42307,1146 @@ module.exports['Includes'] = {
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* ProperlyIncludes
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define ProperlyIncludesIntIvl: Interval[1, 5] properly includes Interval[2, 4]
-define ProperlyIncludesIntBeginsIvl: Interval[1, 5] properly includes Interval[1, 4]
-define ProperlyIncludesIntEndsIvl: Interval[1, 5] properly includes Interval[2, 5]
-define NotProperlyIncludesIntIvl: Interval[1, 5] properly includes Interval[1, 5]
-define ProperlyIncludesRealIvl: Interval[1.234, 3.456] properly includes Interval[2.34, 2.56]
-define NotProperlyIncludesRealIvl: Interval[1.234, 3.456] properly includes Interval[1.234, 3.456]
-define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define ProperlyIncludesDateIvl: DateIvl properly includes Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
-define NotProperlyIncludesDateIvl: DateIvl properly includes Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define PosInfEndProperlyIncludesIntIvl: Interval[0, null] properly includes Interval[1234, 5678]
-define PosInfEndNotProperlyIncludesIntIvl: Interval[0, null] properly includes Interval[0, null]
-define UnknownEndMayProperlyIncludeIntIvl: Interval[0, null) properly includes Interval[0, 0]
-define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define ProperlyIncludesDayOfIvlLowEdge: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
-define ProperlyIncludesDayOfIvlHighEdge: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 2, 23, 59, 59, 999))
-define ProperlyIncludesDayOfIvlNearEdges: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3, 3, 0, 0, 0, 0), DateTime(2012, 9, 1, 23, 59, 59, 999))
-define NotProperlyIncludesDayOfIvlSameEdges: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 9, 2, 0, 0, 0, 0)]
-define MayProperlyIncludeDayOfIvlVeryImpreciseLow: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3), DateTime(2012, 6)]
-define MayProperlyIncludeDayOfIvlVeryImpreciseHigh: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 6), DateTime(2012, 9)]
-define MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3), DateTime(2012, 9)]
-define MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding: PrecisionDateIvl properly includes day of Interval[DateTime(2012), DateTime(2012)]
-*/
-
-module.exports['ProperlyIncludes'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "1086",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
       }, {
-        "localId" : "214",
+        "localId" : "2376",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesIntIvl",
+        "name" : "UnknownBegIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "2376",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegIncludesDateIvl", ": " ]
             }, {
-              "r" : "225",
+              "r" : "2457",
               "s" : [ {
-                "r" : "217",
+                "r" : "2402",
                 "s" : [ {
-                  "r" : "215",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "r" : "2377",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2394",
+                  "s" : [ {
+                    "r" : "2378",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "225",
-                "value" : [ " ", "properly includes", " " ]
+                "r" : "2457",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "222",
+                "r" : "2454",
                 "s" : [ {
-                  "r" : "220",
-                  "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2422",
+                  "s" : [ {
+                    "r" : "2406",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2446",
+                  "s" : [ {
+                    "r" : "2430",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "225",
+          "type" : "Includes",
+          "localId" : "2457",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "226",
+            "localId" : "2458",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "227",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2459",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "228",
+            "localId" : "2460",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2461",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "217",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2402",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "218",
+              "localId" : "2404",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "219",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2405",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "2403",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2377",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "222",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "223",
+              "type" : "DateTime",
+              "localId" : "2394",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "224",
+                "localId" : "2395",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "239",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesIntBeginsIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "239",
-            "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesIntBeginsIvl", ": " ]
-            }, {
-              "r" : "250",
-              "s" : [ {
-                "r" : "242",
-                "s" : [ {
-                  "r" : "240",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
-                } ]
               }, {
-                "r" : "250",
-                "value" : [ " ", "properly includes", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2396",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "247",
-                "s" : [ {
-                  "r" : "245",
-                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "250",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "251",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "252",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2397",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2398",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2399",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2400",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2401",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2378",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2379",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2380",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2381",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2382",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2383",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2384",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "253",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "254",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
             "type" : "Interval",
-            "localId" : "242",
+            "localId" : "2454",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "243",
+              "localId" : "2455",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "244",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2456",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "240",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "241",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "247",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "248",
+              "type" : "DateTime",
+              "localId" : "2422",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "249",
+                "localId" : "2423",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2424",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2425",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2426",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2427",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2428",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2429",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2406",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2407",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2408",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2409",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2410",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2411",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2412",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "245",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
             "high" : {
-              "type" : "Literal",
-              "localId" : "246",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2446",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2447",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2448",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2449",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2450",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2451",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2452",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2453",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2430",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2431",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2432",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2433",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2434",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2435",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2436",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "264",
+        "localId" : "2471",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesIntEndsIvl",
+        "name" : "UnknownBegMayIncludeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "2471",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesIntEndsIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayIncludeDateIvl", ": " ]
             }, {
-              "r" : "275",
+              "r" : "2552",
               "s" : [ {
-                "r" : "267",
+                "r" : "2497",
                 "s" : [ {
-                  "r" : "265",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "r" : "2472",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2489",
+                  "s" : [ {
+                    "r" : "2473",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "275",
-                "value" : [ " ", "properly includes", " " ]
+                "r" : "2552",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "272",
+                "r" : "2549",
                 "s" : [ {
-                  "r" : "270",
-                  "value" : [ "Interval[", "2", ", ", "5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2517",
+                  "s" : [ {
+                    "r" : "2501",
+                    "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2541",
+                  "s" : [ {
+                    "r" : "2525",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "275",
+          "type" : "Includes",
+          "localId" : "2552",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "276",
+            "localId" : "2553",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "277",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2554",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "278",
+            "localId" : "2555",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "279",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2556",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "267",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2497",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "268",
+              "localId" : "2499",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "269",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2500",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "265",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "2498",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2472",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "266",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2489",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2490",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2491",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2492",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2493",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2494",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2495",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2496",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2473",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2474",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2475",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2476",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2477",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2478",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2479",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "272",
+            "localId" : "2549",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "273",
+              "localId" : "2550",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "274",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2551",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2517",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2518",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2519",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2520",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2521",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2522",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2523",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2524",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2501",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2502",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2503",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2504",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2505",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2506",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2507",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "271",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2541",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2542",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2543",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2544",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2545",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2546",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2547",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2548",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2525",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2526",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2527",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2528",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2529",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2530",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2531",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "289",
+        "localId" : "2566",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotProperlyIncludesIntIvl",
+        "name" : "UnknownBegNotIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "289",
+            "r" : "2566",
             "s" : [ {
-              "value" : [ "", "define ", "NotProperlyIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotIncludesDateIvl", ": " ]
             }, {
-              "r" : "300",
+              "r" : "2647",
               "s" : [ {
-                "r" : "292",
+                "r" : "2592",
                 "s" : [ {
-                  "r" : "290",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "r" : "2567",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2584",
+                  "s" : [ {
+                    "r" : "2568",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "300",
-                "value" : [ " ", "properly includes", " " ]
+                "r" : "2647",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "297",
+                "r" : "2644",
                 "s" : [ {
-                  "r" : "295",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2612",
+                  "s" : [ {
+                    "r" : "2596",
+                    "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2636",
+                  "s" : [ {
+                    "r" : "2620",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "300",
+          "type" : "Includes",
+          "localId" : "2647",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "301",
+            "localId" : "2648",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "302",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2649",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "303",
+            "localId" : "2650",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "304",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2651",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "292",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2592",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "293",
+              "localId" : "2594",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "294",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2595",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "290",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "2593",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2567",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "291",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2584",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2585",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2586",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2587",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2588",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2589",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2590",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2591",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2568",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2569",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2570",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2571",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2572",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2573",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2574",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "297",
+            "localId" : "2644",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "298",
+              "localId" : "2645",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "299",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "295",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "314",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesRealIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "314",
-            "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesRealIvl", ": " ]
-            }, {
-              "r" : "325",
-              "s" : [ {
-                "r" : "317",
-                "s" : [ {
-                  "r" : "315",
-                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
-                } ]
-              }, {
-                "r" : "325",
-                "value" : [ " ", "properly includes", " " ]
-              }, {
-                "r" : "322",
-                "s" : [ {
-                  "r" : "320",
-                  "value" : [ "Interval[", "2.34", ", ", "2.56", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "325",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "326",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "327",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "328",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "329",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "317",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "318",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "319",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "315",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "316",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "3.456",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "322",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "323",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "324",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "320",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.34",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "321",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.56",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "339",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotProperlyIncludesRealIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "339",
-            "s" : [ {
-              "value" : [ "", "define ", "NotProperlyIncludesRealIvl", ": " ]
-            }, {
-              "r" : "350",
-              "s" : [ {
-                "r" : "342",
-                "s" : [ {
-                  "r" : "340",
-                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
-                } ]
-              }, {
-                "r" : "350",
-                "value" : [ " ", "properly includes", " " ]
-              }, {
-                "r" : "347",
-                "s" : [ {
-                  "r" : "345",
-                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "350",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "351",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "352",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "353",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "354",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "342",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "343",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "344",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "340",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "341",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "3.456",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "347",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "348",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "349",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "345",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "346",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "3.456",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "364",
-        "name" : "DateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "364",
-            "s" : [ {
-              "value" : [ "", "define ", "DateIvl", ": " ]
-            }, {
-              "r" : "413",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "381",
-                "s" : [ {
-                  "r" : "365",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "405",
-                "s" : [ {
-                  "r" : "389",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "416",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "417",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "413",
-          "lowClosed" : true,
-          "highClosed" : false,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "414",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "415",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "381",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "382",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "383",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "384",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "385",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "386",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "387",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "388",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "365",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "366",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "367",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "368",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "369",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "370",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "371",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "405",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "406",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "407",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "408",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "409",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "410",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "411",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "412",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "389",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "390",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "391",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "392",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "393",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "394",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "395",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "420",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "420",
-            "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesDateIvl", ": " ]
-            }, {
-              "r" : "475",
-              "s" : [ {
-                "r" : "421",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              }, {
-                "r" : "475",
-                "value" : [ " ", "properly includes", " " ]
-              }, {
-                "r" : "472",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "440",
-                  "s" : [ {
-                    "r" : "424",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "464",
-                  "s" : [ {
-                    "r" : "448",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "475",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "476",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "477",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "478",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "479",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "421",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "422",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "423",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "472",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "473",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "474",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2646",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "440",
+              "localId" : "2612",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "441",
+                "localId" : "2613",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "442",
+                "localId" : "2614",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "443",
+                "localId" : "2615",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "444",
+                "localId" : "2616",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "445",
+                "localId" : "2617",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "446",
+                "localId" : "2618",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "447",
+                "localId" : "2619",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "424",
+                "localId" : "2596",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "425",
+                "localId" : "2597",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "426",
+                "localId" : "2598",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -41750,7 +43454,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "427",
+                "localId" : "2599",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -41758,7 +43462,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "428",
+                "localId" : "2600",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -41766,7 +43470,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "429",
+                "localId" : "2601",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -41774,7 +43478,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "430",
+                "localId" : "2602",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -41783,64 +43487,64 @@ module.exports['ProperlyIncludes'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "464",
+              "localId" : "2636",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "465",
+                "localId" : "2637",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "466",
+                "localId" : "2638",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "467",
+                "localId" : "2639",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "468",
+                "localId" : "2640",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "469",
+                "localId" : "2641",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "470",
+                "localId" : "2642",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "471",
+                "localId" : "2643",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "448",
+                "localId" : "2620",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "449",
+                "localId" : "2621",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "450",
+                "localId" : "2622",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -41848,7 +43552,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "451",
+                "localId" : "2623",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -41856,7 +43560,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "452",
+                "localId" : "2624",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -41864,7 +43568,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "453",
+                "localId" : "2625",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -41872,7 +43576,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "454",
+                "localId" : "2626",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -41882,172 +43586,293 @@ module.exports['ProperlyIncludes'] = {
           } ]
         }
       }, {
-        "localId" : "489",
+        "localId" : "2661",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotProperlyIncludesDateIvl",
+        "name" : "PosInfEndIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "489",
+            "r" : "2661",
             "s" : [ {
-              "value" : [ "", "define ", "NotProperlyIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndIncludesDateIvl", ": " ]
             }, {
-              "r" : "544",
+              "r" : "2742",
               "s" : [ {
-                "r" : "490",
+                "r" : "2687",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2678",
+                  "s" : [ {
+                    "r" : "2662",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2686",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "544",
-                "value" : [ " ", "properly includes", " " ]
+                "r" : "2742",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "541",
+                "r" : "2739",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "509",
+                  "r" : "2707",
                   "s" : [ {
-                    "r" : "493",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2691",
+                    "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "533",
+                  "r" : "2731",
                   "s" : [ {
-                    "r" : "517",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2715",
+                    "value" : [ "DateTime", "(", "2015", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "544",
+          "type" : "Includes",
+          "localId" : "2742",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "545",
+            "localId" : "2743",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "546",
+              "localId" : "2744",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "547",
+            "localId" : "2745",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "548",
+              "localId" : "2746",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "490",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "2687",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "491",
+              "localId" : "2689",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "492",
+                "localId" : "2690",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2678",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2679",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2680",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2681",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2682",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2683",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2684",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2685",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2662",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2663",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2664",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2665",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2666",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2667",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2668",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2688",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2686",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "541",
+            "localId" : "2739",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "542",
+              "localId" : "2740",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "543",
+                "localId" : "2741",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "509",
+              "localId" : "2707",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "510",
+                "localId" : "2708",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "511",
+                "localId" : "2709",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "512",
+                "localId" : "2710",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "513",
+                "localId" : "2711",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "514",
+                "localId" : "2712",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "515",
+                "localId" : "2713",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "516",
+                "localId" : "2714",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "493",
+                "localId" : "2691",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2014",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "494",
+                "localId" : "2692",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "495",
+                "localId" : "2693",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -42055,7 +43880,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "496",
+                "localId" : "2694",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -42063,7 +43888,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "497",
+                "localId" : "2695",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -42071,7 +43896,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "498",
+                "localId" : "2696",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -42079,7 +43904,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "499",
+                "localId" : "2697",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -42088,64 +43913,64 @@ module.exports['ProperlyIncludes'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "533",
+              "localId" : "2731",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "534",
+                "localId" : "2732",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "535",
+                "localId" : "2733",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "536",
+                "localId" : "2734",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "537",
+                "localId" : "2735",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "538",
+                "localId" : "2736",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "539",
+                "localId" : "2737",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "540",
+                "localId" : "2738",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "517",
+                "localId" : "2715",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2015",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "518",
+                "localId" : "2716",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "519",
+                "localId" : "2717",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -42153,7 +43978,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "520",
+                "localId" : "2718",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -42161,7 +43986,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "521",
+                "localId" : "2719",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -42169,7 +43994,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "522",
+                "localId" : "2720",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -42177,7 +44002,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "523",
+                "localId" : "2721",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -42187,846 +44012,301 @@ module.exports['ProperlyIncludes'] = {
           } ]
         }
       }, {
-        "localId" : "558",
+        "localId" : "2756",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndProperlyIncludesIntIvl",
+        "name" : "PosInfEndNotIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "558",
+            "r" : "2756",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndProperlyIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotIncludesDateIvl", ": " ]
             }, {
-              "r" : "570",
+              "r" : "2837",
               "s" : [ {
-                "r" : "561",
+                "r" : "2782",
                 "s" : [ {
-                  "r" : "559",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2773",
+                  "s" : [ {
+                    "r" : "2757",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2781",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "570",
-                "value" : [ " ", "properly includes", " " ]
+                "r" : "2837",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "567",
+                "r" : "2834",
                 "s" : [ {
-                  "r" : "565",
-                  "value" : [ "Interval[", "1234", ", ", "5678", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2802",
+                  "s" : [ {
+                    "r" : "2786",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2826",
+                  "s" : [ {
+                    "r" : "2810",
+                    "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "570",
+          "type" : "Includes",
+          "localId" : "2837",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "571",
+            "localId" : "2838",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "572",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2839",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "573",
+            "localId" : "2840",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "574",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2841",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "561",
+            "localId" : "2782",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "563",
+              "localId" : "2784",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "564",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2785",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "559",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "562",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "type" : "DateTime",
+              "localId" : "2773",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "560",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2774",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "567",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "568",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "569",
+                "localId" : "2775",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "565",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1234",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "566",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5678",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "584",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotProperlyIncludesIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "584",
-            "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotProperlyIncludesIntIvl", ": " ]
-            }, {
-              "r" : "597",
-              "s" : [ {
-                "r" : "587",
-                "s" : [ {
-                  "r" : "585",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
-                } ]
-              }, {
-                "r" : "597",
-                "value" : [ " ", "properly includes", " " ]
               }, {
-                "r" : "593",
-                "s" : [ {
-                  "r" : "591",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "597",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "598",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "599",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "600",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "601",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "587",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "589",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "590",
+                "localId" : "2776",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "585",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "588",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "586",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "593",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "595",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "596",
+                "localId" : "2777",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "591",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "594",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "592",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2778",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "611",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayProperlyIncludeIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "611",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayProperlyIncludeIntIvl", ": " ]
-            }, {
-              "r" : "623",
-              "s" : [ {
-                "r" : "614",
-                "s" : [ {
-                  "r" : "612",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
-                } ]
               }, {
-                "r" : "623",
-                "value" : [ " ", "properly includes", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2779",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "620",
-                "s" : [ {
-                  "r" : "618",
-                  "value" : [ "Interval[", "0", ", ", "0", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "623",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "624",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "625",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "626",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "627",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "614",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "616",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "617",
+                "localId" : "2780",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2757",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2758",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2759",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2760",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2761",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2762",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2763",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "612",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
             "high" : {
               "type" : "As",
-              "localId" : "615",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2783",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "613",
+                "localId" : "2781",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "620",
+            "localId" : "2834",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "621",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "622",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "618",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "619",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "637",
-        "name" : "PrecisionDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "637",
-            "s" : [ {
-              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
-            }, {
-              "r" : "686",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "654",
-                "s" : [ {
-                  "r" : "638",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "678",
-                "s" : [ {
-                  "r" : "662",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "689",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "690",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "686",
-          "lowClosed" : true,
-          "highClosed" : false,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "687",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "688",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "654",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "655",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "656",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "657",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "658",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "659",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "660",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "661",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "638",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "639",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "640",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "641",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "642",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "34",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "643",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "56",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "644",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "789",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "678",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "679",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "680",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "681",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "682",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "683",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "684",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "685",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "662",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "663",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "664",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "665",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "666",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "667",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "45",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "668",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "678",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "693",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesDayOfIvlLowEdge",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "693",
-            "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlLowEdge", ": " ]
-            }, {
-              "r" : "748",
-              "s" : [ {
-                "r" : "694",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "748",
-                "value" : [ " ", "properly includes day of", " " ]
-              }, {
-                "r" : "745",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "713",
-                  "s" : [ {
-                    "r" : "697",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "737",
-                  "s" : [ {
-                    "r" : "721",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "748",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "749",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "750",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "751",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "752",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "694",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "695",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "696",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "745",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "746",
+              "localId" : "2835",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "747",
+                "localId" : "2836",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "713",
+              "localId" : "2802",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "714",
+                "localId" : "2803",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "715",
+                "localId" : "2804",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "716",
+                "localId" : "2805",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "717",
+                "localId" : "2806",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "718",
+                "localId" : "2807",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "719",
+                "localId" : "2808",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "720",
+                "localId" : "2809",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "697",
+                "localId" : "2786",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "698",
+                "localId" : "2787",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "699",
+                "localId" : "2788",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "700",
+                "localId" : "2789",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43034,7 +44314,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "701",
+                "localId" : "2790",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43042,7 +44322,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "702",
+                "localId" : "2791",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43050,7 +44330,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "703",
+                "localId" : "2792",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43059,64 +44339,64 @@ module.exports['ProperlyIncludes'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "737",
+              "localId" : "2826",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "738",
+                "localId" : "2827",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "739",
+                "localId" : "2828",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "740",
+                "localId" : "2829",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "741",
+                "localId" : "2830",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "742",
+                "localId" : "2831",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "743",
+                "localId" : "2832",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "744",
+                "localId" : "2833",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "721",
+                "localId" : "2810",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2014",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "722",
+                "localId" : "2811",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "723",
+                "localId" : "2812",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -43124,7 +44404,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "724",
+                "localId" : "2813",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43132,7 +44412,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "725",
+                "localId" : "2814",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43140,7 +44420,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "726",
+                "localId" : "2815",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43148,7 +44428,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "727",
+                "localId" : "2816",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43158,173 +44438,293 @@ module.exports['ProperlyIncludes'] = {
           } ]
         }
       }, {
-        "localId" : "762",
+        "localId" : "2851",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesDayOfIvlHighEdge",
+        "name" : "UnknownEndIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "762",
+            "r" : "2851",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlHighEdge", ": " ]
+              "value" : [ "", "define ", "UnknownEndIncludesDateIvl", ": " ]
             }, {
-              "r" : "817",
+              "r" : "2932",
               "s" : [ {
-                "r" : "763",
+                "r" : "2877",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2868",
+                  "s" : [ {
+                    "r" : "2852",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2876",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "817",
-                "value" : [ " ", "properly includes day of", " " ]
+                "r" : "2932",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "814",
+                "r" : "2929",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "782",
+                  "r" : "2897",
                   "s" : [ {
-                    "r" : "766",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2881",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "806",
+                  "r" : "2921",
                   "s" : [ {
-                    "r" : "790",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "2905",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "817",
+          "type" : "Includes",
+          "localId" : "2932",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "818",
+            "localId" : "2933",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "819",
+              "localId" : "2934",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "820",
+            "localId" : "2935",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "821",
+              "localId" : "2936",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "763",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "2877",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "764",
+              "localId" : "2879",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "765",
+                "localId" : "2880",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2868",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2869",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2870",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2871",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2872",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2873",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2874",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2875",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2852",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2853",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2854",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2855",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2856",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2857",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2858",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2878",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2876",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "814",
+            "localId" : "2929",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "815",
+              "localId" : "2930",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "816",
+                "localId" : "2931",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "782",
+              "localId" : "2897",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "783",
+                "localId" : "2898",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "784",
+                "localId" : "2899",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "785",
+                "localId" : "2900",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "786",
+                "localId" : "2901",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "787",
+                "localId" : "2902",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "788",
+                "localId" : "2903",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "789",
+                "localId" : "2904",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "766",
+                "localId" : "2881",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "767",
+                "localId" : "2882",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "768",
+                "localId" : "2883",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -43332,7 +44732,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "769",
+                "localId" : "2884",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43340,7 +44740,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "770",
+                "localId" : "2885",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43348,7 +44748,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "771",
+                "localId" : "2886",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43356,7 +44756,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "772",
+                "localId" : "2887",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43365,280 +44765,272 @@ module.exports['ProperlyIncludes'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "806",
+              "localId" : "2921",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "807",
+                "localId" : "2922",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "808",
+                "localId" : "2923",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "809",
+                "localId" : "2924",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "810",
+                "localId" : "2925",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "811",
+                "localId" : "2926",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "812",
+                "localId" : "2927",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "813",
+                "localId" : "2928",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "790",
+                "localId" : "2905",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "791",
+                "localId" : "2906",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "792",
+                "localId" : "2907",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "793",
+                "localId" : "2908",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "794",
+                "localId" : "2909",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "795",
+                "localId" : "2910",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "796",
+                "localId" : "2911",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "831",
+        "localId" : "2946",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesDayOfIvlNearEdges",
+        "name" : "UnknownEndMayIncludeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "831",
+            "r" : "2946",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlNearEdges", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayIncludeDateIvl", ": " ]
             }, {
-              "r" : "886",
+              "r" : "3027",
               "s" : [ {
-                "r" : "832",
+                "r" : "2972",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2963",
+                  "s" : [ {
+                    "r" : "2947",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2971",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "886",
-                "value" : [ " ", "properly includes day of", " " ]
+                "r" : "3027",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "883",
+                "r" : "3024",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "851",
+                  "r" : "2992",
                   "s" : [ {
-                    "r" : "835",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2976",
+                    "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "875",
+                  "r" : "3016",
                   "s" : [ {
-                    "r" : "859",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "3000",
+                    "value" : [ "DateTime", "(", "2015", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "886",
+          "type" : "Includes",
+          "localId" : "3027",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "887",
+            "localId" : "3028",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "888",
+              "localId" : "3029",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "889",
+            "localId" : "3030",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "890",
+              "localId" : "3031",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "832",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "833",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "834",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "883",
+            "localId" : "2972",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "884",
+              "localId" : "2974",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "885",
+                "localId" : "2975",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "851",
+              "localId" : "2963",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "852",
+                "localId" : "2964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "853",
+                "localId" : "2965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "854",
+                "localId" : "2966",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "855",
+                "localId" : "2967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "856",
+                "localId" : "2968",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "857",
+                "localId" : "2969",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "858",
+                "localId" : "2970",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "835",
+                "localId" : "2947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "836",
+                "localId" : "2948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "837",
+                "localId" : "2949",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "838",
+                "localId" : "2950",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43646,7 +45038,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "839",
+                "localId" : "2951",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43654,7 +45046,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "840",
+                "localId" : "2952",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43662,7 +45054,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "841",
+                "localId" : "2953",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43670,65 +45062,95 @@ module.exports['ProperlyIncludes'] = {
               }
             },
             "high" : {
+              "type" : "As",
+              "localId" : "2973",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2971",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "3024",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "3025",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3026",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "DateTime",
-              "localId" : "875",
+              "localId" : "2992",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "876",
+                "localId" : "2993",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "877",
+                "localId" : "2994",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "878",
+                "localId" : "2995",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "879",
+                "localId" : "2996",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "880",
+                "localId" : "2997",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "881",
+                "localId" : "2998",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "882",
+                "localId" : "2999",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "859",
+                "localId" : "2976",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2014",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "860",
+                "localId" : "2977",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "861",
+                "localId" : "2978",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -43736,79 +45158,186 @@ module.exports['ProperlyIncludes'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "862",
+                "localId" : "2979",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "863",
+                "localId" : "2980",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "864",
+                "localId" : "2981",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "865",
+                "localId" : "2982",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "3016",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3017",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3018",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3019",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3020",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3021",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3022",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3023",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "3000",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2015",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "3001",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "3002",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "3003",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "3004",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "3005",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "3006",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "900",
+        "localId" : "3041",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotProperlyIncludesDayOfIvlSameEdges",
+        "name" : "UnknownEndNotIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "900",
+            "r" : "3041",
             "s" : [ {
-              "value" : [ "", "define ", "NotProperlyIncludesDayOfIvlSameEdges", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotIncludesDateIvl", ": " ]
             }, {
-              "r" : "955",
+              "r" : "3122",
               "s" : [ {
-                "r" : "901",
+                "r" : "3067",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "3058",
+                  "s" : [ {
+                    "r" : "3042",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "3066",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "955",
-                "value" : [ " ", "properly includes day of", " " ]
+                "r" : "3122",
+                "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "952",
+                "r" : "3119",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "920",
+                  "r" : "3087",
                   "s" : [ {
-                    "r" : "904",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "3071",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "944",
+                  "r" : "3111",
                   "s" : [ {
-                    "r" : "928",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "3095",
+                    "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -43818,133 +45347,116 @@ module.exports['ProperlyIncludes'] = {
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "955",
+          "type" : "Includes",
+          "localId" : "3122",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "956",
+            "localId" : "3123",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "957",
+              "localId" : "3124",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "958",
+            "localId" : "3125",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "959",
+              "localId" : "3126",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "901",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "902",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "903",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "952",
+            "localId" : "3067",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "953",
+              "localId" : "3069",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "954",
+                "localId" : "3070",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "920",
+              "localId" : "3058",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "921",
+                "localId" : "3059",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "922",
+                "localId" : "3060",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "923",
+                "localId" : "3061",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "924",
+                "localId" : "3062",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "925",
+                "localId" : "3063",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "926",
+                "localId" : "3064",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "927",
+                "localId" : "3065",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "904",
+                "localId" : "3042",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "905",
+                "localId" : "3043",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "906",
+                "localId" : "3044",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "907",
+                "localId" : "3045",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43952,7 +45464,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "908",
+                "localId" : "3046",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43960,7 +45472,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "909",
+                "localId" : "3047",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43968,7 +45480,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "910",
+                "localId" : "3048",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -43976,73 +45488,103 @@ module.exports['ProperlyIncludes'] = {
               }
             },
             "high" : {
+              "type" : "As",
+              "localId" : "3068",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "3066",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "3119",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "3120",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3121",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "DateTime",
-              "localId" : "944",
+              "localId" : "3087",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "945",
+                "localId" : "3088",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "946",
+                "localId" : "3089",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "947",
+                "localId" : "3090",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "948",
+                "localId" : "3091",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "949",
+                "localId" : "3092",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "950",
+                "localId" : "3093",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "951",
+                "localId" : "3094",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "928",
+                "localId" : "3071",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "929",
+                "localId" : "3072",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "930",
+                "localId" : "3073",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "931",
+                "localId" : "3074",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -44050,7 +45592,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "932",
+                "localId" : "3075",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -44058,7 +45600,7 @@ module.exports['ProperlyIncludes'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "933",
+                "localId" : "3076",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -44066,688 +45608,108 @@ module.exports['ProperlyIncludes'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "934",
+                "localId" : "3077",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "969",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseLow",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "969",
-            "s" : [ {
-              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseLow", ": " ]
-            }, {
-              "r" : "994",
-              "s" : [ {
-                "r" : "970",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "994",
-                "value" : [ " ", "properly includes day of", " " ]
-              }, {
-                "r" : "991",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "979",
-                  "s" : [ {
-                    "r" : "973",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "988",
-                  "s" : [ {
-                    "r" : "982",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "994",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "995",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "996",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "997",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "998",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "970",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "971",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "972",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "991",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "992",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "993",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
+            "high" : {
               "type" : "DateTime",
-              "localId" : "979",
+              "localId" : "3111",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "980",
+                "localId" : "3112",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "981",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "973",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "974",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "988",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "989",
+                "localId" : "3113",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "990",
+                "localId" : "3114",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "982",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "983",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1008",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseHigh",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1008",
-            "s" : [ {
-              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseHigh", ": " ]
-            }, {
-              "r" : "1033",
-              "s" : [ {
-                "r" : "1009",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "1033",
-                "value" : [ " ", "properly includes day of", " " ]
               }, {
-                "r" : "1030",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1018",
-                  "s" : [ {
-                    "r" : "1012",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1027",
-                  "s" : [ {
-                    "r" : "1021",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "1033",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1034",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1035",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1036",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1037",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1009",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1010",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1011",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1030",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1031",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1032",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1018",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1019",
+                "localId" : "3115",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1020",
+                "localId" : "3116",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1012",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1013",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1027",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1028",
+                "localId" : "3117",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1029",
+                "localId" : "3118",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1021",
+                "localId" : "3095",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2014",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1022",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1047",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1047",
-            "s" : [ {
-              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh", ": " ]
-            }, {
-              "r" : "1072",
-              "s" : [ {
-                "r" : "1048",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "1072",
-                "value" : [ " ", "properly includes day of", " " ]
-              }, {
-                "r" : "1069",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1057",
-                  "s" : [ {
-                    "r" : "1051",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1066",
-                  "s" : [ {
-                    "r" : "1060",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "1072",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1073",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1074",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1075",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1076",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1048",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1049",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1050",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1069",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1070",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1071",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1057",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1058",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1059",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1051",
+                "localId" : "3096",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "1",
                 "annotation" : [ ]
               },
-              "month" : {
+              "day" : {
                 "type" : "Literal",
-                "localId" : "1052",
+                "localId" : "3097",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1066",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1067",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1068",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "hour" : {
                 "type" : "Literal",
-                "localId" : "1060",
+                "localId" : "3098",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "month" : {
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "1061",
+                "localId" : "3099",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1086",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1086",
-            "s" : [ {
-              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding", ": " ]
-            }, {
-              "r" : "1105",
-              "s" : [ {
-                "r" : "1087",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "1105",
-                "value" : [ " ", "properly includes day of", " " ]
-              }, {
-                "r" : "1102",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1094",
-                  "s" : [ {
-                    "r" : "1090",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1100",
-                  "s" : [ {
-                    "r" : "1096",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "1105",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1106",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1107",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1108",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1109",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1087",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1088",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1089",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1102",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1103",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1104",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1094",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1095",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "second" : {
                 "type" : "Literal",
-                "localId" : "1090",
+                "localId" : "3100",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1100",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1101",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1096",
+                "localId" : "3101",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
@@ -44758,64 +45720,41 @@ module.exports['ProperlyIncludes'] = {
   }
 }
 
-/* IncludedIn
+/* ProperlyIncludes
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define IncludesIntIvl: Interval[1, 4] included in Interval[1, 5]
-define NotIncludesIntIvl: Interval[1, 4] included in Interval(1, 5]
-define IncludesRealIvl: Interval[2.34, 2.56] included in Interval[1.234, 3.456]
-define NotIncludesRealIvl: Interval[1.23, 2.56] included in Interval[1.234, 3.456]
+define ProperlyIncludesIntIvl: Interval[1, 5] properly includes Interval[2, 4]
+define ProperlyIncludesIntBeginsIvl: Interval[1, 5] properly includes Interval[1, 4]
+define ProperlyIncludesIntEndsIvl: Interval[1, 5] properly includes Interval[2, 5]
+define NotProperlyIncludesIntIvl: Interval[1, 5] properly includes Interval[1, 5]
+define ProperlyIncludesLongIvl: Interval[1L, 5L] properly includes Interval[2L, 4L]
+define NotProperlyIncludesLongIvl: Interval[1L, 5L] properly includes Interval[1L, 5L]
+define ProperlyIncludesRealIvl: Interval[1.234, 3.456] properly includes Interval[2.34, 2.56]
+define NotProperlyIncludesRealIvl: Interval[1.234, 3.456] properly includes Interval[1.234, 3.456]
 define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define IncludesDateIvl: Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) included in DateIvl
-define NotIncludesDateIvl: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)] included in DateIvl
-define IncludesImpreciseDateIvl: Interval[DateTime(2012, 4), DateTime(2012, 6)] included in DateIvl
-define NotIncludesImpreciseDateIvl: Interval[DateTime(2012, 4), DateTime(2012, 9)] included in DateIvl
-define MayIncludeImpreciseDateIvl: Interval[DateTime(2012), DateTime(2012)] included in DateIvl
+define ProperlyIncludesDateIvl: DateIvl properly includes Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
+define NotProperlyIncludesDateIvl: DateIvl properly includes Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
+define PosInfEndProperlyIncludesIntIvl: Interval[0, null] properly includes Interval[1234, 5678]
+define PosInfEndNotProperlyIncludesIntIvl: Interval[0, null] properly includes Interval[0, null]
+define UnknownEndMayProperlyIncludeIntIvl: Interval[0, null) properly includes Interval[0, 0]
+define ProperlyIncludesLongBeginsIvl: Interval[1L, 5L] properly includes Interval[1L, 4L]
+define ProperlyIncludesLongEndsIvl: Interval[1L, 5L] properly includes Interval[2L, 5L]
+define PosInfEndProperlyIncludesLongIvl: Interval[0L, null] properly includes Interval[1234L, 5678L]
+define PosInfEndNotProperlyIncludesLongIvl: Interval[0L, null] properly includes Interval[0L, null]
+define UnknownEndMayProperlyIncludeLongIvl: Interval[0L, null) properly includes Interval[0L, 0L]
 define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define IncludesDayOfIvlLowEdge: Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) included in day of PrecisionDateIvl
-define IncludesDayOfIvlHighEdge: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 2, 23, 59, 59, 999)) included in day of PrecisionDateIvl
-define NotIncludesDayOfIvlLowEdge: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] included in day of PrecisionDateIvl
-define NotIncludesDayOfIvlHighEdge: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 3, 0, 0, 0, 0)] included in day of PrecisionDateIvl
-define IncludesDayOfIvlImpreciseLowEdge: Interval[DateTime(2012, 3, 2), DateTime(2012, 6, 1)] included in day of PrecisionDateIvl
-define IncludesDayInInterval: DateTime(2012, 3, 3) included in day of PrecisionDateIvl
-define DoesNotIncludeDayInInterval: DateTime(2014, 3, 3) included in day of PrecisionDateIvl
-define QuantityIncludedInterval: 5 'mg' included in Interval[4 'mg', 6 'mg']
-define QuantityNotIncludedInterval: 50 'mg' included in Interval[4 'mg', 6 'mg']
-define IncludesDayOfIvlImpreciseHighEdge: Interval[DateTime(2012, 6, 1), DateTime(2012, 9, 2)] included in day of PrecisionDateIvl
-define IncludesDayOfIvlVeryImpreciseMiddle: Interval[DateTime(2012, 5), DateTime(2012, 6)] included in day of PrecisionDateIvl
-define NotIncludesDayOfIvlVeryImpreciseLow: Interval[DateTime(2012, 2), DateTime(2012, 6)] included in day of PrecisionDateIvl
-define NotIncludesDayOfIvlVeryImpreciseHigh: Interval[DateTime(2012, 6), DateTime(2012, 10)] included in day of PrecisionDateIvl
-define MayIncludeDayOfIvlVeryImpreciseLow: Interval[DateTime(2012, 3), DateTime(2012, 6)] included in day of PrecisionDateIvl
-define MayIncludeDayOfIvlVeryImpreciseHigh: Interval[DateTime(2012, 6), DateTime(2012, 9)] included in day of PrecisionDateIvl
-define MayIncludeDayOfIvlVeryImpreciseSurrounding: Interval[DateTime(2012), DateTime(2012)] included in day of PrecisionDateIvl
-define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
-define ImpreciseIncludesDateIvl: Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) included in ImpDateIvl
-define ImpreciseNotIncludesDateIvl: Interval[DateTime(2012, 2, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) included in ImpDateIvl
-define ImpreciseMayIncludeDateIvl: Interval[DateTime(2012, 3, 15, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) included in ImpDateIvl
-define NegInfBegIncludedInIntIvl: Interval[null, 5] included in Interval[null, 100]
-define NegInfBegNotIncludedInIntIvl: Interval[null, 5] included in Interval[-100, 100]
-define UnknownBegIncludedInIntIvl: Interval(null, 5] included in Interval[null, 100]
-define UnknownBegMayBeIncludedInIntIvl: Interval(null, 5] included in Interval[-100, 100]
-define UnknownBegNotIncludedInIntIvl: Interval(null, 5] included in Interval[-100, 0]
-define PosInfEndIncludedInIntIvl: Interval[0, null] included in Interval[-100, null]
-define PosInfEndNotIncludedInIntIvl: Interval[0, null] included in Interval[-100, 100]
-define UnknownEndIncludedInIntIvl: Interval[0, null) included in Interval[-100, null]
-define UnknownEndMayBeIncludedInIntIvl: Interval[0, null) included in Interval[-100, 100]
-define UnknownEndNotIncludedInIntIvl: Interval[0, null) included in Interval[100, 200]
-define NegInfBegIncludedInDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[null, DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define NegInfBegNotIncludedInDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define UnknownBegIncludedInDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[null, DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define UnknownBegMayBeIncludedInDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define UnknownBegNotIncludedInDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2000, 1, 1, 0, 0, 0, 0)]
-define PosInfEndIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), null]
-define PosInfEndNotIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define UnknownEndIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), null]
-define UnknownEndMayBeIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define UnknownEndNotIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) included in Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
+define ProperlyIncludesDayOfIvlLowEdge: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
+define ProperlyIncludesDayOfIvlHighEdge: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 2, 23, 59, 59, 999))
+define ProperlyIncludesDayOfIvlNearEdges: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3, 3, 0, 0, 0, 0), DateTime(2012, 9, 1, 23, 59, 59, 999))
+define NotProperlyIncludesDayOfIvlSameEdges: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 9, 2, 0, 0, 0, 0)]
+define MayProperlyIncludeDayOfIvlVeryImpreciseLow: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3), DateTime(2012, 6)]
+define MayProperlyIncludeDayOfIvlVeryImpreciseHigh: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 6), DateTime(2012, 9)]
+define MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh: PrecisionDateIvl properly includes day of Interval[DateTime(2012, 3), DateTime(2012, 9)]
+define MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding: PrecisionDateIvl properly includes day of Interval[DateTime(2012), DateTime(2012)]
 */
 
-module.exports['IncludedIn'] = {
+module.exports['ProperlyIncludes'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -44827,7 +45766,7 @@ module.exports['IncludedIn'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "2621",
+        "r" : "1265",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -44902,7 +45841,7 @@ module.exports['IncludedIn'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesIntIvl",
+        "name" : "ProperlyIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -44911,30 +45850,30 @@ module.exports['IncludedIn'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesIntIvl", ": " ]
             }, {
               "r" : "225",
               "s" : [ {
                 "r" : "217",
                 "s" : [ {
                   "r" : "215",
-                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               }, {
                 "r" : "225",
-                "value" : [ " ", "included in", " " ]
+                "value" : [ " ", "properly includes", " " ]
               }, {
                 "r" : "222",
                 "s" : [ {
                   "r" : "220",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "value" : [ "Interval[", "2", ", ", "4", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
+          "type" : "ProperIncludes",
           "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -44989,7 +45928,7 @@ module.exports['IncludedIn'] = {
               "localId" : "216",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -45014,7 +45953,7 @@ module.exports['IncludedIn'] = {
               "localId" : "220",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
@@ -45022,7 +45961,7 @@ module.exports['IncludedIn'] = {
               "localId" : "221",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
@@ -45030,7 +45969,7 @@ module.exports['IncludedIn'] = {
       }, {
         "localId" : "239",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesIntIvl",
+        "name" : "ProperlyIncludesIntBeginsIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -45039,30 +45978,30 @@ module.exports['IncludedIn'] = {
           "s" : {
             "r" : "239",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesIntBeginsIvl", ": " ]
             }, {
               "r" : "250",
               "s" : [ {
                 "r" : "242",
                 "s" : [ {
                   "r" : "240",
-                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               }, {
                 "r" : "250",
-                "value" : [ " ", "included in", " " ]
+                "value" : [ " ", "properly includes", " " ]
               }, {
                 "r" : "247",
                 "s" : [ {
                   "r" : "245",
-                  "value" : [ "Interval(", "1", ", ", "5", "]" ]
+                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
+          "type" : "ProperIncludes",
           "localId" : "250",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -45117,13 +46056,13 @@ module.exports['IncludedIn'] = {
               "localId" : "241",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
             "localId" : "247",
-            "lowClosed" : false,
+            "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
@@ -45150,7 +46089,7 @@ module.exports['IncludedIn'] = {
               "localId" : "246",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
@@ -45158,7 +46097,7 @@ module.exports['IncludedIn'] = {
       }, {
         "localId" : "264",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesRealIvl",
+        "name" : "ProperlyIncludesIntEndsIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -45167,30 +46106,30 @@ module.exports['IncludedIn'] = {
           "s" : {
             "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesRealIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesIntEndsIvl", ": " ]
             }, {
               "r" : "275",
               "s" : [ {
                 "r" : "267",
                 "s" : [ {
                   "r" : "265",
-                  "value" : [ "Interval[", "2.34", ", ", "2.56", "]" ]
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               }, {
                 "r" : "275",
-                "value" : [ " ", "included in", " " ]
+                "value" : [ " ", "properly includes", " " ]
               }, {
                 "r" : "272",
                 "s" : [ {
                   "r" : "270",
-                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
+                  "value" : [ "Interval[", "2", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
+          "type" : "ProperIncludes",
           "localId" : "275",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -45201,7 +46140,7 @@ module.exports['IncludedIn'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "277",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
@@ -45211,7 +46150,7 @@ module.exports['IncludedIn'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "279",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
@@ -45228,24 +46167,24 @@ module.exports['IncludedIn'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "269",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "265",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.34",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "266",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.56",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -45261,24 +46200,24 @@ module.exports['IncludedIn'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "274",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "271",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "3.456",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
@@ -45286,7 +46225,7 @@ module.exports['IncludedIn'] = {
       }, {
         "localId" : "289",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesRealIvl",
+        "name" : "NotProperlyIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -45295,30 +46234,30 @@ module.exports['IncludedIn'] = {
           "s" : {
             "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesRealIvl", ": " ]
+              "value" : [ "", "define ", "NotProperlyIncludesIntIvl", ": " ]
             }, {
               "r" : "300",
               "s" : [ {
                 "r" : "292",
                 "s" : [ {
                   "r" : "290",
-                  "value" : [ "Interval[", "1.23", ", ", "2.56", "]" ]
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               }, {
                 "r" : "300",
-                "value" : [ " ", "included in", " " ]
+                "value" : [ " ", "properly includes", " " ]
               }, {
                 "r" : "297",
                 "s" : [ {
                   "r" : "295",
-                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
+          "type" : "ProperIncludes",
           "localId" : "300",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -45329,7 +46268,7 @@ module.exports['IncludedIn'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "302",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
@@ -45339,7 +46278,7 @@ module.exports['IncludedIn'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "304",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
@@ -45356,24 +46295,24 @@ module.exports['IncludedIn'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "294",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "290",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "291",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.56",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -45389,31 +46328,32 @@ module.exports['IncludedIn'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "299",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "295",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "3.456",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
         "localId" : "314",
-        "name" : "DateIvl",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ProperlyIncludesLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -45422,23 +46362,534 @@ module.exports['IncludedIn'] = {
           "s" : {
             "r" : "314",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesLongIvl", ": " ]
             }, {
-              "r" : "363",
+              "r" : "325",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "331",
+                "r" : "317",
                 "s" : [ {
                   "r" : "315",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "r" : "325",
+                "value" : [ " ", "properly includes", " " ]
               }, {
-                "r" : "355",
+                "r" : "322",
+                "s" : [ {
+                  "r" : "320",
+                  "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "325",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "326",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "327",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "328",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "329",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "317",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "318",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "319",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "315",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "316",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "322",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "323",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "324",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "320",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "321",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "339",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotProperlyIncludesLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "339",
+            "s" : [ {
+              "value" : [ "", "define ", "NotProperlyIncludesLongIvl", ": " ]
+            }, {
+              "r" : "350",
+              "s" : [ {
+                "r" : "342",
+                "s" : [ {
+                  "r" : "340",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "350",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "347",
+                "s" : [ {
+                  "r" : "345",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "350",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "351",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "352",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "353",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "354",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "342",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "343",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "344",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "340",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "347",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "348",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "349",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "364",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ProperlyIncludesRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "364",
+            "s" : [ {
+              "value" : [ "", "define ", "ProperlyIncludesRealIvl", ": " ]
+            }, {
+              "r" : "375",
+              "s" : [ {
+                "r" : "367",
+                "s" : [ {
+                  "r" : "365",
+                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
+                } ]
+              }, {
+                "r" : "375",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "372",
+                "s" : [ {
+                  "r" : "370",
+                  "value" : [ "Interval[", "2.34", ", ", "2.56", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "375",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "376",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "377",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "378",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "379",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "367",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "368",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "369",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.456",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "372",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "373",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "374",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "370",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.34",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.56",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "389",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotProperlyIncludesRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "389",
+            "s" : [ {
+              "value" : [ "", "define ", "NotProperlyIncludesRealIvl", ": " ]
+            }, {
+              "r" : "400",
+              "s" : [ {
+                "r" : "392",
+                "s" : [ {
+                  "r" : "390",
+                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
+                } ]
+              }, {
+                "r" : "400",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "397",
+                "s" : [ {
+                  "r" : "395",
+                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "400",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "401",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "402",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "403",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "404",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "392",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "393",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "394",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "390",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "391",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.456",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "397",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "398",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "399",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.456",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "414",
+        "name" : "DateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "414",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvl", ": " ]
+            }, {
+              "r" : "463",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "431",
+                "s" : [ {
+                  "r" : "415",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "455",
                 "s" : [ {
-                  "r" : "339",
+                  "r" : "439",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
@@ -45449,76 +46900,76 @@ module.exports['IncludedIn'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "366",
+          "localId" : "466",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "367",
+            "localId" : "467",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "363",
+          "localId" : "463",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "364",
+            "localId" : "464",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "365",
+              "localId" : "465",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "331",
+            "localId" : "431",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "332",
+              "localId" : "432",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "333",
+              "localId" : "433",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "334",
+              "localId" : "434",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "335",
+              "localId" : "435",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "336",
+              "localId" : "436",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "337",
+              "localId" : "437",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "338",
+              "localId" : "438",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "315",
+              "localId" : "415",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -45526,7 +46977,7 @@ module.exports['IncludedIn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "316",
+              "localId" : "416",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -45534,7 +46985,7 @@ module.exports['IncludedIn'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "317",
+              "localId" : "417",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -45542,7 +46993,7 @@ module.exports['IncludedIn'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "318",
+              "localId" : "418",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -45550,7 +47001,7 @@ module.exports['IncludedIn'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "319",
+              "localId" : "419",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -45558,7 +47009,7 @@ module.exports['IncludedIn'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "320",
+              "localId" : "420",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -45566,7 +47017,7 @@ module.exports['IncludedIn'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "321",
+              "localId" : "421",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -45575,48 +47026,48 @@ module.exports['IncludedIn'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "355",
+            "localId" : "455",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "356",
+              "localId" : "456",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "357",
+              "localId" : "457",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "358",
+              "localId" : "458",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "359",
+              "localId" : "459",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "360",
+              "localId" : "460",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "361",
+              "localId" : "461",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "362",
+              "localId" : "462",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "339",
+              "localId" : "439",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -45624,7 +47075,7 @@ module.exports['IncludedIn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "340",
+              "localId" : "440",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -45632,7 +47083,7 @@ module.exports['IncludedIn'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "341",
+              "localId" : "441",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -45640,7 +47091,7 @@ module.exports['IncludedIn'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "342",
+              "localId" : "442",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -45648,7 +47099,7 @@ module.exports['IncludedIn'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "343",
+              "localId" : "443",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -45656,7 +47107,7 @@ module.exports['IncludedIn'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "344",
+              "localId" : "444",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -45664,7 +47115,7 @@ module.exports['IncludedIn'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "345",
+              "localId" : "445",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -45673,140 +47124,156 @@ module.exports['IncludedIn'] = {
           }
         }
       }, {
-        "localId" : "370",
+        "localId" : "470",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDateIvl",
+        "name" : "ProperlyIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "370",
+            "r" : "470",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesDateIvl", ": " ]
             }, {
-              "r" : "425",
+              "r" : "525",
               "s" : [ {
-                "r" : "419",
+                "r" : "471",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "525",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "522",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "387",
+                  "r" : "490",
                   "s" : [ {
-                    "r" : "371",
+                    "r" : "474",
                     "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "411",
+                  "r" : "514",
                   "s" : [ {
-                    "r" : "395",
+                    "r" : "498",
                     "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
-              }, {
-                "r" : "425",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "422",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "425",
+          "type" : "ProperIncludes",
+          "localId" : "525",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "426",
+            "localId" : "526",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "427",
+              "localId" : "527",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "428",
+            "localId" : "528",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "429",
+              "localId" : "529",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "471",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "472",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "473",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "419",
+            "localId" : "522",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "420",
+              "localId" : "523",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "421",
+                "localId" : "524",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "387",
+              "localId" : "490",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "388",
+                "localId" : "491",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "389",
+                "localId" : "492",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "390",
+                "localId" : "493",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "391",
+                "localId" : "494",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "392",
+                "localId" : "495",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "393",
+                "localId" : "496",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "394",
+                "localId" : "497",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "371",
+                "localId" : "474",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -45814,7 +47281,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "372",
+                "localId" : "475",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -45822,7 +47289,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "373",
+                "localId" : "476",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -45830,7 +47297,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "374",
+                "localId" : "477",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -45838,7 +47305,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "375",
+                "localId" : "478",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -45846,7 +47313,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "376",
+                "localId" : "479",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -45854,7 +47321,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "377",
+                "localId" : "480",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -45863,48 +47330,48 @@ module.exports['IncludedIn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "411",
+              "localId" : "514",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "412",
+                "localId" : "515",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "413",
+                "localId" : "516",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "414",
+                "localId" : "517",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "415",
+                "localId" : "518",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "416",
+                "localId" : "519",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "417",
+                "localId" : "520",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "418",
+                "localId" : "521",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "395",
+                "localId" : "498",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -45912,7 +47379,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "396",
+                "localId" : "499",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -45920,7 +47387,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "397",
+                "localId" : "500",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -45928,7 +47395,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "398",
+                "localId" : "501",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -45936,7 +47403,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "399",
+                "localId" : "502",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -45944,7 +47411,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "400",
+                "localId" : "503",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -45952,166 +47419,166 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "401",
+                "localId" : "504",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "422",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "423",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "424",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "439",
+        "localId" : "539",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesDateIvl",
+        "name" : "NotProperlyIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "439",
+            "r" : "539",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "NotProperlyIncludesDateIvl", ": " ]
             }, {
-              "r" : "494",
+              "r" : "594",
               "s" : [ {
-                "r" : "488",
+                "r" : "540",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "594",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "591",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "456",
+                  "r" : "559",
                   "s" : [ {
-                    "r" : "440",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "543",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "480",
+                  "r" : "583",
                   "s" : [ {
-                    "r" : "464",
+                    "r" : "567",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "r" : "494",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "491",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "494",
+          "type" : "ProperIncludes",
+          "localId" : "594",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "495",
+            "localId" : "595",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "496",
+              "localId" : "596",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "497",
+            "localId" : "597",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "498",
+              "localId" : "598",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "540",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "541",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "542",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "488",
+            "localId" : "591",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "489",
+              "localId" : "592",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "490",
+                "localId" : "593",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "456",
+              "localId" : "559",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "457",
+                "localId" : "560",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "458",
+                "localId" : "561",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "459",
+                "localId" : "562",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "460",
+                "localId" : "563",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "461",
+                "localId" : "564",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "462",
+                "localId" : "565",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "463",
+                "localId" : "566",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "440",
+                "localId" : "543",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -46119,15 +47586,15 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "441",
+                "localId" : "544",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "442",
+                "localId" : "545",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -46135,7 +47602,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "443",
+                "localId" : "546",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -46143,7 +47610,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "444",
+                "localId" : "547",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -46151,7 +47618,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "445",
+                "localId" : "548",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -46159,7 +47626,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "446",
+                "localId" : "549",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -46168,48 +47635,48 @@ module.exports['IncludedIn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "480",
+              "localId" : "583",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "481",
+                "localId" : "584",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "482",
+                "localId" : "585",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "483",
+                "localId" : "586",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "484",
+                "localId" : "587",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "485",
+                "localId" : "588",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "486",
+                "localId" : "589",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "487",
+                "localId" : "590",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "464",
+                "localId" : "567",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -46217,7 +47684,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "465",
+                "localId" : "568",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -46225,7 +47692,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "466",
+                "localId" : "569",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -46233,7 +47700,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "467",
+                "localId" : "570",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -46241,7 +47708,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "468",
+                "localId" : "571",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -46249,7 +47716,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "469",
+                "localId" : "572",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -46257,532 +47724,1081 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "470",
+                "localId" : "573",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "491",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "492",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "493",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "508",
+        "localId" : "608",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesImpreciseDateIvl",
+        "name" : "PosInfEndProperlyIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "508",
+            "r" : "608",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndProperlyIncludesIntIvl", ": " ]
             }, {
-              "r" : "533",
+              "r" : "620",
               "s" : [ {
-                "r" : "527",
+                "r" : "611",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "515",
-                  "s" : [ {
-                    "r" : "509",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "524",
-                  "s" : [ {
-                    "r" : "518",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "609",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "533",
-                "value" : [ " ", "included in", " " ]
+                "r" : "620",
+                "value" : [ " ", "properly includes", " " ]
               }, {
-                "r" : "530",
+                "r" : "617",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "615",
+                  "value" : [ "Interval[", "1234", ", ", "5678", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "533",
+          "type" : "ProperIncludes",
+          "localId" : "620",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "534",
+            "localId" : "621",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "535",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "622",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "536",
+            "localId" : "623",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "537",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "624",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "527",
+            "localId" : "611",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "528",
+              "localId" : "613",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "529",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "614",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "515",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "516",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "517",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "509",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "510",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "609",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "524",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "612",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "525",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "526",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "518",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "519",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "610",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "530",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "617",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "531",
+              "localId" : "618",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "532",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "619",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "615",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "616",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5678",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "547",
+        "localId" : "634",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesImpreciseDateIvl",
+        "name" : "PosInfEndNotProperlyIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "547",
+            "r" : "634",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotProperlyIncludesIntIvl", ": " ]
             }, {
-              "r" : "572",
+              "r" : "647",
               "s" : [ {
-                "r" : "566",
+                "r" : "637",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "554",
-                  "s" : [ {
-                    "r" : "548",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "563",
-                  "s" : [ {
-                    "r" : "557",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "635",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "572",
-                "value" : [ " ", "included in", " " ]
+                "r" : "647",
+                "value" : [ " ", "properly includes", " " ]
               }, {
-                "r" : "569",
+                "r" : "643",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "641",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "572",
+          "type" : "ProperIncludes",
+          "localId" : "647",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "573",
+            "localId" : "648",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "574",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "649",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "575",
+            "localId" : "650",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "576",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "651",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "566",
+            "localId" : "637",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "567",
+              "localId" : "639",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "568",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "640",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "554",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "635",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "638",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "636",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "643",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "645",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "555",
+                "localId" : "646",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "641",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "644",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "642",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "661",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayProperlyIncludeIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "661",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMayProperlyIncludeIntIvl", ": " ]
+            }, {
+              "r" : "673",
+              "s" : [ {
+                "r" : "664",
+                "s" : [ {
+                  "r" : "662",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "673",
+                "value" : [ " ", "properly includes", " " ]
               }, {
+                "r" : "670",
+                "s" : [ {
+                  "r" : "668",
+                  "value" : [ "Interval[", "0", ", ", "0", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "673",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "674",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "675",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "676",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "677",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "664",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "666",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "556",
+                "localId" : "667",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "548",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "549",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "662",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "563",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "665",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "663",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "670",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "671",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "564",
+                "localId" : "672",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "668",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "669",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "687",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ProperlyIncludesLongBeginsIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "687",
+            "s" : [ {
+              "value" : [ "", "define ", "ProperlyIncludesLongBeginsIvl", ": " ]
+            }, {
+              "r" : "698",
+              "s" : [ {
+                "r" : "690",
+                "s" : [ {
+                  "r" : "688",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
+                } ]
               }, {
+                "r" : "698",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "695",
+                "s" : [ {
+                  "r" : "693",
+                  "value" : [ "Interval[", "1L", ", ", "4L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "698",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "699",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "700",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "701",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "702",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "690",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "691",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "565",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "692",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "557",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "688",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "689",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "695",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "696",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "697",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "558",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "693",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "694",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "712",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ProperlyIncludesLongEndsIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "712",
+            "s" : [ {
+              "value" : [ "", "define ", "ProperlyIncludesLongEndsIvl", ": " ]
+            }, {
+              "r" : "723",
+              "s" : [ {
+                "r" : "715",
+                "s" : [ {
+                  "r" : "713",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "723",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "720",
+                "s" : [ {
+                  "r" : "718",
+                  "value" : [ "Interval[", "2L", ", ", "5L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "723",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "724",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "725",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "726",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "727",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "715",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "716",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "717",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "713",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "714",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "569",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "720",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "570",
+              "localId" : "721",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "571",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "722",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "718",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "719",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "586",
+        "localId" : "737",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayIncludeImpreciseDateIvl",
+        "name" : "PosInfEndProperlyIncludesLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "586",
+            "r" : "737",
             "s" : [ {
-              "value" : [ "", "define ", "MayIncludeImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndProperlyIncludesLongIvl", ": " ]
             }, {
-              "r" : "605",
+              "r" : "749",
               "s" : [ {
-                "r" : "599",
+                "r" : "740",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "591",
-                  "s" : [ {
-                    "r" : "587",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "597",
-                  "s" : [ {
-                    "r" : "593",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "738",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "605",
-                "value" : [ " ", "included in", " " ]
+                "r" : "749",
+                "value" : [ " ", "properly includes", " " ]
               }, {
-                "r" : "602",
+                "r" : "746",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "744",
+                  "value" : [ "Interval[", "1234L", ", ", "5678L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "605",
+          "type" : "ProperIncludes",
+          "localId" : "749",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "606",
+            "localId" : "750",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "607",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "751",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "608",
+            "localId" : "752",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "609",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "753",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "599",
+            "localId" : "740",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "600",
+              "localId" : "742",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "601",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "743",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "591",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "738",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "741",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "739",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "746",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "747",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "592",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "748",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "587",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "744",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "745",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5678",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "763",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndNotProperlyIncludesLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "763",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndNotProperlyIncludesLongIvl", ": " ]
+            }, {
+              "r" : "776",
+              "s" : [ {
+                "r" : "766",
+                "s" : [ {
+                  "r" : "764",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "776",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "772",
+                "s" : [ {
+                  "r" : "770",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "776",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "777",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "778",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "779",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "780",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "766",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "768",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "769",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "764",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "597",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "767",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "765",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "772",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "774",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "598",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "775",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "593",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "770",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "773",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "771",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "790",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayProperlyIncludeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "790",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMayProperlyIncludeLongIvl", ": " ]
+            }, {
+              "r" : "802",
+              "s" : [ {
+                "r" : "793",
+                "s" : [ {
+                  "r" : "791",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "802",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "799",
+                "s" : [ {
+                  "r" : "797",
+                  "value" : [ "Interval[", "0L", ", ", "0L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "802",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "803",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "804",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "805",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "806",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "793",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "795",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "796",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "791",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "794",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "792",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "602",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "799",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "603",
+              "localId" : "800",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "604",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "801",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "797",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "798",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "619",
+        "localId" : "816",
         "name" : "PrecisionDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -46790,25 +48806,25 @@ module.exports['IncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "619",
+            "r" : "816",
             "s" : [ {
               "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
             }, {
-              "r" : "668",
+              "r" : "865",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "636",
+                "r" : "833",
                 "s" : [ {
-                  "r" : "620",
+                  "r" : "817",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "660",
+                "r" : "857",
                 "s" : [ {
-                  "r" : "644",
+                  "r" : "841",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
               }, {
@@ -46819,76 +48835,76 @@ module.exports['IncludedIn'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "671",
+          "localId" : "868",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "672",
+            "localId" : "869",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "668",
+          "localId" : "865",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "669",
+            "localId" : "866",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "670",
+              "localId" : "867",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "636",
+            "localId" : "833",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "637",
+              "localId" : "834",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "638",
+              "localId" : "835",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "639",
+              "localId" : "836",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "640",
+              "localId" : "837",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "641",
+              "localId" : "838",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "642",
+              "localId" : "839",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "643",
+              "localId" : "840",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "620",
+              "localId" : "817",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -46896,7 +48912,7 @@ module.exports['IncludedIn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "621",
+              "localId" : "818",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -46904,7 +48920,7 @@ module.exports['IncludedIn'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "622",
+              "localId" : "819",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -46912,7 +48928,7 @@ module.exports['IncludedIn'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "623",
+              "localId" : "820",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -46920,7 +48936,7 @@ module.exports['IncludedIn'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "624",
+              "localId" : "821",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "34",
@@ -46928,7 +48944,7 @@ module.exports['IncludedIn'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "625",
+              "localId" : "822",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "56",
@@ -46936,7 +48952,7 @@ module.exports['IncludedIn'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "626",
+              "localId" : "823",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "789",
@@ -46945,48 +48961,48 @@ module.exports['IncludedIn'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "660",
+            "localId" : "857",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "661",
+              "localId" : "858",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "662",
+              "localId" : "859",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "663",
+              "localId" : "860",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "664",
+              "localId" : "861",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "665",
+              "localId" : "862",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "666",
+              "localId" : "863",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "667",
+              "localId" : "864",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "644",
+              "localId" : "841",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -46994,7 +49010,7 @@ module.exports['IncludedIn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "645",
+              "localId" : "842",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -47002,7 +49018,7 @@ module.exports['IncludedIn'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "646",
+              "localId" : "843",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -47010,7 +49026,7 @@ module.exports['IncludedIn'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "647",
+              "localId" : "844",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -47018,7 +49034,7 @@ module.exports['IncludedIn'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "648",
+              "localId" : "845",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -47026,7 +49042,7 @@ module.exports['IncludedIn'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "649",
+              "localId" : "846",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "45",
@@ -47034,7 +49050,7 @@ module.exports['IncludedIn'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "650",
+              "localId" : "847",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "678",
@@ -47043,141 +49059,157 @@ module.exports['IncludedIn'] = {
           }
         }
       }, {
-        "localId" : "675",
+        "localId" : "872",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayOfIvlLowEdge",
+        "name" : "ProperlyIncludesDayOfIvlLowEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "675",
+            "r" : "872",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayOfIvlLowEdge", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlLowEdge", ": " ]
             }, {
-              "r" : "730",
+              "r" : "927",
               "s" : [ {
-                "r" : "724",
+                "r" : "873",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "927",
+                "value" : [ " ", "properly includes day of", " " ]
+              }, {
+                "r" : "924",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "692",
+                  "r" : "892",
                   "s" : [ {
-                    "r" : "676",
+                    "r" : "876",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "716",
+                  "r" : "916",
                   "s" : [ {
-                    "r" : "700",
+                    "r" : "900",
                     "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
-              }, {
-                "r" : "730",
-                "value" : [ " ", "included in day of", " " ]
-              }, {
-                "r" : "727",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "730",
+          "type" : "ProperIncludes",
+          "localId" : "927",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "731",
+            "localId" : "928",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "732",
+              "localId" : "929",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "733",
+            "localId" : "930",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "734",
+              "localId" : "931",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "873",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "874",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "875",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "724",
+            "localId" : "924",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "725",
+              "localId" : "925",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "726",
+                "localId" : "926",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "692",
+              "localId" : "892",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "693",
+                "localId" : "893",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "694",
+                "localId" : "894",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "695",
+                "localId" : "895",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "696",
+                "localId" : "896",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "697",
+                "localId" : "897",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "698",
+                "localId" : "898",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "699",
+                "localId" : "899",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "676",
+                "localId" : "876",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -47185,7 +49217,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "677",
+                "localId" : "877",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -47193,7 +49225,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "678",
+                "localId" : "878",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -47201,7 +49233,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "679",
+                "localId" : "879",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47209,7 +49241,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "680",
+                "localId" : "880",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47217,7 +49249,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "681",
+                "localId" : "881",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47225,7 +49257,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "682",
+                "localId" : "882",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47234,48 +49266,48 @@ module.exports['IncludedIn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "716",
+              "localId" : "916",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "717",
+                "localId" : "917",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "718",
+                "localId" : "918",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "719",
+                "localId" : "919",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "720",
+                "localId" : "920",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "721",
+                "localId" : "921",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "722",
+                "localId" : "922",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "723",
+                "localId" : "923",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "700",
+                "localId" : "900",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -47283,7 +49315,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "701",
+                "localId" : "901",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -47291,7 +49323,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "702",
+                "localId" : "902",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -47299,7 +49331,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "703",
+                "localId" : "903",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47307,7 +49339,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "704",
+                "localId" : "904",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47315,7 +49347,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "705",
+                "localId" : "905",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47323,167 +49355,167 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "706",
+                "localId" : "906",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "727",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "728",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "729",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "744",
+        "localId" : "941",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayOfIvlHighEdge",
+        "name" : "ProperlyIncludesDayOfIvlHighEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "744",
+            "r" : "941",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayOfIvlHighEdge", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlHighEdge", ": " ]
             }, {
-              "r" : "799",
+              "r" : "996",
               "s" : [ {
-                "r" : "793",
+                "r" : "942",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "996",
+                "value" : [ " ", "properly includes day of", " " ]
+              }, {
+                "r" : "993",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "761",
+                  "r" : "961",
                   "s" : [ {
-                    "r" : "745",
+                    "r" : "945",
                     "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "785",
+                  "r" : "985",
                   "s" : [ {
-                    "r" : "769",
+                    "r" : "969",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
-              }, {
-                "r" : "799",
-                "value" : [ " ", "included in day of", " " ]
-              }, {
-                "r" : "796",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "799",
+          "type" : "ProperIncludes",
+          "localId" : "996",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "800",
+            "localId" : "997",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "801",
+              "localId" : "998",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "802",
+            "localId" : "999",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "803",
+              "localId" : "1000",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "793",
+            "type" : "ExpressionRef",
+            "localId" : "942",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "943",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "944",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "993",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "794",
+              "localId" : "994",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "795",
+                "localId" : "995",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "761",
+              "localId" : "961",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "762",
+                "localId" : "962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "763",
+                "localId" : "963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "764",
+                "localId" : "964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "765",
+                "localId" : "965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
+                "localId" : "966",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "767",
+                "localId" : "967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "768",
+                "localId" : "968",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "745",
+                "localId" : "945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -47491,7 +49523,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "746",
+                "localId" : "946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -47499,7 +49531,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "747",
+                "localId" : "947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -47507,7 +49539,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "748",
+                "localId" : "948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47515,7 +49547,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "749",
+                "localId" : "949",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47523,7 +49555,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "750",
+                "localId" : "950",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47531,7 +49563,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "751",
+                "localId" : "951",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47540,48 +49572,48 @@ module.exports['IncludedIn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "785",
+              "localId" : "985",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "786",
+                "localId" : "986",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "787",
+                "localId" : "987",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "788",
+                "localId" : "988",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "789",
+                "localId" : "989",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "790",
+                "localId" : "990",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "791",
+                "localId" : "991",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "792",
+                "localId" : "992",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "769",
+                "localId" : "969",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -47589,7 +49621,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "770",
+                "localId" : "970",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -47597,7 +49629,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "771",
+                "localId" : "971",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -47605,7 +49637,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "772",
+                "localId" : "972",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "23",
@@ -47613,7 +49645,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "773",
+                "localId" : "973",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "59",
@@ -47621,7 +49653,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "774",
+                "localId" : "974",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "59",
@@ -47629,167 +49661,167 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "775",
+                "localId" : "975",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "999",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "796",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "797",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "798",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "813",
+        "localId" : "1010",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesDayOfIvlLowEdge",
+        "name" : "ProperlyIncludesDayOfIvlNearEdges",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "813",
+            "r" : "1010",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesDayOfIvlLowEdge", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlNearEdges", ": " ]
             }, {
-              "r" : "868",
+              "r" : "1065",
               "s" : [ {
-                "r" : "862",
+                "r" : "1011",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "1065",
+                "value" : [ " ", "properly includes day of", " " ]
+              }, {
+                "r" : "1062",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "830",
+                  "r" : "1030",
                   "s" : [ {
-                    "r" : "814",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1014",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "854",
+                  "r" : "1054",
                   "s" : [ {
-                    "r" : "838",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1038",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "r" : "868",
-                "value" : [ " ", "included in day of", " " ]
-              }, {
-                "r" : "865",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "868",
+          "type" : "ProperIncludes",
+          "localId" : "1065",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "869",
+            "localId" : "1066",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "870",
+              "localId" : "1067",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "871",
+            "localId" : "1068",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "872",
+              "localId" : "1069",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1011",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1012",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1013",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "862",
+            "localId" : "1062",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "863",
+              "localId" : "1063",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "864",
+                "localId" : "1064",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "830",
+              "localId" : "1030",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "831",
+                "localId" : "1031",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "832",
+                "localId" : "1032",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "833",
+                "localId" : "1033",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "834",
+                "localId" : "1034",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "835",
+                "localId" : "1035",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "836",
+                "localId" : "1036",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "837",
+                "localId" : "1037",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "814",
+                "localId" : "1014",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -47797,7 +49829,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "815",
+                "localId" : "1015",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -47805,15 +49837,15 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "816",
+                "localId" : "1016",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "817",
+                "localId" : "1017",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47821,7 +49853,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "818",
+                "localId" : "1018",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47829,7 +49861,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "819",
+                "localId" : "1019",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47837,7 +49869,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "820",
+                "localId" : "1020",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -47846,48 +49878,48 @@ module.exports['IncludedIn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "854",
+              "localId" : "1054",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "855",
+                "localId" : "1055",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "856",
+                "localId" : "1056",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "857",
+                "localId" : "1057",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "858",
+                "localId" : "1058",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "859",
+                "localId" : "1059",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "860",
+                "localId" : "1060",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "861",
+                "localId" : "1061",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "838",
+                "localId" : "1038",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -47895,15 +49927,15 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "839",
+                "localId" : "1039",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "840",
+                "localId" : "1040",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -47911,191 +49943,191 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "841",
+                "localId" : "1041",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "23",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "842",
+                "localId" : "1042",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "843",
+                "localId" : "1043",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "844",
+                "localId" : "1044",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "865",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "866",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "867",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "value" : "999",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "882",
+        "localId" : "1079",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesDayOfIvlHighEdge",
+        "name" : "NotProperlyIncludesDayOfIvlSameEdges",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "882",
+            "r" : "1079",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesDayOfIvlHighEdge", ": " ]
+              "value" : [ "", "define ", "NotProperlyIncludesDayOfIvlSameEdges", ": " ]
             }, {
-              "r" : "937",
+              "r" : "1134",
               "s" : [ {
-                "r" : "931",
+                "r" : "1080",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "1134",
+                "value" : [ " ", "properly includes day of", " " ]
+              }, {
+                "r" : "1131",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "899",
+                  "r" : "1099",
                   "s" : [ {
-                    "r" : "883",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1083",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "923",
+                  "r" : "1123",
                   "s" : [ {
-                    "r" : "907",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1107",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
-              }, {
-                "r" : "937",
-                "value" : [ " ", "included in day of", " " ]
-              }, {
-                "r" : "934",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "937",
+          "type" : "ProperIncludes",
+          "localId" : "1134",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "938",
+            "localId" : "1135",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "939",
+              "localId" : "1136",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "940",
+            "localId" : "1137",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "941",
+              "localId" : "1138",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1080",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1081",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1082",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "931",
+            "localId" : "1131",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "932",
+              "localId" : "1132",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "933",
+                "localId" : "1133",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "899",
+              "localId" : "1099",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "900",
+                "localId" : "1100",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "901",
+                "localId" : "1101",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "902",
+                "localId" : "1102",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "903",
+                "localId" : "1103",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "904",
+                "localId" : "1104",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "905",
+                "localId" : "1105",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "906",
+                "localId" : "1106",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "883",
+                "localId" : "1083",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -48103,23 +50135,23 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "884",
+                "localId" : "1084",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "885",
+                "localId" : "1085",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "886",
+                "localId" : "1086",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -48127,7 +50159,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "887",
+                "localId" : "1087",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -48135,7 +50167,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "888",
+                "localId" : "1088",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -48143,7 +50175,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "889",
+                "localId" : "1089",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -48152,48 +50184,48 @@ module.exports['IncludedIn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "923",
+              "localId" : "1123",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "924",
+                "localId" : "1124",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "925",
+                "localId" : "1125",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "926",
+                "localId" : "1126",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "927",
+                "localId" : "1127",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "928",
+                "localId" : "1128",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "929",
+                "localId" : "1129",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "930",
+                "localId" : "1130",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "907",
+                "localId" : "1107",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -48201,7 +50233,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "908",
+                "localId" : "1108",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -48209,15 +50241,15 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "909",
+                "localId" : "1109",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "910",
+                "localId" : "1110",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -48225,7 +50257,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "911",
+                "localId" : "1111",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -48233,7 +50265,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "912",
+                "localId" : "1112",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -48241,147 +50273,142 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "913",
+                "localId" : "1113",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "934",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "935",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "936",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "951",
+        "localId" : "1148",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayOfIvlImpreciseLowEdge",
+        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseLow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "951",
+            "r" : "1148",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayOfIvlImpreciseLowEdge", ": " ]
+              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseLow", ": " ]
             }, {
-              "r" : "982",
+              "r" : "1173",
               "s" : [ {
-                "r" : "976",
+                "r" : "1149",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "1173",
+                "value" : [ " ", "properly includes day of", " " ]
+              }, {
+                "r" : "1170",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "960",
+                  "r" : "1158",
                   "s" : [ {
-                    "r" : "952",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
+                    "r" : "1152",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "972",
+                  "r" : "1167",
                   "s" : [ {
-                    "r" : "964",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ")" ]
+                    "r" : "1161",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
-              }, {
-                "r" : "982",
-                "value" : [ " ", "included in day of", " " ]
-              }, {
-                "r" : "979",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "982",
+          "type" : "ProperIncludes",
+          "localId" : "1173",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "983",
+            "localId" : "1174",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "984",
+              "localId" : "1175",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "985",
+            "localId" : "1176",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "986",
+              "localId" : "1177",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1149",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1150",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1151",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "976",
+            "localId" : "1170",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "977",
+              "localId" : "1171",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "978",
+                "localId" : "1172",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "960",
+              "localId" : "1158",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "961",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "962",
+                "localId" : "1159",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "963",
+                "localId" : "1160",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "952",
+                "localId" : "1152",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -48389,45 +50416,32 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "953",
+                "localId" : "1153",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
                 "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "954",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "972",
+              "localId" : "1167",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "973",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "974",
+                "localId" : "1168",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "975",
+                "localId" : "1169",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "964",
+                "localId" : "1161",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -48435,313 +50449,231 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "965",
+                "localId" : "1162",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
                 "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "966",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "979",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "980",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "981",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "996",
+        "localId" : "1187",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayInInterval",
+        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "996",
+            "r" : "1187",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayInInterval", ": " ]
+              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseHigh", ": " ]
             }, {
-              "r" : "1013",
+              "r" : "1212",
               "s" : [ {
-                "r" : "1005",
+                "r" : "1188",
                 "s" : [ {
-                  "r" : "997",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ")" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1013",
-                "value" : [ " ", "included in day of", " " ]
+                "r" : "1212",
+                "value" : [ " ", "properly includes day of", " " ]
               }, {
-                "r" : "1009",
+                "r" : "1209",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1197",
+                  "s" : [ {
+                    "r" : "1191",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1206",
+                  "s" : [ {
+                    "r" : "1200",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "In",
-          "localId" : "1013",
+          "type" : "ProperIncludes",
+          "localId" : "1212",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1014",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1015",
+            "localId" : "1213",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1016",
+              "localId" : "1214",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          } ],
-          "operand" : [ {
-            "type" : "DateTime",
-            "localId" : "1005",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1215",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1006",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1007",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1008",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "997",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "998",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "999",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "localId" : "1216",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          }, {
+          } ],
+          "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1009",
+            "localId" : "1188",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1010",
+              "localId" : "1189",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1011",
+                "localId" : "1190",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
-          } ]
-        }
-      }, {
-        "localId" : "1019",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DoesNotIncludeDayInInterval",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1019",
-            "s" : [ {
-              "value" : [ "", "define ", "DoesNotIncludeDayInInterval", ": " ]
-            }, {
-              "r" : "1036",
-              "s" : [ {
-                "r" : "1028",
-                "s" : [ {
-                  "r" : "1020",
-                  "value" : [ "DateTime", "(", "2014", ", ", "3", ", ", "3", ")" ]
-                } ]
-              }, {
-                "r" : "1036",
-                "value" : [ " ", "included in day of", " " ]
-              }, {
-                "r" : "1032",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "In",
-          "localId" : "1036",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1037",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1038",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1039",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "DateTime",
-            "localId" : "1028",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1029",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1030",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1031",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1020",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2014",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1021",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1022",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1032",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1209",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1033",
+              "localId" : "1210",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1034",
+                "localId" : "1211",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1197",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1198",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1199",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1191",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1192",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1206",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1207",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1208",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1200",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1201",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "1042",
+        "localId" : "1226",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "QuantityIncludedInterval",
+        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1042",
+            "r" : "1226",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIncludedInterval", ": " ]
+              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh", ": " ]
             }, {
-              "r" : "1050",
+              "r" : "1251",
               "s" : [ {
-                "r" : "1043",
+                "r" : "1227",
                 "s" : [ {
-                  "value" : [ "5 ", "'mg'" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1050",
-                "value" : [ " ", "included in", " " ]
+                "r" : "1251",
+                "value" : [ " ", "properly includes day of", " " ]
               }, {
-                "r" : "1046",
+                "r" : "1248",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1044",
+                  "r" : "1236",
                   "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
+                    "r" : "1230",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1045",
+                  "r" : "1245",
                   "s" : [ {
-                    "value" : [ "6 ", "'mg'" ]
+                    "r" : "1239",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -48751,106 +50683,173 @@ module.exports['IncludedIn'] = {
           }
         } ],
         "expression" : {
-          "type" : "In",
-          "localId" : "1050",
+          "type" : "ProperIncludes",
+          "localId" : "1251",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1051",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1252",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1253",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1052",
+            "localId" : "1254",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1053",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1255",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Quantity",
-            "localId" : "1043",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 5,
-            "unit" : "mg",
-            "annotation" : [ ]
+            "type" : "ExpressionRef",
+            "localId" : "1227",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1228",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1229",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
           }, {
             "type" : "Interval",
-            "localId" : "1046",
+            "localId" : "1248",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1047",
+              "localId" : "1249",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1048",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1250",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
-              "localId" : "1044",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "mg",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1237",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1238",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1230",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1231",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Quantity",
-              "localId" : "1045",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 6,
-              "unit" : "mg",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1246",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1247",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1239",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1240",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "1056",
+        "localId" : "1265",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "QuantityNotIncludedInterval",
+        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1056",
+            "r" : "1265",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityNotIncludedInterval", ": " ]
+              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding", ": " ]
             }, {
-              "r" : "1064",
+              "r" : "1284",
               "s" : [ {
-                "r" : "1057",
+                "r" : "1266",
                 "s" : [ {
-                  "value" : [ "50 ", "'mg'" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1064",
-                "value" : [ " ", "included in", " " ]
+                "r" : "1284",
+                "value" : [ " ", "properly includes day of", " " ]
               }, {
-                "r" : "1060",
+                "r" : "1281",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1058",
+                  "r" : "1273",
                   "s" : [ {
-                    "value" : [ "4 ", "'mg'" ]
+                    "r" : "1269",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1059",
+                  "r" : "1279",
                   "s" : [ {
-                    "value" : [ "6 ", "'mg'" ]
+                    "r" : "1275",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -48860,111 +50859,294 @@ module.exports['IncludedIn'] = {
           }
         } ],
         "expression" : {
-          "type" : "In",
-          "localId" : "1064",
+          "type" : "ProperIncludes",
+          "localId" : "1284",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1065",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1285",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1286",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1066",
+            "localId" : "1287",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1067",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1288",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Quantity",
-            "localId" : "1057",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 50,
-            "unit" : "mg",
-            "annotation" : [ ]
+            "type" : "ExpressionRef",
+            "localId" : "1266",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1267",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1268",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
           }, {
             "type" : "Interval",
-            "localId" : "1060",
+            "localId" : "1281",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1061",
+              "localId" : "1282",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1062",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1283",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
-              "localId" : "1058",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4,
-              "unit" : "mg",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1273",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1274",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1269",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Quantity",
-              "localId" : "1059",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 6,
-              "unit" : "mg",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1279",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1280",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1275",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* IncludedIn
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define IncludesIntIvl: Interval[1, 4] included in Interval[1, 5]
+define NotIncludesIntIvl: Interval[1, 4] included in Interval(1, 5]
+define IncludesLongIvl: Interval[1L, 4L] included in Interval[1L, 5L]
+define NotIncludesLongIvl: Interval[1L, 4L] included in Interval(1L, 5L]
+define IncludesRealIvl: Interval[2.34, 2.56] included in Interval[1.234, 3.456]
+define NotIncludesRealIvl: Interval[1.23, 2.56] included in Interval[1.234, 3.456]
+define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
+define IncludesDateIvl: Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) included in DateIvl
+define NotIncludesDateIvl: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)] included in DateIvl
+define IncludesImpreciseDateIvl: Interval[DateTime(2012, 4), DateTime(2012, 6)] included in DateIvl
+define NotIncludesImpreciseDateIvl: Interval[DateTime(2012, 4), DateTime(2012, 9)] included in DateIvl
+define MayIncludeImpreciseDateIvl: Interval[DateTime(2012), DateTime(2012)] included in DateIvl
+define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
+define IncludesDayOfIvlLowEdge: Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) included in day of PrecisionDateIvl
+define IncludesDayOfIvlHighEdge: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 2, 23, 59, 59, 999)) included in day of PrecisionDateIvl
+define NotIncludesDayOfIvlLowEdge: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] included in day of PrecisionDateIvl
+define NotIncludesDayOfIvlHighEdge: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 3, 0, 0, 0, 0)] included in day of PrecisionDateIvl
+define IncludesDayOfIvlImpreciseLowEdge: Interval[DateTime(2012, 3, 2), DateTime(2012, 6, 1)] included in day of PrecisionDateIvl
+define IncludesDayInInterval: DateTime(2012, 3, 3) included in day of PrecisionDateIvl
+define DoesNotIncludeDayInInterval: DateTime(2014, 3, 3) included in day of PrecisionDateIvl
+define QuantityIncludedInterval: 5 'mg' included in Interval[4 'mg', 6 'mg']
+define QuantityNotIncludedInterval: 50 'mg' included in Interval[4 'mg', 6 'mg']
+define IncludesDayOfIvlImpreciseHighEdge: Interval[DateTime(2012, 6, 1), DateTime(2012, 9, 2)] included in day of PrecisionDateIvl
+define IncludesDayOfIvlVeryImpreciseMiddle: Interval[DateTime(2012, 5), DateTime(2012, 6)] included in day of PrecisionDateIvl
+define NotIncludesDayOfIvlVeryImpreciseLow: Interval[DateTime(2012, 2), DateTime(2012, 6)] included in day of PrecisionDateIvl
+define NotIncludesDayOfIvlVeryImpreciseHigh: Interval[DateTime(2012, 6), DateTime(2012, 10)] included in day of PrecisionDateIvl
+define MayIncludeDayOfIvlVeryImpreciseLow: Interval[DateTime(2012, 3), DateTime(2012, 6)] included in day of PrecisionDateIvl
+define MayIncludeDayOfIvlVeryImpreciseHigh: Interval[DateTime(2012, 6), DateTime(2012, 9)] included in day of PrecisionDateIvl
+define MayIncludeDayOfIvlVeryImpreciseSurrounding: Interval[DateTime(2012), DateTime(2012)] included in day of PrecisionDateIvl
+define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
+define ImpreciseIncludesDateIvl: Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) included in ImpDateIvl
+define ImpreciseNotIncludesDateIvl: Interval[DateTime(2012, 2, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) included in ImpDateIvl
+define ImpreciseMayIncludeDateIvl: Interval[DateTime(2012, 3, 15, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) included in ImpDateIvl
+define NegInfBegIncludedInIntIvl: Interval[null, 5] included in Interval[null, 100]
+define NegInfBegNotIncludedInIntIvl: Interval[null, 5] included in Interval[-100, 100]
+define UnknownBegIncludedInIntIvl: Interval(null, 5] included in Interval[null, 100]
+define UnknownBegMayBeIncludedInIntIvl: Interval(null, 5] included in Interval[-100, 100]
+define UnknownBegNotIncludedInIntIvl: Interval(null, 5] included in Interval[-100, 0]
+define PosInfEndIncludedInIntIvl: Interval[0, null] included in Interval[-100, null]
+define PosInfEndNotIncludedInIntIvl: Interval[0, null] included in Interval[-100, 100]
+define UnknownEndIncludedInIntIvl: Interval[0, null) included in Interval[-100, null]
+define UnknownEndMayBeIncludedInIntIvl: Interval[0, null) included in Interval[-100, 100]
+define UnknownEndNotIncludedInIntIvl: Interval[0, null) included in Interval[100, 200]
+define NegInfBegIncludedInLongIvl: Interval[null, 5L] included in Interval[null, 100L]
+define NegInfBegNotIncludedInLongIvl: Interval[null, 5L] included in Interval[-100L, 100L]
+define UnknownBegIncludedInLongIvl: Interval(null, 5L] included in Interval[null, 100L]
+define UnknownBegMayBeIncludedInLongIvl: Interval(null, 5L] included in Interval[-100L, 100L]
+define UnknownBegNotIncludedInLongIvl: Interval(null, 5L] included in Interval[-100L, 0L]
+define PosInfEndIncludedInLongIvl: Interval[0L, null] included in Interval[-100L, null]
+define PosInfEndNotIncludedInLongIvl: Interval[0L, null] included in Interval[-100L, 100L]
+define UnknownEndIncludedInLongIvl: Interval[0L, null) included in Interval[-100L, null]
+define UnknownEndMayBeIncludedInLongIvl: Interval[0L, null) included in Interval[-100L, 100L]
+define UnknownEndNotIncludedInLongIvl: Interval[0L, null) included in Interval[100L, 200L]
+define NegInfBegIncludedInDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[null, DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define NegInfBegNotIncludedInDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define UnknownBegIncludedInDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[null, DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define UnknownBegMayBeIncludedInDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define UnknownBegNotIncludedInDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) included in Interval[DateTime(1, 1, 1, 0, 0, 0, 0), DateTime(2000, 1, 1, 0, 0, 0, 0)]
+define PosInfEndIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), null]
+define PosInfEndNotIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define UnknownEndIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), null]
+define UnknownEndMayBeIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define UnknownEndNotIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) included in Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
+*/
+
+module.exports['IncludedIn'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "2949",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "1070",
+        "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayOfIvlImpreciseHighEdge",
+        "name" : "IncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1070",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayOfIvlImpreciseHighEdge", ": " ]
+              "value" : [ "", "define ", "IncludesIntIvl", ": " ]
             }, {
-              "r" : "1101",
+              "r" : "225",
               "s" : [ {
-                "r" : "1095",
+                "r" : "217",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1079",
-                  "s" : [ {
-                    "r" : "1071",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1091",
-                  "s" : [ {
-                    "r" : "1083",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "215",
+                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
                 } ]
               }, {
-                "r" : "1101",
-                "value" : [ " ", "included in day of", " " ]
+                "r" : "225",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1098",
+                "r" : "222",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "220",
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
@@ -48972,201 +51154,127 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1101",
+          "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1102",
+            "localId" : "226",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1103",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "227",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1104",
+            "localId" : "228",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1105",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1095",
+            "localId" : "217",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1096",
+              "localId" : "218",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1097",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "219",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1079",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1080",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1081",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1082",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1071",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1072",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1073",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1091",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1092",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1093",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1094",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1083",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1084",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1085",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1098",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "222",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1099",
+              "localId" : "223",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1100",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1115",
+        "localId" : "239",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IncludesDayOfIvlVeryImpreciseMiddle",
+        "name" : "NotIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1115",
+            "r" : "239",
             "s" : [ {
-              "value" : [ "", "define ", "IncludesDayOfIvlVeryImpreciseMiddle", ": " ]
+              "value" : [ "", "define ", "NotIncludesIntIvl", ": " ]
             }, {
-              "r" : "1140",
+              "r" : "250",
               "s" : [ {
-                "r" : "1134",
+                "r" : "242",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1122",
-                  "s" : [ {
-                    "r" : "1116",
-                    "value" : [ "DateTime", "(", "2012", ", ", "5", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1131",
-                  "s" : [ {
-                    "r" : "1125",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "240",
+                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
                 } ]
               }, {
-                "r" : "1140",
-                "value" : [ " ", "included in day of", " " ]
+                "r" : "250",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1137",
+                "r" : "247",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "245",
+                  "value" : [ "Interval(", "1", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
@@ -49174,175 +51282,127 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1140",
+          "localId" : "250",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1141",
+            "localId" : "251",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1142",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "252",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1143",
+            "localId" : "253",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1144",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "254",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1134",
+            "localId" : "242",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1135",
+              "localId" : "243",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1136",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "244",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1122",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1123",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1124",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1116",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1117",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1131",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1132",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1133",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1125",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1126",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1137",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "247",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1138",
+              "localId" : "248",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1139",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "249",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "246",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1154",
+        "localId" : "264",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesDayOfIvlVeryImpreciseLow",
+        "name" : "IncludesLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1154",
+            "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesDayOfIvlVeryImpreciseLow", ": " ]
+              "value" : [ "", "define ", "IncludesLongIvl", ": " ]
             }, {
-              "r" : "1179",
+              "r" : "275",
               "s" : [ {
-                "r" : "1173",
+                "r" : "267",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1161",
-                  "s" : [ {
-                    "r" : "1155",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1170",
-                  "s" : [ {
-                    "r" : "1164",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "265",
+                  "value" : [ "Interval[", "1L", ", ", "4L", "]" ]
                 } ]
               }, {
-                "r" : "1179",
-                "value" : [ " ", "included in day of", " " ]
+                "r" : "275",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1176",
+                "r" : "272",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "270",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -49350,175 +51410,127 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1179",
+          "localId" : "275",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1180",
+            "localId" : "276",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1181",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "277",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1182",
+            "localId" : "278",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1183",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "279",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1173",
+            "localId" : "267",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1174",
+              "localId" : "268",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1175",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "269",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1161",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1162",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1163",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1155",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1156",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "265",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1170",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1171",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1172",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1164",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1165",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1176",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "272",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1177",
+              "localId" : "273",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1178",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "274",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "271",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1193",
+        "localId" : "289",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotIncludesDayOfIvlVeryImpreciseHigh",
+        "name" : "NotIncludesLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1193",
+            "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "NotIncludesDayOfIvlVeryImpreciseHigh", ": " ]
+              "value" : [ "", "define ", "NotIncludesLongIvl", ": " ]
             }, {
-              "r" : "1218",
+              "r" : "300",
               "s" : [ {
-                "r" : "1212",
+                "r" : "292",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1200",
-                  "s" : [ {
-                    "r" : "1194",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1209",
-                  "s" : [ {
-                    "r" : "1203",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "290",
+                  "value" : [ "Interval[", "1L", ", ", "4L", "]" ]
                 } ]
               }, {
-                "r" : "1218",
-                "value" : [ " ", "included in day of", " " ]
+                "r" : "300",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1215",
+                "r" : "297",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "295",
+                  "value" : [ "Interval(", "1L", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -49526,175 +51538,127 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1218",
+          "localId" : "300",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1219",
+            "localId" : "301",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1220",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "302",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1221",
+            "localId" : "303",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1222",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "304",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1212",
+            "localId" : "292",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1213",
+              "localId" : "293",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1214",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "294",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1200",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1201",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1202",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1194",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1195",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "290",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1209",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1210",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1211",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1203",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1204",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1215",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "297",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1216",
+              "localId" : "298",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1217",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "299",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "295",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1232",
+        "localId" : "314",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayIncludeDayOfIvlVeryImpreciseLow",
+        "name" : "IncludesRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1232",
+            "r" : "314",
             "s" : [ {
-              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseLow", ": " ]
+              "value" : [ "", "define ", "IncludesRealIvl", ": " ]
             }, {
-              "r" : "1257",
+              "r" : "325",
               "s" : [ {
-                "r" : "1251",
+                "r" : "317",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1239",
-                  "s" : [ {
-                    "r" : "1233",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1248",
-                  "s" : [ {
-                    "r" : "1242",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "315",
+                  "value" : [ "Interval[", "2.34", ", ", "2.56", "]" ]
                 } ]
               }, {
-                "r" : "1257",
-                "value" : [ " ", "included in day of", " " ]
+                "r" : "325",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1254",
+                "r" : "322",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "320",
+                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
                 } ]
               } ]
             } ]
@@ -49702,175 +51666,127 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1257",
+          "localId" : "325",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1258",
+            "localId" : "326",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1259",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "327",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1260",
+            "localId" : "328",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1261",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "329",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1251",
+            "localId" : "317",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1252",
+              "localId" : "318",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1253",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "319",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1240",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1241",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1233",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1234",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "315",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.34",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1248",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1249",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1250",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1242",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1243",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "316",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.56",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1254",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "322",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1255",
+              "localId" : "323",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1256",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "324",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "320",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "321",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.456",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1271",
+        "localId" : "339",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayIncludeDayOfIvlVeryImpreciseHigh",
+        "name" : "NotIncludesRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1271",
+            "r" : "339",
             "s" : [ {
-              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseHigh", ": " ]
+              "value" : [ "", "define ", "NotIncludesRealIvl", ": " ]
             }, {
-              "r" : "1296",
+              "r" : "350",
               "s" : [ {
-                "r" : "1290",
+                "r" : "342",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1278",
-                  "s" : [ {
-                    "r" : "1272",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1287",
-                  "s" : [ {
-                    "r" : "1281",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "340",
+                  "value" : [ "Interval[", "1.23", ", ", "2.56", "]" ]
                 } ]
               }, {
-                "r" : "1296",
-                "value" : [ " ", "included in day of", " " ]
+                "r" : "350",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1293",
+                "r" : "347",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "345",
+                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
                 } ]
               } ]
             } ]
@@ -49878,365 +51794,206 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1296",
+          "localId" : "350",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1297",
+            "localId" : "351",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1298",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "352",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1299",
+            "localId" : "353",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1300",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "354",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1290",
+            "localId" : "342",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1291",
+              "localId" : "343",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1292",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "344",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1278",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1279",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1280",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1272",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1273",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "340",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1287",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1288",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1289",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1281",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1282",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1293",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1294",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1295",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1310",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayIncludeDayOfIvlVeryImpreciseSurrounding",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1310",
-            "s" : [ {
-              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseSurrounding", ": " ]
-            }, {
-              "r" : "1329",
-              "s" : [ {
-                "r" : "1323",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1315",
-                  "s" : [ {
-                    "r" : "1311",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1321",
-                  "s" : [ {
-                    "r" : "1317",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "r" : "1329",
-                "value" : [ " ", "included in day of", " " ]
-              }, {
-                "r" : "1326",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "1329",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1330",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1331",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.56",
               "annotation" : [ ]
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1332",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1333",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1323",
+            "localId" : "347",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1324",
+              "localId" : "348",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1325",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "349",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1315",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1316",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1311",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1321",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1322",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1317",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1326",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1327",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1328",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.456",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1343",
-        "name" : "ImpDateIvl",
+        "localId" : "364",
+        "name" : "DateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1343",
+            "r" : "364",
             "s" : [ {
-              "value" : [ "", "define ", "ImpDateIvl", ": " ]
+              "value" : [ "", "define ", "DateIvl", ": " ]
             }, {
-              "r" : "1362",
+              "r" : "413",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "1350",
+                "r" : "381",
                 "s" : [ {
-                  "r" : "1344",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  "r" : "365",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "1359",
+                "r" : "405",
                 "s" : [ {
-                  "r" : "1353",
-                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
+                  "r" : "389",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "value" : [ "]" ]
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1365",
+          "localId" : "416",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1366",
+            "localId" : "417",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "1362",
+          "localId" : "413",
           "lowClosed" : true,
-          "highClosed" : true,
+          "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1363",
+            "localId" : "414",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1364",
+              "localId" : "415",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "1350",
+            "localId" : "381",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1351",
+              "localId" : "382",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1352",
+              "localId" : "383",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "384",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "385",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "386",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "387",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "388",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1344",
+              "localId" : "365",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -50244,32 +52001,97 @@ module.exports['IncludedIn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1345",
+              "localId" : "366",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "367",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "368",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "369",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "370",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "1359",
+            "localId" : "405",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1360",
+              "localId" : "406",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1361",
+              "localId" : "407",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "408",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "409",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "410",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "411",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "412",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1353",
+              "localId" : "389",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -50277,57 +52099,97 @@ module.exports['IncludedIn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1354",
+              "localId" : "390",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "391",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "392",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "393",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "394",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "1369",
+        "localId" : "420",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseIncludesDateIvl",
+        "name" : "IncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1369",
+            "r" : "420",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "IncludesDateIvl", ": " ]
             }, {
-              "r" : "1424",
+              "r" : "475",
               "s" : [ {
-                "r" : "1418",
+                "r" : "469",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1386",
+                  "r" : "437",
                   "s" : [ {
-                    "r" : "1370",
+                    "r" : "421",
                     "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1410",
+                  "r" : "461",
                   "s" : [ {
-                    "r" : "1394",
+                    "r" : "445",
                     "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "1424",
+                "r" : "475",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1421",
+                "r" : "472",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               } ]
             } ]
@@ -50335,91 +52197,91 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1424",
+          "localId" : "475",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1425",
+            "localId" : "476",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1426",
+              "localId" : "477",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1427",
+            "localId" : "478",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1428",
+              "localId" : "479",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1418",
+            "localId" : "469",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1419",
+              "localId" : "470",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1420",
+                "localId" : "471",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1386",
+              "localId" : "437",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1387",
+                "localId" : "438",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1388",
+                "localId" : "439",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1389",
+                "localId" : "440",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1390",
+                "localId" : "441",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1391",
+                "localId" : "442",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1392",
+                "localId" : "443",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1393",
+                "localId" : "444",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1370",
+                "localId" : "421",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -50427,7 +52289,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1371",
+                "localId" : "422",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -50435,7 +52297,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1372",
+                "localId" : "423",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -50443,7 +52305,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1373",
+                "localId" : "424",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50451,7 +52313,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1374",
+                "localId" : "425",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50459,7 +52321,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1375",
+                "localId" : "426",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50467,7 +52329,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1376",
+                "localId" : "427",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50476,48 +52338,48 @@ module.exports['IncludedIn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1410",
+              "localId" : "461",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1411",
+                "localId" : "462",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1412",
+                "localId" : "463",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1413",
+                "localId" : "464",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1414",
+                "localId" : "465",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1415",
+                "localId" : "466",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1416",
+                "localId" : "467",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1417",
+                "localId" : "468",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1394",
+                "localId" : "445",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -50525,7 +52387,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1395",
+                "localId" : "446",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -50533,7 +52395,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1396",
+                "localId" : "447",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -50541,7 +52403,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1397",
+                "localId" : "448",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50549,7 +52411,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1398",
+                "localId" : "449",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50557,7 +52419,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1399",
+                "localId" : "450",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50565,7 +52427,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1400",
+                "localId" : "451",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50574,16 +52436,16 @@ module.exports['IncludedIn'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "1421",
-            "name" : "ImpDateIvl",
+            "localId" : "472",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1422",
+              "localId" : "473",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1423",
+                "localId" : "474",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -50591,48 +52453,48 @@ module.exports['IncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "1438",
+        "localId" : "489",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseNotIncludesDateIvl",
+        "name" : "NotIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1438",
+            "r" : "489",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseNotIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "NotIncludesDateIvl", ": " ]
             }, {
-              "r" : "1493",
+              "r" : "544",
               "s" : [ {
-                "r" : "1487",
+                "r" : "538",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1455",
+                  "r" : "506",
                   "s" : [ {
-                    "r" : "1439",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "490",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1479",
+                  "r" : "530",
                   "s" : [ {
-                    "r" : "1463",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "514",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "1493",
+                "r" : "544",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1490",
+                "r" : "541",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               } ]
             } ]
@@ -50640,91 +52502,91 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1493",
+          "localId" : "544",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1494",
+            "localId" : "545",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1495",
+              "localId" : "546",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1496",
+            "localId" : "547",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1497",
+              "localId" : "548",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1487",
+            "localId" : "538",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1488",
+              "localId" : "539",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1489",
+                "localId" : "540",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1455",
+              "localId" : "506",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1456",
+                "localId" : "507",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1457",
+                "localId" : "508",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1458",
+                "localId" : "509",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1459",
+                "localId" : "510",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1460",
+                "localId" : "511",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1461",
+                "localId" : "512",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1462",
+                "localId" : "513",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1439",
+                "localId" : "490",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -50732,15 +52594,15 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1440",
+                "localId" : "491",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1441",
+                "localId" : "492",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -50748,7 +52610,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1442",
+                "localId" : "493",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50756,7 +52618,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1443",
+                "localId" : "494",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50764,7 +52626,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1444",
+                "localId" : "495",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50772,7 +52634,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1445",
+                "localId" : "496",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50781,48 +52643,48 @@ module.exports['IncludedIn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1479",
+              "localId" : "530",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1480",
+                "localId" : "531",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1481",
+                "localId" : "532",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1482",
+                "localId" : "533",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1483",
+                "localId" : "534",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1484",
+                "localId" : "535",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1485",
+                "localId" : "536",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1486",
+                "localId" : "537",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1463",
+                "localId" : "514",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -50830,15 +52692,15 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1464",
+                "localId" : "515",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1465",
+                "localId" : "516",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -50846,7 +52708,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1466",
+                "localId" : "517",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50854,7 +52716,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1467",
+                "localId" : "518",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50862,7 +52724,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1468",
+                "localId" : "519",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50870,7 +52732,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1469",
+                "localId" : "520",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -50879,16 +52741,16 @@ module.exports['IncludedIn'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "1490",
-            "name" : "ImpDateIvl",
+            "localId" : "541",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1491",
+              "localId" : "542",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1492",
+                "localId" : "543",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -50896,48 +52758,48 @@ module.exports['IncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "1507",
+        "localId" : "558",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayIncludeDateIvl",
+        "name" : "IncludesImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1507",
+            "r" : "558",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayIncludeDateIvl", ": " ]
+              "value" : [ "", "define ", "IncludesImpreciseDateIvl", ": " ]
             }, {
-              "r" : "1562",
+              "r" : "583",
               "s" : [ {
-                "r" : "1556",
+                "r" : "577",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1524",
+                  "r" : "565",
                   "s" : [ {
-                    "r" : "1508",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "559",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1548",
+                  "r" : "574",
                   "s" : [ {
-                    "r" : "1532",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "568",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "1562",
+                "r" : "583",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1559",
+                "r" : "580",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               } ]
             } ]
@@ -50945,91 +52807,66 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1562",
+          "localId" : "583",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1563",
+            "localId" : "584",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1564",
+              "localId" : "585",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1565",
+            "localId" : "586",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1566",
+              "localId" : "587",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1556",
+            "localId" : "577",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1557",
+              "localId" : "578",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1558",
+                "localId" : "579",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1524",
+              "localId" : "565",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1525",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1526",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1527",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1528",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1529",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1530",
+                "localId" : "566",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1531",
+                "localId" : "567",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1508",
+                "localId" : "559",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -51037,97 +52874,32 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1509",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1510",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1511",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1512",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1513",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1514",
+                "localId" : "560",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "4",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1548",
+              "localId" : "574",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1549",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1550",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1551",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1552",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1553",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1554",
+                "localId" : "575",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1555",
+                "localId" : "576",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1532",
+                "localId" : "568",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -51135,65 +52907,25 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1533",
+                "localId" : "569",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
                 "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1534",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1535",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1536",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1537",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1538",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "1559",
-            "name" : "ImpDateIvl",
+            "localId" : "580",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1560",
+              "localId" : "581",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1561",
+                "localId" : "582",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -51201,34 +52933,48 @@ module.exports['IncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "1576",
+        "localId" : "597",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegIncludedInIntIvl",
+        "name" : "NotIncludesImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1576",
+            "r" : "597",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegIncludedInIntIvl", ": " ]
+              "value" : [ "", "define ", "NotIncludesImpreciseDateIvl", ": " ]
             }, {
-              "r" : "1589",
+              "r" : "622",
               "s" : [ {
-                "r" : "1579",
+                "r" : "616",
                 "s" : [ {
-                  "r" : "1577",
-                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "604",
+                  "s" : [ {
+                    "r" : "598",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "613",
+                  "s" : [ {
+                    "r" : "607",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "1589",
+                "r" : "622",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1585",
+                "r" : "619",
                 "s" : [ {
-                  "r" : "1583",
-                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               } ]
             } ]
@@ -51236,145 +52982,174 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1589",
+          "localId" : "622",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1590",
+            "localId" : "623",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1591",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "624",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1592",
+            "localId" : "625",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1593",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "626",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1579",
+            "localId" : "616",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1581",
+              "localId" : "617",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1582",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "618",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1580",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "type" : "DateTime",
+              "localId" : "604",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1577",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "605",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "606",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "598",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "599",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1578",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "613",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "614",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "615",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "607",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "608",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1585",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "619",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1587",
+              "localId" : "620",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1588",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1586",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1583",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "621",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1584",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1603",
+        "localId" : "636",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotIncludedInIntIvl",
+        "name" : "MayIncludeImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1603",
+            "r" : "636",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotIncludedInIntIvl", ": " ]
+              "value" : [ "", "define ", "MayIncludeImpreciseDateIvl", ": " ]
             }, {
-              "r" : "1617",
+              "r" : "655",
               "s" : [ {
-                "r" : "1606",
-                "s" : [ {
-                  "r" : "1604",
-                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
-                } ]
-              }, {
-                "r" : "1617",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "1614",
+                "r" : "649",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1610",
+                  "r" : "641",
                   "s" : [ {
-                    "r" : "1611",
-                    "value" : [ "-", "100" ]
+                    "r" : "637",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
-                  "r" : "1613",
-                  "value" : [ ", ", "100", "]" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "647",
+                  "s" : [ {
+                    "r" : "643",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "655",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "652",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
                 } ]
               } ]
             } ]
@@ -51382,290 +53157,409 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1617",
+          "localId" : "655",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1618",
+            "localId" : "656",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1619",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "657",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1620",
+            "localId" : "658",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1621",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "659",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1606",
+            "localId" : "649",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1608",
+              "localId" : "650",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1609",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "651",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1607",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1604",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1605",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1614",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1615",
+              "type" : "DateTime",
+              "localId" : "641",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1616",
+                "localId" : "642",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "637",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1610",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "647",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1612",
+                "localId" : "648",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "operand" : {
+              "year" : {
                 "type" : "Literal",
-                "localId" : "1611",
+                "localId" : "643",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
+                "value" : "2012",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "652",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "653",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "654",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1613",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1631",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegIncludedInIntIvl",
+        "localId" : "669",
+        "name" : "PrecisionDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1631",
+            "r" : "669",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegIncludedInIntIvl", ": " ]
+              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
             }, {
-              "r" : "1644",
+              "r" : "718",
               "s" : [ {
-                "r" : "1634",
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "686",
                 "s" : [ {
-                  "r" : "1632",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
+                  "r" : "670",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
-                "r" : "1644",
-                "value" : [ " ", "included in", " " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "1640",
+                "r" : "710",
                 "s" : [ {
-                  "r" : "1638",
-                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                  "r" : "694",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "721",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "722",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "1644",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Interval",
+          "localId" : "718",
+          "lowClosed" : true,
+          "highClosed" : false,
           "annotation" : [ ],
-          "signature" : [ {
+          "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1645",
+            "localId" : "719",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1646",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "720",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1647",
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "686",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1648",
+              "localId" : "687",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1634",
-            "lowClosed" : false,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1636",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1637",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "688",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "689",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "690",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "691",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "692",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "693",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "670",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
-              "type" : "As",
-              "localId" : "1635",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1632",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+            "month" : {
+              "type" : "Literal",
+              "localId" : "671",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "1633",
+              "localId" : "672",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "673",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "674",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "34",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "675",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "56",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "676",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "789",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "Interval",
-            "localId" : "1640",
-            "lowClosed" : true,
-            "highClosed" : true,
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "710",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1642",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1643",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "711",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "712",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "713",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "714",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "715",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "716",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "717",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "694",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
-              "type" : "As",
-              "localId" : "1641",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1638",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+            "month" : {
+              "type" : "Literal",
+              "localId" : "695",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "1639",
+              "localId" : "696",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "697",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "698",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "23",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "699",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "45",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "700",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "678",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1658",
+        "localId" : "725",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayBeIncludedInIntIvl",
+        "name" : "IncludesDayOfIvlLowEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1658",
+            "r" : "725",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayBeIncludedInIntIvl", ": " ]
+              "value" : [ "", "define ", "IncludesDayOfIvlLowEdge", ": " ]
             }, {
-              "r" : "1672",
+              "r" : "780",
               "s" : [ {
-                "r" : "1661",
-                "s" : [ {
-                  "r" : "1659",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
-                } ]
-              }, {
-                "r" : "1672",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "1669",
+                "r" : "774",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1665",
+                  "r" : "742",
                   "s" : [ {
-                    "r" : "1666",
-                    "value" : [ "-", "100" ]
+                    "r" : "726",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1668",
-                  "value" : [ ", ", "100", "]" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "766",
+                  "s" : [ {
+                    "r" : "750",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "780",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "777",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               } ]
             } ]
@@ -51673,152 +53567,305 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1672",
+          "localId" : "780",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1673",
+            "localId" : "781",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1674",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "782",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1675",
+            "localId" : "783",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1676",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "784",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1661",
-            "lowClosed" : false,
-            "highClosed" : true,
+            "localId" : "774",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1663",
+              "localId" : "775",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1664",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "776",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1662",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "type" : "DateTime",
+              "localId" : "742",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1659",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "743",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1660",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1669",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1670",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1671",
+                "localId" : "744",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "745",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "746",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "747",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "748",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "749",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "726",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "727",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "728",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "729",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "730",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "731",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "732",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1665",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "766",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1667",
+                "localId" : "767",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "768",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "769",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "770",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "771",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "772",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "773",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "operand" : {
+              "year" : {
                 "type" : "Literal",
-                "localId" : "1666",
+                "localId" : "750",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "751",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "752",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "753",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "754",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "755",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "756",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "777",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "778",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "779",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1668",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1686",
+        "localId" : "794",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotIncludedInIntIvl",
+        "name" : "IncludesDayOfIvlHighEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1686",
+            "r" : "794",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotIncludedInIntIvl", ": " ]
+              "value" : [ "", "define ", "IncludesDayOfIvlHighEdge", ": " ]
             }, {
-              "r" : "1700",
+              "r" : "849",
               "s" : [ {
-                "r" : "1689",
-                "s" : [ {
-                  "r" : "1687",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
-                } ]
-              }, {
-                "r" : "1700",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "1697",
+                "r" : "843",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1693",
+                  "r" : "811",
                   "s" : [ {
-                    "r" : "1694",
-                    "value" : [ "-", "100" ]
+                    "r" : "795",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1696",
-                  "value" : [ ", ", "0", "]" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "835",
+                  "s" : [ {
+                    "r" : "819",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "849",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "846",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               } ]
             } ]
@@ -51826,152 +53873,305 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1700",
+          "localId" : "849",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1701",
+            "localId" : "850",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1702",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "851",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1703",
+            "localId" : "852",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1704",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "853",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1689",
-            "lowClosed" : false,
-            "highClosed" : true,
+            "localId" : "843",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1691",
+              "localId" : "844",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1692",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "845",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1690",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "type" : "DateTime",
+              "localId" : "811",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1687",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "812",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1688",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1697",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1698",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1699",
+                "localId" : "813",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "814",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "815",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "816",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "817",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "818",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "795",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "796",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "797",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "798",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "799",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "800",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "801",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1693",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "835",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1695",
+                "localId" : "836",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "837",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "838",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "839",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "840",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "841",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "842",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "operand" : {
+              "year" : {
                 "type" : "Literal",
-                "localId" : "1694",
+                "localId" : "819",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "820",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "821",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "822",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "823",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "824",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "825",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "846",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "847",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "848",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1696",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1714",
+        "localId" : "863",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndIncludedInIntIvl",
+        "name" : "NotIncludesDayOfIvlLowEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1714",
+            "r" : "863",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndIncludedInIntIvl", ": " ]
+              "value" : [ "", "define ", "NotIncludesDayOfIvlLowEdge", ": " ]
             }, {
-              "r" : "1729",
+              "r" : "918",
               "s" : [ {
-                "r" : "1717",
-                "s" : [ {
-                  "r" : "1715",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
-                } ]
-              }, {
-                "r" : "1729",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "1725",
+                "r" : "912",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1721",
+                  "r" : "880",
                   "s" : [ {
-                    "r" : "1722",
-                    "value" : [ "-", "100" ]
+                    "r" : "864",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1724",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "904",
+                  "s" : [ {
+                    "r" : "888",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "918",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "915",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               } ]
             } ]
@@ -51979,883 +54179,414 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1729",
+          "localId" : "918",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1730",
+            "localId" : "919",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1731",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "920",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1732",
+            "localId" : "921",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1733",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "922",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1717",
+            "localId" : "912",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1719",
+              "localId" : "913",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1720",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "914",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1715",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1718",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1716",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1725",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1727",
+              "type" : "DateTime",
+              "localId" : "880",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1728",
+                "localId" : "881",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1721",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1723",
+                "localId" : "882",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1722",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1726",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1724",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1743",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotIncludedInIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1743",
-            "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotIncludedInIntIvl", ": " ]
-            }, {
-              "r" : "1757",
-              "s" : [ {
-                "r" : "1746",
-                "s" : [ {
-                  "r" : "1744",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
-                } ]
               }, {
-                "r" : "1757",
-                "value" : [ " ", "included in", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "883",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "1754",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1750",
-                  "s" : [ {
-                    "r" : "1751",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "r" : "1753",
-                  "value" : [ ", ", "100", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "1757",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1758",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1759",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1760",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1761",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1746",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1748",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1749",
+                "localId" : "884",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1744",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1747",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1745",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "885",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1754",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1755",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1756",
+                "localId" : "886",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1750",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1752",
+                "localId" : "887",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "operand" : {
+              "year" : {
                 "type" : "Literal",
-                "localId" : "1751",
+                "localId" : "864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
+                "value" : "2012",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1753",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1771",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndIncludedInIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1771",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndIncludedInIntIvl", ": " ]
-            }, {
-              "r" : "1786",
-              "s" : [ {
-                "r" : "1774",
-                "s" : [ {
-                  "r" : "1772",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "1786",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "1782",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1778",
-                  "s" : [ {
-                    "r" : "1779",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "r" : "1781",
-                  "value" : [ ", ", "null", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "1786",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1787",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1788",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1789",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1790",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1774",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1776",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1777",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "865",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1772",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1775",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1773",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "866",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1782",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1784",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1785",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "867",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1778",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1780",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "868",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
+              },
+              "second" : {
                 "type" : "Literal",
-                "localId" : "1779",
+                "localId" : "869",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "870",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1783",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "type" : "DateTime",
+              "localId" : "904",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1781",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "905",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1800",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayBeIncludedInIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1800",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayBeIncludedInIntIvl", ": " ]
-            }, {
-              "r" : "1814",
-              "s" : [ {
-                "r" : "1803",
-                "s" : [ {
-                  "r" : "1801",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
-                } ]
               }, {
-                "r" : "1814",
-                "value" : [ " ", "included in", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "906",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "1811",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1807",
-                  "s" : [ {
-                    "r" : "1808",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "r" : "1810",
-                  "value" : [ ", ", "100", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "1814",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1815",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1816",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1817",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1818",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1803",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1805",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1806",
+                "localId" : "907",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1801",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1804",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1802",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "908",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1811",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1812",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1813",
+                "localId" : "909",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1807",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1809",
+                "localId" : "910",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "911",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "operand" : {
+              "year" : {
                 "type" : "Literal",
-                "localId" : "1808",
+                "localId" : "888",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
+                "value" : "2012",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1810",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1828",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotIncludedInIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1828",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotIncludedInIntIvl", ": " ]
-            }, {
-              "r" : "1840",
-              "s" : [ {
-                "r" : "1831",
-                "s" : [ {
-                  "r" : "1829",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "1840",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "1837",
-                "s" : [ {
-                  "r" : "1835",
-                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "IncludedIn",
-          "localId" : "1840",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1841",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1842",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1843",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1844",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1831",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1833",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1834",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "889",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1829",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1832",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1830",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "890",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "891",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "892",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "893",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "894",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1837",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "915",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1838",
+              "localId" : "916",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1839",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "917",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1835",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1836",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1854",
+        "localId" : "932",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegIncludedInDateIvl",
+        "name" : "NotIncludesDayOfIvlHighEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1854",
+            "r" : "932",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "NotIncludesDayOfIvlHighEdge", ": " ]
             }, {
-              "r" : "1913",
+              "r" : "987",
               "s" : [ {
-                "r" : "1880",
+                "r" : "981",
                 "s" : [ {
-                  "r" : "1855",
-                  "value" : [ "Interval[", "null", ", " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1872",
+                  "r" : "949",
                   "s" : [ {
-                    "r" : "1856",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "933",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "1913",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "1909",
-                "s" : [ {
-                  "r" : "1884",
-                  "value" : [ "Interval[", "null", ", " ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "1901",
+                  "r" : "973",
                   "s" : [ {
-                    "r" : "1885",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "957",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "987",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "984",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "1913",
+          "localId" : "987",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1914",
+            "localId" : "988",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1915",
+              "localId" : "989",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1916",
+            "localId" : "990",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1917",
+              "localId" : "991",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1880",
+            "localId" : "981",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1882",
+              "localId" : "982",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1883",
+                "localId" : "983",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1881",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1855",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
               "type" : "DateTime",
-              "localId" : "1872",
+              "localId" : "949",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1873",
+                "localId" : "950",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1874",
+                "localId" : "951",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1875",
+                "localId" : "952",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1876",
+                "localId" : "953",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1877",
+                "localId" : "954",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1878",
+                "localId" : "955",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1879",
+                "localId" : "956",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1856",
+                "localId" : "933",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1857",
+                "localId" : "934",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1858",
+                "localId" : "935",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -52863,7 +54594,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1859",
+                "localId" : "936",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -52871,7 +54602,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1860",
+                "localId" : "937",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -52879,7 +54610,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1861",
+                "localId" : "938",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -52887,111 +54618,81 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1862",
+                "localId" : "939",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1909",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1911",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1912",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1910",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1884",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1901",
+              "localId" : "973",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1902",
+                "localId" : "974",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1903",
+                "localId" : "975",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1904",
+                "localId" : "976",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1905",
+                "localId" : "977",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1906",
+                "localId" : "978",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1907",
+                "localId" : "979",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1908",
+                "localId" : "980",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1885",
+                "localId" : "957",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1886",
+                "localId" : "958",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1887",
+                "localId" : "959",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1888",
+                "localId" : "960",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -52999,7 +54700,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1889",
+                "localId" : "961",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -53007,7 +54708,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1890",
+                "localId" : "962",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -53015,1672 +54716,1636 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1891",
+                "localId" : "963",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "984",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "985",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "986",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
           } ]
         }
       }, {
-        "localId" : "1927",
+        "localId" : "1001",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotIncludedInDateIvl",
+        "name" : "IncludesDayOfIvlImpreciseLowEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1927",
+            "r" : "1001",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "IncludesDayOfIvlImpreciseLowEdge", ": " ]
             }, {
-              "r" : "2008",
+              "r" : "1032",
               "s" : [ {
-                "r" : "1953",
-                "s" : [ {
-                  "r" : "1928",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1945",
-                  "s" : [ {
-                    "r" : "1929",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "2008",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "2005",
+                "r" : "1026",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1973",
+                  "r" : "1010",
                   "s" : [ {
-                    "r" : "1957",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1002",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1997",
+                  "r" : "1022",
                   "s" : [ {
-                    "r" : "1981",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1014",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "1032",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "1029",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "2008",
+          "localId" : "1032",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2009",
+            "localId" : "1033",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2010",
+              "localId" : "1034",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2011",
+            "localId" : "1035",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2012",
+              "localId" : "1036",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1953",
+            "localId" : "1026",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1955",
+              "localId" : "1027",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1956",
+                "localId" : "1028",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1954",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1928",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
               "type" : "DateTime",
-              "localId" : "1945",
+              "localId" : "1010",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1946",
+                "localId" : "1011",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1947",
+                "localId" : "1012",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1948",
+                "localId" : "1013",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1949",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1002",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
                 "annotation" : [ ]
-              }, {
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1003",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1004",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1022",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1950",
+                "localId" : "1023",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1951",
+                "localId" : "1024",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1952",
+                "localId" : "1025",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1929",
+                "localId" : "1014",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1930",
+                "localId" : "1015",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1931",
+                "localId" : "1016",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1932",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1933",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1934",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1935",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "2005",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "1029",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2006",
+              "localId" : "1030",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2007",
+                "localId" : "1031",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1046",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IncludesDayInInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1046",
+            "s" : [ {
+              "value" : [ "", "define ", "IncludesDayInInterval", ": " ]
+            }, {
+              "r" : "1063",
+              "s" : [ {
+                "r" : "1055",
+                "s" : [ {
+                  "r" : "1047",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ")" ]
+                } ]
+              }, {
+                "r" : "1063",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "1059",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1063",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1064",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1065",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1066",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "DateTime",
+            "localId" : "1055",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1056",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1057",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1058",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1047",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1973",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1048",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1049",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1059",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1060",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1974",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1061",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1069",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DoesNotIncludeDayInInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1069",
+            "s" : [ {
+              "value" : [ "", "define ", "DoesNotIncludeDayInInterval", ": " ]
+            }, {
+              "r" : "1086",
+              "s" : [ {
+                "r" : "1078",
+                "s" : [ {
+                  "r" : "1070",
+                  "value" : [ "DateTime", "(", "2014", ", ", "3", ", ", "3", ")" ]
+                } ]
+              }, {
+                "r" : "1086",
+                "value" : [ " ", "included in day of", " " ]
               }, {
+                "r" : "1082",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1086",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1087",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1088",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1089",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "DateTime",
+            "localId" : "1078",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1079",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1080",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1081",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1070",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2014",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1071",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1072",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1082",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1083",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1975",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1084",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1092",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "QuantityIncludedInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1092",
+            "s" : [ {
+              "value" : [ "", "define ", "QuantityIncludedInterval", ": " ]
+            }, {
+              "r" : "1100",
+              "s" : [ {
+                "r" : "1093",
+                "s" : [ {
+                  "value" : [ "5 ", "'mg'" ]
+                } ]
+              }, {
+                "r" : "1100",
+                "value" : [ " ", "included in", " " ]
               }, {
+                "r" : "1096",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1094",
+                  "s" : [ {
+                    "value" : [ "4 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1095",
+                  "s" : [ {
+                    "value" : [ "6 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1100",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1101",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1102",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1103",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Quantity",
+            "localId" : "1093",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 5,
+            "unit" : "mg",
+            "annotation" : [ ]
+          }, {
+            "type" : "Interval",
+            "localId" : "1096",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1097",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1976",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1098",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "1094",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "1095",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 6,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1106",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "QuantityNotIncludedInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1106",
+            "s" : [ {
+              "value" : [ "", "define ", "QuantityNotIncludedInterval", ": " ]
+            }, {
+              "r" : "1114",
+              "s" : [ {
+                "r" : "1107",
+                "s" : [ {
+                  "value" : [ "50 ", "'mg'" ]
+                } ]
+              }, {
+                "r" : "1114",
+                "value" : [ " ", "included in", " " ]
               }, {
+                "r" : "1110",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1108",
+                  "s" : [ {
+                    "value" : [ "4 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1109",
+                  "s" : [ {
+                    "value" : [ "6 ", "'mg'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "1114",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1115",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1116",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1117",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Quantity",
+            "localId" : "1107",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 50,
+            "unit" : "mg",
+            "annotation" : [ ]
+          }, {
+            "type" : "Interval",
+            "localId" : "1110",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1111",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1977",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1112",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "1108",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 4,
+              "unit" : "mg",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "1109",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 6,
+              "unit" : "mg",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1120",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IncludesDayOfIvlImpreciseHighEdge",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1120",
+            "s" : [ {
+              "value" : [ "", "define ", "IncludesDayOfIvlImpreciseHighEdge", ": " ]
+            }, {
+              "r" : "1151",
+              "s" : [ {
+                "r" : "1145",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1129",
+                  "s" : [ {
+                    "r" : "1121",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1141",
+                  "s" : [ {
+                    "r" : "1133",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1151",
+                "value" : [ " ", "included in day of", " " ]
               }, {
+                "r" : "1148",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "1151",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1152",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1153",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1154",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1155",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1145",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1146",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1978",
+                "localId" : "1147",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1129",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1130",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1979",
+                "localId" : "1131",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1980",
+                "localId" : "1132",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1957",
+                "localId" : "1121",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1958",
+                "localId" : "1122",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1959",
+                "localId" : "1123",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1960",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1961",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1962",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1963",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1997",
+              "localId" : "1141",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1998",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1999",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2000",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2001",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2002",
+                "localId" : "1142",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2003",
+                "localId" : "1143",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2004",
+                "localId" : "1144",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1981",
+                "localId" : "1133",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1982",
+                "localId" : "1134",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1983",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1984",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1985",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1986",
+                "localId" : "1135",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "2",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1987",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1148",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1149",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1150",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2022",
+        "localId" : "1165",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegIncludedInDateIvl",
+        "name" : "IncludesDayOfIvlVeryImpreciseMiddle",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2022",
+            "r" : "1165",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "IncludesDayOfIvlVeryImpreciseMiddle", ": " ]
             }, {
-              "r" : "2081",
+              "r" : "1190",
               "s" : [ {
-                "r" : "2048",
+                "r" : "1184",
                 "s" : [ {
-                  "r" : "2023",
-                  "value" : [ "Interval(", "null", ", " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2040",
+                  "r" : "1172",
                   "s" : [ {
-                    "r" : "2024",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1166",
+                    "value" : [ "DateTime", "(", "2012", ", ", "5", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "2081",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "2077",
-                "s" : [ {
-                  "r" : "2052",
-                  "value" : [ "Interval[", "null", ", " ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "2069",
+                  "r" : "1181",
                   "s" : [ {
-                    "r" : "2053",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1175",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "1190",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "1187",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "2081",
+          "localId" : "1190",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2082",
+            "localId" : "1191",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2083",
+              "localId" : "1192",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2084",
+            "localId" : "1193",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2085",
+              "localId" : "1194",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2048",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "1184",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2050",
+              "localId" : "1185",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2051",
+                "localId" : "1186",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "2049",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2023",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
               "type" : "DateTime",
-              "localId" : "2040",
+              "localId" : "1172",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2041",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2042",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2043",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2044",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2045",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2046",
+                "localId" : "1173",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2047",
+                "localId" : "1174",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2024",
+                "localId" : "1166",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2025",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2026",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2027",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2028",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2029",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2030",
+                "localId" : "1167",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2077",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2079",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2080",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "2078",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2052",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "value" : "5",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2069",
+              "localId" : "1181",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2070",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2071",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2072",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2073",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2074",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2075",
+                "localId" : "1182",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2076",
+                "localId" : "1183",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2053",
+                "localId" : "1175",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2054",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2055",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2056",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2057",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2058",
+                "localId" : "1176",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "6",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2059",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1187",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1188",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1189",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2095",
+        "localId" : "1204",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayBeIncludedInDateIvl",
+        "name" : "NotIncludesDayOfIvlVeryImpreciseLow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2095",
+            "r" : "1204",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayBeIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "NotIncludesDayOfIvlVeryImpreciseLow", ": " ]
             }, {
-              "r" : "2176",
+              "r" : "1229",
               "s" : [ {
-                "r" : "2121",
-                "s" : [ {
-                  "r" : "2096",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "2113",
-                  "s" : [ {
-                    "r" : "2097",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "2176",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "2173",
+                "r" : "1223",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2141",
+                  "r" : "1211",
                   "s" : [ {
-                    "r" : "2125",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1205",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2165",
+                  "r" : "1220",
                   "s" : [ {
-                    "r" : "2149",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1214",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "1229",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "1226",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "2176",
+          "localId" : "1229",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2177",
+            "localId" : "1230",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2178",
+              "localId" : "1231",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2179",
+            "localId" : "1232",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2180",
+              "localId" : "1233",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2121",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "1223",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2123",
+              "localId" : "1224",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2124",
+                "localId" : "1225",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "2122",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2096",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2113",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "DateTime",
+              "localId" : "1211",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2114",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2115",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2116",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2117",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2118",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2119",
+                "localId" : "1212",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2120",
+                "localId" : "1213",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2097",
+                "localId" : "1205",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2098",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2099",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2100",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2101",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2102",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2103",
+                "localId" : "1206",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2173",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2174",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2175",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "value" : "2",
                 "annotation" : [ ]
               }
             },
-            "low" : {
+            "high" : {
               "type" : "DateTime",
-              "localId" : "2141",
+              "localId" : "1220",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2142",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2143",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2144",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2145",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2146",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2147",
+                "localId" : "1221",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2148",
+                "localId" : "1222",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2125",
+                "localId" : "1214",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2126",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2127",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2128",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2129",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2130",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2131",
+                "localId" : "1215",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "6",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2165",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1226",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1227",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2166",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2167",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2168",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2169",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2170",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2171",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2172",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2149",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2150",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2151",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2152",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2153",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2154",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2155",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1228",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2190",
+        "localId" : "1243",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotIncludedInDateIvl",
+        "name" : "NotIncludesDayOfIvlVeryImpreciseHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2190",
+            "r" : "1243",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "NotIncludesDayOfIvlVeryImpreciseHigh", ": " ]
             }, {
-              "r" : "2271",
+              "r" : "1268",
               "s" : [ {
-                "r" : "2216",
-                "s" : [ {
-                  "r" : "2191",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "2208",
-                  "s" : [ {
-                    "r" : "2192",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "2271",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "2268",
+                "r" : "1262",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2236",
+                  "r" : "1250",
                   "s" : [ {
-                    "r" : "2220",
-                    "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1244",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2260",
+                  "r" : "1259",
                   "s" : [ {
-                    "r" : "2244",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1253",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "1268",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "1265",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "2271",
+          "localId" : "1268",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2272",
+            "localId" : "1269",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2273",
+              "localId" : "1270",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2274",
+            "localId" : "1271",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2275",
+              "localId" : "1272",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2216",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "1262",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2218",
+              "localId" : "1263",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2219",
+                "localId" : "1264",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "2217",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2191",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
               "type" : "DateTime",
-              "localId" : "2208",
+              "localId" : "1250",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2209",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2210",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2211",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2212",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2213",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2214",
+                "localId" : "1251",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2215",
+                "localId" : "1252",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2192",
+                "localId" : "1244",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2193",
+                "localId" : "1245",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2194",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1259",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1260",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2195",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1261",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "minute" : {
+              } ],
+              "year" : {
                 "type" : "Literal",
-                "localId" : "2196",
+                "localId" : "1253",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "2012",
                 "annotation" : [ ]
               },
-              "second" : {
+              "month" : {
                 "type" : "Literal",
-                "localId" : "2197",
+                "localId" : "1254",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "10",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2198",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1265",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1266",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1267",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
+          } ]
+        }
+      }, {
+        "localId" : "1282",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayIncludeDayOfIvlVeryImpreciseLow",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1282",
+            "s" : [ {
+              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseLow", ": " ]
+            }, {
+              "r" : "1307",
+              "s" : [ {
+                "r" : "1301",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1289",
+                  "s" : [ {
+                    "r" : "1283",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1298",
+                  "s" : [ {
+                    "r" : "1292",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1307",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "1304",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "1307",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1308",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1309",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1310",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1311",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "2268",
+            "localId" : "1301",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2269",
+              "localId" : "1302",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2270",
+                "localId" : "1303",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2236",
+              "localId" : "1289",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2237",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2238",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2239",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2240",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2241",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2242",
+                "localId" : "1290",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2243",
+                "localId" : "1291",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2220",
+                "localId" : "1283",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2221",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2222",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2223",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2224",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2225",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2226",
+                "localId" : "1284",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "3",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2260",
+              "localId" : "1298",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2261",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2262",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2263",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2264",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2265",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2266",
+                "localId" : "1299",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2267",
+                "localId" : "1300",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2244",
+                "localId" : "1292",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2245",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2246",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2247",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2248",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2249",
+                "localId" : "1293",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "6",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2250",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1304",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1305",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1306",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2285",
+        "localId" : "1321",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndIncludedInDateIvl",
+        "name" : "MayIncludeDayOfIvlVeryImpreciseHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2285",
+            "r" : "1321",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseHigh", ": " ]
             }, {
-              "r" : "2344",
+              "r" : "1346",
               "s" : [ {
-                "r" : "2311",
+                "r" : "1340",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2302",
+                  "r" : "1328",
                   "s" : [ {
-                    "r" : "2286",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1322",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
-                  "r" : "2310",
-                  "value" : [ ", ", "null", "]" ]
-                } ]
-              }, {
-                "r" : "2344",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "2340",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "2331",
+                  "r" : "1337",
                   "s" : [ {
-                    "r" : "2315",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1331",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
-                  "r" : "2339",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1346",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "1343",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               } ]
             } ]
@@ -54688,576 +56353,564 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "2344",
+          "localId" : "1346",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2345",
+            "localId" : "1347",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2346",
+              "localId" : "1348",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2347",
+            "localId" : "1349",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2348",
+              "localId" : "1350",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2311",
+            "localId" : "1340",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2313",
+              "localId" : "1341",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2314",
+                "localId" : "1342",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2302",
+              "localId" : "1328",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2303",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2304",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2305",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2306",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2307",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2308",
+                "localId" : "1329",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2309",
+                "localId" : "1330",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2286",
+                "localId" : "1322",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2287",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2288",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2289",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2290",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2291",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2292",
+                "localId" : "1323",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "6",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "2312",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2310",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2340",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2342",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2343",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
               "type" : "DateTime",
-              "localId" : "2331",
+              "localId" : "1337",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2332",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2333",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2334",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2335",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2336",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2337",
+                "localId" : "1338",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2338",
+                "localId" : "1339",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2315",
+                "localId" : "1331",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2316",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2317",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2318",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2319",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2320",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2321",
+                "localId" : "1332",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "9",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2341",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1343",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1344",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2339",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1345",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2358",
+        "localId" : "1360",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotIncludedInDateIvl",
+        "name" : "MayIncludeDayOfIvlVeryImpreciseSurrounding",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2358",
+            "r" : "1360",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "MayIncludeDayOfIvlVeryImpreciseSurrounding", ": " ]
             }, {
-              "r" : "2439",
+              "r" : "1379",
               "s" : [ {
-                "r" : "2384",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2375",
-                  "s" : [ {
-                    "r" : "2359",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2383",
-                  "value" : [ ", ", "null", "]" ]
-                } ]
-              }, {
-                "r" : "2439",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "2436",
+                "r" : "1373",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2404",
+                  "r" : "1365",
                   "s" : [ {
-                    "r" : "2388",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1361",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2428",
+                  "r" : "1371",
                   "s" : [ {
-                    "r" : "2412",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1367",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "1379",
+                "value" : [ " ", "included in day of", " " ]
+              }, {
+                "r" : "1376",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "2439",
+          "localId" : "1379",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2440",
+            "localId" : "1380",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2441",
+              "localId" : "1381",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2442",
+            "localId" : "1382",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2443",
+              "localId" : "1383",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2384",
+            "localId" : "1373",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2386",
+              "localId" : "1374",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2387",
+                "localId" : "1375",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2375",
+              "localId" : "1365",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2376",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2377",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2378",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2379",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2380",
+                "localId" : "1366",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2381",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1361",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2382",
+                "localId" : "1372",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2359",
+                "localId" : "1367",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2360",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2361",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2362",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2363",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2364",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2365",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "2012",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2385",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1376",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1377",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2383",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1378",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
+          } ]
+        }
+      }, {
+        "localId" : "1393",
+        "name" : "ImpDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1393",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpDateIvl", ": " ]
+            }, {
+              "r" : "1412",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "1400",
+                "s" : [ {
+                  "r" : "1394",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "1409",
+                "s" : [ {
+                  "r" : "1403",
+                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1415",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1416",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1412",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1413",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1414",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "1400",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1401",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1402",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1394",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "1409",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1410",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1411",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "8",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1419",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseIncludesDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1419",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseIncludesDateIvl", ": " ]
+            }, {
+              "r" : "1474",
+              "s" : [ {
+                "r" : "1468",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1436",
+                  "s" : [ {
+                    "r" : "1420",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1460",
+                  "s" : [ {
+                    "r" : "1444",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "1474",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "1471",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "1474",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1475",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1476",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1477",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1478",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "2436",
+            "localId" : "1468",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2437",
+              "localId" : "1469",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2438",
+                "localId" : "1470",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2404",
+              "localId" : "1436",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2405",
+                "localId" : "1437",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2406",
+                "localId" : "1438",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2407",
+                "localId" : "1439",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2408",
+                "localId" : "1440",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2409",
+                "localId" : "1441",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2410",
+                "localId" : "1442",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2411",
+                "localId" : "1443",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2388",
+                "localId" : "1420",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2389",
+                "localId" : "1421",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "4",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2390",
+                "localId" : "1422",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -55265,7 +56918,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2391",
+                "localId" : "1423",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55273,7 +56926,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2392",
+                "localId" : "1424",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55281,7 +56934,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2393",
+                "localId" : "1425",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55289,7 +56942,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2394",
+                "localId" : "1426",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55298,64 +56951,64 @@ module.exports['IncludedIn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2428",
+              "localId" : "1460",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2429",
+                "localId" : "1461",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2430",
+                "localId" : "1462",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2431",
+                "localId" : "1463",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2432",
+                "localId" : "1464",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2433",
+                "localId" : "1465",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2434",
+                "localId" : "1466",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2435",
+                "localId" : "1467",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2412",
+                "localId" : "1444",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2413",
+                "localId" : "1445",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2414",
+                "localId" : "1446",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -55363,7 +57016,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2415",
+                "localId" : "1447",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55371,7 +57024,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2416",
+                "localId" : "1448",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55379,7 +57032,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2417",
+                "localId" : "1449",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55387,60 +57040,74 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2418",
+                "localId" : "1450",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1471",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1472",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1473",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
           } ]
         }
       }, {
-        "localId" : "2453",
+        "localId" : "1488",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndIncludedInDateIvl",
+        "name" : "ImpreciseNotIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2453",
+            "r" : "1488",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseNotIncludesDateIvl", ": " ]
             }, {
-              "r" : "2512",
+              "r" : "1543",
               "s" : [ {
-                "r" : "2479",
+                "r" : "1537",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2470",
+                  "r" : "1505",
                   "s" : [ {
-                    "r" : "2454",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1489",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2478",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1529",
+                  "s" : [ {
+                    "r" : "1513",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "2512",
+                "r" : "1543",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "2508",
+                "r" : "1540",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2499",
-                  "s" : [ {
-                    "r" : "2483",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2507",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ "ImpDateIvl" ]
                 } ]
               } ]
             } ]
@@ -55448,107 +57115,107 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "2512",
+          "localId" : "1543",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2513",
+            "localId" : "1544",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2514",
+              "localId" : "1545",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2515",
+            "localId" : "1546",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2516",
+              "localId" : "1547",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2479",
+            "localId" : "1537",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2481",
+              "localId" : "1538",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2482",
+                "localId" : "1539",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2470",
+              "localId" : "1505",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2471",
+                "localId" : "1506",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2472",
+                "localId" : "1507",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2473",
+                "localId" : "1508",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2474",
+                "localId" : "1509",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2475",
+                "localId" : "1510",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2476",
+                "localId" : "1511",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2477",
+                "localId" : "1512",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2454",
+                "localId" : "1489",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2455",
+                "localId" : "1490",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2456",
+                "localId" : "1491",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -55556,7 +57223,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2457",
+                "localId" : "1492",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55564,7 +57231,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2458",
+                "localId" : "1493",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55572,7 +57239,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2459",
+                "localId" : "1494",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55580,7 +57247,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2460",
+                "localId" : "1495",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55588,95 +57255,65 @@ module.exports['IncludedIn'] = {
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "2480",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2478",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2508",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2510",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2511",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
               "type" : "DateTime",
-              "localId" : "2499",
+              "localId" : "1529",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2500",
+                "localId" : "1530",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2501",
+                "localId" : "1531",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2502",
+                "localId" : "1532",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2503",
+                "localId" : "1533",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2504",
+                "localId" : "1534",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2505",
+                "localId" : "1535",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2506",
+                "localId" : "1536",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2483",
+                "localId" : "1513",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2484",
+                "localId" : "1514",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2485",
+                "localId" : "1515",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -55684,7 +57321,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2486",
+                "localId" : "1516",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55692,7 +57329,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2487",
+                "localId" : "1517",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55700,7 +57337,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2488",
+                "localId" : "1518",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55708,80 +57345,74 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2489",
+                "localId" : "1519",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2509",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1540",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1541",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2507",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1542",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2526",
+        "localId" : "1557",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayBeIncludedInDateIvl",
+        "name" : "ImpreciseMayIncludeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2526",
+            "r" : "1557",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayBeIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseMayIncludeDateIvl", ": " ]
             }, {
-              "r" : "2607",
+              "r" : "1612",
               "s" : [ {
-                "r" : "2552",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2543",
-                  "s" : [ {
-                    "r" : "2527",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2551",
-                  "value" : [ ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "2607",
-                "value" : [ " ", "included in", " " ]
-              }, {
-                "r" : "2604",
+                "r" : "1606",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2572",
+                  "r" : "1574",
                   "s" : [ {
-                    "r" : "2556",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1558",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2596",
+                  "r" : "1598",
                   "s" : [ {
-                    "r" : "2580",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1582",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "1612",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "1609",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
                 } ]
               } ]
             } ]
@@ -55789,115 +57420,115 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "2607",
+          "localId" : "1612",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2608",
+            "localId" : "1613",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2609",
+              "localId" : "1614",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2610",
+            "localId" : "1615",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2611",
+              "localId" : "1616",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2552",
+            "localId" : "1606",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2554",
+              "localId" : "1607",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2555",
+                "localId" : "1608",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2543",
+              "localId" : "1574",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2544",
+                "localId" : "1575",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2545",
+                "localId" : "1576",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2546",
+                "localId" : "1577",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2547",
+                "localId" : "1578",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2548",
+                "localId" : "1579",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2549",
+                "localId" : "1580",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2550",
+                "localId" : "1581",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2527",
+                "localId" : "1558",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2528",
+                "localId" : "1559",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2529",
+                "localId" : "1560",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "15",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2530",
+                "localId" : "1561",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55905,7 +57536,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2531",
+                "localId" : "1562",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55913,7 +57544,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2532",
+                "localId" : "1563",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55921,7 +57552,7 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2533",
+                "localId" : "1564",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -55929,95 +57560,65 @@ module.exports['IncludedIn'] = {
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "2553",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2551",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2604",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2605",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2606",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
               "type" : "DateTime",
-              "localId" : "2572",
+              "localId" : "1598",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2573",
+                "localId" : "1599",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2574",
+                "localId" : "1600",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2575",
+                "localId" : "1601",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2576",
+                "localId" : "1602",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2577",
+                "localId" : "1603",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2578",
+                "localId" : "1604",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2579",
+                "localId" : "1605",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2556",
+                "localId" : "1582",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2557",
+                "localId" : "1583",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2558",
+                "localId" : "1584",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -56025,7 +57626,7 @@ module.exports['IncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2559",
+                "localId" : "1585",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -56033,7 +57634,7 @@ module.exports['IncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2560",
+                "localId" : "1586",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -56041,7 +57642,7 @@ module.exports['IncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2561",
+                "localId" : "1587",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -56049,165 +57650,206 @@ module.exports['IncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2562",
+                "localId" : "1588",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2596",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1609",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1610",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2597",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2598",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2599",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1611",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1626",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegIncludedInIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1626",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegIncludedInIntIvl", ": " ]
+            }, {
+              "r" : "1639",
+              "s" : [ {
+                "r" : "1629",
+                "s" : [ {
+                  "r" : "1627",
+                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2600",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1639",
+                "value" : [ " ", "included in", " " ]
               }, {
+                "r" : "1635",
+                "s" : [ {
+                  "r" : "1633",
+                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "1639",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1640",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1641",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1642",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1643",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1629",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1631",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2601",
+                "localId" : "1632",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2602",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1630",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1627",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1628",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1635",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1637",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2603",
+                "localId" : "1638",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2580",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2581",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2582",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2583",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2584",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2585",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2586",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1636",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1633",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1634",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2621",
+        "localId" : "1653",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotIncludedInDateIvl",
+        "name" : "NegInfBegNotIncludedInIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2621",
+            "r" : "1653",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotIncludedInIntIvl", ": " ]
             }, {
-              "r" : "2702",
+              "r" : "1667",
               "s" : [ {
-                "r" : "2647",
+                "r" : "1656",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2638",
-                  "s" : [ {
-                    "r" : "2622",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2646",
-                  "value" : [ ", ", "null", ")" ]
+                  "r" : "1654",
+                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "2702",
+                "r" : "1667",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "2699",
+                "r" : "1664",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2667",
-                  "s" : [ {
-                    "r" : "2651",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2691",
+                  "r" : "1660",
                   "s" : [ {
-                    "r" : "2675",
-                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1661",
+                    "value" : [ "-", "100" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "1663",
+                  "value" : [ ", ", "100", "]" ]
                 } ]
               } ]
             } ]
@@ -56215,833 +57857,507 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "2702",
+          "localId" : "1667",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2703",
+            "localId" : "1668",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2704",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1669",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2705",
+            "localId" : "1670",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2706",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1671",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2647",
+            "localId" : "1656",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2649",
+              "localId" : "1658",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2650",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "2638",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2639",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2640",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2641",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2642",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2643",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2644",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2645",
+                "localId" : "1659",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2622",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2623",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2624",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2625",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2626",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2627",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2628",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
-            "high" : {
+            "low" : {
               "type" : "As",
-              "localId" : "2648",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1657",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2646",
+                "localId" : "1654",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1655",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "2699",
+            "localId" : "1664",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2700",
+              "localId" : "1665",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2701",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1666",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2667",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1660",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2668",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2669",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2670",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2671",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2672",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2673",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2674",
+                "localId" : "1662",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2651",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2652",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2653",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2654",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2655",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2656",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "2657",
+                "localId" : "1661",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2691",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2692",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2693",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2694",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2695",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2696",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2697",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2698",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2675",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2040",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2676",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2677",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2678",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2679",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2680",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2681",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1663",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* ProperlyIncludedIn
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define ProperlyIncludesIntIvl: Interval[2, 4] properly included in Interval[1, 5]
-define ProperlyIncludesIntBeginsIvl: Interval[1, 4] properly included in Interval[1, 5]
-define ProperlyIncludesIntEndsIvl: Interval[2, 5] properly included in Interval[1, 5]
-define NotProperlyIncludesIntIvl: Interval[1, 5] properly included in Interval[1, 5]
-define ProperlyIncludesRealIvl: Interval[2.34, 2.56] properly included in Interval[1.234, 3.456]
-define NotProperlyIncludesRealIvl: Interval[1.23, 2.56] properly included in Interval[1.23, 2.56]
-define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define ProperlyIncludesDateIvl: Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) properly included in DateIvl
-define NotProperlyIncludesDateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)) properly included in DateIvl
-define PosInfEndProperlyIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] properly included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), null]
-define PosInfEndNotProperlyIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] properly included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define UnknownEndMayBeProperlyIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) properly included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define ProperlyIncludesDayOfIvlLowEdge: Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) properly included in day of PrecisionDateIvl
-define ProperlyIncludesDayOfIvlHighEdge: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 2, 23, 59, 59, 999)) properly included in day of PrecisionDateIvl
-define ProperlyIncludesDayOfIvlNearEdges: Interval[DateTime(2012, 3, 3, 0, 0, 0, 0), DateTime(2012, 9, 1, 23, 59, 59, 999)) properly included in day of PrecisionDateIvl
-define NotProperlyIncludesDayOfIvlSameEdges: Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 9, 2, 0, 0, 0, 0)] properly included in day of PrecisionDateIvl
-define MayProperlyIncludeDayOfIvlVeryImpreciseLow: Interval[DateTime(2012, 3), DateTime(2012, 6)] properly included in day of PrecisionDateIvl
-define MayProperlyIncludeDayOfIvlVeryImpreciseHigh: Interval[DateTime(2012, 6), DateTime(2012, 9)] properly included in day of PrecisionDateIvl
-define MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh: Interval[DateTime(2012, 3), DateTime(2012, 9)] properly included in day of PrecisionDateIvl
-define MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding: Interval[DateTime(2012), DateTime(2012)] properly included in day of PrecisionDateIvl
-*/
-
-module.exports['ProperlyIncludedIn'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "1270",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
       }, {
-        "localId" : "214",
+        "localId" : "1681",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesIntIvl",
+        "name" : "UnknownBegIncludedInIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "1681",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegIncludedInIntIvl", ": " ]
             }, {
-              "r" : "225",
+              "r" : "1694",
               "s" : [ {
-                "r" : "217",
+                "r" : "1684",
                 "s" : [ {
-                  "r" : "215",
-                  "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                  "r" : "1682",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "225",
-                "value" : [ " ", "properly included in", " " ]
+                "r" : "1694",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "222",
+                "r" : "1690",
                 "s" : [ {
-                  "r" : "220",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "r" : "1688",
+                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "225",
+          "type" : "IncludedIn",
+          "localId" : "1694",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "226",
+            "localId" : "1695",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "227",
+              "localId" : "1696",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "228",
+            "localId" : "1697",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "229",
+              "localId" : "1698",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "217",
-            "lowClosed" : true,
+            "localId" : "1684",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "218",
+              "localId" : "1686",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "219",
+                "localId" : "1687",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1685",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1682",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "216",
+              "localId" : "1683",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "222",
+            "localId" : "1690",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "223",
+              "localId" : "1692",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "224",
+                "localId" : "1693",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1691",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1688",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "221",
+              "localId" : "1689",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "100",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "239",
+        "localId" : "1708",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesIntBeginsIvl",
+        "name" : "UnknownBegMayBeIncludedInIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "239",
+            "r" : "1708",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesIntBeginsIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayBeIncludedInIntIvl", ": " ]
             }, {
-              "r" : "250",
+              "r" : "1722",
               "s" : [ {
-                "r" : "242",
+                "r" : "1711",
                 "s" : [ {
-                  "r" : "240",
-                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
+                  "r" : "1709",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "250",
-                "value" : [ " ", "properly included in", " " ]
+                "r" : "1722",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "247",
+                "r" : "1719",
                 "s" : [ {
-                  "r" : "245",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1715",
+                  "s" : [ {
+                    "r" : "1716",
+                    "value" : [ "-", "100" ]
+                  } ]
+                }, {
+                  "r" : "1718",
+                  "value" : [ ", ", "100", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "250",
+          "type" : "IncludedIn",
+          "localId" : "1722",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "251",
+            "localId" : "1723",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "252",
+              "localId" : "1724",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "253",
+            "localId" : "1725",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "254",
+              "localId" : "1726",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "242",
-            "lowClosed" : true,
+            "localId" : "1711",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "243",
+              "localId" : "1713",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "244",
+                "localId" : "1714",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "240",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1712",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1709",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "241",
+              "localId" : "1710",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "247",
+            "localId" : "1719",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "248",
+              "localId" : "1720",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "249",
+                "localId" : "1721",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "245",
+              "type" : "Negate",
+              "localId" : "1715",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1717",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1716",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "100",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "246",
+              "localId" : "1718",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "100",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "264",
+        "localId" : "1736",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesIntEndsIvl",
+        "name" : "UnknownBegNotIncludedInIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "1736",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesIntEndsIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotIncludedInIntIvl", ": " ]
             }, {
-              "r" : "275",
+              "r" : "1750",
               "s" : [ {
-                "r" : "267",
+                "r" : "1739",
                 "s" : [ {
-                  "r" : "265",
-                  "value" : [ "Interval[", "2", ", ", "5", "]" ]
+                  "r" : "1737",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "275",
-                "value" : [ " ", "properly included in", " " ]
+                "r" : "1750",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "272",
+                "r" : "1747",
                 "s" : [ {
-                  "r" : "270",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1743",
+                  "s" : [ {
+                    "r" : "1744",
+                    "value" : [ "-", "100" ]
+                  } ]
+                }, {
+                  "r" : "1746",
+                  "value" : [ ", ", "0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "275",
+          "type" : "IncludedIn",
+          "localId" : "1750",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "276",
+            "localId" : "1751",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "277",
+              "localId" : "1752",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "278",
+            "localId" : "1753",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "279",
+              "localId" : "1754",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "267",
-            "lowClosed" : true,
+            "localId" : "1739",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "268",
+              "localId" : "1741",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "269",
+                "localId" : "1742",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "265",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1740",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1737",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "266",
+              "localId" : "1738",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -57049,1622 +58365,2004 @@ module.exports['ProperlyIncludedIn'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "272",
+            "localId" : "1747",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "273",
+              "localId" : "1748",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "274",
+                "localId" : "1749",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "270",
+              "type" : "Negate",
+              "localId" : "1743",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1745",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1744",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "100",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "271",
+              "localId" : "1746",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "0",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "289",
+        "localId" : "1764",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotProperlyIncludesIntIvl",
+        "name" : "PosInfEndIncludedInIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "289",
+            "r" : "1764",
             "s" : [ {
-              "value" : [ "", "define ", "NotProperlyIncludesIntIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndIncludedInIntIvl", ": " ]
             }, {
-              "r" : "300",
+              "r" : "1779",
               "s" : [ {
-                "r" : "292",
+                "r" : "1767",
                 "s" : [ {
-                  "r" : "290",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "r" : "1765",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "300",
-                "value" : [ " ", "properly included in", " " ]
+                "r" : "1779",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "297",
+                "r" : "1775",
                 "s" : [ {
-                  "r" : "295",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1771",
+                  "s" : [ {
+                    "r" : "1772",
+                    "value" : [ "-", "100" ]
+                  } ]
+                }, {
+                  "r" : "1774",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "300",
+          "type" : "IncludedIn",
+          "localId" : "1779",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "301",
+            "localId" : "1780",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "302",
+              "localId" : "1781",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "303",
+            "localId" : "1782",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "304",
+              "localId" : "1783",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "292",
+            "localId" : "1767",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "293",
+              "localId" : "1769",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "294",
+                "localId" : "1770",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "290",
+              "localId" : "1765",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "291",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1768",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1766",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "297",
+            "localId" : "1775",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "298",
+              "localId" : "1777",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "299",
+                "localId" : "1778",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "295",
+              "type" : "Negate",
+              "localId" : "1771",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1773",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1772",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "100",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1776",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1774",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "314",
+        "localId" : "1793",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesRealIvl",
+        "name" : "PosInfEndNotIncludedInIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "314",
+            "r" : "1793",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesRealIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotIncludedInIntIvl", ": " ]
             }, {
-              "r" : "325",
+              "r" : "1807",
               "s" : [ {
-                "r" : "317",
+                "r" : "1796",
                 "s" : [ {
-                  "r" : "315",
-                  "value" : [ "Interval[", "2.34", ", ", "2.56", "]" ]
+                  "r" : "1794",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "325",
-                "value" : [ " ", "properly included in", " " ]
+                "r" : "1807",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "322",
+                "r" : "1804",
                 "s" : [ {
-                  "r" : "320",
-                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1800",
+                  "s" : [ {
+                    "r" : "1801",
+                    "value" : [ "-", "100" ]
+                  } ]
+                }, {
+                  "r" : "1803",
+                  "value" : [ ", ", "100", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "325",
+          "type" : "IncludedIn",
+          "localId" : "1807",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "326",
+            "localId" : "1808",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "327",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "1809",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "328",
+            "localId" : "1810",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "329",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "1811",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "317",
+            "localId" : "1796",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "318",
+              "localId" : "1798",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "319",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1799",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "315",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.34",
+              "localId" : "1794",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "316",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.56",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1797",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1795",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "322",
+            "localId" : "1804",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "323",
+              "localId" : "1805",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "324",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1806",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "320",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "1800",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1802",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1801",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "100",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "321",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "3.456",
+              "localId" : "1803",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "339",
+        "localId" : "1821",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotProperlyIncludesRealIvl",
+        "name" : "UnknownEndIncludedInIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "339",
+            "r" : "1821",
             "s" : [ {
-              "value" : [ "", "define ", "NotProperlyIncludesRealIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndIncludedInIntIvl", ": " ]
             }, {
-              "r" : "350",
+              "r" : "1836",
               "s" : [ {
-                "r" : "342",
+                "r" : "1824",
                 "s" : [ {
-                  "r" : "340",
-                  "value" : [ "Interval[", "1.23", ", ", "2.56", "]" ]
+                  "r" : "1822",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "350",
-                "value" : [ " ", "properly included in", " " ]
+                "r" : "1836",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "347",
+                "r" : "1832",
                 "s" : [ {
-                  "r" : "345",
-                  "value" : [ "Interval[", "1.23", ", ", "2.56", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1828",
+                  "s" : [ {
+                    "r" : "1829",
+                    "value" : [ "-", "100" ]
+                  } ]
+                }, {
+                  "r" : "1831",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "350",
+          "type" : "IncludedIn",
+          "localId" : "1836",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "351",
+            "localId" : "1837",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "352",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "1838",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "353",
+            "localId" : "1839",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "354",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "1840",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "342",
+            "localId" : "1824",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "343",
+              "localId" : "1826",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "344",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1827",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "340",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23",
+              "localId" : "1822",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "341",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.56",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1825",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1823",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "347",
+            "localId" : "1832",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "348",
+              "localId" : "1834",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "349",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1835",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "345",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23",
-              "annotation" : [ ]
+              "type" : "Negate",
+              "localId" : "1828",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1830",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1829",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "100",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "346",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.56",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1833",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1831",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "364",
-        "name" : "DateIvl",
+        "localId" : "1850",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayBeIncludedInIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "364",
+            "r" : "1850",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayBeIncludedInIntIvl", ": " ]
             }, {
-              "r" : "413",
+              "r" : "1864",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "381",
+                "r" : "1853",
                 "s" : [ {
-                  "r" : "365",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1851",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "r" : "1864",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "405",
+                "r" : "1861",
                 "s" : [ {
-                  "r" : "389",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1857",
+                  "s" : [ {
+                    "r" : "1858",
+                    "value" : [ "-", "100" ]
+                  } ]
+                }, {
+                  "r" : "1860",
+                  "value" : [ ", ", "100", "]" ]
                 } ]
-              }, {
-                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "416",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "417",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "413",
-          "lowClosed" : true,
-          "highClosed" : false,
+          "type" : "IncludedIn",
+          "localId" : "1864",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "414",
+            "localId" : "1865",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "415",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1866",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "381",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1867",
             "annotation" : [ ],
-            "signature" : [ {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "382",
+              "localId" : "1868",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "383",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "384",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "385",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "386",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "387",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "388",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "365",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1853",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1855",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1856",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1851",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "366",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "367",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "368",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "369",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "As",
+              "localId" : "1854",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1852",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1861",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1862",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1863",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "370",
+            "low" : {
+              "type" : "Negate",
+              "localId" : "1857",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1859",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1858",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "100",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "371",
+              "localId" : "1860",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "100",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "405",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "406",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "407",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "408",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "409",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "410",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1878",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotIncludedInIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1878",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotIncludedInIntIvl", ": " ]
             }, {
+              "r" : "1890",
+              "s" : [ {
+                "r" : "1881",
+                "s" : [ {
+                  "r" : "1879",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "1890",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "1887",
+                "s" : [ {
+                  "r" : "1885",
+                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "1890",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1891",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "411",
+              "localId" : "1892",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }, {
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1893",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "412",
+              "localId" : "1894",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "389",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "390",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "391",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1881",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1883",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1884",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "392",
+              "localId" : "1879",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "393",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "As",
+              "localId" : "1882",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1880",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1887",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1888",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1889",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "394",
+              "localId" : "1885",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "100",
               "annotation" : [ ]
             },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "395",
+              "localId" : "1886",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "200",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "420",
+        "localId" : "1904",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesDateIvl",
+        "name" : "NegInfBegIncludedInLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "420",
+            "r" : "1904",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegIncludedInLongIvl", ": " ]
             }, {
-              "r" : "475",
+              "r" : "1917",
               "s" : [ {
-                "r" : "469",
+                "r" : "1907",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "437",
-                  "s" : [ {
-                    "r" : "421",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "461",
-                  "s" : [ {
-                    "r" : "445",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1905",
+                  "value" : [ "Interval[", "null", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "475",
-                "value" : [ " ", "properly included in", " " ]
+                "r" : "1917",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "472",
+                "r" : "1913",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1911",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "475",
+          "type" : "IncludedIn",
+          "localId" : "1917",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "476",
+            "localId" : "1918",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "477",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1919",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "478",
+            "localId" : "1920",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "479",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1921",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "469",
+            "localId" : "1907",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "470",
+              "localId" : "1909",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "471",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1910",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "437",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1908",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "438",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "439",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "440",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "441",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "442",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "443",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "444",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "421",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "422",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "423",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "424",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "425",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "426",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "427",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1905",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "461",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "462",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "463",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "464",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "465",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "466",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "467",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "468",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "445",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "446",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "447",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "448",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "449",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "450",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "451",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1906",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "472",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1913",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "473",
+              "localId" : "1915",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "474",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1916",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1914",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1911",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1912",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "489",
+        "localId" : "1931",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotProperlyIncludesDateIvl",
+        "name" : "NegInfBegNotIncludedInLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "489",
+            "r" : "1931",
             "s" : [ {
-              "value" : [ "", "define ", "NotProperlyIncludesDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotIncludedInLongIvl", ": " ]
             }, {
-              "r" : "544",
+              "r" : "1945",
               "s" : [ {
-                "r" : "538",
+                "r" : "1934",
+                "s" : [ {
+                  "r" : "1932",
+                  "value" : [ "Interval[", "null", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "1945",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "1942",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "506",
-                  "s" : [ {
-                    "r" : "490",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "530",
+                  "r" : "1938",
                   "s" : [ {
-                    "r" : "514",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1939",
+                    "value" : [ "-", "100L" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "544",
-                "value" : [ " ", "properly included in", " " ]
-              }, {
-                "r" : "541",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1941",
+                  "value" : [ ", ", "100L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "544",
+          "type" : "IncludedIn",
+          "localId" : "1945",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "545",
+            "localId" : "1946",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "546",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1947",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "547",
+            "localId" : "1948",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "548",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1949",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "538",
+            "localId" : "1934",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "539",
+              "localId" : "1936",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "540",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1937",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "506",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1935",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "507",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "508",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "509",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "510",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "511",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "512",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "513",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "490",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "491",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "492",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "493",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "494",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "495",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "496",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1932",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "530",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "531",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "532",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "533",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "534",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "535",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "536",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "537",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "514",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "515",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "516",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "517",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "518",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "519",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "520",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1933",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "541",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1942",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "542",
+              "localId" : "1943",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "543",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1944",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "1938",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1940",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1939",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1941",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "558",
+        "localId" : "1959",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndProperlyIncludedInDateIvl",
+        "name" : "UnknownBegIncludedInLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "558",
+            "r" : "1959",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndProperlyIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegIncludedInLongIvl", ": " ]
             }, {
-              "r" : "617",
+              "r" : "1972",
               "s" : [ {
-                "r" : "584",
+                "r" : "1962",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "575",
-                  "s" : [ {
-                    "r" : "559",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "583",
-                  "value" : [ ", ", "null", "]" ]
+                  "r" : "1960",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "617",
-                "value" : [ " ", "properly included in", " " ]
+                "r" : "1972",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "613",
+                "r" : "1968",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "604",
-                  "s" : [ {
-                    "r" : "588",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "612",
-                  "value" : [ ", ", "null", "]" ]
+                  "r" : "1966",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "617",
+          "type" : "IncludedIn",
+          "localId" : "1972",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "618",
+            "localId" : "1973",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "619",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1974",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "620",
+            "localId" : "1975",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "621",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1976",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "584",
-            "lowClosed" : true,
+            "localId" : "1962",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "586",
+              "localId" : "1964",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "587",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1965",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "575",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "576",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "577",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "578",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "579",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "580",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "581",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "582",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "559",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "560",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "561",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "562",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "563",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "564",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "565",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
               "type" : "As",
-              "localId" : "585",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1963",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "583",
+                "localId" : "1960",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1961",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "613",
+            "localId" : "1968",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "615",
+              "localId" : "1970",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "616",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1971",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "604",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1969",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1966",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1967",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1986",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegMayBeIncludedInLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1986",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegMayBeIncludedInLongIvl", ": " ]
+            }, {
+              "r" : "2000",
+              "s" : [ {
+                "r" : "1989",
+                "s" : [ {
+                  "r" : "1987",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "2000",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "1997",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1993",
+                  "s" : [ {
+                    "r" : "1994",
+                    "value" : [ "-", "100L" ]
+                  } ]
+                }, {
+                  "r" : "1996",
+                  "value" : [ ", ", "100L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "2000",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2001",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2002",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2003",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2004",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1989",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1991",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1992",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1990",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1987",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1988",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1997",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1998",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1999",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "1993",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "605",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1995",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1994",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1996",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2014",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegNotIncludedInLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2014",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegNotIncludedInLongIvl", ": " ]
+            }, {
+              "r" : "2028",
+              "s" : [ {
+                "r" : "2017",
+                "s" : [ {
+                  "r" : "2015",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "2028",
+                "value" : [ " ", "included in", " " ]
               }, {
+                "r" : "2025",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2021",
+                  "s" : [ {
+                    "r" : "2022",
+                    "value" : [ "-", "100L" ]
+                  } ]
+                }, {
+                  "r" : "2024",
+                  "value" : [ ", ", "0L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "2028",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2029",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2030",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2031",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2032",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2017",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2019",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "606",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2020",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "2018",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2015",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2016",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2025",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2026",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "607",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2027",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "2021",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "608",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2023",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2022",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2024",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2042",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndIncludedInLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2042",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndIncludedInLongIvl", ": " ]
+            }, {
+              "r" : "2057",
+              "s" : [ {
+                "r" : "2045",
+                "s" : [ {
+                  "r" : "2043",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "2057",
+                "value" : [ " ", "included in", " " ]
               }, {
+                "r" : "2053",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2049",
+                  "s" : [ {
+                    "r" : "2050",
+                    "value" : [ "-", "100L" ]
+                  } ]
+                }, {
+                  "r" : "2052",
+                  "value" : [ ", ", "null", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "2057",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2058",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2059",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2060",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2061",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2045",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2047",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "609",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2048",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2043",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2046",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2044",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2053",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2055",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "610",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2056",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "2049",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "611",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2051",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
-              "year" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "588",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "localId" : "2050",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "589",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2054",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2052",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "590",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2071",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndNotIncludedInLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2071",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndNotIncludedInLongIvl", ": " ]
+            }, {
+              "r" : "2085",
+              "s" : [ {
+                "r" : "2074",
+                "s" : [ {
+                  "r" : "2072",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "2085",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "2082",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2078",
+                  "s" : [ {
+                    "r" : "2079",
+                    "value" : [ "-", "100L" ]
+                  } ]
+                }, {
+                  "r" : "2081",
+                  "value" : [ ", ", "100L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "2085",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2086",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2087",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2088",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2089",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2074",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2076",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2077",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "591",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2072",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2075",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2073",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "592",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2082",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2083",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2084",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "second" : {
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "2078",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2080",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "593",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "2079",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2081",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2099",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndIncludedInLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2099",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndIncludedInLongIvl", ": " ]
+            }, {
+              "r" : "2114",
+              "s" : [ {
+                "r" : "2102",
+                "s" : [ {
+                  "r" : "2100",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2114",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "2110",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2106",
+                  "s" : [ {
+                    "r" : "2107",
+                    "value" : [ "-", "100L" ]
+                  } ]
+                }, {
+                  "r" : "2109",
+                  "value" : [ ", ", "null", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "2114",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2115",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2116",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2117",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2118",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2102",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2104",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2105",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2100",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2103",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2101",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2110",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2112",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2113",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "2106",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2108",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "594",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "2107",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "As",
-              "localId" : "614",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2111",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "612",
+                "localId" : "2109",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -58672,53 +60370,332 @@ module.exports['ProperlyIncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "631",
+        "localId" : "2128",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotProperlyIncludedInDateIvl",
+        "name" : "UnknownEndMayBeIncludedInLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "631",
+            "r" : "2128",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotProperlyIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayBeIncludedInLongIvl", ": " ]
             }, {
-              "r" : "712",
+              "r" : "2142",
               "s" : [ {
-                "r" : "657",
+                "r" : "2131",
+                "s" : [ {
+                  "r" : "2129",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2142",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "2139",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "648",
+                  "r" : "2135",
                   "s" : [ {
-                    "r" : "632",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2136",
+                    "value" : [ "-", "100L" ]
                   } ]
                 }, {
-                  "r" : "656",
-                  "value" : [ ", ", "null", "]" ]
+                  "r" : "2138",
+                  "value" : [ ", ", "100L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "2142",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2143",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2144",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2145",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2146",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2131",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2133",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2134",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2129",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2132",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2130",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2139",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2140",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2141",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "2135",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2137",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2136",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2138",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2156",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotIncludedInLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2156",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotIncludedInLongIvl", ": " ]
+            }, {
+              "r" : "2168",
+              "s" : [ {
+                "r" : "2159",
+                "s" : [ {
+                  "r" : "2157",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "712",
-                "value" : [ " ", "properly included in", " " ]
+                "r" : "2168",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "709",
+                "r" : "2165",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "r" : "2163",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "2168",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2169",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2170",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2171",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2172",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2159",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2161",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2162",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2157",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2160",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2158",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2165",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2166",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2167",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2163",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2164",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2182",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegIncludedInDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2182",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegIncludedInDateIvl", ": " ]
+            }, {
+              "r" : "2241",
+              "s" : [ {
+                "r" : "2208",
+                "s" : [ {
+                  "r" : "2183",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "677",
+                  "r" : "2200",
                   "s" : [ {
-                    "r" : "661",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2184",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ", " ]
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "2241",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "2237",
+                "s" : [ {
+                  "r" : "2212",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "701",
+                  "r" : "2229",
                   "s" : [ {
-                    "r" : "685",
+                    "r" : "2213",
                     "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -58729,92 +60706,105 @@ module.exports['ProperlyIncludedIn'] = {
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "712",
+          "type" : "IncludedIn",
+          "localId" : "2241",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "713",
+            "localId" : "2242",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "714",
+              "localId" : "2243",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "715",
+            "localId" : "2244",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "716",
+              "localId" : "2245",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "657",
+            "localId" : "2208",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "659",
+              "localId" : "2210",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "660",
+                "localId" : "2211",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2209",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2183",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "648",
+              "localId" : "2200",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "649",
+                "localId" : "2201",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "650",
+                "localId" : "2202",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "651",
+                "localId" : "2203",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "652",
+                "localId" : "2204",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "653",
+                "localId" : "2205",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "654",
+                "localId" : "2206",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "655",
+                "localId" : "2207",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "632",
+                "localId" : "2184",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -58822,7 +60812,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "633",
+                "localId" : "2185",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -58830,7 +60820,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "634",
+                "localId" : "2186",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -58838,7 +60828,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "635",
+                "localId" : "2187",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -58846,7 +60836,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "636",
+                "localId" : "2188",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -58854,7 +60844,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "637",
+                "localId" : "2189",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -58862,95 +60852,95 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "638",
+                "localId" : "2190",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "658",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "656",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "709",
+            "localId" : "2237",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "710",
+              "localId" : "2239",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "711",
+                "localId" : "2240",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2238",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2212",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "677",
+              "localId" : "2229",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "678",
+                "localId" : "2230",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "679",
+                "localId" : "2231",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "680",
+                "localId" : "2232",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "681",
+                "localId" : "2233",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "682",
+                "localId" : "2234",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "683",
+                "localId" : "2235",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "684",
+                "localId" : "2236",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "661",
+                "localId" : "2213",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "662",
+                "localId" : "2214",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -58958,7 +60948,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "663",
+                "localId" : "2215",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -58966,7 +60956,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "664",
+                "localId" : "2216",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -58974,7 +60964,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "665",
+                "localId" : "2217",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -58982,7 +60972,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "666",
+                "localId" : "2218",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -58990,105 +60980,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "667",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "701",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "702",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "703",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "704",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "705",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "706",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "707",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "708",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "685",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "686",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "687",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "688",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "689",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "690",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "691",
+                "localId" : "2219",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59098,53 +60990,53 @@ module.exports['ProperlyIncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "726",
+        "localId" : "2255",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayBeProperlyIncludedInDateIvl",
+        "name" : "NegInfBegNotIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "726",
+            "r" : "2255",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayBeProperlyIncludedInDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotIncludedInDateIvl", ": " ]
             }, {
-              "r" : "807",
+              "r" : "2336",
               "s" : [ {
-                "r" : "752",
+                "r" : "2281",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "r" : "2256",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "743",
+                  "r" : "2273",
                   "s" : [ {
-                    "r" : "727",
+                    "r" : "2257",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "751",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "807",
-                "value" : [ " ", "properly included in", " " ]
+                "r" : "2336",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "804",
+                "r" : "2333",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "772",
+                  "r" : "2301",
                   "s" : [ {
-                    "r" : "756",
+                    "r" : "2285",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "796",
+                  "r" : "2325",
                   "s" : [ {
-                    "r" : "780",
+                    "r" : "2309",
                     "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -59155,92 +61047,105 @@ module.exports['ProperlyIncludedIn'] = {
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "807",
+          "type" : "IncludedIn",
+          "localId" : "2336",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "808",
+            "localId" : "2337",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "809",
+              "localId" : "2338",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "810",
+            "localId" : "2339",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "811",
+              "localId" : "2340",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "752",
+            "localId" : "2281",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "754",
+              "localId" : "2283",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "755",
+                "localId" : "2284",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2282",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2256",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "743",
+              "localId" : "2273",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "744",
+                "localId" : "2274",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "745",
+                "localId" : "2275",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "746",
+                "localId" : "2276",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "747",
+                "localId" : "2277",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "748",
+                "localId" : "2278",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "749",
+                "localId" : "2279",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "750",
+                "localId" : "2280",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "727",
+                "localId" : "2257",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -59248,7 +61153,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "728",
+                "localId" : "2258",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -59256,7 +61161,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "729",
+                "localId" : "2259",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -59264,7 +61169,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "730",
+                "localId" : "2260",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59272,7 +61177,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "731",
+                "localId" : "2261",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59280,7 +61185,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "732",
+                "localId" : "2262",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59288,87 +61193,74 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "733",
+                "localId" : "2263",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "753",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "751",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "804",
+            "localId" : "2333",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "805",
+              "localId" : "2334",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "806",
+                "localId" : "2335",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "772",
+              "localId" : "2301",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "773",
+                "localId" : "2302",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "774",
+                "localId" : "2303",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "775",
+                "localId" : "2304",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "776",
+                "localId" : "2305",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "777",
+                "localId" : "2306",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "778",
+                "localId" : "2307",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "779",
+                "localId" : "2308",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "756",
+                "localId" : "2285",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -59376,7 +61268,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "757",
+                "localId" : "2286",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -59384,7 +61276,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "758",
+                "localId" : "2287",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -59392,7 +61284,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "759",
+                "localId" : "2288",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59400,7 +61292,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "760",
+                "localId" : "2289",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59408,7 +61300,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "761",
+                "localId" : "2290",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59416,7 +61308,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "762",
+                "localId" : "2291",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59425,48 +61317,48 @@ module.exports['ProperlyIncludedIn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "796",
+              "localId" : "2325",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "797",
+                "localId" : "2326",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "798",
+                "localId" : "2327",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "799",
+                "localId" : "2328",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "800",
+                "localId" : "2329",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "801",
+                "localId" : "2330",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "802",
+                "localId" : "2331",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "803",
+                "localId" : "2332",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "780",
+                "localId" : "2309",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2020",
@@ -59474,7 +61366,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "781",
+                "localId" : "2310",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -59482,7 +61374,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "782",
+                "localId" : "2311",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -59490,7 +61382,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "783",
+                "localId" : "2312",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59498,7 +61390,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "784",
+                "localId" : "2313",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59506,7 +61398,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "785",
+                "localId" : "2314",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59514,7 +61406,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "786",
+                "localId" : "2315",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59524,426 +61416,179 @@ module.exports['ProperlyIncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "821",
-        "name" : "PrecisionDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "821",
-            "s" : [ {
-              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
-            }, {
-              "r" : "870",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "838",
-                "s" : [ {
-                  "r" : "822",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "862",
-                "s" : [ {
-                  "r" : "846",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "873",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "874",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "870",
-          "lowClosed" : true,
-          "highClosed" : false,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "871",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "872",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "838",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "839",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "840",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "841",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "842",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "843",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "844",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "845",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "822",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "823",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "824",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "825",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "826",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "34",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "827",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "56",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "828",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "789",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "862",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "863",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "864",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "865",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "866",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "867",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "868",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "869",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "846",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "847",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "848",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "849",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "850",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "851",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "45",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "852",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "678",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "877",
+        "localId" : "2350",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesDayOfIvlLowEdge",
+        "name" : "UnknownBegIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "877",
+            "r" : "2350",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlLowEdge", ": " ]
+              "value" : [ "", "define ", "UnknownBegIncludedInDateIvl", ": " ]
             }, {
-              "r" : "932",
+              "r" : "2409",
               "s" : [ {
-                "r" : "926",
+                "r" : "2376",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "894",
-                  "s" : [ {
-                    "r" : "878",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "r" : "2351",
+                  "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "918",
+                  "r" : "2368",
                   "s" : [ {
-                    "r" : "902",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2352",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "932",
-                "value" : [ " ", "properly included in day of", " " ]
+                "r" : "2409",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "929",
+                "r" : "2405",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "2380",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "2397",
+                  "s" : [ {
+                    "r" : "2381",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "932",
+          "type" : "IncludedIn",
+          "localId" : "2409",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "933",
+            "localId" : "2410",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "934",
+              "localId" : "2411",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "935",
+            "localId" : "2412",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "936",
+              "localId" : "2413",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "926",
-            "lowClosed" : true,
+            "localId" : "2376",
+            "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "927",
+              "localId" : "2378",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "928",
+                "localId" : "2379",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2377",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2351",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "894",
+              "localId" : "2368",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "895",
+                "localId" : "2369",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "896",
+                "localId" : "2370",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "897",
+                "localId" : "2371",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "898",
+                "localId" : "2372",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "899",
+                "localId" : "2373",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "900",
+                "localId" : "2374",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "901",
+                "localId" : "2375",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "878",
+                "localId" : "2352",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "879",
+                "localId" : "2353",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "880",
+                "localId" : "2354",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "881",
+                "localId" : "2355",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59951,7 +61596,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "882",
+                "localId" : "2356",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59959,7 +61604,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "883",
+                "localId" : "2357",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -59967,73 +61612,103 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "884",
+                "localId" : "2358",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2405",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2407",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2408",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "2406",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2380",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "918",
+              "localId" : "2397",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "919",
+                "localId" : "2398",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "920",
+                "localId" : "2399",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "921",
+                "localId" : "2400",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "922",
+                "localId" : "2401",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "923",
+                "localId" : "2402",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "924",
+                "localId" : "2403",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "925",
+                "localId" : "2404",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "902",
+                "localId" : "2381",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "903",
+                "localId" : "2382",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "904",
+                "localId" : "2383",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -60041,7 +61716,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "905",
+                "localId" : "2384",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60049,7 +61724,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "906",
+                "localId" : "2385",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60057,7 +61732,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "907",
+                "localId" : "2386",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60065,183 +61740,188 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "908",
+                "localId" : "2387",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "929",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "930",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "931",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "946",
+        "localId" : "2423",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesDayOfIvlHighEdge",
+        "name" : "UnknownBegMayBeIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "946",
+            "r" : "2423",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlHighEdge", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayBeIncludedInDateIvl", ": " ]
             }, {
-              "r" : "1001",
+              "r" : "2504",
               "s" : [ {
-                "r" : "995",
+                "r" : "2449",
+                "s" : [ {
+                  "r" : "2424",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2441",
+                  "s" : [ {
+                    "r" : "2425",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "2504",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "2501",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "963",
+                  "r" : "2469",
                   "s" : [ {
-                    "r" : "947",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2453",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "987",
+                  "r" : "2493",
                   "s" : [ {
-                    "r" : "971",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "2477",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "1001",
-                "value" : [ " ", "properly included in day of", " " ]
-              }, {
-                "r" : "998",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "1001",
+          "type" : "IncludedIn",
+          "localId" : "2504",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1002",
+            "localId" : "2505",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1003",
+              "localId" : "2506",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1004",
+            "localId" : "2507",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1005",
+              "localId" : "2508",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "995",
-            "lowClosed" : true,
+            "localId" : "2449",
+            "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "996",
+              "localId" : "2451",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "997",
+                "localId" : "2452",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2450",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2424",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "963",
+              "localId" : "2441",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "964",
+                "localId" : "2442",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "965",
+                "localId" : "2443",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "966",
+                "localId" : "2444",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "967",
+                "localId" : "2445",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "968",
+                "localId" : "2446",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "969",
+                "localId" : "2447",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "970",
+                "localId" : "2448",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "947",
+                "localId" : "2425",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "948",
+                "localId" : "2426",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "949",
+                "localId" : "2427",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -60249,7 +61929,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "950",
+                "localId" : "2428",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60257,7 +61937,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "951",
+                "localId" : "2429",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60265,7 +61945,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "952",
+                "localId" : "2430",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60273,289 +61953,409 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "953",
+                "localId" : "2431",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2501",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2502",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2503",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "high" : {
+            "low" : {
               "type" : "DateTime",
-              "localId" : "987",
+              "localId" : "2469",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "988",
+                "localId" : "2470",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "989",
+                "localId" : "2471",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "990",
+                "localId" : "2472",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "991",
+                "localId" : "2473",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "992",
+                "localId" : "2474",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "993",
+                "localId" : "2475",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "994",
+                "localId" : "2476",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "971",
+                "localId" : "2453",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "972",
+                "localId" : "2454",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "973",
+                "localId" : "2455",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "974",
+                "localId" : "2456",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "975",
+                "localId" : "2457",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "976",
+                "localId" : "2458",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "977",
+                "localId" : "2459",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "998",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "999",
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2493",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1000",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2494",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2495",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2496",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2497",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2498",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2499",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2500",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2477",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2020",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2478",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2479",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2480",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2481",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2482",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2483",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1015",
+        "localId" : "2518",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ProperlyIncludesDayOfIvlNearEdges",
+        "name" : "UnknownBegNotIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1015",
+            "r" : "2518",
             "s" : [ {
-              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlNearEdges", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotIncludedInDateIvl", ": " ]
             }, {
-              "r" : "1070",
+              "r" : "2599",
               "s" : [ {
-                "r" : "1064",
+                "r" : "2544",
+                "s" : [ {
+                  "r" : "2519",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2536",
+                  "s" : [ {
+                    "r" : "2520",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "2599",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "2596",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1032",
+                  "r" : "2564",
                   "s" : [ {
-                    "r" : "1016",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2548",
+                    "value" : [ "DateTime", "(", "1", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1056",
+                  "r" : "2588",
                   "s" : [ {
-                    "r" : "1040",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "2572",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "1070",
-                "value" : [ " ", "properly included in day of", " " ]
-              }, {
-                "r" : "1067",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "1070",
+          "type" : "IncludedIn",
+          "localId" : "2599",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1071",
+            "localId" : "2600",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1072",
+              "localId" : "2601",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1073",
+            "localId" : "2602",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1074",
+              "localId" : "2603",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1064",
-            "lowClosed" : true,
+            "localId" : "2544",
+            "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1065",
+              "localId" : "2546",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1066",
+                "localId" : "2547",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2545",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2519",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "1032",
+              "localId" : "2536",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1033",
+                "localId" : "2537",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1034",
+                "localId" : "2538",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1035",
+                "localId" : "2539",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1036",
+                "localId" : "2540",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1037",
+                "localId" : "2541",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1038",
+                "localId" : "2542",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1039",
+                "localId" : "2543",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1016",
+                "localId" : "2520",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1017",
+                "localId" : "2521",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1018",
+                "localId" : "2522",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1019",
+                "localId" : "2523",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60563,7 +62363,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1020",
+                "localId" : "2524",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60571,7 +62371,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1021",
+                "localId" : "2525",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60579,73 +62379,90 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1022",
+                "localId" : "2526",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1056",
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2596",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2597",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2598",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2564",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1057",
+                "localId" : "2565",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1058",
+                "localId" : "2566",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1059",
+                "localId" : "2567",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1060",
+                "localId" : "2568",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1061",
+                "localId" : "2569",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1062",
+                "localId" : "2570",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1063",
+                "localId" : "2571",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1040",
+                "localId" : "2548",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1041",
+                "localId" : "2549",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1042",
+                "localId" : "2550",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -60653,215 +62470,298 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1043",
+                "localId" : "2551",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1044",
+                "localId" : "2552",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1045",
+                "localId" : "2553",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1046",
+                "localId" : "2554",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1067",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1068",
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2588",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1069",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2589",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2590",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2591",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2592",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2593",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2594",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2595",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2572",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2573",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2574",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2575",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2576",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2577",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2578",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1084",
+        "localId" : "2613",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotProperlyIncludesDayOfIvlSameEdges",
+        "name" : "PosInfEndIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1084",
+            "r" : "2613",
             "s" : [ {
-              "value" : [ "", "define ", "NotProperlyIncludesDayOfIvlSameEdges", ": " ]
+              "value" : [ "", "define ", "PosInfEndIncludedInDateIvl", ": " ]
             }, {
-              "r" : "1139",
+              "r" : "2672",
               "s" : [ {
-                "r" : "1133",
+                "r" : "2639",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1101",
-                  "s" : [ {
-                    "r" : "1085",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1125",
+                  "r" : "2630",
                   "s" : [ {
-                    "r" : "1109",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2614",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "2638",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1139",
-                "value" : [ " ", "properly included in day of", " " ]
+                "r" : "2672",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1136",
+                "r" : "2668",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2659",
+                  "s" : [ {
+                    "r" : "2643",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2667",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "1139",
+          "type" : "IncludedIn",
+          "localId" : "2672",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1140",
+            "localId" : "2673",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1141",
+              "localId" : "2674",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1142",
+            "localId" : "2675",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1143",
+              "localId" : "2676",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1133",
+            "localId" : "2639",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1134",
+              "localId" : "2641",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1135",
+                "localId" : "2642",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1101",
+              "localId" : "2630",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1102",
+                "localId" : "2631",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1103",
+                "localId" : "2632",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1104",
+                "localId" : "2633",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1105",
+                "localId" : "2634",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1106",
+                "localId" : "2635",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1107",
+                "localId" : "2636",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1108",
+                "localId" : "2637",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1085",
+                "localId" : "2614",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1086",
+                "localId" : "2615",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1087",
+                "localId" : "2616",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1088",
+                "localId" : "2617",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60869,7 +62769,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1089",
+                "localId" : "2618",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60877,7 +62777,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1090",
+                "localId" : "2619",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60885,7 +62785,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1091",
+                "localId" : "2620",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60893,73 +62793,103 @@ module.exports['ProperlyIncludedIn'] = {
               }
             },
             "high" : {
+              "type" : "As",
+              "localId" : "2640",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2638",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2668",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2670",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2671",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "DateTime",
-              "localId" : "1125",
+              "localId" : "2659",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1126",
+                "localId" : "2660",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1127",
+                "localId" : "2661",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1128",
+                "localId" : "2662",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1129",
+                "localId" : "2663",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1130",
+                "localId" : "2664",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1131",
+                "localId" : "2665",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1132",
+                "localId" : "2666",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1109",
+                "localId" : "2643",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1110",
+                "localId" : "2644",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1111",
+                "localId" : "2645",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1112",
+                "localId" : "2646",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60967,7 +62897,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1113",
+                "localId" : "2647",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60975,7 +62905,7 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1114",
+                "localId" : "2648",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -60983,706 +62913,1637 @@ module.exports['ProperlyIncludedIn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1115",
+                "localId" : "2649",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1136",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1137",
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2669",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1138",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2667",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1153",
+        "localId" : "2686",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseLow",
+        "name" : "PosInfEndNotIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1153",
+            "r" : "2686",
             "s" : [ {
-              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseLow", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotIncludedInDateIvl", ": " ]
             }, {
-              "r" : "1178",
+              "r" : "2767",
               "s" : [ {
-                "r" : "1172",
+                "r" : "2712",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1160",
+                  "r" : "2703",
                   "s" : [ {
-                    "r" : "1154",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                    "r" : "2687",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2711",
+                  "value" : [ ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "2767",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "2764",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2732",
+                  "s" : [ {
+                    "r" : "2716",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1169",
+                  "r" : "2756",
                   "s" : [ {
-                    "r" : "1163",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
+                    "r" : "2740",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
-              }, {
-                "r" : "1178",
-                "value" : [ " ", "properly included in day of", " " ]
-              }, {
-                "r" : "1175",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "1178",
+          "type" : "IncludedIn",
+          "localId" : "2767",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1179",
+            "localId" : "2768",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1180",
+              "localId" : "2769",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1181",
+            "localId" : "2770",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1182",
+              "localId" : "2771",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1172",
+            "localId" : "2712",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1173",
+              "localId" : "2714",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1174",
+                "localId" : "2715",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1160",
+              "localId" : "2703",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1161",
+                "localId" : "2704",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1162",
+                "localId" : "2705",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2706",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2707",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2708",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2709",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2710",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1154",
+                "localId" : "2687",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1155",
+                "localId" : "2688",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1169",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1170",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2689",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1171",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2690",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "1163",
+                "localId" : "2691",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "month" : {
+              "second" : {
                 "type" : "Literal",
-                "localId" : "1164",
+                "localId" : "2692",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2693",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1175",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1176",
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2713",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1177",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2711",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
-          } ]
-        }
-      }, {
-        "localId" : "1192",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseHigh",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1192",
-            "s" : [ {
-              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseHigh", ": " ]
-            }, {
-              "r" : "1217",
-              "s" : [ {
-                "r" : "1211",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1199",
-                  "s" : [ {
-                    "r" : "1193",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1208",
-                  "s" : [ {
-                    "r" : "1202",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "r" : "1217",
-                "value" : [ " ", "properly included in day of", " " ]
-              }, {
-                "r" : "1214",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "1217",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1218",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1219",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1220",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1221",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1211",
+            "localId" : "2764",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1212",
+              "localId" : "2765",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1213",
+                "localId" : "2766",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1199",
+              "localId" : "2732",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1200",
+                "localId" : "2733",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1201",
+                "localId" : "2734",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2735",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2736",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2737",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2738",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2739",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1193",
+                "localId" : "2716",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1194",
+                "localId" : "2717",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2718",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2719",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2720",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2721",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2722",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1208",
+              "localId" : "2756",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1209",
+                "localId" : "2757",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1210",
+                "localId" : "2758",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2759",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2760",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2761",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2762",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2763",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1202",
+                "localId" : "2740",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1203",
+                "localId" : "2741",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1214",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1215",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1216",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2742",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2743",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2744",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2745",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2746",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1231",
+        "localId" : "2781",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh",
+        "name" : "UnknownEndIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1231",
+            "r" : "2781",
             "s" : [ {
-              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh", ": " ]
+              "value" : [ "", "define ", "UnknownEndIncludedInDateIvl", ": " ]
             }, {
-              "r" : "1256",
+              "r" : "2840",
               "s" : [ {
-                "r" : "1250",
+                "r" : "2807",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1238",
-                  "s" : [ {
-                    "r" : "1232",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1247",
+                  "r" : "2798",
                   "s" : [ {
-                    "r" : "1241",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                    "r" : "2782",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "2806",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1256",
-                "value" : [ " ", "properly included in day of", " " ]
+                "r" : "2840",
+                "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "1253",
+                "r" : "2836",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2827",
+                  "s" : [ {
+                    "r" : "2811",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2835",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "1256",
+          "type" : "IncludedIn",
+          "localId" : "2840",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1257",
+            "localId" : "2841",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1258",
+              "localId" : "2842",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1259",
+            "localId" : "2843",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1260",
+              "localId" : "2844",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1250",
+            "localId" : "2807",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1251",
+              "localId" : "2809",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1252",
+                "localId" : "2810",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1238",
+              "localId" : "2798",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1239",
+                "localId" : "2799",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1240",
+                "localId" : "2800",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2801",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2802",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2803",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2804",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2805",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1232",
+                "localId" : "2782",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1233",
+                "localId" : "2783",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2784",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2785",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2786",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2787",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2788",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
+              "type" : "As",
+              "localId" : "2808",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2806",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2836",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2838",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2839",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "DateTime",
-              "localId" : "1247",
+              "localId" : "2827",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1248",
+                "localId" : "2828",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1249",
+                "localId" : "2829",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2830",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2831",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2832",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2833",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2834",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1241",
+                "localId" : "2811",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1242",
+                "localId" : "2812",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2813",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2814",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2815",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2816",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2817",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1253",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1254",
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2837",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1255",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2835",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1270",
+        "localId" : "2854",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding",
+        "name" : "UnknownEndMayBeIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1270",
+            "r" : "2854",
             "s" : [ {
-              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayBeIncludedInDateIvl", ": " ]
             }, {
-              "r" : "1289",
+              "r" : "2935",
               "s" : [ {
-                "r" : "1283",
+                "r" : "2880",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1275",
+                  "r" : "2871",
                   "s" : [ {
-                    "r" : "1271",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
+                    "r" : "2855",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2879",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2935",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "2932",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2900",
+                  "s" : [ {
+                    "r" : "2884",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1281",
+                  "r" : "2924",
                   "s" : [ {
-                    "r" : "1277",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
+                    "r" : "2908",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
-              }, {
-                "r" : "1289",
-                "value" : [ " ", "properly included in day of", " " ]
-              }, {
-                "r" : "1286",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludedIn",
-          "localId" : "1289",
+          "type" : "IncludedIn",
+          "localId" : "2935",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1290",
+            "localId" : "2936",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1291",
+              "localId" : "2937",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1292",
+            "localId" : "2938",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1293",
+              "localId" : "2939",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1283",
+            "localId" : "2880",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1284",
+              "localId" : "2882",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1285",
+                "localId" : "2883",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1275",
+              "localId" : "2871",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1276",
+                "localId" : "2872",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1271",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2873",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1281",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1282",
+                "localId" : "2874",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2875",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2876",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2877",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2878",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1277",
+                "localId" : "2855",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1286",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2856",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2857",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2858",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2859",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2860",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2861",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2881",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2879",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2932",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1287",
+              "localId" : "2933",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1288",
+                "localId" : "2934",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2900",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2901",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2902",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2903",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2904",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2905",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2906",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2907",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2884",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2885",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2886",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2887",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2888",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2889",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2890",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2924",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2925",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2926",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2927",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2928",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2929",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2930",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2931",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2908",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2020",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2909",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2910",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2911",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2912",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2913",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2914",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2949",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotIncludedInDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2949",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotIncludedInDateIvl", ": " ]
+            }, {
+              "r" : "3030",
+              "s" : [ {
+                "r" : "2975",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2966",
+                  "s" : [ {
+                    "r" : "2950",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2974",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "3030",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "3027",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2995",
+                  "s" : [ {
+                    "r" : "2979",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "3019",
+                  "s" : [ {
+                    "r" : "3003",
+                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "3030",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "3031",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "3032",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "3033",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "3034",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2975",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2977",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2978",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2966",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2967",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2968",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2969",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2970",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2971",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2972",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2973",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2950",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2951",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2952",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2953",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2954",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2955",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2956",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2976",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2974",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "3027",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "3028",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3029",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2995",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2996",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2997",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2998",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2999",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3000",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3001",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3002",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2979",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2020",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2980",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2981",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2982",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2983",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2984",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2985",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "3019",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3020",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3021",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3022",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3023",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3024",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3025",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3026",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "3003",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2040",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "3004",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "3005",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "3006",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "3007",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "3008",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "3009",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
@@ -61691,48 +64552,38 @@ module.exports['ProperlyIncludedIn'] = {
   }
 }
 
-/* After
+/* ProperlyIncludedIn
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define AfterIntIvl: Interval[5, 10] after Interval[2, 4]
-define NotAfterIntIvl: Interval[5, 10] after Interval[2, 5]
-define AfterRealIvl: Interval[1.234, 2.345] after Interval[0.0, 1.23]
-define NotAfterRealIvl: Interval[1.234, 2.345] after Interval[0.0, 1.234]
+define ProperlyIncludesIntIvl: Interval[2, 4] properly included in Interval[1, 5]
+define ProperlyIncludesIntBeginsIvl: Interval[1, 4] properly included in Interval[1, 5]
+define ProperlyIncludesIntEndsIvl: Interval[2, 5] properly included in Interval[1, 5]
+define NotProperlyIncludesIntIvl: Interval[1, 5] properly included in Interval[1, 5]
+define ProperlyIncludesLongIvl: Interval[2L, 4L] properly included in Interval[1L, 5L]
+define ProperlyIncludesLongBeginsIvl: Interval[1L, 4L] properly included in Interval[1L, 5L]
+define ProperlyIncludesLongEndsIvl: Interval[2L, 5L] properly included in Interval[1L, 5L]
+define NotProperlyIncludesLongIvl: Interval[1L, 5L] properly included in Interval[1L, 5L]
+define ProperlyIncludesRealIvl: Interval[2.34, 2.56] properly included in Interval[1.234, 3.456]
+define NotProperlyIncludesRealIvl: Interval[1.23, 2.56] properly included in Interval[1.23, 2.56]
 define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define AfterDateIvl: DateIvl after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0))
-define NotAfterDateIvl: DateIvl after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define AfterImpreciseDateIvl: DateIvl after Interval[DateTime(2012, 1), DateTime(2012, 2)]
-define NotAfterImpreciseDateIvl: DateIvl after Interval[DateTime(2012, 1), DateTime(2012, 3)]
-define MayBeAfterImpreciseDateIvl: DateIvl after Interval[DateTime(2012), DateTime(2012)]
+define ProperlyIncludesDateIvl: Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) properly included in DateIvl
+define NotProperlyIncludesDateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)) properly included in DateIvl
+define PosInfEndProperlyIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] properly included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), null]
+define PosInfEndNotProperlyIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] properly included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define UnknownEndMayBeProperlyIncludedInDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) properly included in Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
 define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define AfterDayOfIvl: PrecisionDateIvl after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define BeforeDayOfIvl: PrecisionDateIvl after day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
-define StartsSameDayOfIvlEnd: PrecisionDateIvl after day of Interval[DateTime(2012, 9, 2, 23, 59, 59, 999), DateTime(2012, 10, 2, 0, 0, 0, 0)]
-define EndsSameDayOfIvlStart: PrecisionDateIvl after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define MayBeAfterDayOfImpreciseIvl: PrecisionDateIvl after day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
-define MayBeBeforeDayOfImpreciseIvl: PrecisionDateIvl after day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
-define ImpreciseAfterDateIvl: ImpDateIvl after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0))
-define ImpreciseNotAfterDateIvl: ImpDateIvl after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 4, 1, 0, 0, 0, 0))
-define ImpreciseMayBeAfterDateIvl: ImpDateIvl after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 15, 0, 0, 0, 0))
-define NegInfBegNotAfterIntIvl: Interval[null, 100] after Interval[-100, 0]
-define UnknownBegMayBeAfterIntIvl: Interval(null, 100] after Interval[-100, 0]
-define UnknownBegNotAfterIntIvl: Interval(null, 5] after Interval[0, 100]
-define PosInfEndAfterIntIvl: Interval[0, null] after Interval[-100, -20]
-define PosInfEndNotAfterIntIvl: Interval[0, null] after Interval[-100, 0]
-define UnknownEndAfterIntIvl: Interval[0, null) after Interval[-100, -20]
-define UnknownEndNotAfterIntIvl: Interval[0, null) after Interval[-100, 0]
-define NegInfBegNotAfterDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define UnknownBegMayBeAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define UnknownBegNotAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define PosInfEndAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define PosInfEndNotAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define UnknownEndAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define UnknownEndNotAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) after Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
+define ProperlyIncludesDayOfIvlLowEdge: Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)) properly included in day of PrecisionDateIvl
+define ProperlyIncludesDayOfIvlHighEdge: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2012, 9, 2, 23, 59, 59, 999)) properly included in day of PrecisionDateIvl
+define ProperlyIncludesDayOfIvlNearEdges: Interval[DateTime(2012, 3, 3, 0, 0, 0, 0), DateTime(2012, 9, 1, 23, 59, 59, 999)) properly included in day of PrecisionDateIvl
+define NotProperlyIncludesDayOfIvlSameEdges: Interval[DateTime(2012, 3, 2, 0, 0, 0, 0), DateTime(2012, 9, 2, 0, 0, 0, 0)] properly included in day of PrecisionDateIvl
+define MayProperlyIncludeDayOfIvlVeryImpreciseLow: Interval[DateTime(2012, 3), DateTime(2012, 6)] properly included in day of PrecisionDateIvl
+define MayProperlyIncludeDayOfIvlVeryImpreciseHigh: Interval[DateTime(2012, 6), DateTime(2012, 9)] properly included in day of PrecisionDateIvl
+define MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh: Interval[DateTime(2012, 3), DateTime(2012, 9)] properly included in day of PrecisionDateIvl
+define MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding: Interval[DateTime(2012), DateTime(2012)] properly included in day of PrecisionDateIvl
 */
 
-module.exports['After'] = {
+module.exports['ProperlyIncludedIn'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -61744,7 +64595,7 @@ module.exports['After'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "1813",
+        "r" : "1370",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -61819,7 +64670,7 @@ module.exports['After'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterIntIvl",
+        "name" : "ProperlyIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -61828,30 +64679,30 @@ module.exports['After'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "AfterIntIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesIntIvl", ": " ]
             }, {
               "r" : "225",
               "s" : [ {
                 "r" : "217",
                 "s" : [ {
                   "r" : "215",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                  "value" : [ "Interval[", "2", ", ", "4", "]" ]
                 } ]
               }, {
                 "r" : "225",
-                "value" : [ " ", "after", " " ]
+                "value" : [ " ", "properly included in", " " ]
               }, {
                 "r" : "222",
                 "s" : [ {
                   "r" : "220",
-                  "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
+          "type" : "ProperIncludedIn",
           "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -61898,7 +64749,7 @@ module.exports['After'] = {
               "localId" : "215",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
@@ -61906,7 +64757,7 @@ module.exports['After'] = {
               "localId" : "216",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "4",
               "annotation" : [ ]
             }
           }, {
@@ -61931,7 +64782,7 @@ module.exports['After'] = {
               "localId" : "220",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
@@ -61939,132 +64790,132 @@ module.exports['After'] = {
               "localId" : "221",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "232",
+        "localId" : "239",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotAfterIntIvl",
+        "name" : "ProperlyIncludesIntBeginsIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "232",
+            "r" : "239",
             "s" : [ {
-              "value" : [ "", "define ", "NotAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesIntBeginsIvl", ": " ]
             }, {
-              "r" : "243",
+              "r" : "250",
               "s" : [ {
-                "r" : "235",
+                "r" : "242",
                 "s" : [ {
-                  "r" : "233",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                  "r" : "240",
+                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
                 } ]
               }, {
-                "r" : "243",
-                "value" : [ " ", "after", " " ]
+                "r" : "250",
+                "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "240",
+                "r" : "247",
                 "s" : [ {
-                  "r" : "238",
-                  "value" : [ "Interval[", "2", ", ", "5", "]" ]
+                  "r" : "245",
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "243",
+          "type" : "ProperIncludedIn",
+          "localId" : "250",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "244",
+            "localId" : "251",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "245",
+              "localId" : "252",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "246",
+            "localId" : "253",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "247",
+              "localId" : "254",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "235",
+            "localId" : "242",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "236",
+              "localId" : "243",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "237",
+                "localId" : "244",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "233",
+              "localId" : "240",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "234",
+              "localId" : "241",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "4",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "240",
+            "localId" : "247",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "241",
+              "localId" : "248",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "242",
+                "localId" : "249",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "238",
+              "localId" : "245",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "239",
+              "localId" : "246",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -62073,369 +64924,1137 @@ module.exports['After'] = {
           } ]
         }
       }, {
-        "localId" : "250",
+        "localId" : "264",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterRealIvl",
+        "name" : "ProperlyIncludesIntEndsIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "250",
+            "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "AfterRealIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesIntEndsIvl", ": " ]
             }, {
-              "r" : "261",
+              "r" : "275",
               "s" : [ {
-                "r" : "253",
+                "r" : "267",
                 "s" : [ {
-                  "r" : "251",
-                  "value" : [ "Interval[", "1.234", ", ", "2.345", "]" ]
+                  "r" : "265",
+                  "value" : [ "Interval[", "2", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "261",
-                "value" : [ " ", "after", " " ]
+                "r" : "275",
+                "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "258",
+                "r" : "272",
                 "s" : [ {
-                  "r" : "256",
-                  "value" : [ "Interval[", "0.0", ", ", "1.23", "]" ]
+                  "r" : "270",
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "261",
+          "type" : "ProperIncludedIn",
+          "localId" : "275",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "262",
+            "localId" : "276",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "263",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "277",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
+            "localId" : "278",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "265",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "279",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "253",
+            "localId" : "267",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "254",
+              "localId" : "268",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "255",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "269",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "localId" : "265",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.345",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "258",
+            "localId" : "272",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "259",
+              "localId" : "273",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "260",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "274",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "256",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.0",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "257",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23",
+              "localId" : "271",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "268",
+        "localId" : "289",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotAfterRealIvl",
+        "name" : "NotProperlyIncludesIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "268",
+            "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "NotAfterRealIvl", ": " ]
+              "value" : [ "", "define ", "NotProperlyIncludesIntIvl", ": " ]
             }, {
-              "r" : "279",
+              "r" : "300",
               "s" : [ {
-                "r" : "271",
+                "r" : "292",
                 "s" : [ {
-                  "r" : "269",
-                  "value" : [ "Interval[", "1.234", ", ", "2.345", "]" ]
+                  "r" : "290",
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "279",
-                "value" : [ " ", "after", " " ]
+                "r" : "300",
+                "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "276",
+                "r" : "297",
                 "s" : [ {
-                  "r" : "274",
-                  "value" : [ "Interval[", "0.0", ", ", "1.234", "]" ]
+                  "r" : "295",
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "279",
+          "type" : "ProperIncludedIn",
+          "localId" : "300",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "280",
+            "localId" : "301",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "281",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "302",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "282",
+            "localId" : "303",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "283",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "304",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "271",
+            "localId" : "292",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "272",
+              "localId" : "293",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "273",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "294",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "localId" : "290",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.345",
+              "localId" : "291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "276",
+            "localId" : "297",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "277",
+              "localId" : "298",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "278",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "299",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.0",
+              "localId" : "295",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "localId" : "296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "286",
-        "name" : "DateIvl",
+        "localId" : "314",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ProperlyIncludesLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "286",
+            "r" : "314",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesLongIvl", ": " ]
             }, {
-              "r" : "335",
+              "r" : "325",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "303",
+                "r" : "317",
                 "s" : [ {
-                  "r" : "287",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "315",
+                  "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "r" : "325",
+                "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "327",
+                "r" : "322",
                 "s" : [ {
-                  "r" : "311",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "320",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
-              }, {
-                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "338",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "339",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "335",
-          "lowClosed" : true,
-          "highClosed" : false,
+          "type" : "ProperIncludedIn",
+          "localId" : "325",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "336",
+            "localId" : "326",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "337",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "327",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "303",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "328",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "304",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "305",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "306",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "329",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "307",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "317",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "318",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "319",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "315",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "308",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "316",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
-            }, {
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "322",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "323",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "324",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "320",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "321",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "339",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ProperlyIncludesLongBeginsIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "339",
+            "s" : [ {
+              "value" : [ "", "define ", "ProperlyIncludesLongBeginsIvl", ": " ]
+            }, {
+              "r" : "350",
+              "s" : [ {
+                "r" : "342",
+                "s" : [ {
+                  "r" : "340",
+                  "value" : [ "Interval[", "1L", ", ", "4L", "]" ]
+                } ]
+              }, {
+                "r" : "350",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "347",
+                "s" : [ {
+                  "r" : "345",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludedIn",
+          "localId" : "350",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "351",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "309",
+              "localId" : "352",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "353",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "354",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "342",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "343",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "344",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "340",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "347",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "348",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "349",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "364",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ProperlyIncludesLongEndsIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "364",
+            "s" : [ {
+              "value" : [ "", "define ", "ProperlyIncludesLongEndsIvl", ": " ]
+            }, {
+              "r" : "375",
+              "s" : [ {
+                "r" : "367",
+                "s" : [ {
+                  "r" : "365",
+                  "value" : [ "Interval[", "2L", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "375",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "372",
+                "s" : [ {
+                  "r" : "370",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludedIn",
+          "localId" : "375",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "376",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "377",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "378",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "379",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "367",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "368",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "369",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "372",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "373",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "374",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "370",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "389",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotProperlyIncludesLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "389",
+            "s" : [ {
+              "value" : [ "", "define ", "NotProperlyIncludesLongIvl", ": " ]
+            }, {
+              "r" : "400",
+              "s" : [ {
+                "r" : "392",
+                "s" : [ {
+                  "r" : "390",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "400",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "397",
+                "s" : [ {
+                  "r" : "395",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludedIn",
+          "localId" : "400",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "401",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "402",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "403",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "404",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "392",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "393",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "394",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "390",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "391",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "397",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "398",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "399",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "414",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ProperlyIncludesRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "414",
+            "s" : [ {
+              "value" : [ "", "define ", "ProperlyIncludesRealIvl", ": " ]
+            }, {
+              "r" : "425",
+              "s" : [ {
+                "r" : "417",
+                "s" : [ {
+                  "r" : "415",
+                  "value" : [ "Interval[", "2.34", ", ", "2.56", "]" ]
+                } ]
+              }, {
+                "r" : "425",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "422",
+                "s" : [ {
+                  "r" : "420",
+                  "value" : [ "Interval[", "1.234", ", ", "3.456", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludedIn",
+          "localId" : "425",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "426",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "427",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "428",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "429",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "417",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "418",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "419",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "415",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.34",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "416",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.56",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "422",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "423",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "424",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "420",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "421",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "3.456",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "439",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotProperlyIncludesRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "439",
+            "s" : [ {
+              "value" : [ "", "define ", "NotProperlyIncludesRealIvl", ": " ]
+            }, {
+              "r" : "450",
+              "s" : [ {
+                "r" : "442",
+                "s" : [ {
+                  "r" : "440",
+                  "value" : [ "Interval[", "1.23", ", ", "2.56", "]" ]
+                } ]
+              }, {
+                "r" : "450",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "447",
+                "s" : [ {
+                  "r" : "445",
+                  "value" : [ "Interval[", "1.23", ", ", "2.56", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludedIn",
+          "localId" : "450",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "451",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "452",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "453",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "454",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "442",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "443",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "444",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "440",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "441",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.56",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "447",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "448",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "449",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "445",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "446",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.56",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "464",
+        "name" : "DateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "464",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvl", ": " ]
+            }, {
+              "r" : "513",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "481",
+                "s" : [ {
+                  "r" : "465",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "505",
+                "s" : [ {
+                  "r" : "489",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "516",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "517",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "513",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "514",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "515",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "481",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "482",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "310",
+              "localId" : "483",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "484",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "485",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "486",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "487",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "488",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "287",
+              "localId" : "465",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -62443,7 +66062,7 @@ module.exports['After'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "288",
+              "localId" : "466",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -62451,7 +66070,7 @@ module.exports['After'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "289",
+              "localId" : "467",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -62459,7 +66078,7 @@ module.exports['After'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "290",
+              "localId" : "468",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -62467,7 +66086,7 @@ module.exports['After'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "291",
+              "localId" : "469",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -62475,7 +66094,7 @@ module.exports['After'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "292",
+              "localId" : "470",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -62483,7 +66102,7 @@ module.exports['After'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "293",
+              "localId" : "471",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -62492,48 +66111,48 @@ module.exports['After'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "327",
+            "localId" : "505",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "328",
+              "localId" : "506",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "329",
+              "localId" : "507",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "330",
+              "localId" : "508",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "331",
+              "localId" : "509",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "332",
+              "localId" : "510",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "333",
+              "localId" : "511",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "334",
+              "localId" : "512",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "311",
+              "localId" : "489",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -62541,7 +66160,7 @@ module.exports['After'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "312",
+              "localId" : "490",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -62549,7 +66168,7 @@ module.exports['After'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "313",
+              "localId" : "491",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -62557,7 +66176,7 @@ module.exports['After'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "314",
+              "localId" : "492",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -62565,7 +66184,7 @@ module.exports['After'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "315",
+              "localId" : "493",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -62573,7 +66192,7 @@ module.exports['After'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "316",
+              "localId" : "494",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -62581,7 +66200,7 @@ module.exports['After'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "317",
+              "localId" : "495",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -62590,156 +66209,140 @@ module.exports['After'] = {
           }
         }
       }, {
-        "localId" : "342",
+        "localId" : "520",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterDateIvl",
+        "name" : "ProperlyIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "342",
+            "r" : "520",
             "s" : [ {
-              "value" : [ "", "define ", "AfterDateIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesDateIvl", ": " ]
             }, {
-              "r" : "397",
+              "r" : "575",
               "s" : [ {
-                "r" : "343",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              }, {
-                "r" : "397",
-                "value" : [ " ", "after", " " ]
-              }, {
-                "r" : "394",
+                "r" : "569",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "362",
+                  "r" : "537",
                   "s" : [ {
-                    "r" : "346",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "521",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "386",
+                  "r" : "561",
                   "s" : [ {
-                    "r" : "370",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "545",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
+              }, {
+                "r" : "575",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "572",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "397",
+          "type" : "ProperIncludedIn",
+          "localId" : "575",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "398",
+            "localId" : "576",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "399",
+              "localId" : "577",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "400",
+            "localId" : "578",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "401",
+              "localId" : "579",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "343",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "344",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "345",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "394",
+            "localId" : "569",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "395",
+              "localId" : "570",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "396",
+                "localId" : "571",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "362",
+              "localId" : "537",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "363",
+                "localId" : "538",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "364",
+                "localId" : "539",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "365",
+                "localId" : "540",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "366",
+                "localId" : "541",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "367",
+                "localId" : "542",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "368",
+                "localId" : "543",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "369",
+                "localId" : "544",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "346",
+                "localId" : "521",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -62747,15 +66350,15 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "347",
+                "localId" : "522",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "4",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "348",
+                "localId" : "523",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -62763,7 +66366,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "349",
+                "localId" : "524",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -62771,7 +66374,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "350",
+                "localId" : "525",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -62779,7 +66382,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "351",
+                "localId" : "526",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -62787,7 +66390,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "352",
+                "localId" : "527",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -62796,48 +66399,48 @@ module.exports['After'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "386",
+              "localId" : "561",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "387",
+                "localId" : "562",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "388",
+                "localId" : "563",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "389",
+                "localId" : "564",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "390",
+                "localId" : "565",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "391",
+                "localId" : "566",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "392",
+                "localId" : "567",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "393",
+                "localId" : "568",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "370",
+                "localId" : "545",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -62845,15 +66448,15 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "371",
+                "localId" : "546",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "372",
+                "localId" : "547",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -62861,7 +66464,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "373",
+                "localId" : "548",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -62869,7 +66472,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "374",
+                "localId" : "549",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -62877,7 +66480,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "375",
+                "localId" : "550",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -62885,166 +66488,166 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "376",
+                "localId" : "551",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "572",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "573",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "574",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
           } ]
         }
       }, {
-        "localId" : "404",
+        "localId" : "589",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotAfterDateIvl",
+        "name" : "NotProperlyIncludesDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "404",
+            "r" : "589",
             "s" : [ {
-              "value" : [ "", "define ", "NotAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "NotProperlyIncludesDateIvl", ": " ]
             }, {
-              "r" : "459",
+              "r" : "644",
               "s" : [ {
-                "r" : "405",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              }, {
-                "r" : "459",
-                "value" : [ " ", "after", " " ]
-              }, {
-                "r" : "456",
+                "r" : "638",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "424",
+                  "r" : "606",
                   "s" : [ {
-                    "r" : "408",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "590",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "448",
+                  "r" : "630",
                   "s" : [ {
-                    "r" : "432",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "614",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "644",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "641",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "459",
+          "type" : "ProperIncludedIn",
+          "localId" : "644",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "460",
+            "localId" : "645",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "461",
+              "localId" : "646",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "462",
+            "localId" : "647",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "463",
+              "localId" : "648",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "405",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "406",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "407",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "456",
+            "localId" : "638",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "457",
+              "localId" : "639",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "458",
+                "localId" : "640",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "424",
+              "localId" : "606",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "425",
+                "localId" : "607",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "426",
+                "localId" : "608",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "427",
+                "localId" : "609",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "428",
+                "localId" : "610",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "429",
+                "localId" : "611",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "430",
+                "localId" : "612",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "431",
+                "localId" : "613",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "408",
+                "localId" : "590",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -63052,15 +66655,15 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "409",
+                "localId" : "591",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "410",
+                "localId" : "592",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -63068,7 +66671,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "411",
+                "localId" : "593",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -63076,7 +66679,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "412",
+                "localId" : "594",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -63084,7 +66687,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "413",
+                "localId" : "595",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -63092,7 +66695,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "414",
+                "localId" : "596",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -63101,48 +66704,48 @@ module.exports['After'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "448",
+              "localId" : "630",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "449",
+                "localId" : "631",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "450",
+                "localId" : "632",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "451",
+                "localId" : "633",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "452",
+                "localId" : "634",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "453",
+                "localId" : "635",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "454",
+                "localId" : "636",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "455",
+                "localId" : "637",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "432",
+                "localId" : "614",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -63150,15 +66753,15 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "433",
+                "localId" : "615",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "434",
+                "localId" : "616",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -63166,7 +66769,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "435",
+                "localId" : "617",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -63174,7 +66777,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "436",
+                "localId" : "618",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -63182,7 +66785,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "437",
+                "localId" : "619",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -63190,230 +66793,414 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "438",
+                "localId" : "620",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "641",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "642",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "643",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
           } ]
         }
       }, {
-        "localId" : "466",
+        "localId" : "658",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterImpreciseDateIvl",
+        "name" : "PosInfEndProperlyIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "466",
+            "r" : "658",
             "s" : [ {
-              "value" : [ "", "define ", "AfterImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndProperlyIncludedInDateIvl", ": " ]
             }, {
-              "r" : "491",
+              "r" : "717",
               "s" : [ {
-                "r" : "467",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              }, {
-                "r" : "491",
-                "value" : [ " ", "after", " " ]
-              }, {
-                "r" : "488",
+                "r" : "684",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "476",
+                  "r" : "675",
                   "s" : [ {
-                    "r" : "470",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "659",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ", " ]
+                  "r" : "683",
+                  "value" : [ ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "717",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "713",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "485",
+                  "r" : "704",
                   "s" : [ {
-                    "r" : "479",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                    "r" : "688",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "712",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "491",
+          "type" : "ProperIncludedIn",
+          "localId" : "717",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "492",
+            "localId" : "718",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "493",
+              "localId" : "719",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "494",
+            "localId" : "720",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "495",
+              "localId" : "721",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "467",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "468",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "469",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "488",
+            "localId" : "684",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "489",
+              "localId" : "686",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "490",
+                "localId" : "687",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "476",
+              "localId" : "675",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "477",
+                "localId" : "676",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "478",
+                "localId" : "677",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "678",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "679",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "680",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "681",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "682",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "470",
+                "localId" : "659",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "471",
+                "localId" : "660",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "661",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "662",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "663",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "664",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "665",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
             "high" : {
+              "type" : "As",
+              "localId" : "685",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "683",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "713",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "715",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "716",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "DateTime",
-              "localId" : "485",
+              "localId" : "704",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "486",
+                "localId" : "705",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "487",
+                "localId" : "706",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "707",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "708",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "709",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "710",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "711",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "479",
+                "localId" : "688",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "480",
+                "localId" : "689",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "690",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "691",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "692",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "693",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "694",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "714",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "712",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "498",
+        "localId" : "731",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotAfterImpreciseDateIvl",
+        "name" : "PosInfEndNotProperlyIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "498",
+            "r" : "731",
             "s" : [ {
-              "value" : [ "", "define ", "NotAfterImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotProperlyIncludedInDateIvl", ": " ]
             }, {
-              "r" : "523",
+              "r" : "812",
               "s" : [ {
-                "r" : "499",
+                "r" : "757",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "748",
+                  "s" : [ {
+                    "r" : "732",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "756",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "523",
-                "value" : [ " ", "after", " " ]
+                "r" : "812",
+                "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "520",
+                "r" : "809",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "508",
+                  "r" : "777",
                   "s" : [ {
-                    "r" : "502",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "761",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "517",
+                  "r" : "801",
                   "s" : [ {
-                    "r" : "511",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                    "r" : "785",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -63423,172 +67210,423 @@ module.exports['After'] = {
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "523",
+          "type" : "ProperIncludedIn",
+          "localId" : "812",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "524",
+            "localId" : "813",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "525",
+              "localId" : "814",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "526",
+            "localId" : "815",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "527",
+              "localId" : "816",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "499",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "757",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "500",
+              "localId" : "759",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "501",
+                "localId" : "760",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "748",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "749",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "750",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "751",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "752",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "753",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "754",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "755",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "732",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "733",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "734",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "735",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "736",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "737",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "738",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "758",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "756",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "520",
+            "localId" : "809",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "521",
+              "localId" : "810",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "522",
+                "localId" : "811",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "508",
+              "localId" : "777",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "509",
+                "localId" : "778",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "510",
+                "localId" : "779",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "780",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "781",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "782",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "783",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "784",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "502",
+                "localId" : "761",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "503",
+                "localId" : "762",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "763",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "764",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "765",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "766",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "767",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "517",
+              "localId" : "801",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "518",
+                "localId" : "802",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "519",
+                "localId" : "803",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "804",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "805",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "806",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "807",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "808",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "511",
+                "localId" : "785",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "512",
+                "localId" : "786",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "787",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "788",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "789",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "790",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "791",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "530",
+        "localId" : "826",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayBeAfterImpreciseDateIvl",
+        "name" : "UnknownEndMayBeProperlyIncludedInDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "530",
+            "r" : "826",
             "s" : [ {
-              "value" : [ "", "define ", "MayBeAfterImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayBeProperlyIncludedInDateIvl", ": " ]
             }, {
-              "r" : "549",
+              "r" : "907",
               "s" : [ {
-                "r" : "531",
+                "r" : "852",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "843",
+                  "s" : [ {
+                    "r" : "827",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "851",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "549",
-                "value" : [ " ", "after", " " ]
+                "r" : "907",
+                "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "546",
+                "r" : "904",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "538",
+                  "r" : "872",
                   "s" : [ {
-                    "r" : "534",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
+                    "r" : "856",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "544",
+                  "r" : "896",
                   "s" : [ {
-                    "r" : "540",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
+                    "r" : "880",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -63598,108 +67636,376 @@ module.exports['After'] = {
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "549",
+          "type" : "ProperIncludedIn",
+          "localId" : "907",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "550",
+            "localId" : "908",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "551",
+              "localId" : "909",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "552",
+            "localId" : "910",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "553",
+              "localId" : "911",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "531",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "852",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "532",
+              "localId" : "854",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "533",
+                "localId" : "855",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "843",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "844",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "845",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "846",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "847",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "848",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "849",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "850",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "827",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "828",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "829",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "830",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "831",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "832",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "833",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "853",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "851",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "546",
+            "localId" : "904",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "547",
+              "localId" : "905",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "548",
+                "localId" : "906",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "538",
+              "localId" : "872",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "539",
+                "localId" : "873",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "874",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "875",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "876",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "877",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "878",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "879",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "534",
+                "localId" : "856",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "857",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "858",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "859",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "860",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "861",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "862",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "544",
+              "localId" : "896",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "545",
+                "localId" : "897",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "898",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "899",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "900",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "901",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "902",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "903",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "540",
+                "localId" : "880",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "881",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "882",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "883",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "884",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "885",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "886",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "556",
+        "localId" : "921",
         "name" : "PrecisionDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -63707,25 +68013,25 @@ module.exports['After'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "556",
+            "r" : "921",
             "s" : [ {
               "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
             }, {
-              "r" : "605",
+              "r" : "970",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "573",
+                "r" : "938",
                 "s" : [ {
-                  "r" : "557",
+                  "r" : "922",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "597",
+                "r" : "962",
                 "s" : [ {
-                  "r" : "581",
+                  "r" : "946",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
               }, {
@@ -63736,76 +68042,76 @@ module.exports['After'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "608",
+          "localId" : "973",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "609",
+            "localId" : "974",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "605",
+          "localId" : "970",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "606",
+            "localId" : "971",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "607",
+              "localId" : "972",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "573",
+            "localId" : "938",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "574",
+              "localId" : "939",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "575",
+              "localId" : "940",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "576",
+              "localId" : "941",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "577",
+              "localId" : "942",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "578",
+              "localId" : "943",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "579",
+              "localId" : "944",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "580",
+              "localId" : "945",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "557",
+              "localId" : "922",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -63813,7 +68119,7 @@ module.exports['After'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "558",
+              "localId" : "923",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -63821,7 +68127,7 @@ module.exports['After'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "559",
+              "localId" : "924",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -63829,7 +68135,7 @@ module.exports['After'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "560",
+              "localId" : "925",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -63837,7 +68143,7 @@ module.exports['After'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "561",
+              "localId" : "926",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "34",
@@ -63845,7 +68151,7 @@ module.exports['After'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "562",
+              "localId" : "927",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "56",
@@ -63853,7 +68159,7 @@ module.exports['After'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "563",
+              "localId" : "928",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "789",
@@ -63862,48 +68168,48 @@ module.exports['After'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "597",
+            "localId" : "962",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "598",
+              "localId" : "963",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "599",
+              "localId" : "964",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "600",
+              "localId" : "965",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "601",
+              "localId" : "966",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "602",
+              "localId" : "967",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "603",
+              "localId" : "968",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "604",
+              "localId" : "969",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "581",
+              "localId" : "946",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -63911,7 +68217,7 @@ module.exports['After'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "582",
+              "localId" : "947",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -63919,7 +68225,7 @@ module.exports['After'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "583",
+              "localId" : "948",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -63927,7 +68233,7 @@ module.exports['After'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "584",
+              "localId" : "949",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -63935,7 +68241,7 @@ module.exports['After'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "585",
+              "localId" : "950",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -63943,7 +68249,7 @@ module.exports['After'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "586",
+              "localId" : "951",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "45",
@@ -63951,7 +68257,7 @@ module.exports['After'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "587",
+              "localId" : "952",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "678",
@@ -63960,157 +68266,141 @@ module.exports['After'] = {
           }
         }
       }, {
-        "localId" : "612",
+        "localId" : "977",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterDayOfIvl",
+        "name" : "ProperlyIncludesDayOfIvlLowEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "612",
+            "r" : "977",
             "s" : [ {
-              "value" : [ "", "define ", "AfterDayOfIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlLowEdge", ": " ]
             }, {
-              "r" : "667",
+              "r" : "1032",
               "s" : [ {
-                "r" : "613",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "667",
-                "value" : [ " ", "after day of", " " ]
-              }, {
-                "r" : "664",
+                "r" : "1026",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "632",
+                  "r" : "994",
                   "s" : [ {
-                    "r" : "616",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "978",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "656",
+                  "r" : "1018",
                   "s" : [ {
-                    "r" : "640",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1002",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "1032",
+                "value" : [ " ", "properly included in day of", " " ]
+              }, {
+                "r" : "1029",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "667",
+          "type" : "ProperIncludedIn",
+          "localId" : "1032",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "668",
+            "localId" : "1033",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "669",
+              "localId" : "1034",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "670",
+            "localId" : "1035",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "671",
+              "localId" : "1036",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "613",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "614",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "615",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "664",
+            "localId" : "1026",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "665",
+              "localId" : "1027",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "666",
+                "localId" : "1028",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "632",
+              "localId" : "994",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "633",
+                "localId" : "995",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "634",
+                "localId" : "996",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "635",
+                "localId" : "997",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "636",
+                "localId" : "998",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "637",
+                "localId" : "999",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "638",
+                "localId" : "1000",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "639",
+                "localId" : "1001",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "616",
+                "localId" : "978",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -64118,15 +68408,15 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "617",
+                "localId" : "979",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "618",
+                "localId" : "980",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -64134,7 +68424,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "619",
+                "localId" : "981",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64142,7 +68432,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "620",
+                "localId" : "982",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64150,7 +68440,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "621",
+                "localId" : "983",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64158,7 +68448,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "622",
+                "localId" : "984",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64167,48 +68457,48 @@ module.exports['After'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "656",
+              "localId" : "1018",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "657",
+                "localId" : "1019",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "658",
+                "localId" : "1020",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "659",
+                "localId" : "1021",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "660",
+                "localId" : "1022",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "661",
+                "localId" : "1023",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "662",
+                "localId" : "1024",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "663",
+                "localId" : "1025",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "640",
+                "localId" : "1002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -64216,15 +68506,15 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "641",
+                "localId" : "1003",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "642",
+                "localId" : "1004",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -64232,7 +68522,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "643",
+                "localId" : "1005",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64240,7 +68530,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "644",
+                "localId" : "1006",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64248,7 +68538,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "645",
+                "localId" : "1007",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64256,167 +68546,167 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "646",
+                "localId" : "1008",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1029",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1030",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1031",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
           } ]
         }
       }, {
-        "localId" : "674",
+        "localId" : "1046",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "BeforeDayOfIvl",
+        "name" : "ProperlyIncludesDayOfIvlHighEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "674",
+            "r" : "1046",
             "s" : [ {
-              "value" : [ "", "define ", "BeforeDayOfIvl", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlHighEdge", ": " ]
             }, {
-              "r" : "729",
+              "r" : "1101",
               "s" : [ {
-                "r" : "675",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "729",
-                "value" : [ " ", "after day of", " " ]
-              }, {
-                "r" : "726",
+                "r" : "1095",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "694",
+                  "r" : "1063",
                   "s" : [ {
-                    "r" : "678",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1047",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "718",
+                  "r" : "1087",
                   "s" : [ {
-                    "r" : "702",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1071",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "1101",
+                "value" : [ " ", "properly included in day of", " " ]
+              }, {
+                "r" : "1098",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "729",
+          "type" : "ProperIncludedIn",
+          "localId" : "1101",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "730",
+            "localId" : "1102",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "731",
+              "localId" : "1103",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "732",
+            "localId" : "1104",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "733",
+              "localId" : "1105",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "675",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "676",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "677",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "726",
+            "localId" : "1095",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "727",
+              "localId" : "1096",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "728",
+                "localId" : "1097",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "694",
+              "localId" : "1063",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "695",
+                "localId" : "1064",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "696",
+                "localId" : "1065",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "697",
+                "localId" : "1066",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "698",
+                "localId" : "1067",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "699",
+                "localId" : "1068",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "700",
+                "localId" : "1069",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "701",
+                "localId" : "1070",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "678",
+                "localId" : "1047",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -64424,23 +68714,23 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "679",
+                "localId" : "1048",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "680",
+                "localId" : "1049",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "681",
+                "localId" : "1050",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64448,7 +68738,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "682",
+                "localId" : "1051",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64456,7 +68746,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "683",
+                "localId" : "1052",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64464,7 +68754,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "684",
+                "localId" : "1053",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -64473,48 +68763,48 @@ module.exports['After'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "718",
+              "localId" : "1087",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "719",
+                "localId" : "1088",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "720",
+                "localId" : "1089",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "721",
+                "localId" : "1090",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "722",
+                "localId" : "1091",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "723",
+                "localId" : "1092",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "724",
+                "localId" : "1093",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "725",
+                "localId" : "1094",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "702",
+                "localId" : "1071",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -64522,207 +68812,207 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "703",
+                "localId" : "1072",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "704",
+                "localId" : "1073",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "705",
+                "localId" : "1074",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "23",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "706",
+                "localId" : "1075",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "707",
+                "localId" : "1076",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "708",
+                "localId" : "1077",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1098",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1099",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1100",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "736",
+        "localId" : "1115",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "StartsSameDayOfIvlEnd",
+        "name" : "ProperlyIncludesDayOfIvlNearEdges",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "736",
+            "r" : "1115",
             "s" : [ {
-              "value" : [ "", "define ", "StartsSameDayOfIvlEnd", ": " ]
+              "value" : [ "", "define ", "ProperlyIncludesDayOfIvlNearEdges", ": " ]
             }, {
-              "r" : "791",
+              "r" : "1170",
               "s" : [ {
-                "r" : "737",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "791",
-                "value" : [ " ", "after day of", " " ]
-              }, {
-                "r" : "788",
+                "r" : "1164",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "756",
+                  "r" : "1132",
                   "s" : [ {
-                    "r" : "740",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "1116",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "780",
+                  "r" : "1156",
                   "s" : [ {
-                    "r" : "764",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1140",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "1170",
+                "value" : [ " ", "properly included in day of", " " ]
+              }, {
+                "r" : "1167",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "791",
+          "type" : "ProperIncludedIn",
+          "localId" : "1170",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "792",
+            "localId" : "1171",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "793",
+              "localId" : "1172",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "794",
+            "localId" : "1173",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "795",
+              "localId" : "1174",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "737",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "738",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "739",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "788",
+            "localId" : "1164",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "789",
+              "localId" : "1165",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "790",
+                "localId" : "1166",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "756",
+              "localId" : "1132",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "757",
+                "localId" : "1133",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "758",
+                "localId" : "1134",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "759",
+                "localId" : "1135",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "760",
+                "localId" : "1136",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "761",
+                "localId" : "1137",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "762",
+                "localId" : "1138",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "763",
+                "localId" : "1139",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "740",
+                "localId" : "1116",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -64730,97 +69020,97 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "741",
+                "localId" : "1117",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "742",
+                "localId" : "1118",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "743",
+                "localId" : "1119",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "744",
+                "localId" : "1120",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "745",
+                "localId" : "1121",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "746",
+                "localId" : "1122",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "780",
+              "localId" : "1156",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "781",
+                "localId" : "1157",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "782",
+                "localId" : "1158",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "783",
+                "localId" : "1159",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "784",
+                "localId" : "1160",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "785",
+                "localId" : "1161",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "786",
+                "localId" : "1162",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "787",
+                "localId" : "1163",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "764",
+                "localId" : "1140",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -64828,207 +69118,207 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "765",
+                "localId" : "1141",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "766",
+                "localId" : "1142",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "767",
+                "localId" : "1143",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "23",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "768",
+                "localId" : "1144",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "769",
+                "localId" : "1145",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "770",
+                "localId" : "1146",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1167",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1168",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1169",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "798",
+        "localId" : "1184",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EndsSameDayOfIvlStart",
+        "name" : "NotProperlyIncludesDayOfIvlSameEdges",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "798",
+            "r" : "1184",
             "s" : [ {
-              "value" : [ "", "define ", "EndsSameDayOfIvlStart", ": " ]
+              "value" : [ "", "define ", "NotProperlyIncludesDayOfIvlSameEdges", ": " ]
             }, {
-              "r" : "853",
+              "r" : "1239",
               "s" : [ {
-                "r" : "799",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "853",
-                "value" : [ " ", "after day of", " " ]
-              }, {
-                "r" : "850",
+                "r" : "1233",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "818",
+                  "r" : "1201",
                   "s" : [ {
-                    "r" : "802",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1185",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "842",
+                  "r" : "1225",
                   "s" : [ {
-                    "r" : "826",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1209",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "1239",
+                "value" : [ " ", "properly included in day of", " " ]
+              }, {
+                "r" : "1236",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "853",
+          "type" : "ProperIncludedIn",
+          "localId" : "1239",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "854",
+            "localId" : "1240",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "855",
+              "localId" : "1241",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "856",
+            "localId" : "1242",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "857",
+              "localId" : "1243",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "799",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "800",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "801",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "850",
+            "localId" : "1233",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "851",
+              "localId" : "1234",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "852",
+                "localId" : "1235",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "818",
+              "localId" : "1201",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "819",
+                "localId" : "1202",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "820",
+                "localId" : "1203",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "821",
+                "localId" : "1204",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "822",
+                "localId" : "1205",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "823",
+                "localId" : "1206",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "824",
+                "localId" : "1207",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "825",
+                "localId" : "1208",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "802",
+                "localId" : "1185",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -65036,15 +69326,15 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "803",
+                "localId" : "1186",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "804",
+                "localId" : "1187",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -65052,7 +69342,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "805",
+                "localId" : "1188",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -65060,7 +69350,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "806",
+                "localId" : "1189",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -65068,7 +69358,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "807",
+                "localId" : "1190",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -65076,7 +69366,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "808",
+                "localId" : "1191",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -65085,48 +69375,48 @@ module.exports['After'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "842",
+              "localId" : "1225",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "843",
+                "localId" : "1226",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "844",
+                "localId" : "1227",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "845",
+                "localId" : "1228",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "846",
+                "localId" : "1229",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "847",
+                "localId" : "1230",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "848",
+                "localId" : "1231",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "849",
+                "localId" : "1232",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "826",
+                "localId" : "1209",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -65134,15 +69424,15 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "827",
+                "localId" : "1210",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "828",
+                "localId" : "1211",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -65150,7 +69440,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "829",
+                "localId" : "1212",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -65158,7 +69448,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "830",
+                "localId" : "1213",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -65166,7 +69456,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "831",
+                "localId" : "1214",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -65174,142 +69464,142 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "832",
+                "localId" : "1215",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1236",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1237",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1238",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
           } ]
         }
       }, {
-        "localId" : "860",
+        "localId" : "1253",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayBeAfterDayOfImpreciseIvl",
+        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseLow",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "860",
+            "r" : "1253",
             "s" : [ {
-              "value" : [ "", "define ", "MayBeAfterDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseLow", ": " ]
             }, {
-              "r" : "885",
+              "r" : "1278",
               "s" : [ {
-                "r" : "861",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "885",
-                "value" : [ " ", "after day of", " " ]
-              }, {
-                "r" : "882",
+                "r" : "1272",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "870",
+                  "r" : "1260",
                   "s" : [ {
-                    "r" : "864",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "1254",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "879",
+                  "r" : "1269",
                   "s" : [ {
-                    "r" : "873",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                    "r" : "1263",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "1278",
+                "value" : [ " ", "properly included in day of", " " ]
+              }, {
+                "r" : "1275",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "885",
+          "type" : "ProperIncludedIn",
+          "localId" : "1278",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "886",
+            "localId" : "1279",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "887",
+              "localId" : "1280",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "888",
+            "localId" : "1281",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "889",
+              "localId" : "1282",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "861",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "862",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "863",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "882",
+            "localId" : "1272",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "883",
+              "localId" : "1273",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "884",
+                "localId" : "1274",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "870",
+              "localId" : "1260",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "871",
+                "localId" : "1261",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "872",
+                "localId" : "1262",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "864",
+                "localId" : "1254",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -65317,32 +69607,32 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "865",
+                "localId" : "1255",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "879",
+              "localId" : "1269",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "880",
+                "localId" : "1270",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "881",
+                "localId" : "1271",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "873",
+                "localId" : "1263",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -65350,142 +69640,142 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "874",
+                "localId" : "1264",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "6",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1275",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1276",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1277",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "892",
+        "localId" : "1292",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayBeBeforeDayOfImpreciseIvl",
+        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "892",
+            "r" : "1292",
             "s" : [ {
-              "value" : [ "", "define ", "MayBeBeforeDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseHigh", ": " ]
             }, {
-              "r" : "917",
+              "r" : "1317",
               "s" : [ {
-                "r" : "893",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "917",
-                "value" : [ " ", "after day of", " " ]
-              }, {
-                "r" : "914",
+                "r" : "1311",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "902",
+                  "r" : "1299",
                   "s" : [ {
-                    "r" : "896",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                    "r" : "1293",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "911",
+                  "r" : "1308",
                   "s" : [ {
-                    "r" : "905",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                    "r" : "1302",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "1317",
+                "value" : [ " ", "properly included in day of", " " ]
+              }, {
+                "r" : "1314",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "917",
+          "type" : "ProperIncludedIn",
+          "localId" : "1317",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "918",
+            "localId" : "1318",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "919",
+              "localId" : "1319",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "920",
+            "localId" : "1320",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "921",
+              "localId" : "1321",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "893",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "894",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "895",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "914",
+            "localId" : "1311",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "915",
+              "localId" : "1312",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "916",
+                "localId" : "1313",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "902",
+              "localId" : "1299",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "903",
+                "localId" : "1300",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "904",
+                "localId" : "1301",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "896",
+                "localId" : "1293",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -65493,32 +69783,32 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "897",
+                "localId" : "1294",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "6",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "911",
+              "localId" : "1308",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "912",
+                "localId" : "1309",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "913",
+                "localId" : "1310",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "905",
+                "localId" : "1302",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -65526,297 +69816,142 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "906",
+                "localId" : "1303",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "9",
                 "annotation" : [ ]
               }
             }
-          } ]
-        }
-      }, {
-        "localId" : "924",
-        "name" : "ImpDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "924",
-            "s" : [ {
-              "value" : [ "", "define ", "ImpDateIvl", ": " ]
-            }, {
-              "r" : "943",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "931",
-                "s" : [ {
-                  "r" : "925",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "940",
-                "s" : [ {
-                  "r" : "934",
-                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
-                } ]
-              }, {
-                "value" : [ "]" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "946",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "947",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "943",
-          "lowClosed" : true,
-          "highClosed" : true,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "944",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "945",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "931",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "932",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "933",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "925",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "926",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "940",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1314",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "941",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "942",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "934",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "935",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1315",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1316",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "950",
+        "localId" : "1331",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseAfterDateIvl",
+        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "950",
+            "r" : "1331",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseLowAndHigh", ": " ]
             }, {
-              "r" : "1005",
+              "r" : "1356",
               "s" : [ {
-                "r" : "951",
-                "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
-                } ]
-              }, {
-                "r" : "1005",
-                "value" : [ " ", "after", " " ]
-              }, {
-                "r" : "1002",
+                "r" : "1350",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "970",
+                  "r" : "1338",
                   "s" : [ {
-                    "r" : "954",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1332",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "994",
+                  "r" : "1347",
                   "s" : [ {
-                    "r" : "978",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1341",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1356",
+                "value" : [ " ", "properly included in day of", " " ]
+              }, {
+                "r" : "1353",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "1005",
+          "type" : "ProperIncludedIn",
+          "localId" : "1356",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1006",
+            "localId" : "1357",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1007",
+              "localId" : "1358",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1008",
+            "localId" : "1359",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1009",
+              "localId" : "1360",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "951",
-            "name" : "ImpDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "952",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "953",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "1002",
+            "localId" : "1350",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1003",
+              "localId" : "1351",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1004",
+                "localId" : "1352",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "970",
+              "localId" : "1338",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "971",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "972",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "973",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "974",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "975",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "976",
+                "localId" : "1339",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "977",
+                "localId" : "1340",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "954",
+                "localId" : "1332",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -65824,97 +69959,32 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "955",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "956",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "957",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "958",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "959",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "960",
+                "localId" : "1333",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "3",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "994",
+              "localId" : "1347",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "995",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "996",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "997",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "998",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "999",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1000",
+                "localId" : "1348",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1001",
+                "localId" : "1349",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "978",
+                "localId" : "1341",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -65922,403 +69992,349 @@ module.exports['After'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "979",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "980",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "981",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "982",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "983",
+                "localId" : "1342",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "9",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "984",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1353",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1354",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1355",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1012",
+        "localId" : "1370",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseNotAfterDateIvl",
+        "name" : "MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1012",
+            "r" : "1370",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseNotAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "MayProperlyIncludeDayOfIvlVeryImpreciseSurrounding", ": " ]
             }, {
-              "r" : "1067",
+              "r" : "1389",
               "s" : [ {
-                "r" : "1013",
-                "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
-                } ]
-              }, {
-                "r" : "1067",
-                "value" : [ " ", "after", " " ]
-              }, {
-                "r" : "1064",
+                "r" : "1383",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1032",
+                  "r" : "1375",
                   "s" : [ {
-                    "r" : "1016",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1371",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1056",
+                  "r" : "1381",
                   "s" : [ {
-                    "r" : "1040",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1377",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1389",
+                "value" : [ " ", "properly included in day of", " " ]
+              }, {
+                "r" : "1386",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "After",
-          "localId" : "1067",
+          "type" : "ProperIncludedIn",
+          "localId" : "1389",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1068",
+            "localId" : "1390",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1069",
+              "localId" : "1391",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1070",
+            "localId" : "1392",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1071",
+              "localId" : "1393",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1013",
-            "name" : "ImpDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1014",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1015",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "1064",
+            "localId" : "1383",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1065",
+              "localId" : "1384",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1066",
+                "localId" : "1385",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1032",
+              "localId" : "1375",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1033",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1034",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1035",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1036",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1037",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1038",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1039",
+                "localId" : "1376",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1016",
+                "localId" : "1371",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1017",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1018",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1019",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1020",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1021",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1022",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1056",
+              "localId" : "1381",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1057",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1058",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1059",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1060",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1061",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1062",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1063",
+                "localId" : "1382",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1040",
+                "localId" : "1377",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1041",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1042",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1043",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1044",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1045",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1046",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1386",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1387",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1388",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* After
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define AfterIntIvl: Interval[5, 10] after Interval[2, 4]
+define NotAfterIntIvl: Interval[5, 10] after Interval[2, 5]
+define AfterLongIvl: Interval[5L, 10L] after Interval[2L, 4L]
+define NotAfterLongIvl: Interval[5L, 10L] after Interval[2L, 5L]
+define AfterRealIvl: Interval[1.234, 2.345] after Interval[0.0, 1.23]
+define NotAfterRealIvl: Interval[1.234, 2.345] after Interval[0.0, 1.234]
+define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
+define AfterDateIvl: DateIvl after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0))
+define NotAfterDateIvl: DateIvl after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define AfterImpreciseDateIvl: DateIvl after Interval[DateTime(2012, 1), DateTime(2012, 2)]
+define NotAfterImpreciseDateIvl: DateIvl after Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define MayBeAfterImpreciseDateIvl: DateIvl after Interval[DateTime(2012), DateTime(2012)]
+define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
+define AfterDayOfIvl: PrecisionDateIvl after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define BeforeDayOfIvl: PrecisionDateIvl after day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
+define StartsSameDayOfIvlEnd: PrecisionDateIvl after day of Interval[DateTime(2012, 9, 2, 23, 59, 59, 999), DateTime(2012, 10, 2, 0, 0, 0, 0)]
+define EndsSameDayOfIvlStart: PrecisionDateIvl after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define MayBeAfterDayOfImpreciseIvl: PrecisionDateIvl after day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define MayBeBeforeDayOfImpreciseIvl: PrecisionDateIvl after day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
+define ImpreciseAfterDateIvl: ImpDateIvl after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0))
+define ImpreciseNotAfterDateIvl: ImpDateIvl after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 4, 1, 0, 0, 0, 0))
+define ImpreciseMayBeAfterDateIvl: ImpDateIvl after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 15, 0, 0, 0, 0))
+define NegInfBegNotAfterIntIvl: Interval[null, 100] after Interval[-100, 0]
+define UnknownBegMayBeAfterIntIvl: Interval(null, 100] after Interval[-100, 0]
+define UnknownBegNotAfterIntIvl: Interval(null, 5] after Interval[0, 100]
+define PosInfEndAfterIntIvl: Interval[0, null] after Interval[-100, -20]
+define PosInfEndNotAfterIntIvl: Interval[0, null] after Interval[-100, 0]
+define UnknownEndAfterIntIvl: Interval[0, null) after Interval[-100, -20]
+define UnknownEndNotAfterIntIvl: Interval[0, null) after Interval[-100, 0]
+define NegInfBegNotAfterLongIvl: Interval[null, 100L] after Interval[-100L, 0L]
+define UnknownBegMayBeAfterLongIvl: Interval(null, 100L] after Interval[-100L, 0L]
+define UnknownBegNotAfterLongIvl: Interval(null, 5L] after Interval[0L, 100L]
+define PosInfEndAfterLongIvl: Interval[0L, null] after Interval[-100L, -20L]
+define PosInfEndNotAfterLongIvl: Interval[0L, null] after Interval[-100L, 0L]
+define UnknownEndAfterLongIvl: Interval[0L, null) after Interval[-100L, -20L]
+define UnknownEndNotAfterLongIvl: Interval[0L, null) after Interval[-100L, 0L]
+define NegInfBegNotAfterDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define UnknownBegMayBeAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define UnknownBegNotAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define PosInfEndAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define PosInfEndNotAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define UnknownEndAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define UnknownEndNotAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) after Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
+*/
+
+module.exports['After'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "1998",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "1074",
+        "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayBeAfterDateIvl",
+        "name" : "AfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1074",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayBeAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "AfterIntIvl", ": " ]
             }, {
-              "r" : "1129",
+              "r" : "225",
               "s" : [ {
-                "r" : "1075",
+                "r" : "217",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "r" : "215",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
               }, {
-                "r" : "1129",
+                "r" : "225",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1126",
+                "r" : "222",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1094",
-                  "s" : [ {
-                    "r" : "1078",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1118",
-                  "s" : [ {
-                    "r" : "1102",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "220",
+                  "value" : [ "Interval[", "2", ", ", "4", "]" ]
                 } ]
               } ]
             } ]
@@ -66326,298 +70342,127 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1129",
+          "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1130",
+            "localId" : "226",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1131",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "227",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1132",
+            "localId" : "228",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1133",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1075",
-            "name" : "ImpDateIvl",
+            "type" : "Interval",
+            "localId" : "217",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1076",
+              "localId" : "218",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1077",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "219",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1126",
+            "localId" : "222",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1127",
+              "localId" : "223",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1128",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1094",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1095",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1096",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1097",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1098",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1099",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1100",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1101",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1078",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1079",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1080",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1081",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1082",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1083",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1084",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1118",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1119",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1120",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1121",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1122",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1123",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1124",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1125",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1102",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1103",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1104",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1105",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1106",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1107",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1108",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1136",
+        "localId" : "232",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotAfterIntIvl",
+        "name" : "NotAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1136",
+            "r" : "232",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "NotAfterIntIvl", ": " ]
             }, {
-              "r" : "1150",
+              "r" : "243",
               "s" : [ {
-                "r" : "1139",
+                "r" : "235",
                 "s" : [ {
-                  "r" : "1137",
-                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                  "r" : "233",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
               }, {
-                "r" : "1150",
+                "r" : "243",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1147",
+                "r" : "240",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1143",
-                  "s" : [ {
-                    "r" : "1144",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "r" : "1146",
-                  "value" : [ ", ", "0", "]" ]
+                  "r" : "238",
+                  "value" : [ "Interval[", "2", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
@@ -66625,152 +70470,127 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1150",
+          "localId" : "243",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1151",
+            "localId" : "244",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1152",
+              "localId" : "245",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1153",
+            "localId" : "246",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1154",
+              "localId" : "247",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1139",
+            "localId" : "235",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1141",
+              "localId" : "236",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1142",
+                "localId" : "237",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1140",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1137",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "233",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1138",
+              "localId" : "234",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1147",
+            "localId" : "240",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1148",
+              "localId" : "241",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1149",
+                "localId" : "242",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Negate",
-              "localId" : "1143",
+              "type" : "Literal",
+              "localId" : "238",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1145",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1144",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
-                "annotation" : [ ]
-              }
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1146",
+              "localId" : "239",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1157",
+        "localId" : "250",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayBeAfterIntIvl",
+        "name" : "AfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1157",
+            "r" : "250",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayBeAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "AfterLongIvl", ": " ]
             }, {
-              "r" : "1171",
+              "r" : "261",
               "s" : [ {
-                "r" : "1160",
+                "r" : "253",
                 "s" : [ {
-                  "r" : "1158",
-                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
+                  "r" : "251",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               }, {
-                "r" : "1171",
+                "r" : "261",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1168",
+                "r" : "258",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1164",
-                  "s" : [ {
-                    "r" : "1165",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "r" : "1167",
-                  "value" : [ ", ", "0", "]" ]
+                  "r" : "256",
+                  "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                 } ]
               } ]
             } ]
@@ -66778,144 +70598,127 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1171",
+          "localId" : "261",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1172",
+            "localId" : "262",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1173",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "263",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1174",
+            "localId" : "264",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1175",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "265",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1160",
-            "lowClosed" : false,
+            "localId" : "253",
+            "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1162",
+              "localId" : "254",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1163",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "255",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1161",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1158",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "251",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1159",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1168",
+            "localId" : "258",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1169",
+              "localId" : "259",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1170",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "260",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Negate",
-              "localId" : "1164",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1166",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1165",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1167",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "257",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1178",
+        "localId" : "268",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotAfterIntIvl",
+        "name" : "NotAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1178",
+            "r" : "268",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "NotAfterLongIvl", ": " ]
             }, {
-              "r" : "1190",
+              "r" : "279",
               "s" : [ {
-                "r" : "1181",
+                "r" : "271",
                 "s" : [ {
-                  "r" : "1179",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
+                  "r" : "269",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               }, {
-                "r" : "1190",
+                "r" : "279",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1187",
+                "r" : "276",
                 "s" : [ {
-                  "r" : "1185",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                  "r" : "274",
+                  "value" : [ "Interval[", "2L", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
@@ -66923,147 +70726,127 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1190",
+          "localId" : "279",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1191",
+            "localId" : "280",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1192",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "281",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1193",
+            "localId" : "282",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1194",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "283",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1181",
-            "lowClosed" : false,
+            "localId" : "271",
+            "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1183",
+              "localId" : "272",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1184",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "273",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1182",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1179",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1180",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1187",
+            "localId" : "276",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1188",
+              "localId" : "277",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1189",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "278",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1185",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1186",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1197",
+        "localId" : "286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndAfterIntIvl",
+        "name" : "AfterRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1197",
+            "r" : "286",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "AfterRealIvl", ": " ]
             }, {
-              "r" : "1213",
+              "r" : "297",
               "s" : [ {
-                "r" : "1200",
+                "r" : "289",
                 "s" : [ {
-                  "r" : "1198",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                  "r" : "287",
+                  "value" : [ "Interval[", "1.234", ", ", "2.345", "]" ]
                 } ]
               }, {
-                "r" : "1213",
+                "r" : "297",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1210",
+                "r" : "294",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1204",
-                  "s" : [ {
-                    "r" : "1205",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1207",
-                  "s" : [ {
-                    "r" : "1208",
-                    "value" : [ "-", "20" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "292",
+                  "value" : [ "Interval[", "0.0", ", ", "1.23", "]" ]
                 } ]
               } ]
             } ]
@@ -67071,164 +70854,127 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1213",
+          "localId" : "297",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1214",
+            "localId" : "298",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1215",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "299",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1216",
+            "localId" : "300",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1217",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "301",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1200",
+            "localId" : "289",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1202",
+              "localId" : "290",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1203",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1198",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1201",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1199",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.345",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1210",
+            "localId" : "294",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1211",
+              "localId" : "295",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1212",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "296",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Negate",
-              "localId" : "1204",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1206",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1205",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "Negate",
-              "localId" : "1207",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1209",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1208",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "293",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1220",
+        "localId" : "304",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotAfterIntIvl",
+        "name" : "NotAfterRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1220",
+            "r" : "304",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "NotAfterRealIvl", ": " ]
             }, {
-              "r" : "1234",
+              "r" : "315",
               "s" : [ {
-                "r" : "1223",
+                "r" : "307",
                 "s" : [ {
-                  "r" : "1221",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                  "r" : "305",
+                  "value" : [ "Interval[", "1.234", ", ", "2.345", "]" ]
                 } ]
               }, {
-                "r" : "1234",
+                "r" : "315",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1231",
+                "r" : "312",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1227",
-                  "s" : [ {
-                    "r" : "1228",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "r" : "1230",
-                  "value" : [ ", ", "0", "]" ]
+                  "r" : "310",
+                  "value" : [ "Interval[", "0.0", ", ", "1.234", "]" ]
                 } ]
               } ]
             } ]
@@ -67236,492 +70982,402 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1234",
+          "localId" : "315",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1235",
+            "localId" : "316",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1236",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1237",
+            "localId" : "318",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1238",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "319",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1223",
+            "localId" : "307",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1225",
+              "localId" : "308",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1226",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "309",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1224",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1222",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.345",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1231",
+            "localId" : "312",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1232",
+              "localId" : "313",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1233",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Negate",
-              "localId" : "1227",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1229",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1228",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "310",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.0",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1230",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1241",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndAfterIntIvl",
+        "localId" : "322",
+        "name" : "DateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1241",
+            "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "DateIvl", ": " ]
             }, {
-              "r" : "1257",
+              "r" : "371",
               "s" : [ {
-                "r" : "1244",
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "339",
                 "s" : [ {
-                  "r" : "1242",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                  "r" : "323",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "r" : "1257",
-                "value" : [ " ", "after", " " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "1254",
+                "r" : "363",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1248",
-                  "s" : [ {
-                    "r" : "1249",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1251",
-                  "s" : [ {
-                    "r" : "1252",
-                    "value" : [ "-", "20" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "347",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "374",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "375",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "After",
-          "localId" : "1257",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Interval",
+          "localId" : "371",
+          "lowClosed" : true,
+          "highClosed" : false,
           "annotation" : [ ],
-          "signature" : [ {
+          "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1258",
+            "localId" : "372",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1259",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1260",
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "339",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1261",
+              "localId" : "340",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1244",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1246",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1247",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "341",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "342",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "343",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "344",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "345",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "346",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "1242",
+              "localId" : "324",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "325",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "326",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "1245",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1243",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1254",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1255",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1256",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "327",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1248",
+            "second" : {
+              "type" : "Literal",
+              "localId" : "328",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1250",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1249",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
-                "annotation" : [ ]
-              }
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
-            "high" : {
-              "type" : "Negate",
-              "localId" : "1251",
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "329",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1253",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1252",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
-                "annotation" : [ ]
-              }
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
-          } ]
-        }
-      }, {
-        "localId" : "1264",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotAfterIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1264",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotAfterIntIvl", ": " ]
-            }, {
-              "r" : "1278",
-              "s" : [ {
-                "r" : "1267",
-                "s" : [ {
-                  "r" : "1265",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "1278",
-                "value" : [ " ", "after", " " ]
-              }, {
-                "r" : "1275",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1271",
-                  "s" : [ {
-                    "r" : "1272",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "r" : "1274",
-                  "value" : [ ", ", "0", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "After",
-          "localId" : "1278",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1279",
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "363",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1280",
+              "localId" : "364",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1281",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1282",
+              "localId" : "365",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1267",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1269",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1270",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "366",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "367",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "368",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "369",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "370",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "1265",
+              "localId" : "348",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "349",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "350",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "1268",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1266",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1275",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1276",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1277",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "351",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1271",
+            "second" : {
+              "type" : "Literal",
+              "localId" : "352",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1273",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1272",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
-                "annotation" : [ ]
-              }
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
-            "high" : {
+            "millisecond" : {
               "type" : "Literal",
-              "localId" : "1274",
+              "localId" : "353",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1285",
+        "localId" : "378",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotAfterDateIvl",
+        "name" : "AfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1285",
+            "r" : "378",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "AfterDateIvl", ": " ]
             }, {
-              "r" : "1366",
+              "r" : "433",
               "s" : [ {
-                "r" : "1311",
+                "r" : "379",
                 "s" : [ {
-                  "r" : "1286",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1303",
-                  "s" : [ {
-                    "r" : "1287",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "1366",
+                "r" : "433",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1363",
+                "r" : "430",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1331",
+                  "r" : "398",
                   "s" : [ {
-                    "r" : "1315",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "382",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1355",
+                  "r" : "422",
                   "s" : [ {
-                    "r" : "1339",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "406",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -67729,227 +71385,115 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1366",
+          "localId" : "433",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1367",
+            "localId" : "434",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1368",
+              "localId" : "435",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1369",
+            "localId" : "436",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1370",
+              "localId" : "437",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1311",
-            "lowClosed" : true,
-            "highClosed" : false,
+            "type" : "ExpressionRef",
+            "localId" : "379",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1313",
+              "localId" : "380",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1314",
+                "localId" : "381",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1312",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1286",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1303",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1304",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1305",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1306",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1307",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1308",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1309",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1310",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1287",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1288",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1289",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1290",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1291",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1292",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1293",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1363",
+            "localId" : "430",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1364",
+              "localId" : "431",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1365",
+                "localId" : "432",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1331",
+              "localId" : "398",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1332",
+                "localId" : "399",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1333",
+                "localId" : "400",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1334",
+                "localId" : "401",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1335",
+                "localId" : "402",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1336",
+                "localId" : "403",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1337",
+                "localId" : "404",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1338",
+                "localId" : "405",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1315",
+                "localId" : "382",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1316",
+                "localId" : "383",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -67957,7 +71501,7 @@ module.exports['After'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1317",
+                "localId" : "384",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -67965,7 +71509,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1318",
+                "localId" : "385",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -67973,7 +71517,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1319",
+                "localId" : "386",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -67981,7 +71525,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1320",
+                "localId" : "387",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -67989,7 +71533,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1321",
+                "localId" : "388",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -67998,64 +71542,64 @@ module.exports['After'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1355",
+              "localId" : "422",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1356",
+                "localId" : "423",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1357",
+                "localId" : "424",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1358",
+                "localId" : "425",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1359",
+                "localId" : "426",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1360",
+                "localId" : "427",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1361",
+                "localId" : "428",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1362",
+                "localId" : "429",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1339",
+                "localId" : "406",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1340",
+                "localId" : "407",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1341",
+                "localId" : "408",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -68063,7 +71607,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1342",
+                "localId" : "409",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68071,7 +71615,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1343",
+                "localId" : "410",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68079,7 +71623,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1344",
+                "localId" : "411",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68087,7 +71631,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1345",
+                "localId" : "412",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68097,54 +71641,45 @@ module.exports['After'] = {
           } ]
         }
       }, {
-        "localId" : "1373",
+        "localId" : "440",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayBeAfterDateIvl",
+        "name" : "NotAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1373",
+            "r" : "440",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayBeAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "NotAfterDateIvl", ": " ]
             }, {
-              "r" : "1454",
+              "r" : "495",
               "s" : [ {
-                "r" : "1399",
+                "r" : "441",
                 "s" : [ {
-                  "r" : "1374",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "1391",
-                  "s" : [ {
-                    "r" : "1375",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "1454",
+                "r" : "495",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1451",
+                "r" : "492",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1419",
+                  "r" : "460",
                   "s" : [ {
-                    "r" : "1403",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "444",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1443",
+                  "r" : "484",
                   "s" : [ {
-                    "r" : "1427",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "468",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -68155,227 +71690,115 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1454",
+          "localId" : "495",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1455",
+            "localId" : "496",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1456",
+              "localId" : "497",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1457",
+            "localId" : "498",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1458",
+              "localId" : "499",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1399",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "type" : "ExpressionRef",
+            "localId" : "441",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1401",
+              "localId" : "442",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1402",
+                "localId" : "443",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1400",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1374",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1391",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1392",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1393",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1394",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1395",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1396",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1397",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1398",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1375",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1376",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1377",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1378",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1379",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1380",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1381",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1451",
+            "localId" : "492",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1452",
+              "localId" : "493",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1453",
+                "localId" : "494",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1419",
+              "localId" : "460",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1420",
+                "localId" : "461",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1421",
+                "localId" : "462",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1422",
+                "localId" : "463",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1423",
+                "localId" : "464",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1424",
+                "localId" : "465",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1425",
+                "localId" : "466",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1426",
+                "localId" : "467",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1403",
+                "localId" : "444",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1404",
+                "localId" : "445",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -68383,7 +71806,7 @@ module.exports['After'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1405",
+                "localId" : "446",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -68391,7 +71814,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1406",
+                "localId" : "447",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68399,7 +71822,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1407",
+                "localId" : "448",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68407,7 +71830,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1408",
+                "localId" : "449",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68415,7 +71838,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1409",
+                "localId" : "450",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68424,64 +71847,64 @@ module.exports['After'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1443",
+              "localId" : "484",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1444",
+                "localId" : "485",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1445",
+                "localId" : "486",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1446",
+                "localId" : "487",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1447",
+                "localId" : "488",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1448",
+                "localId" : "489",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1449",
+                "localId" : "490",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1450",
+                "localId" : "491",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1427",
+                "localId" : "468",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1428",
+                "localId" : "469",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1429",
+                "localId" : "470",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -68489,7 +71912,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1430",
+                "localId" : "471",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68497,7 +71920,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1431",
+                "localId" : "472",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68505,7 +71928,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1432",
+                "localId" : "473",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68513,7 +71936,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1433",
+                "localId" : "474",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -68523,54 +71946,45 @@ module.exports['After'] = {
           } ]
         }
       }, {
-        "localId" : "1461",
+        "localId" : "502",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotAfterDateIvl",
+        "name" : "AfterImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1461",
+            "r" : "502",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "AfterImpreciseDateIvl", ": " ]
             }, {
-              "r" : "1542",
+              "r" : "527",
               "s" : [ {
-                "r" : "1487",
+                "r" : "503",
                 "s" : [ {
-                  "r" : "1462",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "1479",
-                  "s" : [ {
-                    "r" : "1463",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "1542",
+                "r" : "527",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1539",
+                "r" : "524",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1507",
+                  "r" : "512",
                   "s" : [ {
-                    "r" : "1491",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "506",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1531",
+                  "r" : "521",
                   "s" : [ {
-                    "r" : "1515",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "515",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -68581,422 +71995,171 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1542",
+          "localId" : "527",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1543",
+            "localId" : "528",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1544",
+              "localId" : "529",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1545",
+            "localId" : "530",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1546",
+              "localId" : "531",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1487",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "type" : "ExpressionRef",
+            "localId" : "503",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1489",
+              "localId" : "504",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1490",
+                "localId" : "505",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1488",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1462",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1479",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1480",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1481",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1482",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1483",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1484",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1485",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1486",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1463",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1464",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1465",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1466",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1467",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1468",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1469",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1539",
+            "localId" : "524",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1540",
+              "localId" : "525",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1541",
+                "localId" : "526",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1507",
+              "localId" : "512",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1508",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1509",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1510",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1511",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1512",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1513",
+                "localId" : "513",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1514",
+                "localId" : "514",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1491",
+                "localId" : "506",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1492",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1493",
+                "localId" : "507",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1494",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1495",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1496",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1497",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1531",
+              "localId" : "521",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1532",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1533",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1534",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1535",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1536",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1537",
+                "localId" : "522",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1538",
+                "localId" : "523",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1515",
+                "localId" : "515",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1516",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1517",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1518",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1519",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1520",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1521",
+                "localId" : "516",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "2",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1549",
+        "localId" : "534",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndAfterDateIvl",
+        "name" : "NotAfterImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1549",
+            "r" : "534",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "NotAfterImpreciseDateIvl", ": " ]
             }, {
-              "r" : "1630",
+              "r" : "559",
               "s" : [ {
-                "r" : "1575",
+                "r" : "535",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1566",
-                  "s" : [ {
-                    "r" : "1550",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "1574",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "1630",
+                "r" : "559",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1627",
+                "r" : "556",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1595",
+                  "r" : "544",
                   "s" : [ {
-                    "r" : "1579",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "538",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1619",
+                  "r" : "553",
                   "s" : [ {
-                    "r" : "1603",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "547",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -69007,422 +72170,171 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1630",
+          "localId" : "559",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1631",
+            "localId" : "560",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1632",
+              "localId" : "561",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1633",
+            "localId" : "562",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1634",
+              "localId" : "563",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1575",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "535",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1577",
+              "localId" : "536",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1578",
+                "localId" : "537",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1566",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1567",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1568",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1569",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1570",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1571",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1572",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1573",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1550",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1551",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1552",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1553",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1554",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1555",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1556",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1576",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1574",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1627",
+            "localId" : "556",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1628",
+              "localId" : "557",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1629",
+                "localId" : "558",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1595",
+              "localId" : "544",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1596",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1597",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1598",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1599",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1600",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1601",
+                "localId" : "545",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1602",
+                "localId" : "546",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1579",
+                "localId" : "538",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1580",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1581",
+                "localId" : "539",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1582",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1583",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1584",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1585",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1619",
+              "localId" : "553",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1620",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1621",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1622",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1623",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1624",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1625",
+                "localId" : "554",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1626",
+                "localId" : "555",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1603",
+                "localId" : "547",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1604",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1605",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1606",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1607",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1608",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1609",
+                "localId" : "548",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "3",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1637",
+        "localId" : "566",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotAfterDateIvl",
+        "name" : "MayBeAfterImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1637",
+            "r" : "566",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "MayBeAfterImpreciseDateIvl", ": " ]
             }, {
-              "r" : "1718",
+              "r" : "585",
               "s" : [ {
-                "r" : "1663",
+                "r" : "567",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1654",
-                  "s" : [ {
-                    "r" : "1638",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "1662",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "1718",
+                "r" : "585",
                 "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1715",
+                "r" : "582",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1683",
+                  "r" : "574",
                   "s" : [ {
-                    "r" : "1667",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "570",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1707",
+                  "r" : "580",
                   "s" : [ {
-                    "r" : "1691",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "576",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -69433,227 +72345,526 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1718",
+          "localId" : "585",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1719",
+            "localId" : "586",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1720",
+              "localId" : "587",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1721",
+            "localId" : "588",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1722",
+              "localId" : "589",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "567",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "568",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "569",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "1663",
+            "localId" : "582",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1665",
+              "localId" : "583",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1666",
+                "localId" : "584",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1654",
+              "localId" : "574",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1655",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1656",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1657",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1658",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1659",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1660",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1661",
+                "localId" : "575",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1638",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1639",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1640",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1641",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1642",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1643",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1644",
+                "localId" : "570",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "2012",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1664",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1662",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1715",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1716",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1717",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
               "type" : "DateTime",
-              "localId" : "1683",
+              "localId" : "580",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1684",
+                "localId" : "581",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1685",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "576",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "592",
+        "name" : "PrecisionDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "592",
+            "s" : [ {
+              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
+            }, {
+              "r" : "641",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "609",
+                "s" : [ {
+                  "r" : "593",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "633",
+                "s" : [ {
+                  "r" : "617",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "644",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "645",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "641",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "642",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "643",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "609",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "610",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "611",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "612",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "613",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "614",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "615",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "616",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "593",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "594",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "595",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "596",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "597",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "34",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "598",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "56",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "599",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "789",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "633",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "634",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "635",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "636",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "637",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "638",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "639",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "640",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "617",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "618",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "619",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "620",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "621",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "23",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "622",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "45",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "623",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "678",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "648",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AfterDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "648",
+            "s" : [ {
+              "value" : [ "", "define ", "AfterDayOfIvl", ": " ]
+            }, {
+              "r" : "703",
+              "s" : [ {
+                "r" : "649",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "703",
+                "value" : [ " ", "after day of", " " ]
+              }, {
+                "r" : "700",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "668",
+                  "s" : [ {
+                    "r" : "652",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "692",
+                  "s" : [ {
+                    "r" : "676",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "After",
+          "localId" : "703",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "704",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "705",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "706",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "707",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "649",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "650",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "651",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "700",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "701",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "702",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "668",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "669",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1686",
+                "localId" : "670",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1687",
+                "localId" : "671",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1688",
+                "localId" : "672",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1689",
+                "localId" : "673",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1690",
+                "localId" : "674",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "675",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1667",
+                "localId" : "652",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1668",
+                "localId" : "653",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -69661,15 +72872,15 @@ module.exports['After'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1669",
+                "localId" : "654",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1670",
+                "localId" : "655",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69677,7 +72888,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1671",
+                "localId" : "656",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69685,7 +72896,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1672",
+                "localId" : "657",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69693,7 +72904,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1673",
+                "localId" : "658",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69702,64 +72913,64 @@ module.exports['After'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1707",
+              "localId" : "692",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1708",
+                "localId" : "693",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1709",
+                "localId" : "694",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1710",
+                "localId" : "695",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1711",
+                "localId" : "696",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1712",
+                "localId" : "697",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1713",
+                "localId" : "698",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1714",
+                "localId" : "699",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1691",
+                "localId" : "676",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1692",
+                "localId" : "677",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1693",
+                "localId" : "678",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -69767,7 +72978,7 @@ module.exports['After'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1694",
+                "localId" : "679",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69775,7 +72986,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1695",
+                "localId" : "680",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69783,7 +72994,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1696",
+                "localId" : "681",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69791,7 +73002,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1697",
+                "localId" : "682",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69801,54 +73012,45 @@ module.exports['After'] = {
           } ]
         }
       }, {
-        "localId" : "1725",
+        "localId" : "710",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndAfterDateIvl",
+        "name" : "BeforeDayOfIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1725",
+            "r" : "710",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "BeforeDayOfIvl", ": " ]
             }, {
-              "r" : "1806",
+              "r" : "765",
               "s" : [ {
-                "r" : "1751",
+                "r" : "711",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1742",
-                  "s" : [ {
-                    "r" : "1726",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "1750",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1806",
-                "value" : [ " ", "after", " " ]
+                "r" : "765",
+                "value" : [ " ", "after day of", " " ]
               }, {
-                "r" : "1803",
+                "r" : "762",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1771",
+                  "r" : "730",
                   "s" : [ {
-                    "r" : "1755",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "714",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1795",
+                  "r" : "754",
                   "s" : [ {
-                    "r" : "1779",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "738",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -69859,115 +73061,132 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1806",
+          "localId" : "765",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1807",
+            "localId" : "766",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1808",
+              "localId" : "767",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1809",
+            "localId" : "768",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1810",
+              "localId" : "769",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "711",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "712",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "713",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "1751",
+            "localId" : "762",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1753",
+              "localId" : "763",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1754",
+                "localId" : "764",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1742",
+              "localId" : "730",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1743",
+                "localId" : "731",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1744",
+                "localId" : "732",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1745",
+                "localId" : "733",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1746",
+                "localId" : "734",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1747",
+                "localId" : "735",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1748",
+                "localId" : "736",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1749",
+                "localId" : "737",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1726",
+                "localId" : "714",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1727",
+                "localId" : "715",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1728",
+                "localId" : "716",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1729",
+                "localId" : "717",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69975,7 +73194,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1730",
+                "localId" : "718",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69983,7 +73202,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1731",
+                "localId" : "719",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69991,7 +73210,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1732",
+                "localId" : "720",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -69999,201 +73218,379 @@ module.exports['After'] = {
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1752",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "DateTime",
+              "localId" : "754",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1750",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "755",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "756",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "757",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "758",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "759",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "760",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "761",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "738",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "739",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "740",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "741",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "742",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "743",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "744",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "772",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "StartsSameDayOfIvlEnd",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "772",
+            "s" : [ {
+              "value" : [ "", "define ", "StartsSameDayOfIvlEnd", ": " ]
+            }, {
+              "r" : "827",
+              "s" : [ {
+                "r" : "773",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "827",
+                "value" : [ " ", "after day of", " " ]
+              }, {
+                "r" : "824",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "792",
+                  "s" : [ {
+                    "r" : "776",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "816",
+                  "s" : [ {
+                    "r" : "800",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "After",
+          "localId" : "827",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "828",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "829",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "830",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "831",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "773",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "774",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "775",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1803",
+            "localId" : "824",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1804",
+              "localId" : "825",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1805",
+                "localId" : "826",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1771",
+              "localId" : "792",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1772",
+                "localId" : "793",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1773",
+                "localId" : "794",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1774",
+                "localId" : "795",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1775",
+                "localId" : "796",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1776",
+                "localId" : "797",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1777",
+                "localId" : "798",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1778",
+                "localId" : "799",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1755",
+                "localId" : "776",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1756",
+                "localId" : "777",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1757",
+                "localId" : "778",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1758",
+                "localId" : "779",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "23",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1759",
+                "localId" : "780",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1760",
+                "localId" : "781",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1761",
+                "localId" : "782",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "999",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1795",
+              "localId" : "816",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1796",
+                "localId" : "817",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1797",
+                "localId" : "818",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1798",
+                "localId" : "819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1799",
+                "localId" : "820",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1800",
+                "localId" : "821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1801",
+                "localId" : "822",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1802",
+                "localId" : "823",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1779",
+                "localId" : "800",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1780",
+                "localId" : "801",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "10",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1781",
+                "localId" : "802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1782",
+                "localId" : "803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70201,7 +73598,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1783",
+                "localId" : "804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70209,7 +73606,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1784",
+                "localId" : "805",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70217,7 +73614,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1785",
+                "localId" : "806",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70227,54 +73624,45 @@ module.exports['After'] = {
           } ]
         }
       }, {
-        "localId" : "1813",
+        "localId" : "834",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotAfterDateIvl",
+        "name" : "EndsSameDayOfIvlStart",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1813",
+            "r" : "834",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "EndsSameDayOfIvlStart", ": " ]
             }, {
-              "r" : "1894",
+              "r" : "889",
               "s" : [ {
-                "r" : "1839",
+                "r" : "835",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1830",
-                  "s" : [ {
-                    "r" : "1814",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "1838",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1894",
-                "value" : [ " ", "after", " " ]
+                "r" : "889",
+                "value" : [ " ", "after day of", " " ]
               }, {
-                "r" : "1891",
+                "r" : "886",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1859",
+                  "r" : "854",
                   "s" : [ {
-                    "r" : "1843",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "838",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1883",
+                  "r" : "878",
                   "s" : [ {
-                    "r" : "1867",
-                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "862",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -70285,99 +73673,116 @@ module.exports['After'] = {
         } ],
         "expression" : {
           "type" : "After",
-          "localId" : "1894",
+          "localId" : "889",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1895",
+            "localId" : "890",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1896",
+              "localId" : "891",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1897",
+            "localId" : "892",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1898",
+              "localId" : "893",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "835",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "836",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "837",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "1839",
+            "localId" : "886",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1841",
+              "localId" : "887",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1842",
+                "localId" : "888",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1830",
+              "localId" : "854",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1831",
+                "localId" : "855",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1832",
+                "localId" : "856",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1833",
+                "localId" : "857",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1834",
+                "localId" : "858",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1835",
+                "localId" : "859",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1836",
+                "localId" : "860",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1837",
+                "localId" : "861",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1814",
+                "localId" : "838",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1815",
+                "localId" : "839",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -70385,15 +73790,15 @@ module.exports['After'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1816",
+                "localId" : "840",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1817",
+                "localId" : "841",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70401,7 +73806,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1818",
+                "localId" : "842",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70409,7 +73814,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1819",
+                "localId" : "843",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70417,7 +73822,7 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1820",
+                "localId" : "844",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70425,103 +73830,73 @@ module.exports['After'] = {
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1840",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1838",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1891",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1892",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1893",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
               "type" : "DateTime",
-              "localId" : "1859",
+              "localId" : "878",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1860",
+                "localId" : "879",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1861",
+                "localId" : "880",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1862",
+                "localId" : "881",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1863",
+                "localId" : "882",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1864",
+                "localId" : "883",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1865",
+                "localId" : "884",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1866",
+                "localId" : "885",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1843",
+                "localId" : "862",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1844",
+                "localId" : "863",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1845",
+                "localId" : "864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1846",
+                "localId" : "865",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70529,7 +73904,7 @@ module.exports['After'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1847",
+                "localId" : "866",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70537,7 +73912,7 @@ module.exports['After'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1848",
+                "localId" : "867",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -70545,863 +73920,450 @@ module.exports['After'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1849",
+                "localId" : "868",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1883",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1884",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1885",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1886",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1887",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "896",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayBeAfterDayOfImpreciseIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "896",
+            "s" : [ {
+              "value" : [ "", "define ", "MayBeAfterDayOfImpreciseIvl", ": " ]
+            }, {
+              "r" : "921",
+              "s" : [ {
+                "r" : "897",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1888",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "921",
+                "value" : [ " ", "after day of", " " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1889",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1890",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1867",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2040",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1868",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1869",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1870",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1871",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1872",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1873",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      } ]
-    }
-  }
-}
-
-/* Before
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define BeforeIntIvl: Interval[2, 4] before Interval[5, 10]
-define NotBeforeIntIvl: Interval[2, 5] before Interval[5, 10]
-define BeforeRealIvl: Interval[0.0, 1.23] before Interval[1.234, 2.345]
-define NotBeforeRealIvl: Interval[1.234, 2.345] before Interval[0.0, 1.234]
-define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define BeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) before DateIvl
-define NotBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)] before DateIvl
-define BeforeImpreciseDateIvl: DateIvl before Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define NotBeforeImpreciseDateIvl: DateIvl before Interval[DateTime(2012, 8), DateTime(2012, 12)]
-define MayBeBeforeImpreciseDateIvl: DateIvl before Interval[DateTime(2012), DateTime(2012)]
-define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define AfterDayOfIvl: PrecisionDateIvl before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define BeforeDayOfIvl: PrecisionDateIvl before day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
-define StartsSameDayOfIvlEnd: PrecisionDateIvl before day of Interval[DateTime(2012, 9, 2, 23, 59, 59, 999), DateTime(2012, 10, 2, 0, 0, 0, 0)]
-define EndsSameDayOfIvlStart: PrecisionDateIvl before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define MayBeAfterDayOfImpreciseIvl: PrecisionDateIvl before day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
-define MayBeBeforeDayOfImpreciseIvl: PrecisionDateIvl before day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
-define ImpreciseBeforeDateIvl: ImpDateIvl before Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0))
-define ImpreciseNotBeforeDateIvl: ImpDateIvl before Interval[DateTime(2012, 8, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0))
-define ImpreciseMayBeBeforeDateIvl: ImpDateIvl before Interval[DateTime(2012, 8, 15, 0, 0, 0, 0), DateTime(2012, 12, 15, 0, 0, 0, 0))
-define NegInfBegBeforeIntIvl: Interval[null, 100] before Interval[101, 200]
-define NegInfBegNotBeforeIntIvl: Interval[null, 100] before Interval[100, 200]
-define UnknownBegBeforeIntIvl: Interval(null, 100] before Interval[101, 200]
-define UnknownBegNotBeforeIntIvl: Interval(null, 5] before Interval[0, 100]
-define PosInfEndNotBeforeIntIvl: Interval[0, null] before Interval[1000, 2000]
-define UnknownEndMayBeBeforeIntIvl: Interval[0, null) before Interval[1000, 2000]
-define UnknownEndNotBeforeIntIvl: Interval[0, null) before Interval[-100, 0]
-define NegInfBegBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
-define NegInfBegNotBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define UnknownBegBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
-define UnknownBegNotBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define PosInfEndNotBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define UnknownEndMayBeBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) before Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
-define UnknownEndNotBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-*/
-
-module.exports['Before'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "1799",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
-      }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "BeforeIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "214",
-            "s" : [ {
-              "value" : [ "", "define ", "BeforeIntIvl", ": " ]
-            }, {
-              "r" : "225",
-              "s" : [ {
-                "r" : "217",
-                "s" : [ {
-                  "r" : "215",
-                  "value" : [ "Interval[", "2", ", ", "4", "]" ]
-                } ]
-              }, {
-                "r" : "225",
-                "value" : [ " ", "before", " " ]
-              }, {
-                "r" : "222",
+                "r" : "918",
                 "s" : [ {
-                  "r" : "220",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "906",
+                  "s" : [ {
+                    "r" : "900",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "915",
+                  "s" : [ {
+                    "r" : "909",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "225",
+          "type" : "After",
+          "localId" : "921",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "226",
+            "localId" : "922",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "227",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "923",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "228",
+            "localId" : "924",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "925",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "217",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "897",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "218",
+              "localId" : "898",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "219",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "899",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "222",
+            "localId" : "918",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "223",
+              "localId" : "919",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "224",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "920",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "232",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotBeforeIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "232",
-            "s" : [ {
-              "value" : [ "", "define ", "NotBeforeIntIvl", ": " ]
-            }, {
-              "r" : "243",
-              "s" : [ {
-                "r" : "235",
-                "s" : [ {
-                  "r" : "233",
-                  "value" : [ "Interval[", "2", ", ", "5", "]" ]
-                } ]
-              }, {
-                "r" : "243",
-                "value" : [ " ", "before", " " ]
-              }, {
-                "r" : "240",
-                "s" : [ {
-                  "r" : "238",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Before",
-          "localId" : "243",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "244",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "245",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "246",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "247",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "235",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "236",
+              "type" : "DateTime",
+              "localId" : "906",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "237",
+                "localId" : "907",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "908",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "900",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "901",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "233",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
             "high" : {
-              "type" : "Literal",
-              "localId" : "234",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "240",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "241",
+              "type" : "DateTime",
+              "localId" : "915",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "242",
+                "localId" : "916",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "917",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "909",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "910",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "238",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "250",
+        "localId" : "928",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "BeforeRealIvl",
+        "name" : "MayBeBeforeDayOfImpreciseIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "250",
+            "r" : "928",
             "s" : [ {
-              "value" : [ "", "define ", "BeforeRealIvl", ": " ]
+              "value" : [ "", "define ", "MayBeBeforeDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "261",
+              "r" : "953",
               "s" : [ {
-                "r" : "253",
+                "r" : "929",
                 "s" : [ {
-                  "r" : "251",
-                  "value" : [ "Interval[", "0.0", ", ", "1.23", "]" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "261",
-                "value" : [ " ", "before", " " ]
+                "r" : "953",
+                "value" : [ " ", "after day of", " " ]
               }, {
-                "r" : "258",
+                "r" : "950",
                 "s" : [ {
-                  "r" : "256",
-                  "value" : [ "Interval[", "1.234", ", ", "2.345", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "938",
+                  "s" : [ {
+                    "r" : "932",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "947",
+                  "s" : [ {
+                    "r" : "941",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "261",
+          "type" : "After",
+          "localId" : "953",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "262",
+            "localId" : "954",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "263",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "955",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
+            "localId" : "956",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "265",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "957",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "253",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "929",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "254",
+              "localId" : "930",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "255",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "931",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "258",
+            "localId" : "950",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "259",
+              "localId" : "951",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "260",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "952",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "256",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "257",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.345",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "268",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotBeforeRealIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "268",
-            "s" : [ {
-              "value" : [ "", "define ", "NotBeforeRealIvl", ": " ]
-            }, {
-              "r" : "279",
-              "s" : [ {
-                "r" : "271",
-                "s" : [ {
-                  "r" : "269",
-                  "value" : [ "Interval[", "1.234", ", ", "2.345", "]" ]
-                } ]
-              }, {
-                "r" : "279",
-                "value" : [ " ", "before", " " ]
-              }, {
-                "r" : "276",
-                "s" : [ {
-                  "r" : "274",
-                  "value" : [ "Interval[", "0.0", ", ", "1.234", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Before",
-          "localId" : "279",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "280",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "281",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "282",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "283",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "271",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "272",
+              "type" : "DateTime",
+              "localId" : "938",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "273",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "939",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "940",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "932",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "933",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
                 "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
-            },
             "high" : {
-              "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.345",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "276",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "277",
+              "type" : "DateTime",
+              "localId" : "947",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "278",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "948",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "949",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "941",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "942",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "286",
-        "name" : "DateIvl",
+        "localId" : "960",
+        "name" : "ImpDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "286",
+            "r" : "960",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvl", ": " ]
+              "value" : [ "", "define ", "ImpDateIvl", ": " ]
             }, {
-              "r" : "335",
+              "r" : "979",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "303",
+                "r" : "967",
                 "s" : [ {
-                  "r" : "287",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "961",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "327",
+                "r" : "976",
                 "s" : [ {
-                  "r" : "311",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "970",
+                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "338",
+          "localId" : "982",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "339",
+            "localId" : "983",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "335",
+          "localId" : "979",
           "lowClosed" : true,
-          "highClosed" : false,
+          "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "336",
+            "localId" : "980",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "337",
+              "localId" : "981",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "303",
+            "localId" : "967",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "304",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "305",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "306",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "307",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "308",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "309",
+              "localId" : "968",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "310",
+              "localId" : "969",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "287",
+              "localId" : "961",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -71409,97 +74371,32 @@ module.exports['Before'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "288",
+              "localId" : "962",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "289",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "290",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "291",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             }
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "327",
+            "localId" : "976",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "328",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "329",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "330",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "331",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "332",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "333",
+              "localId" : "977",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "334",
+              "localId" : "978",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "311",
+              "localId" : "970",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -71507,189 +74404,165 @@ module.exports['Before'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "312",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "313",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "314",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "315",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "316",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "317",
+              "localId" : "971",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "8",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "342",
+        "localId" : "986",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "BeforeDateIvl",
+        "name" : "ImpreciseAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "342",
+            "r" : "986",
             "s" : [ {
-              "value" : [ "", "define ", "BeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseAfterDateIvl", ": " ]
             }, {
-              "r" : "397",
+              "r" : "1041",
               "s" : [ {
-                "r" : "391",
+                "r" : "987",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1041",
+                "value" : [ " ", "after", " " ]
+              }, {
+                "r" : "1038",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "359",
+                  "r" : "1006",
                   "s" : [ {
-                    "r" : "343",
+                    "r" : "990",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "383",
+                  "r" : "1030",
                   "s" : [ {
-                    "r" : "367",
+                    "r" : "1014",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
-              }, {
-                "r" : "397",
-                "value" : [ " ", "before", " " ]
-              }, {
-                "r" : "394",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "397",
+          "type" : "After",
+          "localId" : "1041",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "398",
+            "localId" : "1042",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "399",
+              "localId" : "1043",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "400",
+            "localId" : "1044",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "401",
+              "localId" : "1045",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "987",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "988",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "989",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "391",
+            "localId" : "1038",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "392",
+              "localId" : "1039",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "393",
+                "localId" : "1040",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "359",
+              "localId" : "1006",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "360",
+                "localId" : "1007",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "361",
+                "localId" : "1008",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "362",
+                "localId" : "1009",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "363",
+                "localId" : "1010",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "364",
+                "localId" : "1011",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "365",
+                "localId" : "1012",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "366",
+                "localId" : "1013",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "343",
+                "localId" : "990",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -71697,7 +74570,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "344",
+                "localId" : "991",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -71705,7 +74578,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "345",
+                "localId" : "992",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -71713,7 +74586,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "346",
+                "localId" : "993",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -71721,7 +74594,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "347",
+                "localId" : "994",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -71729,7 +74602,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "348",
+                "localId" : "995",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -71737,7 +74610,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "349",
+                "localId" : "996",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -71746,48 +74619,48 @@ module.exports['Before'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "383",
+              "localId" : "1030",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "384",
+                "localId" : "1031",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "385",
+                "localId" : "1032",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "386",
+                "localId" : "1033",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "387",
+                "localId" : "1034",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "388",
+                "localId" : "1035",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "389",
+                "localId" : "1036",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "390",
+                "localId" : "1037",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "367",
+                "localId" : "1014",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -71795,7 +74668,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "368",
+                "localId" : "1015",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -71803,7 +74676,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "369",
+                "localId" : "1016",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -71811,7 +74684,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "370",
+                "localId" : "1017",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -71819,7 +74692,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "371",
+                "localId" : "1018",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -71827,7 +74700,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "372",
+                "localId" : "1019",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -71835,166 +74708,166 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "373",
+                "localId" : "1020",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "394",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "395",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "396",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "404",
+        "localId" : "1048",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotBeforeDateIvl",
+        "name" : "ImpreciseNotAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "404",
+            "r" : "1048",
             "s" : [ {
-              "value" : [ "", "define ", "NotBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseNotAfterDateIvl", ": " ]
             }, {
-              "r" : "459",
+              "r" : "1103",
               "s" : [ {
-                "r" : "453",
+                "r" : "1049",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1103",
+                "value" : [ " ", "after", " " ]
+              }, {
+                "r" : "1100",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "421",
+                  "r" : "1068",
                   "s" : [ {
-                    "r" : "405",
+                    "r" : "1052",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "445",
+                  "r" : "1092",
                   "s" : [ {
-                    "r" : "429",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1076",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "r" : "459",
-                "value" : [ " ", "before", " " ]
-              }, {
-                "r" : "456",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "459",
+          "type" : "After",
+          "localId" : "1103",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "460",
+            "localId" : "1104",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "461",
+              "localId" : "1105",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "462",
+            "localId" : "1106",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "463",
+              "localId" : "1107",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1049",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1050",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1051",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "453",
+            "localId" : "1100",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "454",
+              "localId" : "1101",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "455",
+                "localId" : "1102",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "421",
+              "localId" : "1068",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "422",
+                "localId" : "1069",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "423",
+                "localId" : "1070",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "424",
+                "localId" : "1071",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "425",
+                "localId" : "1072",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "426",
+                "localId" : "1073",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "427",
+                "localId" : "1074",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "428",
+                "localId" : "1075",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "405",
+                "localId" : "1052",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -72002,7 +74875,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "406",
+                "localId" : "1053",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -72010,7 +74883,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "407",
+                "localId" : "1054",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -72018,7 +74891,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "408",
+                "localId" : "1055",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -72026,7 +74899,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "409",
+                "localId" : "1056",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -72034,7 +74907,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "410",
+                "localId" : "1057",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -72042,7 +74915,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "411",
+                "localId" : "1058",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -72051,48 +74924,48 @@ module.exports['Before'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "445",
+              "localId" : "1092",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "446",
+                "localId" : "1093",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "447",
+                "localId" : "1094",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "448",
+                "localId" : "1095",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "449",
+                "localId" : "1096",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "450",
+                "localId" : "1097",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "451",
+                "localId" : "1098",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "452",
+                "localId" : "1099",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "429",
+                "localId" : "1076",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -72100,15 +74973,15 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "430",
+                "localId" : "1077",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "4",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "431",
+                "localId" : "1078",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -72116,7 +74989,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "432",
+                "localId" : "1079",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -72124,7 +74997,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "433",
+                "localId" : "1080",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -72132,7 +75005,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "434",
+                "localId" : "1081",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -72140,157 +75013,166 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "435",
+                "localId" : "1082",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "456",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "457",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "458",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "466",
+        "localId" : "1110",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "BeforeImpreciseDateIvl",
+        "name" : "ImpreciseMayBeAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "466",
+            "r" : "1110",
             "s" : [ {
-              "value" : [ "", "define ", "BeforeImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseMayBeAfterDateIvl", ": " ]
             }, {
-              "r" : "491",
+              "r" : "1165",
               "s" : [ {
-                "r" : "467",
+                "r" : "1111",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "491",
-                "value" : [ " ", "before", " " ]
+                "r" : "1165",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "488",
+                "r" : "1162",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "476",
+                  "r" : "1130",
                   "s" : [ {
-                    "r" : "470",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                    "r" : "1114",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "485",
+                  "r" : "1154",
                   "s" : [ {
-                    "r" : "479",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                    "r" : "1138",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "491",
+          "type" : "After",
+          "localId" : "1165",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "492",
+            "localId" : "1166",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "493",
+              "localId" : "1167",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "494",
+            "localId" : "1168",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "495",
+              "localId" : "1169",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "467",
-            "name" : "DateIvl",
+            "localId" : "1111",
+            "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "468",
+              "localId" : "1112",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "469",
+                "localId" : "1113",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "488",
+            "localId" : "1162",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "489",
+              "localId" : "1163",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "490",
+                "localId" : "1164",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "476",
+              "localId" : "1130",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "477",
+                "localId" : "1131",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "478",
+                "localId" : "1132",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1133",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1134",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1135",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1136",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1137",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "470",
+                "localId" : "1114",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -72298,32 +75180,97 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "471",
+                "localId" : "1115",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1116",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1117",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1118",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1119",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1120",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "485",
+              "localId" : "1154",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "486",
+                "localId" : "1155",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "487",
+                "localId" : "1156",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1157",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1158",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1159",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1160",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1161",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "479",
+                "localId" : "1138",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -72331,640 +75278,535 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "480",
+                "localId" : "1139",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1140",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "15",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1141",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1142",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1143",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1144",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "498",
+        "localId" : "1172",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotBeforeImpreciseDateIvl",
+        "name" : "NegInfBegNotAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "498",
+            "r" : "1172",
             "s" : [ {
-              "value" : [ "", "define ", "NotBeforeImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotAfterIntIvl", ": " ]
             }, {
-              "r" : "523",
+              "r" : "1186",
               "s" : [ {
-                "r" : "499",
+                "r" : "1175",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1173",
+                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "523",
-                "value" : [ " ", "before", " " ]
+                "r" : "1186",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "520",
+                "r" : "1183",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "508",
-                  "s" : [ {
-                    "r" : "502",
-                    "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "517",
+                  "r" : "1179",
                   "s" : [ {
-                    "r" : "511",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                    "r" : "1180",
+                    "value" : [ "-", "100" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "1182",
+                  "value" : [ ", ", "0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "523",
+          "type" : "After",
+          "localId" : "1186",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "524",
+            "localId" : "1187",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "525",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1188",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "526",
+            "localId" : "1189",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "527",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1190",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "499",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1175",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "500",
+              "localId" : "1177",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "501",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1178",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1176",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1173",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1174",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "520",
+            "localId" : "1183",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "521",
+              "localId" : "1184",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "522",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1185",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "508",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1179",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "509",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "510",
+                "localId" : "1181",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "502",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "503",
+                "localId" : "1180",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "8",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "517",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "518",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "519",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "511",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "512",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1182",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "530",
+        "localId" : "1193",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayBeBeforeImpreciseDateIvl",
+        "name" : "UnknownBegMayBeAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "530",
+            "r" : "1193",
             "s" : [ {
-              "value" : [ "", "define ", "MayBeBeforeImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayBeAfterIntIvl", ": " ]
             }, {
-              "r" : "549",
+              "r" : "1207",
               "s" : [ {
-                "r" : "531",
+                "r" : "1196",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1194",
+                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "549",
-                "value" : [ " ", "before", " " ]
+                "r" : "1207",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "546",
+                "r" : "1204",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "538",
-                  "s" : [ {
-                    "r" : "534",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "544",
+                  "r" : "1200",
                   "s" : [ {
-                    "r" : "540",
-                    "value" : [ "DateTime", "(", "2012", ")" ]
+                    "r" : "1201",
+                    "value" : [ "-", "100" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "1203",
+                  "value" : [ ", ", "0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "549",
+          "type" : "After",
+          "localId" : "1207",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "550",
+            "localId" : "1208",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "551",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1209",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "552",
+            "localId" : "1210",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "553",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1211",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "531",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1196",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "532",
+              "localId" : "1198",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "533",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1199",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1197",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1194",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1195",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "546",
+            "localId" : "1204",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "547",
+              "localId" : "1205",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "548",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1206",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "538",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1200",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "539",
+                "localId" : "1202",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "534",
+                "localId" : "1201",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "544",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "545",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "540",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1203",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "556",
-        "name" : "PrecisionDateIvl",
+        "localId" : "1214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegNotAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "556",
+            "r" : "1214",
             "s" : [ {
-              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotAfterIntIvl", ": " ]
             }, {
-              "r" : "605",
+              "r" : "1226",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "573",
+                "r" : "1217",
                 "s" : [ {
-                  "r" : "557",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
+                  "r" : "1215",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "r" : "1226",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "597",
+                "r" : "1223",
                 "s" : [ {
-                  "r" : "581",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
+                  "r" : "1221",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
                 } ]
-              }, {
-                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "608",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "609",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "605",
-          "lowClosed" : true,
-          "highClosed" : false,
+          "type" : "After",
+          "localId" : "1226",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "606",
+            "localId" : "1227",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "607",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1228",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "573",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1229",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "574",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "575",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "576",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "577",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "578",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "579",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "580",
+              "localId" : "1230",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "557",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "558",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "559",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "560",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "561",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "34",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "562",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "56",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "563",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "789",
-              "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "597",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1217",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "598",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "599",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "600",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "601",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "602",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "603",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "604",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "581",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "582",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "583",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1219",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1220",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "584",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "As",
+              "localId" : "1218",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1215",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "585",
+              "localId" : "1216",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
+              "value" : "5",
               "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1223",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1224",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1225",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "586",
+              "localId" : "1221",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "45",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "587",
+              "localId" : "1222",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "678",
+              "value" : "100",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "612",
+        "localId" : "1233",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterDayOfIvl",
+        "name" : "PosInfEndAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "612",
+            "r" : "1233",
             "s" : [ {
-              "value" : [ "", "define ", "AfterDayOfIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndAfterIntIvl", ": " ]
             }, {
-              "r" : "667",
+              "r" : "1249",
               "s" : [ {
-                "r" : "613",
+                "r" : "1236",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "1234",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "667",
-                "value" : [ " ", "before day of", " " ]
+                "r" : "1249",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "664",
+                "r" : "1246",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "632",
+                  "r" : "1240",
                   "s" : [ {
-                    "r" : "616",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1241",
+                    "value" : [ "-", "100" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "656",
+                  "r" : "1243",
                   "s" : [ {
-                    "r" : "640",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1244",
+                    "value" : [ "-", "20" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -72974,609 +75816,322 @@ module.exports['Before'] = {
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "667",
+          "type" : "After",
+          "localId" : "1249",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "668",
+            "localId" : "1250",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "669",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1251",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "670",
+            "localId" : "1252",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "671",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1253",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "613",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1236",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "614",
+              "localId" : "1238",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "615",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1239",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1237",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1235",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "664",
+            "localId" : "1246",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "665",
+              "localId" : "1247",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "666",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1248",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "632",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "633",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "634",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "635",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "636",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "637",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "638",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "639",
+                "localId" : "1242",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "616",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "617",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "618",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "619",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "620",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "621",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "622",
+                "localId" : "1241",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "656",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1243",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "657",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "658",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "659",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "660",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "661",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "662",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "663",
+                "localId" : "1245",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "640",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "641",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "642",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "643",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "644",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "645",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "646",
+                "localId" : "1244",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "20",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "674",
+        "localId" : "1256",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "BeforeDayOfIvl",
+        "name" : "PosInfEndNotAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "674",
+            "r" : "1256",
             "s" : [ {
-              "value" : [ "", "define ", "BeforeDayOfIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotAfterIntIvl", ": " ]
             }, {
-              "r" : "729",
+              "r" : "1270",
               "s" : [ {
-                "r" : "675",
+                "r" : "1259",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "1257",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "729",
-                "value" : [ " ", "before day of", " " ]
+                "r" : "1270",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "726",
+                "r" : "1267",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "694",
-                  "s" : [ {
-                    "r" : "678",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "718",
+                  "r" : "1263",
                   "s" : [ {
-                    "r" : "702",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1264",
+                    "value" : [ "-", "100" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "1266",
+                  "value" : [ ", ", "0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "729",
+          "type" : "After",
+          "localId" : "1270",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "730",
+            "localId" : "1271",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "731",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1272",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "732",
+            "localId" : "1273",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "733",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1274",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "675",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1259",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "676",
+              "localId" : "1261",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "677",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1262",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1257",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1260",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1258",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "726",
+            "localId" : "1267",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "727",
+              "localId" : "1268",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "728",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1269",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "694",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1263",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "695",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "696",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "697",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "698",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "699",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "700",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "701",
+                "localId" : "1265",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "678",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "679",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "680",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "681",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "682",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "683",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "684",
+                "localId" : "1264",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "718",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "719",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "720",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "721",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "722",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "723",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "724",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "725",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "702",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "703",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "704",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "705",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "706",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "707",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "708",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "736",
+        "localId" : "1277",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "StartsSameDayOfIvlEnd",
+        "name" : "UnknownEndAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "736",
+            "r" : "1277",
             "s" : [ {
-              "value" : [ "", "define ", "StartsSameDayOfIvlEnd", ": " ]
+              "value" : [ "", "define ", "UnknownEndAfterIntIvl", ": " ]
             }, {
-              "r" : "791",
+              "r" : "1293",
               "s" : [ {
-                "r" : "737",
+                "r" : "1280",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "1278",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "791",
-                "value" : [ " ", "before day of", " " ]
+                "r" : "1293",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "788",
+                "r" : "1290",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "756",
+                  "r" : "1284",
                   "s" : [ {
-                    "r" : "740",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "1285",
+                    "value" : [ "-", "100" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "780",
+                  "r" : "1287",
                   "s" : [ {
-                    "r" : "764",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1288",
+                    "value" : [ "-", "20" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -73586,1837 +76141,1551 @@ module.exports['Before'] = {
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "791",
+          "type" : "After",
+          "localId" : "1293",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "792",
+            "localId" : "1294",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "793",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1295",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "794",
+            "localId" : "1296",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "795",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1297",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "737",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1280",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "738",
+              "localId" : "1282",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "739",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1283",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1278",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1281",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1279",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "788",
+            "localId" : "1290",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "789",
+              "localId" : "1291",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "790",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1292",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "756",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "757",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "758",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "759",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "760",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "761",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "762",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "763",
+                "localId" : "1286",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "740",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "741",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "742",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "743",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "744",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "745",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "746",
+                "localId" : "1285",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "780",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "781",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "782",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "783",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "784",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "785",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "786",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "787",
+                "localId" : "1289",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "764",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "765",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "766",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "767",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "768",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "769",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "770",
+                "localId" : "1288",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "20",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "798",
+        "localId" : "1300",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EndsSameDayOfIvlStart",
+        "name" : "UnknownEndNotAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "798",
+            "r" : "1300",
             "s" : [ {
-              "value" : [ "", "define ", "EndsSameDayOfIvlStart", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotAfterIntIvl", ": " ]
             }, {
-              "r" : "853",
+              "r" : "1314",
               "s" : [ {
-                "r" : "799",
+                "r" : "1303",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "1301",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "853",
-                "value" : [ " ", "before day of", " " ]
+                "r" : "1314",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "850",
+                "r" : "1311",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "818",
-                  "s" : [ {
-                    "r" : "802",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "842",
+                  "r" : "1307",
                   "s" : [ {
-                    "r" : "826",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1308",
+                    "value" : [ "-", "100" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "1310",
+                  "value" : [ ", ", "0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "853",
+          "type" : "After",
+          "localId" : "1314",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "854",
+            "localId" : "1315",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "855",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1316",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "856",
+            "localId" : "1317",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "857",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1318",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "799",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1303",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "800",
+              "localId" : "1305",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "801",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1306",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1301",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1304",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1302",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "850",
+            "localId" : "1311",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "851",
+              "localId" : "1312",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "852",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1313",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "818",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1307",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "819",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "820",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "821",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "822",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "823",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "824",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "825",
+                "localId" : "1309",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "802",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "803",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "804",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "805",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "806",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "807",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "808",
+                "localId" : "1308",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "842",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "843",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "844",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "845",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "846",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "847",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "848",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "849",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "826",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "827",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "828",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "829",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "830",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "831",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "832",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1310",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "860",
+        "localId" : "1321",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayBeAfterDayOfImpreciseIvl",
+        "name" : "NegInfBegNotAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "860",
+            "r" : "1321",
             "s" : [ {
-              "value" : [ "", "define ", "MayBeAfterDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotAfterLongIvl", ": " ]
             }, {
-              "r" : "885",
+              "r" : "1335",
               "s" : [ {
-                "r" : "861",
+                "r" : "1324",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "1322",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "885",
-                "value" : [ " ", "before day of", " " ]
+                "r" : "1335",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "882",
+                "r" : "1332",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "870",
-                  "s" : [ {
-                    "r" : "864",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "879",
+                  "r" : "1328",
                   "s" : [ {
-                    "r" : "873",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                    "r" : "1329",
+                    "value" : [ "-", "100L" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "1331",
+                  "value" : [ ", ", "0L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "885",
+          "type" : "After",
+          "localId" : "1335",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "886",
+            "localId" : "1336",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "887",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1337",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "888",
+            "localId" : "1338",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "889",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1339",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "861",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1324",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "862",
+              "localId" : "1326",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "863",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1327",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1325",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1322",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "882",
+            "localId" : "1332",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "883",
+              "localId" : "1333",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "884",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1334",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "870",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "871",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "872",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1330",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "864",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "865",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "localId" : "1329",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "879",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "880",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "881",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "873",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "874",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1331",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "892",
+        "localId" : "1342",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayBeBeforeDayOfImpreciseIvl",
+        "name" : "UnknownBegMayBeAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "892",
+            "r" : "1342",
             "s" : [ {
-              "value" : [ "", "define ", "MayBeBeforeDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayBeAfterLongIvl", ": " ]
             }, {
-              "r" : "917",
+              "r" : "1356",
               "s" : [ {
-                "r" : "893",
+                "r" : "1345",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "1343",
+                  "value" : [ "Interval(", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "917",
-                "value" : [ " ", "before day of", " " ]
+                "r" : "1356",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "914",
+                "r" : "1353",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "902",
-                  "s" : [ {
-                    "r" : "896",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "911",
+                  "r" : "1349",
                   "s" : [ {
-                    "r" : "905",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                    "r" : "1350",
+                    "value" : [ "-", "100L" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "1352",
+                  "value" : [ ", ", "0L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "917",
+          "type" : "After",
+          "localId" : "1356",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "918",
+            "localId" : "1357",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "919",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1358",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "920",
+            "localId" : "1359",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "921",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1360",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "893",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1345",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "894",
+              "localId" : "1347",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "895",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1348",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1346",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1343",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1344",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "914",
+            "localId" : "1353",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "915",
+              "localId" : "1354",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "916",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1355",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "902",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1349",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "903",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "904",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1351",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "896",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "897",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "localId" : "1350",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "911",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "912",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "913",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "905",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "906",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1352",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "924",
-        "name" : "ImpDateIvl",
+        "localId" : "1363",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegNotAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "924",
+            "r" : "1363",
             "s" : [ {
-              "value" : [ "", "define ", "ImpDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotAfterLongIvl", ": " ]
             }, {
-              "r" : "943",
+              "r" : "1375",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "931",
+                "r" : "1366",
                 "s" : [ {
-                  "r" : "925",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  "r" : "1364",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "r" : "1375",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "940",
+                "r" : "1372",
                 "s" : [ {
-                  "r" : "934",
-                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
+                  "r" : "1370",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "946",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "947",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "943",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "After",
+          "localId" : "1375",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "944",
+            "localId" : "1376",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "945",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1377",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "931",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1378",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "932",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "933",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "925",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "localId" : "1379",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1366",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1368",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1369",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "month" : {
+            "low" : {
+              "type" : "As",
+              "localId" : "1367",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1364",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "Literal",
-              "localId" : "926",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "localId" : "1365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "940",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "Interval",
+            "localId" : "1372",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "941",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "942",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1373",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1374",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "934",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "localId" : "1370",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "935",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
+              "localId" : "1371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "950",
+        "localId" : "1382",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseBeforeDateIvl",
+        "name" : "PosInfEndAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "950",
+            "r" : "1382",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndAfterLongIvl", ": " ]
             }, {
-              "r" : "1005",
+              "r" : "1398",
               "s" : [ {
-                "r" : "951",
+                "r" : "1385",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "r" : "1383",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1005",
-                "value" : [ " ", "before", " " ]
+                "r" : "1398",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1002",
+                "r" : "1395",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "970",
+                  "r" : "1389",
                   "s" : [ {
-                    "r" : "954",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1390",
+                    "value" : [ "-", "100L" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "994",
+                  "r" : "1392",
                   "s" : [ {
-                    "r" : "978",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1393",
+                    "value" : [ "-", "20L" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "1005",
+          "type" : "After",
+          "localId" : "1398",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1006",
+            "localId" : "1399",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1007",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1400",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1008",
+            "localId" : "1401",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1009",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1402",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "951",
-            "name" : "ImpDateIvl",
+            "type" : "Interval",
+            "localId" : "1385",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "952",
+              "localId" : "1387",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "953",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1388",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1386",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1384",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1002",
+            "localId" : "1395",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1003",
+              "localId" : "1396",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1004",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1397",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "970",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1389",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "971",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "972",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "973",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "974",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "975",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "976",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "977",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1391",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "954",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "955",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "956",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "957",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "958",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "959",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "960",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1390",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "994",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1392",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "995",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "996",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "997",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "998",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "999",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1000",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1001",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1394",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "978",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "979",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "980",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "981",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "982",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "983",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "984",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1393",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "20",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1012",
+        "localId" : "1405",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseNotBeforeDateIvl",
+        "name" : "PosInfEndNotAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1012",
+            "r" : "1405",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseNotBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotAfterLongIvl", ": " ]
             }, {
-              "r" : "1067",
+              "r" : "1419",
               "s" : [ {
-                "r" : "1013",
+                "r" : "1408",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "r" : "1406",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1067",
-                "value" : [ " ", "before", " " ]
+                "r" : "1419",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1064",
+                "r" : "1416",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1032",
-                  "s" : [ {
-                    "r" : "1016",
-                    "value" : [ "DateTime", "(", "2012", ", ", "8", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1056",
+                  "r" : "1412",
                   "s" : [ {
-                    "r" : "1040",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1413",
+                    "value" : [ "-", "100L" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "r" : "1415",
+                  "value" : [ ", ", "0L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "1067",
+          "type" : "After",
+          "localId" : "1419",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1068",
+            "localId" : "1420",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1069",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1421",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1070",
+            "localId" : "1422",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1071",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1423",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1013",
-            "name" : "ImpDateIvl",
+            "type" : "Interval",
+            "localId" : "1408",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1014",
+              "localId" : "1410",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1015",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1411",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1406",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1409",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1407",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1064",
+            "localId" : "1416",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1065",
+              "localId" : "1417",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1066",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1418",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1032",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1412",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1033",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1034",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1035",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1036",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1037",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1038",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1039",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1414",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1016",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1017",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "8",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1018",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1019",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1020",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1021",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "1022",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1413",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1056",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1057",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1058",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1059",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1060",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1061",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1062",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1063",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1040",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1041",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1042",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1043",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1044",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1045",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1046",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1415",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1074",
+        "localId" : "1426",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayBeBeforeDateIvl",
+        "name" : "UnknownEndAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1074",
+            "r" : "1426",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayBeBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndAfterLongIvl", ": " ]
             }, {
-              "r" : "1129",
+              "r" : "1442",
               "s" : [ {
-                "r" : "1075",
+                "r" : "1429",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "r" : "1427",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1129",
-                "value" : [ " ", "before", " " ]
+                "r" : "1442",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1126",
+                "r" : "1439",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1094",
+                  "r" : "1433",
                   "s" : [ {
-                    "r" : "1078",
-                    "value" : [ "DateTime", "(", "2012", ", ", "8", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1434",
+                    "value" : [ "-", "100L" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1118",
+                  "r" : "1436",
                   "s" : [ {
-                    "r" : "1102",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1437",
+                    "value" : [ "-", "20L" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "1129",
+          "type" : "After",
+          "localId" : "1442",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1130",
+            "localId" : "1443",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1131",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1444",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1132",
+            "localId" : "1445",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1133",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1446",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1075",
-            "name" : "ImpDateIvl",
+            "type" : "Interval",
+            "localId" : "1429",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1076",
+              "localId" : "1431",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1077",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1432",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1427",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1430",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1428",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1126",
+            "localId" : "1439",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1127",
+              "localId" : "1440",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1128",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1441",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1094",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1433",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1095",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1435",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1096",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1434",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "high" : {
+              "type" : "Negate",
+              "localId" : "1436",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1097",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1438",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1098",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1437",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "20",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1449",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotAfterLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1449",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotAfterLongIvl", ": " ]
+            }, {
+              "r" : "1463",
+              "s" : [ {
+                "r" : "1452",
+                "s" : [ {
+                  "r" : "1450",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "1463",
+                "value" : [ " ", "after", " " ]
+              }, {
+                "r" : "1460",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1456",
+                  "s" : [ {
+                    "r" : "1457",
+                    "value" : [ "-", "100L" ]
+                  } ]
+                }, {
+                  "r" : "1459",
+                  "value" : [ ", ", "0L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "After",
+          "localId" : "1463",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1464",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1465",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1466",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1467",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1452",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1454",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1099",
+                "localId" : "1455",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1450",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1453",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1451",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1460",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1461",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1462",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "1456",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1458",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1457",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1459",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1470",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegNotAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1470",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegNotAfterDateIvl", ": " ]
+            }, {
+              "r" : "1551",
+              "s" : [ {
+                "r" : "1496",
+                "s" : [ {
+                  "r" : "1471",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "1488",
+                  "s" : [ {
+                    "r" : "1472",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "1551",
+                "value" : [ " ", "after", " " ]
+              }, {
+                "r" : "1548",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1516",
+                  "s" : [ {
+                    "r" : "1500",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1540",
+                  "s" : [ {
+                    "r" : "1524",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "After",
+          "localId" : "1551",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1552",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1553",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1554",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1555",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1496",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1498",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1499",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1497",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1471",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1488",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1489",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1100",
+                "localId" : "1490",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1101",
+                "localId" : "1491",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1492",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1493",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1494",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1495",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1078",
+                "localId" : "1472",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1079",
+                "localId" : "1473",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "8",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1080",
+                "localId" : "1474",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1081",
+                "localId" : "1475",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -75424,7 +77693,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1082",
+                "localId" : "1476",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -75432,7 +77701,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1083",
+                "localId" : "1477",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -75440,7 +77709,122 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1084",
+                "localId" : "1478",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1548",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1549",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1550",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1516",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1517",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1518",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1519",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1520",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1521",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1522",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1523",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1500",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1501",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1502",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1503",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1504",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1505",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1506",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -75449,72 +77833,72 @@ module.exports['Before'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1118",
+              "localId" : "1540",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1119",
+                "localId" : "1541",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1120",
+                "localId" : "1542",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1121",
+                "localId" : "1543",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1122",
+                "localId" : "1544",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1123",
+                "localId" : "1545",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1124",
+                "localId" : "1546",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1125",
+                "localId" : "1547",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1102",
+                "localId" : "1524",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1103",
+                "localId" : "1525",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1104",
+                "localId" : "1526",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1105",
+                "localId" : "1527",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -75522,7 +77906,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1106",
+                "localId" : "1528",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -75530,7 +77914,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1107",
+                "localId" : "1529",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -75538,7 +77922,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1108",
+                "localId" : "1530",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -75548,1113 +77932,588 @@ module.exports['Before'] = {
           } ]
         }
       }, {
-        "localId" : "1136",
+        "localId" : "1558",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegBeforeIntIvl",
+        "name" : "UnknownBegMayBeAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1136",
+            "r" : "1558",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayBeAfterDateIvl", ": " ]
             }, {
-              "r" : "1148",
+              "r" : "1639",
               "s" : [ {
-                "r" : "1139",
+                "r" : "1584",
                 "s" : [ {
-                  "r" : "1137",
-                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                  "r" : "1559",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "1576",
+                  "s" : [ {
+                    "r" : "1560",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "1148",
-                "value" : [ " ", "before", " " ]
+                "r" : "1639",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1145",
+                "r" : "1636",
                 "s" : [ {
-                  "r" : "1143",
-                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1604",
+                  "s" : [ {
+                    "r" : "1588",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1628",
+                  "s" : [ {
+                    "r" : "1612",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "1148",
+          "type" : "After",
+          "localId" : "1639",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1149",
+            "localId" : "1640",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1150",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1641",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1151",
+            "localId" : "1642",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1152",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1643",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1139",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "1584",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1141",
+              "localId" : "1586",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1142",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1587",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1140",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1585",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1137",
+                "localId" : "1559",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1138",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1145",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1146",
+              "type" : "DateTime",
+              "localId" : "1576",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1147",
+                "localId" : "1577",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1143",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "101",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1144",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1155",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotBeforeIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1155",
-            "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotBeforeIntIvl", ": " ]
-            }, {
-              "r" : "1167",
-              "s" : [ {
-                "r" : "1158",
-                "s" : [ {
-                  "r" : "1156",
-                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
-                } ]
               }, {
-                "r" : "1167",
-                "value" : [ " ", "before", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1578",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "1164",
-                "s" : [ {
-                  "r" : "1162",
-                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Before",
-          "localId" : "1167",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1168",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1169",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1579",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1580",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1581",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1582",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1583",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1560",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1561",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1562",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1563",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1564",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1565",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1566",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1170",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1171",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1158",
+            "localId" : "1636",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1160",
+              "localId" : "1637",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1161",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1638",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1159",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "type" : "DateTime",
+              "localId" : "1604",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1156",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1605",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1606",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1607",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1608",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1609",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1610",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1611",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1588",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1589",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1590",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1591",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1592",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1593",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1594",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1157",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1164",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1165",
+              "type" : "DateTime",
+              "localId" : "1628",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1166",
+                "localId" : "1629",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1630",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1631",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1632",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1633",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1634",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1635",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1612",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2010",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1613",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1614",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1615",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1616",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1617",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1618",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1162",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1163",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1174",
+        "localId" : "1646",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegBeforeIntIvl",
+        "name" : "UnknownBegNotAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1174",
+            "r" : "1646",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotAfterDateIvl", ": " ]
             }, {
-              "r" : "1186",
+              "r" : "1727",
               "s" : [ {
-                "r" : "1177",
+                "r" : "1672",
                 "s" : [ {
-                  "r" : "1175",
-                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
+                  "r" : "1647",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "1664",
+                  "s" : [ {
+                    "r" : "1648",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "1186",
-                "value" : [ " ", "before", " " ]
+                "r" : "1727",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1183",
+                "r" : "1724",
                 "s" : [ {
-                  "r" : "1181",
-                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1692",
+                  "s" : [ {
+                    "r" : "1676",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1716",
+                  "s" : [ {
+                    "r" : "1700",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "1186",
+          "type" : "After",
+          "localId" : "1727",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1187",
+            "localId" : "1728",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1188",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1729",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1189",
+            "localId" : "1730",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1190",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1731",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1177",
+            "localId" : "1672",
             "lowClosed" : false,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1179",
+              "localId" : "1674",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1180",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1675",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1178",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1673",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1175",
+                "localId" : "1647",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1176",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1183",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1184",
+              "type" : "DateTime",
+              "localId" : "1664",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1185",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1181",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "101",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1182",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1193",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotBeforeIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1193",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotBeforeIntIvl", ": " ]
-            }, {
-              "r" : "1205",
-              "s" : [ {
-                "r" : "1196",
-                "s" : [ {
-                  "r" : "1194",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
-                } ]
-              }, {
-                "r" : "1205",
-                "value" : [ " ", "before", " " ]
-              }, {
-                "r" : "1202",
-                "s" : [ {
-                  "r" : "1200",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Before",
-          "localId" : "1205",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1206",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1207",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1208",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1209",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1196",
-            "lowClosed" : false,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1198",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1199",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1197",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1194",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1195",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1202",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1203",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1204",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1200",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1201",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1212",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotBeforeIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1212",
-            "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotBeforeIntIvl", ": " ]
-            }, {
-              "r" : "1224",
-              "s" : [ {
-                "r" : "1215",
-                "s" : [ {
-                  "r" : "1213",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
-                } ]
-              }, {
-                "r" : "1224",
-                "value" : [ " ", "before", " " ]
-              }, {
-                "r" : "1221",
-                "s" : [ {
-                  "r" : "1219",
-                  "value" : [ "Interval[", "1000", ", ", "2000", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Before",
-          "localId" : "1224",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1225",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1226",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1227",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1228",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1215",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1217",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1218",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1213",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1216",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1214",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1221",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1222",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1223",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1219",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1000",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2000",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1231",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayBeBeforeIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1231",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayBeBeforeIntIvl", ": " ]
-            }, {
-              "r" : "1243",
-              "s" : [ {
-                "r" : "1234",
-                "s" : [ {
-                  "r" : "1232",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "1243",
-                "value" : [ " ", "before", " " ]
-              }, {
-                "r" : "1240",
-                "s" : [ {
-                  "r" : "1238",
-                  "value" : [ "Interval[", "1000", ", ", "2000", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Before",
-          "localId" : "1243",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1244",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1245",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1246",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1247",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1234",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1236",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1237",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1232",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1235",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1233",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1240",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1241",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1242",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1238",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1000",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2000",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1250",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotBeforeIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1250",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotBeforeIntIvl", ": " ]
-            }, {
-              "r" : "1264",
-              "s" : [ {
-                "r" : "1253",
-                "s" : [ {
-                  "r" : "1251",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "1264",
-                "value" : [ " ", "before", " " ]
-              }, {
-                "r" : "1261",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1257",
-                  "s" : [ {
-                    "r" : "1258",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "r" : "1260",
-                  "value" : [ ", ", "0", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Before",
-          "localId" : "1264",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1265",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1266",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1267",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1268",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1253",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1255",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1256",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1254",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1252",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1261",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1262",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1263",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1257",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1259",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1258",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1260",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1271",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegBeforeDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1271",
-            "s" : [ {
-              "value" : [ "", "define ", "NegInfBegBeforeDateIvl", ": " ]
-            }, {
-              "r" : "1352",
-              "s" : [ {
-                "r" : "1297",
-                "s" : [ {
-                  "r" : "1272",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1289",
-                  "s" : [ {
-                    "r" : "1273",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "1352",
-                "value" : [ " ", "before", " " ]
-              }, {
-                "r" : "1349",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1317",
-                  "s" : [ {
-                    "r" : "1301",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1341",
-                  "s" : [ {
-                    "r" : "1325",
-                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Before",
-          "localId" : "1352",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1353",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1354",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1355",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1356",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1297",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1299",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1300",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1298",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1272",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1289",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1290",
+                "localId" : "1665",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1291",
+                "localId" : "1666",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1292",
+                "localId" : "1667",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1293",
+                "localId" : "1668",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1294",
+                "localId" : "1669",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1295",
+                "localId" : "1670",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1296",
+                "localId" : "1671",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1273",
+                "localId" : "1648",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -76662,7 +78521,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1274",
+                "localId" : "1649",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -76670,7 +78529,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1275",
+                "localId" : "1650",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -76678,7 +78537,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1276",
+                "localId" : "1651",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76686,7 +78545,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1277",
+                "localId" : "1652",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76694,7 +78553,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1278",
+                "localId" : "1653",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76702,7 +78561,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1279",
+                "localId" : "1654",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76711,73 +78570,73 @@ module.exports['Before'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1349",
+            "localId" : "1724",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1350",
+              "localId" : "1725",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1351",
+                "localId" : "1726",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1317",
+              "localId" : "1692",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1318",
+                "localId" : "1693",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1319",
+                "localId" : "1694",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1320",
+                "localId" : "1695",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1321",
+                "localId" : "1696",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1322",
+                "localId" : "1697",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1323",
+                "localId" : "1698",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1324",
+                "localId" : "1699",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1301",
+                "localId" : "1676",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1302",
+                "localId" : "1677",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -76785,7 +78644,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1303",
+                "localId" : "1678",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -76793,7 +78652,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1304",
+                "localId" : "1679",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76801,7 +78660,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1305",
+                "localId" : "1680",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76809,7 +78668,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1306",
+                "localId" : "1681",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76817,7 +78676,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1307",
+                "localId" : "1682",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76826,56 +78685,56 @@ module.exports['Before'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1341",
+              "localId" : "1716",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1342",
+                "localId" : "1717",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1343",
+                "localId" : "1718",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1344",
+                "localId" : "1719",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1345",
+                "localId" : "1720",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1346",
+                "localId" : "1721",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1347",
+                "localId" : "1722",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1348",
+                "localId" : "1723",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1325",
+                "localId" : "1700",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2030",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1326",
+                "localId" : "1701",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -76883,7 +78742,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1327",
+                "localId" : "1702",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -76891,7 +78750,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1328",
+                "localId" : "1703",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76899,7 +78758,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1329",
+                "localId" : "1704",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76907,7 +78766,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1330",
+                "localId" : "1705",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76915,7 +78774,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1331",
+                "localId" : "1706",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -76925,53 +78784,53 @@ module.exports['Before'] = {
           } ]
         }
       }, {
-        "localId" : "1359",
+        "localId" : "1734",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotBeforeDateIvl",
+        "name" : "PosInfEndAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1359",
+            "r" : "1734",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndAfterDateIvl", ": " ]
             }, {
-              "r" : "1440",
+              "r" : "1815",
               "s" : [ {
-                "r" : "1385",
+                "r" : "1760",
                 "s" : [ {
-                  "r" : "1360",
-                  "value" : [ "Interval[", "null", ", " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1377",
+                  "r" : "1751",
                   "s" : [ {
-                    "r" : "1361",
+                    "r" : "1735",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "r" : "1759",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1440",
-                "value" : [ " ", "before", " " ]
+                "r" : "1815",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1437",
+                "r" : "1812",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1405",
+                  "r" : "1780",
                   "s" : [ {
-                    "r" : "1389",
+                    "r" : "1764",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1429",
+                  "r" : "1804",
                   "s" : [ {
-                    "r" : "1413",
+                    "r" : "1788",
                     "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -76982,105 +78841,92 @@ module.exports['Before'] = {
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "1440",
+          "type" : "After",
+          "localId" : "1815",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1441",
+            "localId" : "1816",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1442",
+              "localId" : "1817",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1443",
+            "localId" : "1818",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1444",
+              "localId" : "1819",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1385",
+            "localId" : "1760",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1387",
+              "localId" : "1762",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1388",
+                "localId" : "1763",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1386",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1360",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
               "type" : "DateTime",
-              "localId" : "1377",
+              "localId" : "1751",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1378",
+                "localId" : "1752",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1379",
+                "localId" : "1753",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1380",
+                "localId" : "1754",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1381",
+                "localId" : "1755",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1382",
+                "localId" : "1756",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1383",
+                "localId" : "1757",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1384",
+                "localId" : "1758",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1361",
+                "localId" : "1735",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -77088,7 +78934,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1362",
+                "localId" : "1736",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77096,7 +78942,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1363",
+                "localId" : "1737",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77104,7 +78950,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1364",
+                "localId" : "1738",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77112,7 +78958,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1365",
+                "localId" : "1739",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77120,7 +78966,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1366",
+                "localId" : "1740",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77128,74 +78974,87 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1367",
+                "localId" : "1741",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1761",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1759",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1437",
+            "localId" : "1812",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1438",
+              "localId" : "1813",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1439",
+                "localId" : "1814",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1405",
+              "localId" : "1780",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1406",
+                "localId" : "1781",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1407",
+                "localId" : "1782",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1408",
+                "localId" : "1783",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1409",
+                "localId" : "1784",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1410",
+                "localId" : "1785",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1411",
+                "localId" : "1786",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1412",
+                "localId" : "1787",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1389",
+                "localId" : "1764",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -77203,7 +79062,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1390",
+                "localId" : "1765",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77211,7 +79070,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1391",
+                "localId" : "1766",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77219,7 +79078,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1392",
+                "localId" : "1767",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77227,7 +79086,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1393",
+                "localId" : "1768",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77235,7 +79094,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1394",
+                "localId" : "1769",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77243,7 +79102,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1395",
+                "localId" : "1770",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77252,48 +79111,48 @@ module.exports['Before'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1429",
+              "localId" : "1804",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1430",
+                "localId" : "1805",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1431",
+                "localId" : "1806",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1432",
+                "localId" : "1807",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1433",
+                "localId" : "1808",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1434",
+                "localId" : "1809",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1435",
+                "localId" : "1810",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1436",
+                "localId" : "1811",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1413",
+                "localId" : "1788",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2010",
@@ -77301,7 +79160,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1414",
+                "localId" : "1789",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77309,7 +79168,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1415",
+                "localId" : "1790",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77317,7 +79176,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1416",
+                "localId" : "1791",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77325,7 +79184,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1417",
+                "localId" : "1792",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77333,7 +79192,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1418",
+                "localId" : "1793",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77341,7 +79200,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1419",
+                "localId" : "1794",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77351,54 +79210,54 @@ module.exports['Before'] = {
           } ]
         }
       }, {
-        "localId" : "1447",
+        "localId" : "1822",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegBeforeDateIvl",
+        "name" : "PosInfEndNotAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1447",
+            "r" : "1822",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotAfterDateIvl", ": " ]
             }, {
-              "r" : "1528",
+              "r" : "1903",
               "s" : [ {
-                "r" : "1473",
+                "r" : "1848",
                 "s" : [ {
-                  "r" : "1448",
-                  "value" : [ "Interval(", "null", ", " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1465",
+                  "r" : "1839",
                   "s" : [ {
-                    "r" : "1449",
+                    "r" : "1823",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "r" : "1847",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1528",
-                "value" : [ " ", "before", " " ]
+                "r" : "1903",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1525",
+                "r" : "1900",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1493",
+                  "r" : "1868",
                   "s" : [ {
-                    "r" : "1477",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1852",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1517",
+                  "r" : "1892",
                   "s" : [ {
-                    "r" : "1501",
-                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1876",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -77408,105 +79267,92 @@ module.exports['Before'] = {
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "1528",
+          "type" : "After",
+          "localId" : "1903",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1529",
+            "localId" : "1904",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1530",
+              "localId" : "1905",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1531",
+            "localId" : "1906",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1532",
+              "localId" : "1907",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1473",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "1848",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1475",
+              "localId" : "1850",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1476",
+                "localId" : "1851",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1474",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1448",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
               "type" : "DateTime",
-              "localId" : "1465",
+              "localId" : "1839",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1466",
+                "localId" : "1840",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1467",
+                "localId" : "1841",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1468",
+                "localId" : "1842",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1469",
+                "localId" : "1843",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1470",
+                "localId" : "1844",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1471",
+                "localId" : "1845",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1472",
+                "localId" : "1846",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1449",
+                "localId" : "1823",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -77514,7 +79360,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1450",
+                "localId" : "1824",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77522,7 +79368,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1451",
+                "localId" : "1825",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77530,7 +79376,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1452",
+                "localId" : "1826",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77538,7 +79384,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1453",
+                "localId" : "1827",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77546,7 +79392,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1454",
+                "localId" : "1828",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77554,82 +79400,95 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1455",
+                "localId" : "1829",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1849",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1847",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1525",
+            "localId" : "1900",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1526",
+              "localId" : "1901",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1527",
+                "localId" : "1902",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1493",
+              "localId" : "1868",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1494",
+                "localId" : "1869",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1495",
+                "localId" : "1870",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1496",
+                "localId" : "1871",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1497",
+                "localId" : "1872",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1498",
+                "localId" : "1873",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1499",
+                "localId" : "1874",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1500",
+                "localId" : "1875",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1477",
+                "localId" : "1852",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1478",
+                "localId" : "1853",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77637,7 +79496,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1479",
+                "localId" : "1854",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77645,7 +79504,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1480",
+                "localId" : "1855",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77653,7 +79512,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1481",
+                "localId" : "1856",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77661,7 +79520,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1482",
+                "localId" : "1857",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77669,7 +79528,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1483",
+                "localId" : "1858",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77678,56 +79537,56 @@ module.exports['Before'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1517",
+              "localId" : "1892",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1518",
+                "localId" : "1893",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1519",
+                "localId" : "1894",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1520",
+                "localId" : "1895",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1521",
+                "localId" : "1896",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1522",
+                "localId" : "1897",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1523",
+                "localId" : "1898",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1524",
+                "localId" : "1899",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1501",
+                "localId" : "1876",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2030",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1502",
+                "localId" : "1877",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77735,7 +79594,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1503",
+                "localId" : "1878",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77743,7 +79602,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1504",
+                "localId" : "1879",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77751,7 +79610,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1505",
+                "localId" : "1880",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77759,7 +79618,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1506",
+                "localId" : "1881",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77767,7 +79626,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1507",
+                "localId" : "1882",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77777,54 +79636,54 @@ module.exports['Before'] = {
           } ]
         }
       }, {
-        "localId" : "1535",
+        "localId" : "1910",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotBeforeDateIvl",
+        "name" : "UnknownEndAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1535",
+            "r" : "1910",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndAfterDateIvl", ": " ]
             }, {
-              "r" : "1616",
+              "r" : "1991",
               "s" : [ {
-                "r" : "1561",
+                "r" : "1936",
                 "s" : [ {
-                  "r" : "1536",
-                  "value" : [ "Interval(", "null", ", " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1553",
+                  "r" : "1927",
                   "s" : [ {
-                    "r" : "1537",
+                    "r" : "1911",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "r" : "1935",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1616",
-                "value" : [ " ", "before", " " ]
+                "r" : "1991",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1613",
+                "r" : "1988",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1581",
+                  "r" : "1956",
                   "s" : [ {
-                    "r" : "1565",
+                    "r" : "1940",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1605",
+                  "r" : "1980",
                   "s" : [ {
-                    "r" : "1589",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1964",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -77834,105 +79693,92 @@ module.exports['Before'] = {
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "1616",
+          "type" : "After",
+          "localId" : "1991",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1617",
+            "localId" : "1992",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1618",
+              "localId" : "1993",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1619",
+            "localId" : "1994",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1620",
+              "localId" : "1995",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1561",
-            "lowClosed" : false,
+            "localId" : "1936",
+            "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1563",
+              "localId" : "1938",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1564",
+                "localId" : "1939",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1562",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1536",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
               "type" : "DateTime",
-              "localId" : "1553",
+              "localId" : "1927",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1554",
+                "localId" : "1928",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1555",
+                "localId" : "1929",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1556",
+                "localId" : "1930",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1557",
+                "localId" : "1931",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1558",
+                "localId" : "1932",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1559",
+                "localId" : "1933",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1560",
+                "localId" : "1934",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1537",
+                "localId" : "1911",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -77940,7 +79786,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1538",
+                "localId" : "1912",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77948,7 +79794,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1539",
+                "localId" : "1913",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -77956,7 +79802,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1540",
+                "localId" : "1914",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77964,7 +79810,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1541",
+                "localId" : "1915",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77972,7 +79818,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1542",
+                "localId" : "1916",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -77980,74 +79826,87 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1543",
+                "localId" : "1917",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1937",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1935",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1613",
+            "localId" : "1988",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1614",
+              "localId" : "1989",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1615",
+                "localId" : "1990",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1581",
+              "localId" : "1956",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1582",
+                "localId" : "1957",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1583",
+                "localId" : "1958",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1584",
+                "localId" : "1959",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1585",
+                "localId" : "1960",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1586",
+                "localId" : "1961",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1587",
+                "localId" : "1962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1588",
+                "localId" : "1963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1565",
+                "localId" : "1940",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -78055,7 +79914,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1566",
+                "localId" : "1941",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -78063,7 +79922,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1567",
+                "localId" : "1942",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -78071,7 +79930,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1568",
+                "localId" : "1943",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78079,7 +79938,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1569",
+                "localId" : "1944",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78087,7 +79946,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1570",
+                "localId" : "1945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78095,7 +79954,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1571",
+                "localId" : "1946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78104,56 +79963,56 @@ module.exports['Before'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1605",
+              "localId" : "1980",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1606",
+                "localId" : "1981",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1607",
+                "localId" : "1982",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1608",
+                "localId" : "1983",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1609",
+                "localId" : "1984",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1610",
+                "localId" : "1985",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1611",
+                "localId" : "1986",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1612",
+                "localId" : "1987",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1589",
+                "localId" : "1964",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1590",
+                "localId" : "1965",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -78161,7 +80020,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1591",
+                "localId" : "1966",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -78169,7 +80028,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1592",
+                "localId" : "1967",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78177,7 +80036,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1593",
+                "localId" : "1968",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78185,7 +80044,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1594",
+                "localId" : "1969",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78193,7 +80052,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1595",
+                "localId" : "1970",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78203,54 +80062,54 @@ module.exports['Before'] = {
           } ]
         }
       }, {
-        "localId" : "1623",
+        "localId" : "1998",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotBeforeDateIvl",
+        "name" : "UnknownEndNotAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1623",
+            "r" : "1998",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotAfterDateIvl", ": " ]
             }, {
-              "r" : "1704",
+              "r" : "2079",
               "s" : [ {
-                "r" : "1649",
+                "r" : "2024",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1640",
+                  "r" : "2015",
                   "s" : [ {
-                    "r" : "1624",
+                    "r" : "1999",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "1648",
-                  "value" : [ ", ", "null", "]" ]
+                  "r" : "2023",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1704",
-                "value" : [ " ", "before", " " ]
+                "r" : "2079",
+                "value" : [ " ", "after", " " ]
               }, {
-                "r" : "1701",
+                "r" : "2076",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1669",
+                  "r" : "2044",
                   "s" : [ {
-                    "r" : "1653",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2028",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1693",
+                  "r" : "2068",
                   "s" : [ {
-                    "r" : "1677",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2052",
+                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -78260,92 +80119,92 @@ module.exports['Before'] = {
           }
         } ],
         "expression" : {
-          "type" : "Before",
-          "localId" : "1704",
+          "type" : "After",
+          "localId" : "2079",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1705",
+            "localId" : "2080",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1706",
+              "localId" : "2081",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1707",
+            "localId" : "2082",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1708",
+              "localId" : "2083",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1649",
+            "localId" : "2024",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1651",
+              "localId" : "2026",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1652",
+                "localId" : "2027",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1640",
+              "localId" : "2015",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1641",
+                "localId" : "2016",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1642",
+                "localId" : "2017",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1643",
+                "localId" : "2018",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1644",
+                "localId" : "2019",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1645",
+                "localId" : "2020",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1646",
+                "localId" : "2021",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1647",
+                "localId" : "2022",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1624",
+                "localId" : "1999",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -78353,7 +80212,7 @@ module.exports['Before'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1625",
+                "localId" : "2000",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -78361,7 +80220,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1626",
+                "localId" : "2001",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -78369,7 +80228,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1627",
+                "localId" : "2002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78377,7 +80236,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1628",
+                "localId" : "2003",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78385,7 +80244,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1629",
+                "localId" : "2004",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78393,7 +80252,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1630",
+                "localId" : "2005",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78402,86 +80261,86 @@ module.exports['Before'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "1650",
+              "localId" : "2025",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1648",
+                "localId" : "2023",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1701",
+            "localId" : "2076",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1702",
+              "localId" : "2077",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1703",
+                "localId" : "2078",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1669",
+              "localId" : "2044",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1670",
+                "localId" : "2045",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1671",
+                "localId" : "2046",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1672",
+                "localId" : "2047",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1673",
+                "localId" : "2048",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1674",
+                "localId" : "2049",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1675",
+                "localId" : "2050",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1676",
+                "localId" : "2051",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1653",
+                "localId" : "2028",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1654",
+                "localId" : "2029",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -78489,7 +80348,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1655",
+                "localId" : "2030",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -78497,7 +80356,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1656",
+                "localId" : "2031",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78505,7 +80364,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1657",
+                "localId" : "2032",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78513,7 +80372,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1658",
+                "localId" : "2033",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78521,7 +80380,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1659",
+                "localId" : "2034",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78530,56 +80389,56 @@ module.exports['Before'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1693",
+              "localId" : "2068",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1694",
+                "localId" : "2069",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1695",
+                "localId" : "2070",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1696",
+                "localId" : "2071",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1697",
+                "localId" : "2072",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1698",
+                "localId" : "2073",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1699",
+                "localId" : "2074",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1700",
+                "localId" : "2075",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1677",
+                "localId" : "2052",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2040",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1678",
+                "localId" : "2053",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -78587,7 +80446,7 @@ module.exports['Before'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1679",
+                "localId" : "2054",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -78595,7 +80454,7 @@ module.exports['Before'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1680",
+                "localId" : "2055",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78603,7 +80462,7 @@ module.exports['Before'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1681",
+                "localId" : "2056",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78611,7 +80470,7 @@ module.exports['Before'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1682",
+                "localId" : "2057",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78619,7 +80478,7 @@ module.exports['Before'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1683",
+                "localId" : "2058",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -78628,58 +80487,174 @@ module.exports['Before'] = {
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* Before
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define BeforeIntIvl: Interval[2, 4] before Interval[5, 10]
+define NotBeforeIntIvl: Interval[2, 5] before Interval[5, 10]
+define BeforeLongIvl: Interval[2L, 4L] before Interval[5L, 10L]
+define NotBeforeLongIvl: Interval[2L, 5L] before Interval[5L, 10L]
+define BeforeRealIvl: Interval[0.0, 1.23] before Interval[1.234, 2.345]
+define NotBeforeRealIvl: Interval[1.234, 2.345] before Interval[0.0, 1.234]
+define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
+define BeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) before DateIvl
+define NotBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)] before DateIvl
+define BeforeImpreciseDateIvl: DateIvl before Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define NotBeforeImpreciseDateIvl: DateIvl before Interval[DateTime(2012, 8), DateTime(2012, 12)]
+define MayBeBeforeImpreciseDateIvl: DateIvl before Interval[DateTime(2012), DateTime(2012)]
+define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
+define AfterDayOfIvl: PrecisionDateIvl before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define BeforeDayOfIvl: PrecisionDateIvl before day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
+define StartsSameDayOfIvlEnd: PrecisionDateIvl before day of Interval[DateTime(2012, 9, 2, 23, 59, 59, 999), DateTime(2012, 10, 2, 0, 0, 0, 0)]
+define EndsSameDayOfIvlStart: PrecisionDateIvl before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define MayBeAfterDayOfImpreciseIvl: PrecisionDateIvl before day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define MayBeBeforeDayOfImpreciseIvl: PrecisionDateIvl before day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
+define ImpreciseBeforeDateIvl: ImpDateIvl before Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0))
+define ImpreciseNotBeforeDateIvl: ImpDateIvl before Interval[DateTime(2012, 8, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0))
+define ImpreciseMayBeBeforeDateIvl: ImpDateIvl before Interval[DateTime(2012, 8, 15, 0, 0, 0, 0), DateTime(2012, 12, 15, 0, 0, 0, 0))
+define NegInfBegBeforeIntIvl: Interval[null, 100] before Interval[101, 200]
+define NegInfBegNotBeforeIntIvl: Interval[null, 100] before Interval[100, 200]
+define UnknownBegBeforeIntIvl: Interval(null, 100] before Interval[101, 200]
+define UnknownBegNotBeforeIntIvl: Interval(null, 5] before Interval[0, 100]
+define PosInfEndNotBeforeIntIvl: Interval[0, null] before Interval[1000, 2000]
+define UnknownEndMayBeBeforeIntIvl: Interval[0, null) before Interval[1000, 2000]
+define UnknownEndNotBeforeIntIvl: Interval[0, null) before Interval[-100, 0]
+define NegInfBegBeforeLongIvl: Interval[null, 100L] before Interval[101L, 200L]
+define NegInfBegNotBeforeLongIvl: Interval[null, 100L] before Interval[100L, 200L]
+define UnknownBegBeforeLongIvl: Interval(null, 100L] before Interval[101L, 200L]
+define UnknownBegNotBeforeLongIvl: Interval(null, 5L] before Interval[0L, 100L]
+define PosInfEndNotBeforeLongIvl: Interval[0L, null] before Interval[1000L, 2000L]
+define UnknownEndMayBeBeforeLongIvl: Interval[0L, null) before Interval[1000L, 2000L]
+define UnknownEndNotBeforeLongIvl: Interval[0L, null) before Interval[-100L, 0L]
+define NegInfBegBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
+define NegInfBegNotBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define UnknownBegBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
+define UnknownBegNotBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define PosInfEndNotBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define UnknownEndMayBeBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) before Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
+define UnknownEndNotBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+*/
+
+module.exports['Before'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "1970",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "1711",
+        "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayBeBeforeDateIvl",
+        "name" : "BeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1711",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayBeBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "BeforeIntIvl", ": " ]
             }, {
-              "r" : "1792",
+              "r" : "225",
               "s" : [ {
-                "r" : "1737",
+                "r" : "217",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1728",
-                  "s" : [ {
-                    "r" : "1712",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "1736",
-                  "value" : [ ", ", "null", ")" ]
+                  "r" : "215",
+                  "value" : [ "Interval[", "2", ", ", "4", "]" ]
                 } ]
               }, {
-                "r" : "1792",
+                "r" : "225",
                 "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1789",
+                "r" : "222",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1757",
-                  "s" : [ {
-                    "r" : "1741",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1781",
-                  "s" : [ {
-                    "r" : "1765",
-                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "220",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
               } ]
             } ]
@@ -78687,425 +80662,127 @@ module.exports['Before'] = {
         } ],
         "expression" : {
           "type" : "Before",
-          "localId" : "1792",
+          "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1793",
+            "localId" : "226",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1794",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "227",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1795",
+            "localId" : "228",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1796",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1737",
+            "localId" : "217",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1739",
+              "localId" : "218",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1740",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "219",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1728",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1729",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1730",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1731",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1732",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1733",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1734",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1735",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1712",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1713",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1714",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1715",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1716",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1717",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1718",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1738",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1736",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1789",
+            "localId" : "222",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1790",
+              "localId" : "223",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1791",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1757",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1758",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1759",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1760",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1761",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1762",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1763",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1764",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1741",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1742",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1743",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1744",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1745",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1746",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1747",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1781",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1782",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1783",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1784",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1785",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1786",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1787",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1788",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1765",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2040",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1766",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1767",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1768",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1769",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1770",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1771",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1799",
+        "localId" : "232",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotBeforeDateIvl",
+        "name" : "NotBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1799",
+            "r" : "232",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "NotBeforeIntIvl", ": " ]
             }, {
-              "r" : "1880",
+              "r" : "243",
               "s" : [ {
-                "r" : "1825",
+                "r" : "235",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1816",
-                  "s" : [ {
-                    "r" : "1800",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "1824",
-                  "value" : [ ", ", "null", ")" ]
+                  "r" : "233",
+                  "value" : [ "Interval[", "2", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1880",
+                "r" : "243",
                 "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1877",
+                "r" : "240",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1845",
-                  "s" : [ {
-                    "r" : "1829",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1869",
-                  "s" : [ {
-                    "r" : "1853",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "238",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
               } ]
             } ]
@@ -79113,509 +80790,612 @@ module.exports['Before'] = {
         } ],
         "expression" : {
           "type" : "Before",
-          "localId" : "1880",
+          "localId" : "243",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1881",
+            "localId" : "244",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1882",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "245",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1883",
+            "localId" : "246",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1884",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "247",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1825",
+            "localId" : "235",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1827",
+              "localId" : "236",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1828",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "237",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1816",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1817",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1818",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1819",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1820",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1821",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1822",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1823",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1800",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1801",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1802",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1803",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1804",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1805",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1806",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "233",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1826",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1824",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1877",
+            "localId" : "240",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1878",
+              "localId" : "241",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1879",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "242",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1845",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1846",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1847",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1848",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1849",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1850",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "238",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "250",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "BeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "250",
+            "s" : [ {
+              "value" : [ "", "define ", "BeforeLongIvl", ": " ]
+            }, {
+              "r" : "261",
+              "s" : [ {
+                "r" : "253",
+                "s" : [ {
+                  "r" : "251",
+                  "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1851",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "261",
+                "value" : [ " ", "before", " " ]
               }, {
+                "r" : "258",
+                "s" : [ {
+                  "r" : "256",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Before",
+          "localId" : "261",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "262",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "263",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "264",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "265",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "253",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "254",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1852",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1829",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1830",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1831",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1832",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1833",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1834",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1835",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "255",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "251",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1869",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "258",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "259",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1870",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "260",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "257",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "268",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "268",
+            "s" : [ {
+              "value" : [ "", "define ", "NotBeforeLongIvl", ": " ]
+            }, {
+              "r" : "279",
+              "s" : [ {
+                "r" : "271",
+                "s" : [ {
+                  "r" : "269",
+                  "value" : [ "Interval[", "2L", ", ", "5L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1871",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "279",
+                "value" : [ " ", "before", " " ]
               }, {
+                "r" : "276",
+                "s" : [ {
+                  "r" : "274",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Before",
+          "localId" : "279",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "280",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "281",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "282",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "283",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "271",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "272",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1872",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "273",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "276",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "277",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1873",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "278",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "286",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "BeforeRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "286",
+            "s" : [ {
+              "value" : [ "", "define ", "BeforeRealIvl", ": " ]
+            }, {
+              "r" : "297",
+              "s" : [ {
+                "r" : "289",
+                "s" : [ {
+                  "r" : "287",
+                  "value" : [ "Interval[", "0.0", ", ", "1.23", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1874",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "297",
+                "value" : [ " ", "before", " " ]
               }, {
+                "r" : "294",
+                "s" : [ {
+                  "r" : "292",
+                  "value" : [ "Interval[", "1.234", ", ", "2.345", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Before",
+          "localId" : "297",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "298",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "299",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "300",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "301",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "289",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "290",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1875",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "294",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "295",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1876",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1853",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1854",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1855",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1856",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1857",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1858",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1859",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "296",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "293",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.345",
+              "annotation" : [ ]
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* BeforeOrOn
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)]
-define MeetsAfterDateIvl: Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)) before or on DateIvl
-define MeetsBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) before or on DateIvl
-define AfterDateIvl: Interval[DateTime(2012, 10, 11, 0, 0, 0, 0), DateTime(2012, 10, 29, 0, 0, 0, 0)) before or on DateIvl
-define BeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 0, 0, 0, 0)) before or on DateIvl
-define MayMeetAfterImpreciseDateIvl: DateIvl before or on Interval[DateTime(2012, 1), DateTime(2012, 2)]
-define MayMeetBeforeImpreciseDateIvl: DateIvl before or on Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define NotMeetsImpreciseDateIvl: DateIvl before or on Interval[DateTime(2012, 1), DateTime(2012, 12)]
-define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define MeetsAfterDayOfIvl: PrecisionDateIvl before or on day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define MeetsBeforeDayOfIvl: PrecisionDateIvl before or on day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
-define NotMeetsDayOfIvl: PrecisionDateIvl before or on day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define NotMeetsDayOfImpreciseIVL: PrecisionDateIvl before or on day of Interval[DateTime(2012, 1), DateTime(2012, 2)]
-define MayMeetAfterDayOfImpreciseIvl: PrecisionDateIvl before or on day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
-define MayMeetBeforeDayOfImpreciseIvl: PrecisionDateIvl before or on day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
-define ImpreciseMayMeetAfterDateIvl: ImpDateIvl before or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 23, 59, 59, 999)]
-define ImpreciseMayMeetBeforeDateIvl: ImpDateIvl before or on Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999)]
-define ImpreciseNotMeetsDateIvl: ImpDateIvl before or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999))
-define NullEndIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), null)
-define BeforeNullEndIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 20, 0, 0, 0, 0)] before or on NullEndIvl
-define AfterStartNullEndIvl: Interval[DateTime(2012, 3, 10, 0, 0, 0, 0), DateTime(2012, 3, 20, 0, 0, 0, 0)] before or on NullEndIvl
-define NullEndStartBeforeIvl: NullEndIvl before or on Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 4, 20, 0, 0, 0, 0)]
-define NullEndStartAfterIvl: NullEndIvl before or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 20, 0, 0, 0, 0)]
-define NullStartIvl: Interval(null, DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define EndsBeforeNullStartIvlEnds: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 20, 0, 0, 0, 0)] before or on NullStartIvl
-define AfterEndOfNullStartIvl: Interval[DateTime(2012, 3, 10, 0, 0, 0, 0), DateTime(2012, 3, 20, 0, 0, 0, 0)] before or on NullStartIvl
-define NullStartStartBeforeIvl: NullStartIvl before or on Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 4, 20, 0, 0, 0, 0)]
-define NullStartStartAfterIvl: NullStartIvl before or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 20, 0, 0, 0, 0)]
-define DateIvlBeforeNull: DateIvl before or on null
-define NullBeforeDateIvl: null before or on DateIvl
-define DateTimeBeforeDateIvl: DateTime(2012, 2, 20, 0, 0, 0, 0) before or on DateIvl
-define DateBeforeDateIvl: Date(2012, 2, 20) before or on DateIvl
-define DateIvlBeforeDateTime: DateIvl before or on DateTime(2012, 9, 20, 0, 0, 0, 0)
-define DateIvlBeforeDate: DateIvl before or on DateTime(2012, 9, 20)
-define DateOnlyIvl: Interval[Date(2012, 1, 1), Date(2012, 2, 20)]
-define DateOnlyIvlBeforeDateIvl: DateOnlyIvl before or on DateIvl
-define DateIvlAfterDateOnlyIvl: DateIvl before or on DateOnlyIvl
-define DateOnlyMeetsBeforeDateIvl: Interval[Date(2012, 1, 1), Date(2012, 3, 1)] before or on DateIvl
-*/
-
-module.exports['BeforeOrOn'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "1983",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "304",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotBeforeRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "304",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "NotBeforeRealIvl", ": " ]
             }, {
+              "r" : "315",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "307",
+                "s" : [ {
+                  "r" : "305",
+                  "value" : [ "Interval[", "1.234", ", ", "2.345", "]" ]
+                } ]
+              }, {
+                "r" : "315",
+                "value" : [ " ", "before", " " ]
+              }, {
+                "r" : "312",
+                "s" : [ {
+                  "r" : "310",
+                  "value" : [ "Interval[", "0.0", ", ", "1.234", "]" ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Before",
+          "localId" : "315",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "316",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "318",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "319",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "307",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "308",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "309",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.345",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "312",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "313",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "310",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "322",
         "name" : "DateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -79623,105 +81403,105 @@ module.exports['BeforeOrOn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "322",
             "s" : [ {
               "value" : [ "", "define ", "DateIvl", ": " ]
             }, {
-              "r" : "263",
+              "r" : "371",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "231",
+                "r" : "339",
                 "s" : [ {
-                  "r" : "215",
+                  "r" : "323",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "255",
+                "r" : "363",
                 "s" : [ {
-                  "r" : "239",
+                  "r" : "347",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "value" : [ "]" ]
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "266",
+          "localId" : "374",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "267",
+            "localId" : "375",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "263",
+          "localId" : "371",
           "lowClosed" : true,
-          "highClosed" : true,
+          "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
+            "localId" : "372",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "265",
+              "localId" : "373",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "231",
+            "localId" : "339",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "232",
+              "localId" : "340",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "233",
+              "localId" : "341",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "234",
+              "localId" : "342",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "235",
+              "localId" : "343",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "236",
+              "localId" : "344",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "237",
+              "localId" : "345",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "238",
+              "localId" : "346",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "215",
+              "localId" : "323",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -79729,7 +81509,7 @@ module.exports['BeforeOrOn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "216",
+              "localId" : "324",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -79737,7 +81517,7 @@ module.exports['BeforeOrOn'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "217",
+              "localId" : "325",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -79745,7 +81525,7 @@ module.exports['BeforeOrOn'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "218",
+              "localId" : "326",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -79753,7 +81533,7 @@ module.exports['BeforeOrOn'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "219",
+              "localId" : "327",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -79761,7 +81541,7 @@ module.exports['BeforeOrOn'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "220",
+              "localId" : "328",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -79769,7 +81549,7 @@ module.exports['BeforeOrOn'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "221",
+              "localId" : "329",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -79778,48 +81558,48 @@ module.exports['BeforeOrOn'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "255",
+            "localId" : "363",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "256",
+              "localId" : "364",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "257",
+              "localId" : "365",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "258",
+              "localId" : "366",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "259",
+              "localId" : "367",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "260",
+              "localId" : "368",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "261",
+              "localId" : "369",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "262",
+              "localId" : "370",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "239",
+              "localId" : "347",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -79827,7 +81607,7 @@ module.exports['BeforeOrOn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "240",
+              "localId" : "348",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -79835,7 +81615,7 @@ module.exports['BeforeOrOn'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "241",
+              "localId" : "349",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -79843,7 +81623,7 @@ module.exports['BeforeOrOn'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "242",
+              "localId" : "350",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -79851,7 +81631,7 @@ module.exports['BeforeOrOn'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "243",
+              "localId" : "351",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -79859,7 +81639,7 @@ module.exports['BeforeOrOn'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "244",
+              "localId" : "352",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -79867,7 +81647,7 @@ module.exports['BeforeOrOn'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "245",
+              "localId" : "353",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -79876,46 +81656,46 @@ module.exports['BeforeOrOn'] = {
           }
         }
       }, {
-        "localId" : "270",
+        "localId" : "378",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterDateIvl",
+        "name" : "BeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "270",
+            "r" : "378",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "BeforeDateIvl", ": " ]
             }, {
-              "r" : "325",
+              "r" : "433",
               "s" : [ {
-                "r" : "319",
+                "r" : "427",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "287",
+                  "r" : "395",
                   "s" : [ {
-                    "r" : "271",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "379",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "311",
+                  "r" : "419",
                   "s" : [ {
-                    "r" : "295",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "403",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "325",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "433",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "322",
+                "r" : "430",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
@@ -79924,92 +81704,92 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "325",
+          "type" : "Before",
+          "localId" : "433",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "326",
+            "localId" : "434",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "327",
+              "localId" : "435",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "328",
+            "localId" : "436",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "329",
+              "localId" : "437",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "319",
+            "localId" : "427",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "320",
+              "localId" : "428",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "321",
+                "localId" : "429",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "287",
+              "localId" : "395",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "288",
+                "localId" : "396",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "289",
+                "localId" : "397",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "290",
+                "localId" : "398",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "291",
+                "localId" : "399",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "292",
+                "localId" : "400",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "293",
+                "localId" : "401",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "294",
+                "localId" : "402",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "271",
+                "localId" : "379",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -80017,15 +81797,15 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "272",
+                "localId" : "380",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "273",
+                "localId" : "381",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -80033,7 +81813,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "274",
+                "localId" : "382",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80041,7 +81821,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "275",
+                "localId" : "383",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80049,7 +81829,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "276",
+                "localId" : "384",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80057,7 +81837,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "277",
+                "localId" : "385",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80066,48 +81846,48 @@ module.exports['BeforeOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "311",
+              "localId" : "419",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "312",
+                "localId" : "420",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "313",
+                "localId" : "421",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "314",
+                "localId" : "422",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "315",
+                "localId" : "423",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "316",
+                "localId" : "424",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "317",
+                "localId" : "425",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "318",
+                "localId" : "426",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "295",
+                "localId" : "403",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -80115,15 +81895,15 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "296",
+                "localId" : "404",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "297",
+                "localId" : "405",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -80131,7 +81911,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "298",
+                "localId" : "406",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80139,7 +81919,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "299",
+                "localId" : "407",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80147,7 +81927,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "300",
+                "localId" : "408",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80155,7 +81935,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "301",
+                "localId" : "409",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80164,16 +81944,16 @@ module.exports['BeforeOrOn'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "322",
+            "localId" : "430",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "323",
+              "localId" : "431",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "324",
+                "localId" : "432",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -80181,46 +81961,46 @@ module.exports['BeforeOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "332",
+        "localId" : "440",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeDateIvl",
+        "name" : "NotBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "332",
+            "r" : "440",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "NotBeforeDateIvl", ": " ]
             }, {
-              "r" : "387",
+              "r" : "495",
               "s" : [ {
-                "r" : "381",
+                "r" : "489",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "349",
+                  "r" : "457",
                   "s" : [ {
-                    "r" : "333",
+                    "r" : "441",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "373",
+                  "r" : "481",
                   "s" : [ {
-                    "r" : "357",
+                    "r" : "465",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "387",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "495",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "384",
+                "r" : "492",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
@@ -80229,92 +82009,92 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "387",
+          "type" : "Before",
+          "localId" : "495",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "388",
+            "localId" : "496",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "389",
+              "localId" : "497",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "390",
+            "localId" : "498",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "391",
+              "localId" : "499",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "381",
+            "localId" : "489",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "382",
+              "localId" : "490",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "383",
+                "localId" : "491",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "349",
+              "localId" : "457",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "350",
+                "localId" : "458",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "351",
+                "localId" : "459",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "352",
+                "localId" : "460",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "353",
+                "localId" : "461",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "354",
+                "localId" : "462",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "355",
+                "localId" : "463",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "356",
+                "localId" : "464",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "333",
+                "localId" : "441",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -80322,7 +82102,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "334",
+                "localId" : "442",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -80330,7 +82110,7 @@ module.exports['BeforeOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "335",
+                "localId" : "443",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -80338,7 +82118,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "336",
+                "localId" : "444",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80346,7 +82126,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "337",
+                "localId" : "445",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80354,7 +82134,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "338",
+                "localId" : "446",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80362,7 +82142,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "339",
+                "localId" : "447",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -80371,48 +82151,48 @@ module.exports['BeforeOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "373",
+              "localId" : "481",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "374",
+                "localId" : "482",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "375",
+                "localId" : "483",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "376",
+                "localId" : "484",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "377",
+                "localId" : "485",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "378",
+                "localId" : "486",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "379",
+                "localId" : "487",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "380",
+                "localId" : "488",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "357",
+                "localId" : "465",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -80420,7 +82200,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "358",
+                "localId" : "466",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -80428,519 +82208,7 @@ module.exports['BeforeOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "359",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "360",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "361",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "362",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "363",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "384",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "385",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "386",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "394",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "394",
-            "s" : [ {
-              "value" : [ "", "define ", "AfterDateIvl", ": " ]
-            }, {
-              "r" : "449",
-              "s" : [ {
-                "r" : "443",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "411",
-                  "s" : [ {
-                    "r" : "395",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "11", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "435",
-                  "s" : [ {
-                    "r" : "419",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "449",
-                "value" : [ " ", "before or on", " " ]
-              }, {
-                "r" : "446",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "449",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "450",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "451",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "452",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "453",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "443",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "444",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "445",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "411",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "412",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "413",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "414",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "415",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "416",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "417",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "418",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "395",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "396",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "397",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "11",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "398",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "399",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "400",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "401",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "435",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "436",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "437",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "438",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "439",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "440",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "441",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "442",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "419",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "420",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "421",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "29",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "422",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "423",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "424",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "425",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "446",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "447",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "448",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "456",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "BeforeDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "456",
-            "s" : [ {
-              "value" : [ "", "define ", "BeforeDateIvl", ": " ]
-            }, {
-              "r" : "511",
-              "s" : [ {
-                "r" : "505",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "473",
-                  "s" : [ {
-                    "r" : "457",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "497",
-                  "s" : [ {
-                    "r" : "481",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "511",
-                "value" : [ " ", "before or on", " " ]
-              }, {
-                "r" : "508",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "511",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "512",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "513",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "514",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "515",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "505",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "506",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "507",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "473",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "474",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "475",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "476",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "477",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "478",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "479",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "480",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "457",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "458",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "459",
+                "localId" : "467",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -80948,105 +82216,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "460",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "461",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "462",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "463",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "497",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "498",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "499",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "500",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "501",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "502",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "503",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "504",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "481",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "482",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "483",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "29",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "484",
+                "localId" : "468",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -81054,7 +82224,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "485",
+                "localId" : "469",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -81062,7 +82232,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "486",
+                "localId" : "470",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -81070,7 +82240,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "487",
+                "localId" : "471",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -81079,16 +82249,16 @@ module.exports['BeforeOrOn'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "508",
+            "localId" : "492",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "509",
+              "localId" : "493",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "510",
+                "localId" : "494",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -81096,45 +82266,45 @@ module.exports['BeforeOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "518",
+        "localId" : "502",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetAfterImpreciseDateIvl",
+        "name" : "BeforeImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "518",
+            "r" : "502",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetAfterImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "BeforeImpreciseDateIvl", ": " ]
             }, {
-              "r" : "543",
+              "r" : "527",
               "s" : [ {
-                "r" : "519",
+                "r" : "503",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "543",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "527",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "540",
+                "r" : "524",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "528",
+                  "r" : "512",
                   "s" : [ {
-                    "r" : "522",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "506",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "537",
+                  "r" : "521",
                   "s" : [ {
-                    "r" : "531",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                    "r" : "515",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -81144,83 +82314,83 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "543",
+          "type" : "Before",
+          "localId" : "527",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "544",
+            "localId" : "528",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "545",
+              "localId" : "529",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "546",
+            "localId" : "530",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "547",
+              "localId" : "531",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "519",
+            "localId" : "503",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "520",
+              "localId" : "504",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "521",
+                "localId" : "505",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "540",
+            "localId" : "524",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "541",
+              "localId" : "525",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "542",
+                "localId" : "526",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "528",
+              "localId" : "512",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "529",
+                "localId" : "513",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "530",
+                "localId" : "514",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "522",
+                "localId" : "506",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -81228,32 +82398,32 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "523",
+                "localId" : "507",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "9",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "537",
+              "localId" : "521",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "538",
+                "localId" : "522",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "539",
+                "localId" : "523",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "531",
+                "localId" : "515",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -81261,54 +82431,54 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "532",
+                "localId" : "516",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "12",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "550",
+        "localId" : "534",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetBeforeImpreciseDateIvl",
+        "name" : "NotBeforeImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "550",
+            "r" : "534",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetBeforeImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "NotBeforeImpreciseDateIvl", ": " ]
             }, {
-              "r" : "575",
+              "r" : "559",
               "s" : [ {
-                "r" : "551",
+                "r" : "535",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "575",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "559",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "572",
+                "r" : "556",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "560",
+                  "r" : "544",
                   "s" : [ {
-                    "r" : "554",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                    "r" : "538",
+                    "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "569",
+                  "r" : "553",
                   "s" : [ {
-                    "r" : "563",
+                    "r" : "547",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
                   } ]
                 }, {
@@ -81319,83 +82489,83 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "575",
+          "type" : "Before",
+          "localId" : "559",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "576",
+            "localId" : "560",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "577",
+              "localId" : "561",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "578",
+            "localId" : "562",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "579",
+              "localId" : "563",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "551",
+            "localId" : "535",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "552",
+              "localId" : "536",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "553",
+                "localId" : "537",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "572",
+            "localId" : "556",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "573",
+              "localId" : "557",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "574",
+                "localId" : "558",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "560",
+              "localId" : "544",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "561",
+                "localId" : "545",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "562",
+                "localId" : "546",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "554",
+                "localId" : "538",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -81403,32 +82573,32 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "555",
+                "localId" : "539",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "8",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "569",
+              "localId" : "553",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "570",
+                "localId" : "554",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "571",
+                "localId" : "555",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "563",
+                "localId" : "547",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -81436,7 +82606,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "564",
+                "localId" : "548",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -81446,45 +82616,45 @@ module.exports['BeforeOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "582",
+        "localId" : "566",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsImpreciseDateIvl",
+        "name" : "MayBeBeforeImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "582",
+            "r" : "566",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "MayBeBeforeImpreciseDateIvl", ": " ]
             }, {
-              "r" : "607",
+              "r" : "585",
               "s" : [ {
-                "r" : "583",
+                "r" : "567",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "607",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "585",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "604",
+                "r" : "582",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "592",
+                  "r" : "574",
                   "s" : [ {
-                    "r" : "586",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "570",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "601",
+                  "r" : "580",
                   "s" : [ {
-                    "r" : "595",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                    "r" : "576",
+                    "value" : [ "DateTime", "(", "2012", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -81494,134 +82664,108 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "607",
+          "type" : "Before",
+          "localId" : "585",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "608",
+            "localId" : "586",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "609",
+              "localId" : "587",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "610",
+            "localId" : "588",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "611",
+              "localId" : "589",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "583",
+            "localId" : "567",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "584",
+              "localId" : "568",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "585",
+                "localId" : "569",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "604",
+            "localId" : "582",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "605",
+              "localId" : "583",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "606",
+                "localId" : "584",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "592",
+              "localId" : "574",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "593",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "594",
+                "localId" : "575",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "586",
+                "localId" : "570",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "587",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "601",
+              "localId" : "580",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "602",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "603",
+                "localId" : "581",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "595",
+                "localId" : "576",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "596",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "614",
+        "localId" : "592",
         "name" : "PrecisionDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -81629,25 +82773,25 @@ module.exports['BeforeOrOn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "614",
+            "r" : "592",
             "s" : [ {
               "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
             }, {
-              "r" : "663",
+              "r" : "641",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "631",
+                "r" : "609",
                 "s" : [ {
-                  "r" : "615",
+                  "r" : "593",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "655",
+                "r" : "633",
                 "s" : [ {
-                  "r" : "639",
+                  "r" : "617",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
               }, {
@@ -81658,76 +82802,76 @@ module.exports['BeforeOrOn'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "666",
+          "localId" : "644",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "667",
+            "localId" : "645",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "663",
+          "localId" : "641",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "664",
+            "localId" : "642",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "665",
+              "localId" : "643",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "631",
+            "localId" : "609",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "632",
+              "localId" : "610",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "633",
+              "localId" : "611",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "634",
+              "localId" : "612",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "635",
+              "localId" : "613",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "636",
+              "localId" : "614",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "637",
+              "localId" : "615",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "638",
+              "localId" : "616",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "615",
+              "localId" : "593",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -81735,7 +82879,7 @@ module.exports['BeforeOrOn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "616",
+              "localId" : "594",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -81743,7 +82887,7 @@ module.exports['BeforeOrOn'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "617",
+              "localId" : "595",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -81751,7 +82895,7 @@ module.exports['BeforeOrOn'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "618",
+              "localId" : "596",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -81759,7 +82903,7 @@ module.exports['BeforeOrOn'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "619",
+              "localId" : "597",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "34",
@@ -81767,7 +82911,7 @@ module.exports['BeforeOrOn'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "620",
+              "localId" : "598",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "56",
@@ -81775,7 +82919,7 @@ module.exports['BeforeOrOn'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "621",
+              "localId" : "599",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "789",
@@ -81784,48 +82928,48 @@ module.exports['BeforeOrOn'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "655",
+            "localId" : "633",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "656",
+              "localId" : "634",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "657",
+              "localId" : "635",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "658",
+              "localId" : "636",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "659",
+              "localId" : "637",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "660",
+              "localId" : "638",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "661",
+              "localId" : "639",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "662",
+              "localId" : "640",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "639",
+              "localId" : "617",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -81833,7 +82977,7 @@ module.exports['BeforeOrOn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "640",
+              "localId" : "618",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -81841,7 +82985,7 @@ module.exports['BeforeOrOn'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "641",
+              "localId" : "619",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -81849,7 +82993,7 @@ module.exports['BeforeOrOn'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "642",
+              "localId" : "620",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -81857,7 +83001,7 @@ module.exports['BeforeOrOn'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "643",
+              "localId" : "621",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -81865,7 +83009,7 @@ module.exports['BeforeOrOn'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "644",
+              "localId" : "622",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "45",
@@ -81873,7 +83017,7 @@ module.exports['BeforeOrOn'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "645",
+              "localId" : "623",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "678",
@@ -81882,44 +83026,44 @@ module.exports['BeforeOrOn'] = {
           }
         }
       }, {
-        "localId" : "670",
+        "localId" : "648",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterDayOfIvl",
+        "name" : "AfterDayOfIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "670",
+            "r" : "648",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterDayOfIvl", ": " ]
+              "value" : [ "", "define ", "AfterDayOfIvl", ": " ]
             }, {
-              "r" : "725",
+              "r" : "703",
               "s" : [ {
-                "r" : "671",
+                "r" : "649",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "725",
-                "value" : [ " ", "before or on day of", " " ]
+                "r" : "703",
+                "value" : [ " ", "before day of", " " ]
               }, {
-                "r" : "722",
+                "r" : "700",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "690",
+                  "r" : "668",
                   "s" : [ {
-                    "r" : "674",
+                    "r" : "652",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "714",
+                  "r" : "692",
                   "s" : [ {
-                    "r" : "698",
+                    "r" : "676",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -81930,109 +83074,109 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "725",
+          "type" : "Before",
+          "localId" : "703",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "726",
+            "localId" : "704",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "727",
+              "localId" : "705",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "728",
+            "localId" : "706",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "729",
+              "localId" : "707",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "671",
+            "localId" : "649",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "672",
+              "localId" : "650",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "673",
+                "localId" : "651",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "722",
+            "localId" : "700",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "723",
+              "localId" : "701",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "724",
+                "localId" : "702",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "690",
+              "localId" : "668",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "691",
+                "localId" : "669",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "692",
+                "localId" : "670",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "693",
+                "localId" : "671",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "694",
+                "localId" : "672",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "695",
+                "localId" : "673",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "696",
+                "localId" : "674",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "697",
+                "localId" : "675",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "674",
+                "localId" : "652",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -82040,7 +83184,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "675",
+                "localId" : "653",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -82048,7 +83192,7 @@ module.exports['BeforeOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "676",
+                "localId" : "654",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -82056,7 +83200,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "677",
+                "localId" : "655",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82064,7 +83208,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "678",
+                "localId" : "656",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82072,7 +83216,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "679",
+                "localId" : "657",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82080,7 +83224,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "680",
+                "localId" : "658",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82089,48 +83233,48 @@ module.exports['BeforeOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "714",
+              "localId" : "692",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "715",
+                "localId" : "693",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "716",
+                "localId" : "694",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "717",
+                "localId" : "695",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "718",
+                "localId" : "696",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "719",
+                "localId" : "697",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "720",
+                "localId" : "698",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "721",
+                "localId" : "699",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "698",
+                "localId" : "676",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -82138,7 +83282,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "699",
+                "localId" : "677",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -82146,7 +83290,7 @@ module.exports['BeforeOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "700",
+                "localId" : "678",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -82154,7 +83298,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "701",
+                "localId" : "679",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82162,7 +83306,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "702",
+                "localId" : "680",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82170,7 +83314,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "703",
+                "localId" : "681",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82178,7 +83322,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "704",
+                "localId" : "682",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82188,44 +83332,44 @@ module.exports['BeforeOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "732",
+        "localId" : "710",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeDayOfIvl",
+        "name" : "BeforeDayOfIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "732",
+            "r" : "710",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeDayOfIvl", ": " ]
+              "value" : [ "", "define ", "BeforeDayOfIvl", ": " ]
             }, {
-              "r" : "787",
+              "r" : "765",
               "s" : [ {
-                "r" : "733",
+                "r" : "711",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "787",
-                "value" : [ " ", "before or on day of", " " ]
+                "r" : "765",
+                "value" : [ " ", "before day of", " " ]
               }, {
-                "r" : "784",
+                "r" : "762",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "752",
+                  "r" : "730",
                   "s" : [ {
-                    "r" : "736",
+                    "r" : "714",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "776",
+                  "r" : "754",
                   "s" : [ {
-                    "r" : "760",
+                    "r" : "738",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -82236,109 +83380,109 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "787",
+          "type" : "Before",
+          "localId" : "765",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "788",
+            "localId" : "766",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "789",
+              "localId" : "767",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "790",
+            "localId" : "768",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "791",
+              "localId" : "769",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "733",
+            "localId" : "711",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "734",
+              "localId" : "712",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "735",
+                "localId" : "713",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "784",
+            "localId" : "762",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "785",
+              "localId" : "763",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "786",
+                "localId" : "764",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "752",
+              "localId" : "730",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "753",
+                "localId" : "731",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "754",
+                "localId" : "732",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "755",
+                "localId" : "733",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "756",
+                "localId" : "734",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "757",
+                "localId" : "735",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "758",
+                "localId" : "736",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "759",
+                "localId" : "737",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "736",
+                "localId" : "714",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -82346,7 +83490,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "737",
+                "localId" : "715",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -82354,7 +83498,7 @@ module.exports['BeforeOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "738",
+                "localId" : "716",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -82362,7 +83506,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "739",
+                "localId" : "717",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82370,7 +83514,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "740",
+                "localId" : "718",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82378,7 +83522,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "741",
+                "localId" : "719",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82386,7 +83530,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "742",
+                "localId" : "720",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82395,48 +83539,48 @@ module.exports['BeforeOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "776",
+              "localId" : "754",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "777",
+                "localId" : "755",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "778",
+                "localId" : "756",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "779",
+                "localId" : "757",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "780",
+                "localId" : "758",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "781",
+                "localId" : "759",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "782",
+                "localId" : "760",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "783",
+                "localId" : "761",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "760",
+                "localId" : "738",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -82444,7 +83588,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "761",
+                "localId" : "739",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -82452,7 +83596,7 @@ module.exports['BeforeOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "762",
+                "localId" : "740",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -82460,7 +83604,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "763",
+                "localId" : "741",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82468,7 +83612,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "764",
+                "localId" : "742",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82476,7 +83620,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "765",
+                "localId" : "743",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82484,7 +83628,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "766",
+                "localId" : "744",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82494,45 +83638,45 @@ module.exports['BeforeOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "794",
+        "localId" : "772",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsDayOfIvl",
+        "name" : "StartsSameDayOfIvlEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "794",
+            "r" : "772",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsDayOfIvl", ": " ]
+              "value" : [ "", "define ", "StartsSameDayOfIvlEnd", ": " ]
             }, {
-              "r" : "849",
+              "r" : "827",
               "s" : [ {
-                "r" : "795",
+                "r" : "773",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "849",
-                "value" : [ " ", "before or on day of", " " ]
+                "r" : "827",
+                "value" : [ " ", "before day of", " " ]
               }, {
-                "r" : "846",
+                "r" : "824",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "814",
+                  "r" : "792",
                   "s" : [ {
-                    "r" : "798",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "776",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "838",
+                  "r" : "816",
                   "s" : [ {
-                    "r" : "822",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "800",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -82542,81 +83686,169 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "849",
+          "type" : "Before",
+          "localId" : "827",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "850",
+            "localId" : "828",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "851",
+              "localId" : "829",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "852",
+            "localId" : "830",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "853",
+              "localId" : "831",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "795",
+            "localId" : "773",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "796",
+              "localId" : "774",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "797",
+                "localId" : "775",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "846",
+            "localId" : "824",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "847",
+              "localId" : "825",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "848",
+                "localId" : "826",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "814",
+              "localId" : "792",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "815",
+                "localId" : "793",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "816",
+                "localId" : "794",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "795",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "796",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "797",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "798",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "799",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "776",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "777",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "778",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "779",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "780",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "781",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "782",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "816",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "817",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
@@ -82641,108 +83873,20 @@ module.exports['BeforeOrOn'] = {
                 "localId" : "821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "798",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "799",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "800",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "801",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "802",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "803",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "804",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "838",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "839",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "840",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "841",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "842",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "843",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "844",
+                "localId" : "822",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "845",
+                "localId" : "823",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "822",
+                "localId" : "800",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -82750,15 +83894,15 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "823",
+                "localId" : "801",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "10",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "824",
+                "localId" : "802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -82766,7 +83910,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "825",
+                "localId" : "803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82774,7 +83918,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "826",
+                "localId" : "804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82782,7 +83926,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "827",
+                "localId" : "805",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82790,7 +83934,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "828",
+                "localId" : "806",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -82800,45 +83944,45 @@ module.exports['BeforeOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "856",
+        "localId" : "834",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsDayOfImpreciseIVL",
+        "name" : "EndsSameDayOfIvlStart",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "856",
+            "r" : "834",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsDayOfImpreciseIVL", ": " ]
+              "value" : [ "", "define ", "EndsSameDayOfIvlStart", ": " ]
             }, {
-              "r" : "881",
+              "r" : "889",
               "s" : [ {
-                "r" : "857",
+                "r" : "835",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "881",
-                "value" : [ " ", "before or on day of", " " ]
+                "r" : "889",
+                "value" : [ " ", "before day of", " " ]
               }, {
-                "r" : "878",
+                "r" : "886",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "866",
+                  "r" : "854",
                   "s" : [ {
-                    "r" : "860",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "838",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "875",
+                  "r" : "878",
                   "s" : [ {
-                    "r" : "869",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                    "r" : "862",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -82848,84 +83992,109 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "881",
+          "type" : "Before",
+          "localId" : "889",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "882",
+            "localId" : "890",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "883",
+              "localId" : "891",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "884",
+            "localId" : "892",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "885",
+              "localId" : "893",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "857",
+            "localId" : "835",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "858",
+              "localId" : "836",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "859",
+                "localId" : "837",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "878",
+            "localId" : "886",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "879",
+              "localId" : "887",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "880",
+                "localId" : "888",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "866",
+              "localId" : "854",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "867",
+                "localId" : "855",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "868",
+                "localId" : "856",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "857",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "858",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "859",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "860",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "861",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "860",
+                "localId" : "838",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -82933,32 +84102,97 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "861",
+                "localId" : "839",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "840",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "841",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "842",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "843",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "844",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "875",
+              "localId" : "878",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "876",
+                "localId" : "879",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "877",
+                "localId" : "880",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "881",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "882",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "883",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "884",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "885",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "869",
+                "localId" : "862",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -82966,54 +84200,94 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "870",
+                "localId" : "863",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
                 "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "865",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "866",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "867",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "868",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "888",
+        "localId" : "896",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetAfterDayOfImpreciseIvl",
+        "name" : "MayBeAfterDayOfImpreciseIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "888",
+            "r" : "896",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetAfterDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "MayBeAfterDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "913",
+              "r" : "921",
               "s" : [ {
-                "r" : "889",
+                "r" : "897",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "913",
-                "value" : [ " ", "before or on day of", " " ]
+                "r" : "921",
+                "value" : [ " ", "before day of", " " ]
               }, {
-                "r" : "910",
+                "r" : "918",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "898",
+                  "r" : "906",
                   "s" : [ {
-                    "r" : "892",
+                    "r" : "900",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "907",
+                  "r" : "915",
                   "s" : [ {
-                    "r" : "901",
+                    "r" : "909",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                   } ]
                 }, {
@@ -83024,84 +84298,84 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "913",
+          "type" : "Before",
+          "localId" : "921",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "914",
+            "localId" : "922",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "915",
+              "localId" : "923",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "916",
+            "localId" : "924",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "917",
+              "localId" : "925",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "889",
+            "localId" : "897",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "890",
+              "localId" : "898",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "891",
+                "localId" : "899",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "910",
+            "localId" : "918",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "911",
+              "localId" : "919",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "912",
+                "localId" : "920",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "898",
+              "localId" : "906",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "899",
+                "localId" : "907",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "900",
+                "localId" : "908",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "892",
+                "localId" : "900",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -83109,7 +84383,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "893",
+                "localId" : "901",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -83118,23 +84392,23 @@ module.exports['BeforeOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "907",
+              "localId" : "915",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "908",
+                "localId" : "916",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "909",
+                "localId" : "917",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "901",
+                "localId" : "909",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -83142,7 +84416,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "902",
+                "localId" : "910",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -83152,44 +84426,44 @@ module.exports['BeforeOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "920",
+        "localId" : "928",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetBeforeDayOfImpreciseIvl",
+        "name" : "MayBeBeforeDayOfImpreciseIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "920",
+            "r" : "928",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetBeforeDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "MayBeBeforeDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "945",
+              "r" : "953",
               "s" : [ {
-                "r" : "921",
+                "r" : "929",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "945",
-                "value" : [ " ", "before or on day of", " " ]
+                "r" : "953",
+                "value" : [ " ", "before day of", " " ]
               }, {
-                "r" : "942",
+                "r" : "950",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "930",
+                  "r" : "938",
                   "s" : [ {
-                    "r" : "924",
+                    "r" : "932",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "939",
+                  "r" : "947",
                   "s" : [ {
-                    "r" : "933",
+                    "r" : "941",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
                   } ]
                 }, {
@@ -83200,84 +84474,84 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "945",
+          "type" : "Before",
+          "localId" : "953",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "946",
+            "localId" : "954",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "947",
+              "localId" : "955",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "948",
+            "localId" : "956",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "949",
+              "localId" : "957",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "921",
+            "localId" : "929",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "922",
+              "localId" : "930",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "923",
+                "localId" : "931",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "942",
+            "localId" : "950",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "943",
+              "localId" : "951",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "944",
+                "localId" : "952",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "930",
+              "localId" : "938",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "931",
+                "localId" : "939",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "932",
+                "localId" : "940",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "924",
+                "localId" : "932",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -83285,7 +84559,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "925",
+                "localId" : "933",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -83294,23 +84568,23 @@ module.exports['BeforeOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "939",
+              "localId" : "947",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "940",
+                "localId" : "948",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "941",
+                "localId" : "949",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "933",
+                "localId" : "941",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -83318,7 +84592,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "934",
+                "localId" : "942",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -83328,7 +84602,7 @@ module.exports['BeforeOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "952",
+        "localId" : "960",
         "name" : "ImpDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -83336,25 +84610,25 @@ module.exports['BeforeOrOn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "952",
+            "r" : "960",
             "s" : [ {
               "value" : [ "", "define ", "ImpDateIvl", ": " ]
             }, {
-              "r" : "971",
+              "r" : "979",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "959",
+                "r" : "967",
                 "s" : [ {
-                  "r" : "953",
+                  "r" : "961",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "968",
+                "r" : "976",
                 "s" : [ {
-                  "r" : "962",
+                  "r" : "970",
                   "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
                 } ]
               }, {
@@ -83365,51 +84639,51 @@ module.exports['BeforeOrOn'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "974",
+          "localId" : "982",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "975",
+            "localId" : "983",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "971",
+          "localId" : "979",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "972",
+            "localId" : "980",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "973",
+              "localId" : "981",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "959",
+            "localId" : "967",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "960",
+              "localId" : "968",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "961",
+              "localId" : "969",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "953",
+              "localId" : "961",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -83417,7 +84691,7 @@ module.exports['BeforeOrOn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "954",
+              "localId" : "962",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -83426,23 +84700,23 @@ module.exports['BeforeOrOn'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "968",
+            "localId" : "976",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "969",
+              "localId" : "977",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "970",
+              "localId" : "978",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "962",
+              "localId" : "970",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -83450,7 +84724,7 @@ module.exports['BeforeOrOn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "963",
+              "localId" : "971",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "8",
@@ -83459,156 +84733,156 @@ module.exports['BeforeOrOn'] = {
           }
         }
       }, {
-        "localId" : "978",
+        "localId" : "986",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayMeetAfterDateIvl",
+        "name" : "ImpreciseBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "978",
+            "r" : "986",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayMeetAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseBeforeDateIvl", ": " ]
             }, {
-              "r" : "1033",
+              "r" : "1041",
               "s" : [ {
-                "r" : "979",
+                "r" : "987",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "1033",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1041",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1030",
+                "r" : "1038",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "998",
+                  "r" : "1006",
                   "s" : [ {
-                    "r" : "982",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "990",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1022",
+                  "r" : "1030",
                   "s" : [ {
-                    "r" : "1006",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "1014",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1033",
+          "type" : "Before",
+          "localId" : "1041",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1034",
+            "localId" : "1042",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1035",
+              "localId" : "1043",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1036",
+            "localId" : "1044",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1037",
+              "localId" : "1045",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "979",
+            "localId" : "987",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "980",
+              "localId" : "988",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "981",
+                "localId" : "989",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1030",
+            "localId" : "1038",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1031",
+              "localId" : "1039",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1032",
+                "localId" : "1040",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "998",
+              "localId" : "1006",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "999",
+                "localId" : "1007",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1000",
+                "localId" : "1008",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1001",
+                "localId" : "1009",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1002",
+                "localId" : "1010",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1003",
+                "localId" : "1011",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1004",
+                "localId" : "1012",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1005",
+                "localId" : "1013",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "982",
+                "localId" : "990",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -83616,15 +84890,15 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "983",
+                "localId" : "991",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "984",
+                "localId" : "992",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -83632,7 +84906,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "985",
+                "localId" : "993",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -83640,7 +84914,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "986",
+                "localId" : "994",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -83648,7 +84922,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "987",
+                "localId" : "995",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -83656,7 +84930,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "988",
+                "localId" : "996",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -83665,48 +84939,48 @@ module.exports['BeforeOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1022",
+              "localId" : "1030",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1023",
+                "localId" : "1031",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1024",
+                "localId" : "1032",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1025",
+                "localId" : "1033",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1026",
+                "localId" : "1034",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1027",
+                "localId" : "1035",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1028",
+                "localId" : "1036",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1029",
+                "localId" : "1037",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1006",
+                "localId" : "1014",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -83714,206 +84988,206 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1007",
+                "localId" : "1015",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "12",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1008",
+                "localId" : "1016",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "29",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1009",
+                "localId" : "1017",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1010",
+                "localId" : "1018",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1011",
+                "localId" : "1019",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1012",
+                "localId" : "1020",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1040",
+        "localId" : "1048",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayMeetBeforeDateIvl",
+        "name" : "ImpreciseNotBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1040",
+            "r" : "1048",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayMeetBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseNotBeforeDateIvl", ": " ]
             }, {
-              "r" : "1095",
+              "r" : "1103",
               "s" : [ {
-                "r" : "1041",
+                "r" : "1049",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "1095",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1103",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1092",
+                "r" : "1100",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1060",
+                  "r" : "1068",
                   "s" : [ {
-                    "r" : "1044",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1052",
+                    "value" : [ "DateTime", "(", "2012", ", ", "8", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1084",
+                  "r" : "1092",
                   "s" : [ {
-                    "r" : "1068",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "1076",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1095",
+          "type" : "Before",
+          "localId" : "1103",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1096",
+            "localId" : "1104",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1097",
+              "localId" : "1105",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1098",
+            "localId" : "1106",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1099",
+              "localId" : "1107",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1041",
+            "localId" : "1049",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1042",
+              "localId" : "1050",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1043",
+                "localId" : "1051",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1092",
+            "localId" : "1100",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1093",
+              "localId" : "1101",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1094",
+                "localId" : "1102",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1060",
+              "localId" : "1068",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1061",
+                "localId" : "1069",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1062",
+                "localId" : "1070",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1063",
+                "localId" : "1071",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1064",
+                "localId" : "1072",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1065",
+                "localId" : "1073",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1066",
+                "localId" : "1074",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1067",
+                "localId" : "1075",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1044",
+                "localId" : "1052",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -83921,15 +85195,15 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1045",
+                "localId" : "1053",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "8",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1046",
+                "localId" : "1054",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -83937,7 +85211,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1047",
+                "localId" : "1055",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -83945,7 +85219,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1048",
+                "localId" : "1056",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -83953,7 +85227,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1049",
+                "localId" : "1057",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -83961,7 +85235,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1050",
+                "localId" : "1058",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -83970,48 +85244,48 @@ module.exports['BeforeOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1084",
+              "localId" : "1092",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1085",
+                "localId" : "1093",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1086",
+                "localId" : "1094",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1087",
+                "localId" : "1095",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1088",
+                "localId" : "1096",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1089",
+                "localId" : "1097",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1090",
+                "localId" : "1098",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1091",
+                "localId" : "1099",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1068",
+                "localId" : "1076",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -84019,7 +85293,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1069",
+                "localId" : "1077",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -84027,87 +85301,87 @@ module.exports['BeforeOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1070",
+                "localId" : "1078",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1071",
+                "localId" : "1079",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1072",
+                "localId" : "1080",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1073",
+                "localId" : "1081",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1074",
+                "localId" : "1082",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1102",
+        "localId" : "1110",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseNotMeetsDateIvl",
+        "name" : "ImpreciseMayBeBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1102",
+            "r" : "1110",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseNotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseMayBeBeforeDateIvl", ": " ]
             }, {
-              "r" : "1157",
+              "r" : "1165",
               "s" : [ {
-                "r" : "1103",
+                "r" : "1111",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "1157",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1165",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1154",
+                "r" : "1162",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1122",
+                  "r" : "1130",
                   "s" : [ {
-                    "r" : "1106",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1114",
+                    "value" : [ "DateTime", "(", "2012", ", ", "8", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1146",
+                  "r" : "1154",
                   "s" : [ {
-                    "r" : "1130",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "1138",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
@@ -84117,108 +85391,108 @@ module.exports['BeforeOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1157",
+          "type" : "Before",
+          "localId" : "1165",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1158",
+            "localId" : "1166",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1159",
+              "localId" : "1167",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1160",
+            "localId" : "1168",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1161",
+              "localId" : "1169",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1103",
+            "localId" : "1111",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1104",
+              "localId" : "1112",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1105",
+                "localId" : "1113",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1154",
+            "localId" : "1162",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1155",
+              "localId" : "1163",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1156",
+                "localId" : "1164",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1122",
+              "localId" : "1130",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1123",
+                "localId" : "1131",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1124",
+                "localId" : "1132",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1125",
+                "localId" : "1133",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1126",
+                "localId" : "1134",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1127",
+                "localId" : "1135",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1128",
+                "localId" : "1136",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1129",
+                "localId" : "1137",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1106",
+                "localId" : "1114",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -84226,23 +85500,23 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1107",
+                "localId" : "1115",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "8",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1108",
+                "localId" : "1116",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "15",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1109",
+                "localId" : "1117",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -84250,7 +85524,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1110",
+                "localId" : "1118",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -84258,7 +85532,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1111",
+                "localId" : "1119",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -84266,7 +85540,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1112",
+                "localId" : "1120",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -84275,48 +85549,48 @@ module.exports['BeforeOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1146",
+              "localId" : "1154",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1147",
+                "localId" : "1155",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1148",
+                "localId" : "1156",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1149",
+                "localId" : "1157",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1150",
+                "localId" : "1158",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1151",
+                "localId" : "1159",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1152",
+                "localId" : "1160",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1153",
+                "localId" : "1161",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1130",
+                "localId" : "1138",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -84324,7 +85598,7 @@ module.exports['BeforeOrOn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1131",
+                "localId" : "1139",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -84332,2488 +85606,2130 @@ module.exports['BeforeOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1132",
+                "localId" : "1140",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
+                "value" : "15",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1133",
+                "localId" : "1141",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1134",
+                "localId" : "1142",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1135",
+                "localId" : "1143",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1136",
+                "localId" : "1144",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1164",
-        "name" : "NullEndIvl",
+        "localId" : "1172",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1164",
+            "r" : "1172",
             "s" : [ {
-              "value" : [ "", "define ", "NullEndIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegBeforeIntIvl", ": " ]
             }, {
-              "r" : "1190",
+              "r" : "1184",
               "s" : [ {
-                "value" : [ "Interval[" ]
+                "r" : "1175",
+                "s" : [ {
+                  "r" : "1173",
+                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1184",
+                "value" : [ " ", "before", " " ]
               }, {
                 "r" : "1181",
                 "s" : [ {
-                  "r" : "1165",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1179",
+                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
                 } ]
-              }, {
-                "r" : "1189",
-                "value" : [ ", ", "null", ")" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1194",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1195",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "1190",
-          "lowClosed" : true,
-          "highClosed" : false,
+          "type" : "Before",
+          "localId" : "1184",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1192",
+            "localId" : "1185",
             "annotation" : [ ],
             "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1193",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "1181",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1182",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1183",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1184",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1185",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
               "type" : "NamedTypeSpecifier",
               "localId" : "1186",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1187",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1187",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "1188",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1165",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1166",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1167",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1175",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1177",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1178",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1168",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "As",
+              "localId" : "1176",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1173",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1169",
+              "localId" : "1174",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "100",
               "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1181",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1182",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1183",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "1170",
+              "localId" : "1179",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "101",
               "annotation" : [ ]
             },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1171",
+              "localId" : "1180",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "200",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "As",
-            "localId" : "1191",
-            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1189",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            }
-          }
+          } ]
         }
       }, {
-        "localId" : "1198",
+        "localId" : "1191",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "BeforeNullEndIvl",
+        "name" : "NegInfBegNotBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1198",
+            "r" : "1191",
             "s" : [ {
-              "value" : [ "", "define ", "BeforeNullEndIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotBeforeIntIvl", ": " ]
             }, {
-              "r" : "1253",
+              "r" : "1203",
               "s" : [ {
-                "r" : "1247",
+                "r" : "1194",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1215",
-                  "s" : [ {
-                    "r" : "1199",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1239",
-                  "s" : [ {
-                    "r" : "1223",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1192",
+                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "1253",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1203",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1250",
+                "r" : "1200",
                 "s" : [ {
-                  "value" : [ "NullEndIvl" ]
+                  "r" : "1198",
+                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1253",
+          "type" : "Before",
+          "localId" : "1203",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1254",
+            "localId" : "1204",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1255",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1205",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1256",
+            "localId" : "1206",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1257",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1207",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1247",
+            "localId" : "1194",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1248",
+              "localId" : "1196",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1249",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1197",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1195",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1216",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1217",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1218",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1219",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1220",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1221",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1222",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1199",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1200",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1201",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1202",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1203",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1204",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1205",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1192",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1240",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1241",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1242",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1243",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1244",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1245",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1246",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1223",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1224",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1225",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1226",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1227",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1228",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1229",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1193",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1250",
-            "name" : "NullEndIvl",
+            "type" : "Interval",
+            "localId" : "1200",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1251",
+              "localId" : "1201",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1252",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1202",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1198",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1199",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1260",
+        "localId" : "1210",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterStartNullEndIvl",
+        "name" : "UnknownBegBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1260",
+            "r" : "1210",
             "s" : [ {
-              "value" : [ "", "define ", "AfterStartNullEndIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegBeforeIntIvl", ": " ]
             }, {
-              "r" : "1315",
+              "r" : "1222",
               "s" : [ {
-                "r" : "1309",
+                "r" : "1213",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1277",
-                  "s" : [ {
-                    "r" : "1261",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1301",
-                  "s" : [ {
-                    "r" : "1285",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1211",
+                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "1315",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1222",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1312",
+                "r" : "1219",
                 "s" : [ {
-                  "value" : [ "NullEndIvl" ]
+                  "r" : "1217",
+                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1315",
+          "type" : "Before",
+          "localId" : "1222",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1316",
+            "localId" : "1223",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1317",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1224",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1318",
+            "localId" : "1225",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1319",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1226",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1309",
-            "lowClosed" : true,
+            "localId" : "1213",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1310",
+              "localId" : "1215",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1311",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1216",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1277",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1214",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1278",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1279",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1280",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1281",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1282",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1283",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1284",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1261",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1262",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1263",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1264",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1265",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1266",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1267",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1211",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1301",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1302",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1303",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1304",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1305",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1306",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1307",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1308",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1285",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1286",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1287",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1288",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1289",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1290",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1291",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1212",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1312",
-            "name" : "NullEndIvl",
+            "type" : "Interval",
+            "localId" : "1219",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1313",
+              "localId" : "1220",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1314",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1221",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1322",
+        "localId" : "1229",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullEndStartBeforeIvl",
+        "name" : "UnknownBegNotBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1322",
+            "r" : "1229",
             "s" : [ {
-              "value" : [ "", "define ", "NullEndStartBeforeIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotBeforeIntIvl", ": " ]
             }, {
-              "r" : "1377",
+              "r" : "1241",
               "s" : [ {
-                "r" : "1323",
+                "r" : "1232",
                 "s" : [ {
-                  "value" : [ "NullEndIvl" ]
+                  "r" : "1230",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1377",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1241",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1374",
+                "r" : "1238",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1342",
-                  "s" : [ {
-                    "r" : "1326",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1366",
-                  "s" : [ {
-                    "r" : "1350",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1236",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1377",
+          "type" : "Before",
+          "localId" : "1241",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1378",
+            "localId" : "1242",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1379",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1243",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1380",
+            "localId" : "1244",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1381",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1245",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1323",
-            "name" : "NullEndIvl",
+            "type" : "Interval",
+            "localId" : "1232",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1324",
+              "localId" : "1234",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1325",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1235",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1233",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1230",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1231",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1374",
+            "localId" : "1238",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1375",
+              "localId" : "1239",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1376",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1240",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1342",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1343",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1344",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1345",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1346",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1347",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1348",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1349",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1326",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1327",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1328",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1329",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1330",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1331",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1332",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1366",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1367",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1368",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1369",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1370",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1371",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1372",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1373",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1350",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1351",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1352",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1353",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1354",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1355",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1356",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1237",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1384",
+        "localId" : "1248",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullEndStartAfterIvl",
+        "name" : "PosInfEndNotBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1384",
+            "r" : "1248",
             "s" : [ {
-              "value" : [ "", "define ", "NullEndStartAfterIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotBeforeIntIvl", ": " ]
             }, {
-              "r" : "1439",
+              "r" : "1260",
               "s" : [ {
-                "r" : "1385",
+                "r" : "1251",
                 "s" : [ {
-                  "value" : [ "NullEndIvl" ]
+                  "r" : "1249",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1439",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1260",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1436",
+                "r" : "1257",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1404",
-                  "s" : [ {
-                    "r" : "1388",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1428",
-                  "s" : [ {
-                    "r" : "1412",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1255",
+                  "value" : [ "Interval[", "1000", ", ", "2000", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1439",
+          "type" : "Before",
+          "localId" : "1260",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1440",
+            "localId" : "1261",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1441",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1262",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1442",
+            "localId" : "1263",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1443",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1264",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1385",
-            "name" : "NullEndIvl",
+            "type" : "Interval",
+            "localId" : "1251",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1386",
+              "localId" : "1253",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1387",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1254",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1249",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1252",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1250",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1436",
+            "localId" : "1257",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1437",
+              "localId" : "1258",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1438",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1259",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1404",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1405",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1406",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1407",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1408",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1409",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1410",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1411",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1388",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1389",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1390",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1391",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1392",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1393",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1394",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1255",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1000",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1428",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1429",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1430",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1431",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1432",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1433",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1434",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1435",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1412",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1413",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1414",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1415",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1416",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1417",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1418",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2000",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1446",
-        "name" : "NullStartIvl",
+        "localId" : "1267",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayBeBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1446",
+            "r" : "1267",
             "s" : [ {
-              "value" : [ "", "define ", "NullStartIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayBeBeforeIntIvl", ": " ]
             }, {
-              "r" : "1472",
+              "r" : "1279",
               "s" : [ {
-                "r" : "1447",
-                "value" : [ "Interval(", "null", ", " ]
-              }, {
-                "r" : "1464",
+                "r" : "1270",
                 "s" : [ {
-                  "r" : "1448",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1268",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "value" : [ "]" ]
+                "r" : "1279",
+                "value" : [ " ", "before", " " ]
+              }, {
+                "r" : "1276",
+                "s" : [ {
+                  "r" : "1274",
+                  "value" : [ "Interval[", "1000", ", ", "2000", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1476",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1477",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "1472",
-          "lowClosed" : false,
-          "highClosed" : true,
+          "type" : "Before",
+          "localId" : "1279",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1474",
+            "localId" : "1280",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1475",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "As",
-            "localId" : "1473",
-            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1447",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "localId" : "1281",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "1464",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1282",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1465",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1466",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1467",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1468",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1469",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1470",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1471",
+              "localId" : "1283",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1448",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1449",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1450",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1270",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1272",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1273",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "1451",
+              "localId" : "1268",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1452",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "As",
+              "localId" : "1271",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1269",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1276",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1277",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1278",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "1453",
+              "localId" : "1274",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "1000",
               "annotation" : [ ]
             },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1454",
+              "localId" : "1275",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "2000",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "1480",
+        "localId" : "1286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EndsBeforeNullStartIvlEnds",
+        "name" : "UnknownEndNotBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1480",
+            "r" : "1286",
             "s" : [ {
-              "value" : [ "", "define ", "EndsBeforeNullStartIvlEnds", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotBeforeIntIvl", ": " ]
             }, {
-              "r" : "1535",
+              "r" : "1300",
               "s" : [ {
-                "r" : "1529",
+                "r" : "1289",
+                "s" : [ {
+                  "r" : "1287",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "1300",
+                "value" : [ " ", "before", " " ]
+              }, {
+                "r" : "1297",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1497",
-                  "s" : [ {
-                    "r" : "1481",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1521",
+                  "r" : "1293",
                   "s" : [ {
-                    "r" : "1505",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1294",
+                    "value" : [ "-", "100" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "r" : "1535",
-                "value" : [ " ", "before or on", " " ]
-              }, {
-                "r" : "1532",
-                "s" : [ {
-                  "value" : [ "NullStartIvl" ]
+                  "r" : "1296",
+                  "value" : [ ", ", "0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1535",
+          "type" : "Before",
+          "localId" : "1300",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1536",
+            "localId" : "1301",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1537",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1302",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1538",
+            "localId" : "1303",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1539",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1304",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1529",
+            "localId" : "1289",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1530",
+              "localId" : "1291",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1531",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1292",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1497",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1290",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1498",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1499",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1500",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1501",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1502",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1503",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1288",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1297",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1298",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1504",
+                "localId" : "1299",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1481",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1482",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1483",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1484",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1485",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1486",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1487",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1521",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "low" : {
+              "type" : "Negate",
+              "localId" : "1293",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1522",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1523",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1524",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1525",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1526",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1527",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1528",
+                "localId" : "1295",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1505",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1506",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1507",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1508",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1509",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1510",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "1511",
+                "localId" : "1294",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1532",
-            "name" : "NullStartIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1533",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1534",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "value" : "100",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1542",
+        "localId" : "1307",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterEndOfNullStartIvl",
+        "name" : "NegInfBegBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1542",
+            "r" : "1307",
             "s" : [ {
-              "value" : [ "", "define ", "AfterEndOfNullStartIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegBeforeLongIvl", ": " ]
             }, {
-              "r" : "1597",
+              "r" : "1319",
               "s" : [ {
-                "r" : "1591",
+                "r" : "1310",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1559",
-                  "s" : [ {
-                    "r" : "1543",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1583",
-                  "s" : [ {
-                    "r" : "1567",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1308",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1597",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1319",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1594",
+                "r" : "1316",
                 "s" : [ {
-                  "value" : [ "NullStartIvl" ]
+                  "r" : "1314",
+                  "value" : [ "Interval[", "101L", ", ", "200L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1597",
+          "type" : "Before",
+          "localId" : "1319",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1598",
+            "localId" : "1320",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1599",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1321",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1600",
+            "localId" : "1322",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1601",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1323",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1591",
+            "localId" : "1310",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1592",
+              "localId" : "1312",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1593",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1313",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1559",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1311",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1560",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1561",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1562",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1563",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1564",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1565",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1566",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1543",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1544",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1545",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1546",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1547",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1548",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1549",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1308",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1583",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1584",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1585",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1586",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1587",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1588",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1589",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1590",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1567",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1568",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1569",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1570",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1571",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1572",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1573",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1309",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1594",
-            "name" : "NullStartIvl",
+            "type" : "Interval",
+            "localId" : "1316",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1595",
+              "localId" : "1317",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1596",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1318",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1314",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1315",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1604",
+        "localId" : "1326",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullStartStartBeforeIvl",
+        "name" : "NegInfBegNotBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1604",
+            "r" : "1326",
             "s" : [ {
-              "value" : [ "", "define ", "NullStartStartBeforeIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotBeforeLongIvl", ": " ]
             }, {
-              "r" : "1659",
+              "r" : "1338",
               "s" : [ {
-                "r" : "1605",
+                "r" : "1329",
                 "s" : [ {
-                  "value" : [ "NullStartIvl" ]
+                  "r" : "1327",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1659",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1338",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1656",
+                "r" : "1335",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1624",
-                  "s" : [ {
-                    "r" : "1608",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1648",
-                  "s" : [ {
-                    "r" : "1632",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1333",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1659",
+          "type" : "Before",
+          "localId" : "1338",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1660",
+            "localId" : "1339",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1661",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1340",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1662",
+            "localId" : "1341",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1663",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1342",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1605",
-            "name" : "NullStartIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1606",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1607",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "1656",
+            "localId" : "1329",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1657",
+              "localId" : "1331",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1658",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1332",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1624",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1330",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1327",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1335",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1336",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1625",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1337",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1333",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1334",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1345",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1345",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegBeforeLongIvl", ": " ]
+            }, {
+              "r" : "1357",
+              "s" : [ {
+                "r" : "1348",
+                "s" : [ {
+                  "r" : "1346",
+                  "value" : [ "Interval(", "null", ", ", "100L", "]" ]
+                } ]
+              }, {
+                "r" : "1357",
+                "value" : [ " ", "before", " " ]
               }, {
+                "r" : "1354",
+                "s" : [ {
+                  "r" : "1352",
+                  "value" : [ "Interval[", "101L", ", ", "200L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Before",
+          "localId" : "1357",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1358",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1359",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1360",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1361",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1348",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1350",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1626",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1351",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1349",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1346",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1354",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1355",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1627",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1356",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1352",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1353",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1364",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegNotBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1364",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegNotBeforeLongIvl", ": " ]
+            }, {
+              "r" : "1376",
+              "s" : [ {
+                "r" : "1367",
+                "s" : [ {
+                  "r" : "1365",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "1376",
+                "value" : [ " ", "before", " " ]
               }, {
+                "r" : "1373",
+                "s" : [ {
+                  "r" : "1371",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Before",
+          "localId" : "1376",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1377",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1378",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1379",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1380",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1367",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1369",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1628",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1370",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1368",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1365",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1373",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1374",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1629",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1375",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1372",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1383",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndNotBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1383",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndNotBeforeLongIvl", ": " ]
+            }, {
+              "r" : "1395",
+              "s" : [ {
+                "r" : "1386",
+                "s" : [ {
+                  "r" : "1384",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "1395",
+                "value" : [ " ", "before", " " ]
               }, {
+                "r" : "1392",
+                "s" : [ {
+                  "r" : "1390",
+                  "value" : [ "Interval[", "1000L", ", ", "2000L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Before",
+          "localId" : "1395",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1396",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1397",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1398",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1399",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1386",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1388",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1630",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1389",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1384",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1387",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1385",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1392",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1393",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1394",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1390",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1000",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1391",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2000",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1402",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayBeBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1402",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMayBeBeforeLongIvl", ": " ]
+            }, {
+              "r" : "1414",
+              "s" : [ {
+                "r" : "1405",
+                "s" : [ {
+                  "r" : "1403",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
               }, {
+                "r" : "1414",
+                "value" : [ " ", "before", " " ]
+              }, {
+                "r" : "1411",
+                "s" : [ {
+                  "r" : "1409",
+                  "value" : [ "Interval[", "1000L", ", ", "2000L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Before",
+          "localId" : "1414",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1415",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1416",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1417",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1418",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1405",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1407",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1631",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1408",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1608",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1406",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1404",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1609",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1411",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1412",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1413",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1610",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1409",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1000",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1410",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2000",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1421",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1421",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotBeforeLongIvl", ": " ]
+            }, {
+              "r" : "1435",
+              "s" : [ {
+                "r" : "1424",
+                "s" : [ {
+                  "r" : "1422",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "1435",
+                "value" : [ " ", "before", " " ]
+              }, {
+                "r" : "1432",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1428",
+                  "s" : [ {
+                    "r" : "1429",
+                    "value" : [ "-", "100L" ]
+                  } ]
+                }, {
+                  "r" : "1431",
+                  "value" : [ ", ", "0L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Before",
+          "localId" : "1435",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1436",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1437",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1438",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1439",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1424",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1426",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1427",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1611",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1422",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1425",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1423",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1612",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1432",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1433",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1434",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1613",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "1428",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1430",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
+              } ],
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "1614",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1429",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1431",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1442",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1442",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1523",
+              "s" : [ {
+                "r" : "1468",
+                "s" : [ {
+                  "r" : "1443",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "1460",
+                  "s" : [ {
+                    "r" : "1444",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "1523",
+                "value" : [ " ", "before", " " ]
+              }, {
+                "r" : "1520",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1488",
+                  "s" : [ {
+                    "r" : "1472",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1512",
+                  "s" : [ {
+                    "r" : "1496",
+                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Before",
+          "localId" : "1523",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1524",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1525",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1526",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1527",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1468",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1470",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1471",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1469",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1443",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1648",
+              "localId" : "1460",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1649",
+                "localId" : "1461",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1650",
+                "localId" : "1462",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1651",
+                "localId" : "1463",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1652",
+                "localId" : "1464",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1653",
+                "localId" : "1465",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1654",
+                "localId" : "1466",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1655",
+                "localId" : "1467",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1632",
+                "localId" : "1444",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1633",
+                "localId" : "1445",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1634",
+                "localId" : "1446",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1635",
+                "localId" : "1447",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -86821,7 +87737,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1636",
+                "localId" : "1448",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -86829,7 +87745,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1637",
+                "localId" : "1449",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -86837,174 +87753,82 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1638",
+                "localId" : "1450",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          } ]
-        }
-      }, {
-        "localId" : "1666",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullStartStartAfterIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1666",
-            "s" : [ {
-              "value" : [ "", "define ", "NullStartStartAfterIvl", ": " ]
-            }, {
-              "r" : "1721",
-              "s" : [ {
-                "r" : "1667",
-                "s" : [ {
-                  "value" : [ "NullStartIvl" ]
-                } ]
-              }, {
-                "r" : "1721",
-                "value" : [ " ", "before or on", " " ]
-              }, {
-                "r" : "1718",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1686",
-                  "s" : [ {
-                    "r" : "1670",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1710",
-                  "s" : [ {
-                    "r" : "1694",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1721",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1722",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1723",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1724",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1725",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1667",
-            "name" : "NullStartIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1668",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1669",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           }, {
             "type" : "Interval",
-            "localId" : "1718",
+            "localId" : "1520",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1719",
+              "localId" : "1521",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1720",
+                "localId" : "1522",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1686",
+              "localId" : "1488",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1687",
+                "localId" : "1489",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1688",
+                "localId" : "1490",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1689",
+                "localId" : "1491",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1690",
+                "localId" : "1492",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1691",
+                "localId" : "1493",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1692",
+                "localId" : "1494",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1693",
+                "localId" : "1495",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1670",
+                "localId" : "1472",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1671",
+                "localId" : "1473",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -87012,7 +87836,7 @@ module.exports['BeforeOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1672",
+                "localId" : "1474",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -87020,7 +87844,7 @@ module.exports['BeforeOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1673",
+                "localId" : "1475",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -87028,7 +87852,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1674",
+                "localId" : "1476",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -87036,7 +87860,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1675",
+                "localId" : "1477",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -87044,7 +87868,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1676",
+                "localId" : "1478",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -87053,56 +87877,56 @@ module.exports['BeforeOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1710",
+              "localId" : "1512",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1711",
+                "localId" : "1513",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1712",
+                "localId" : "1514",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1713",
+                "localId" : "1515",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1714",
+                "localId" : "1516",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1715",
+                "localId" : "1517",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1716",
+                "localId" : "1518",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1717",
+                "localId" : "1519",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1694",
+                "localId" : "1496",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2030",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1695",
+                "localId" : "1497",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -87110,15 +87934,15 @@ module.exports['BeforeOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1696",
+                "localId" : "1498",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1697",
+                "localId" : "1499",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -87126,7 +87950,7 @@ module.exports['BeforeOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1698",
+                "localId" : "1500",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -87134,7 +87958,7 @@ module.exports['BeforeOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1699",
+                "localId" : "1501",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -87142,7 +87966,7 @@ module.exports['BeforeOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1700",
+                "localId" : "1502",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -87152,4108 +87976,32902 @@ module.exports['BeforeOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "1728",
+        "localId" : "1530",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlBeforeNull",
+        "name" : "NegInfBegNotBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1728",
+            "r" : "1530",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlBeforeNull", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotBeforeDateIvl", ": " ]
             }, {
-              "r" : "1733",
+              "r" : "1611",
               "s" : [ {
-                "r" : "1729",
+                "r" : "1556",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1531",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "1548",
+                  "s" : [ {
+                    "r" : "1532",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "1733",
-                "value" : [ " ", "before or on", " ", "null" ]
+                "r" : "1611",
+                "value" : [ " ", "before", " " ]
+              }, {
+                "r" : "1608",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1576",
+                  "s" : [ {
+                    "r" : "1560",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1600",
+                  "s" : [ {
+                    "r" : "1584",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1733",
+          "type" : "Before",
+          "localId" : "1611",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1737",
+            "localId" : "1612",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1738",
+              "localId" : "1613",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1739",
+            "localId" : "1614",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1740",
+              "localId" : "1615",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1729",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1556",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1730",
+              "localId" : "1558",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1731",
+                "localId" : "1559",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "As",
-            "localId" : "1734",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1732",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
             },
-            "asTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1735",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1736",
+            "low" : {
+              "type" : "As",
+              "localId" : "1557",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1531",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1548",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1549",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1550",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1551",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1552",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1553",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1554",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1555",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1532",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1533",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1534",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1535",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1536",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1537",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1538",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1608",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1609",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1610",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1576",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1577",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1578",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1579",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1580",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1581",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1582",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1583",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1560",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1561",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1562",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1563",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1564",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1565",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1566",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1600",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1601",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1602",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1603",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1604",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1605",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1606",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1607",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1584",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2010",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1585",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1586",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1587",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1588",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1589",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1590",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "1743",
+        "localId" : "1618",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullBeforeDateIvl",
+        "name" : "UnknownBegBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1743",
+            "r" : "1618",
             "s" : [ {
-              "value" : [ "", "define ", "NullBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegBeforeDateIvl", ": " ]
             }, {
-              "r" : "1748",
+              "r" : "1699",
               "s" : [ {
-                "r" : "1744",
-                "value" : [ "null", " ", "before or on", " " ]
+                "r" : "1644",
+                "s" : [ {
+                  "r" : "1619",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "1636",
+                  "s" : [ {
+                    "r" : "1620",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
               }, {
-                "r" : "1745",
+                "r" : "1699",
+                "value" : [ " ", "before", " " ]
+              }, {
+                "r" : "1696",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1664",
+                  "s" : [ {
+                    "r" : "1648",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1688",
+                  "s" : [ {
+                    "r" : "1672",
+                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1748",
+          "type" : "Before",
+          "localId" : "1699",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1752",
+            "localId" : "1700",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1753",
+              "localId" : "1701",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1754",
+            "localId" : "1702",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1755",
+              "localId" : "1703",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "As",
-            "localId" : "1749",
+            "type" : "Interval",
+            "localId" : "1644",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1744",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1750",
+              "localId" : "1646",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1751",
+                "localId" : "1647",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1645",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1619",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1636",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1637",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1638",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1639",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1640",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1641",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1642",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1643",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1620",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1621",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1622",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1623",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1624",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1625",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1626",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1745",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1696",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1746",
+              "localId" : "1697",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1747",
+                "localId" : "1698",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1664",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1665",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1666",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1667",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1668",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1669",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1670",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1671",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1648",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2020",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1649",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1650",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1651",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1652",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1653",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1654",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1688",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1689",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1690",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1691",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1692",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1693",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1694",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1695",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1672",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2030",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1673",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1674",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1675",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1676",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1677",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1678",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "1758",
+        "localId" : "1706",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeBeforeDateIvl",
+        "name" : "UnknownBegNotBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1758",
+            "r" : "1706",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotBeforeDateIvl", ": " ]
             }, {
-              "r" : "1786",
+              "r" : "1787",
               "s" : [ {
-                "r" : "1775",
+                "r" : "1732",
                 "s" : [ {
-                  "r" : "1759",
-                  "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1707",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "1724",
+                  "s" : [ {
+                    "r" : "1708",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "1786",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1787",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1783",
+                "r" : "1784",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1752",
+                  "s" : [ {
+                    "r" : "1736",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1776",
+                  "s" : [ {
+                    "r" : "1760",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1786",
+          "type" : "Before",
+          "localId" : "1787",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1793",
+            "localId" : "1788",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1794",
+              "localId" : "1789",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1795",
+            "localId" : "1790",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1796",
+              "localId" : "1791",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "If",
-            "localId" : "1787",
+            "type" : "Interval",
+            "localId" : "1732",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
-            "condition" : {
-              "type" : "IsNull",
-              "localId" : "1788",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1734",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1735",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1733",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
-                "type" : "DateTime",
-                "localId" : "1775",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1776",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1777",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1778",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1779",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1780",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1781",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1782",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1759",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1760",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1761",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1762",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1763",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1764",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1765",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Null",
+                "localId" : "1707",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
             },
-            "then" : {
-              "type" : "Null",
-              "localId" : "1789",
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1724",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1790",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1791",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1725",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1726",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1727",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1728",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1729",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1730",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1731",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1708",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1709",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1710",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1711",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1712",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1713",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1714",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1784",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1785",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1786",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
               }
             },
-            "else" : {
-              "type" : "Interval",
-              "localId" : "1792",
-              "lowClosed" : true,
-              "highClosed" : true,
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1752",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "low" : {
-                "type" : "DateTime",
-                "localId" : "1775",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1776",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1777",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1778",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1779",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1780",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1781",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1782",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1759",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1760",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1761",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1762",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1763",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1764",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1765",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1753",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1754",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1755",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1756",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1757",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1758",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1759",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1736",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
               },
-              "high" : {
-                "type" : "DateTime",
-                "localId" : "1775",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1776",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1777",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1778",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1779",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1780",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1781",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1782",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1759",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1760",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1761",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1762",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1763",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1764",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1765",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1737",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1738",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1739",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1740",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1741",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1742",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1783",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1784",
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1776",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1785",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1777",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1778",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1779",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1780",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1781",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1782",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1783",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1760",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2020",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1761",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1762",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1763",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1764",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1765",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1766",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1799",
+        "localId" : "1794",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateBeforeDateIvl",
+        "name" : "PosInfEndNotBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1799",
+            "r" : "1794",
             "s" : [ {
-              "value" : [ "", "define ", "DateBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotBeforeDateIvl", ": " ]
             }, {
-              "r" : "1815",
+              "r" : "1875",
               "s" : [ {
-                "r" : "1808",
+                "r" : "1820",
                 "s" : [ {
-                  "r" : "1800",
-                  "value" : [ "Date", "(", "2012", ", ", "2", ", ", "20", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1811",
+                  "s" : [ {
+                    "r" : "1795",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "1819",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1815",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1875",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1812",
+                "r" : "1872",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1840",
+                  "s" : [ {
+                    "r" : "1824",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1864",
+                  "s" : [ {
+                    "r" : "1848",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1815",
+          "type" : "Before",
+          "localId" : "1875",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1825",
+            "localId" : "1876",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1826",
+              "localId" : "1877",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1827",
+            "localId" : "1878",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1828",
+              "localId" : "1879",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "If",
-            "localId" : "1819",
+            "type" : "Interval",
+            "localId" : "1820",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "condition" : {
-              "type" : "IsNull",
-              "localId" : "1820",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1822",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "ToDateTime",
-                "localId" : "1817",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1818",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "Date",
-                  "localId" : "1808",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1809",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1810",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1811",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1800",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1801",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1802",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "20",
-                    "annotation" : [ ]
-                  }
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1823",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
               }
             },
-            "then" : {
-              "type" : "Null",
-              "localId" : "1821",
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1811",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1822",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1823",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1812",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1813",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1814",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1815",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1816",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1817",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1818",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1795",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1796",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1797",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1798",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1799",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1800",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1801",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
-            "else" : {
-              "type" : "Interval",
-              "localId" : "1824",
-              "lowClosed" : true,
-              "highClosed" : true,
+            "high" : {
+              "type" : "As",
+              "localId" : "1821",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "low" : {
-                "type" : "ToDateTime",
-                "localId" : "1817",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1818",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "Date",
-                  "localId" : "1808",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1809",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1810",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1811",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1800",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1801",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1802",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "20",
-                    "annotation" : [ ]
-                  }
-                }
-              },
-              "high" : {
-                "type" : "ToDateTime",
-                "localId" : "1817",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1818",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "Date",
-                  "localId" : "1808",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1809",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1810",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1811",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1800",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1801",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1802",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "20",
-                    "annotation" : [ ]
-                  }
-                }
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1819",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1812",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1872",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1813",
+              "localId" : "1873",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1814",
+                "localId" : "1874",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1840",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1841",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1842",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1843",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1844",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1845",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1846",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1847",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1824",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1825",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1826",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1827",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1828",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1829",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1830",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1864",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1865",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1866",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1867",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1868",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1869",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1870",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1871",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1848",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2020",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1849",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1850",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1851",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1852",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1853",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1854",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "1831",
+        "localId" : "1882",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlBeforeDateTime",
+        "name" : "UnknownEndMayBeBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1831",
+            "r" : "1882",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlBeforeDateTime", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayBeBeforeDateIvl", ": " ]
             }, {
-              "r" : "1859",
+              "r" : "1963",
               "s" : [ {
-                "r" : "1832",
+                "r" : "1908",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1899",
+                  "s" : [ {
+                    "r" : "1883",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "1907",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1859",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1963",
+                "value" : [ " ", "before", " " ]
               }, {
-                "r" : "1851",
+                "r" : "1960",
                 "s" : [ {
-                  "r" : "1835",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1928",
+                  "s" : [ {
+                    "r" : "1912",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1952",
+                  "s" : [ {
+                    "r" : "1936",
+                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1859",
+          "type" : "Before",
+          "localId" : "1963",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1866",
+            "localId" : "1964",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1867",
+              "localId" : "1965",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1868",
+            "localId" : "1966",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1869",
+              "localId" : "1967",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1832",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1908",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1833",
+              "localId" : "1910",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1834",
+                "localId" : "1911",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "If",
-            "localId" : "1860",
-            "annotation" : [ ],
-            "condition" : {
-              "type" : "IsNull",
-              "localId" : "1861",
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1899",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "DateTime",
-                "localId" : "1851",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1852",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1853",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1854",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1855",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1856",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1857",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1858",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1835",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1836",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1837",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1838",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1839",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1840",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1841",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1900",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1901",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1902",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1903",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1904",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1905",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1906",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1883",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1884",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1885",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1886",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1887",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1888",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1889",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
-            "then" : {
-              "type" : "Null",
-              "localId" : "1862",
+            "high" : {
+              "type" : "As",
+              "localId" : "1909",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1863",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1864",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1907",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1960",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1961",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1962",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
               }
             },
-            "else" : {
-              "type" : "Interval",
-              "localId" : "1865",
-              "lowClosed" : true,
-              "highClosed" : true,
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1928",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "low" : {
-                "type" : "DateTime",
-                "localId" : "1851",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1852",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1853",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1854",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1855",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1856",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1857",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1858",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1835",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1836",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1837",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1838",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1839",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1840",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1841",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1929",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1930",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1931",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1932",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1933",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1934",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1935",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1912",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2020",
+                "annotation" : [ ]
               },
-              "high" : {
-                "type" : "DateTime",
-                "localId" : "1851",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1852",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1913",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1914",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1915",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1916",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1917",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1918",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1952",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1953",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1954",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1955",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1956",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1957",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1958",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1959",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1936",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2040",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1937",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1938",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1939",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1940",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1941",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1942",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1970",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1970",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotBeforeDateIvl", ": " ]
+            }, {
+              "r" : "2051",
+              "s" : [ {
+                "r" : "1996",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1853",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "r" : "1987",
+                  "s" : [ {
+                    "r" : "1971",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1854",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "r" : "1995",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2051",
+                "value" : [ " ", "before", " " ]
+              }, {
+                "r" : "2048",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1855",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "r" : "2016",
+                  "s" : [ {
+                    "r" : "2000",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1856",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "value" : [ ", " ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1857",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
+                  "r" : "2040",
+                  "s" : [ {
+                    "r" : "2024",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
                 }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1858",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1835",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1836",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1837",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1838",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1839",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1840",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1841",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Before",
+          "localId" : "2051",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2052",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2053",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2054",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2055",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1996",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1998",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1999",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1987",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1988",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1989",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1990",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1991",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1992",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1993",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1994",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1971",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1972",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1973",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1974",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1975",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1976",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1977",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1997",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1995",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2048",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2049",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2050",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2016",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2017",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2018",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2019",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2020",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2021",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2022",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2023",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2000",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2001",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2002",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2003",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2004",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2005",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2006",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2040",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2041",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2042",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2043",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2044",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2045",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2046",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2047",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2024",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2025",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2026",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2027",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2028",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2029",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2030",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* BeforeOrOn
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)]
+define MeetsAfterDateIvl: Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)) before or on DateIvl
+define MeetsBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) before or on DateIvl
+define AfterDateIvl: Interval[DateTime(2012, 10, 11, 0, 0, 0, 0), DateTime(2012, 10, 29, 0, 0, 0, 0)) before or on DateIvl
+define BeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 0, 0, 0, 0)) before or on DateIvl
+define MayMeetAfterImpreciseDateIvl: DateIvl before or on Interval[DateTime(2012, 1), DateTime(2012, 2)]
+define MayMeetBeforeImpreciseDateIvl: DateIvl before or on Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define NotMeetsImpreciseDateIvl: DateIvl before or on Interval[DateTime(2012, 1), DateTime(2012, 12)]
+define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
+define MeetsAfterDayOfIvl: PrecisionDateIvl before or on day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define MeetsBeforeDayOfIvl: PrecisionDateIvl before or on day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
+define NotMeetsDayOfIvl: PrecisionDateIvl before or on day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define NotMeetsDayOfImpreciseIVL: PrecisionDateIvl before or on day of Interval[DateTime(2012, 1), DateTime(2012, 2)]
+define MayMeetAfterDayOfImpreciseIvl: PrecisionDateIvl before or on day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define MayMeetBeforeDayOfImpreciseIvl: PrecisionDateIvl before or on day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
+define ImpreciseMayMeetAfterDateIvl: ImpDateIvl before or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 23, 59, 59, 999)]
+define ImpreciseMayMeetBeforeDateIvl: ImpDateIvl before or on Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999)]
+define ImpreciseNotMeetsDateIvl: ImpDateIvl before or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999))
+define NullEndIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), null)
+define BeforeNullEndIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 20, 0, 0, 0, 0)] before or on NullEndIvl
+define AfterStartNullEndIvl: Interval[DateTime(2012, 3, 10, 0, 0, 0, 0), DateTime(2012, 3, 20, 0, 0, 0, 0)] before or on NullEndIvl
+define NullEndStartBeforeIvl: NullEndIvl before or on Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 4, 20, 0, 0, 0, 0)]
+define NullEndStartAfterIvl: NullEndIvl before or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 20, 0, 0, 0, 0)]
+define NullStartIvl: Interval(null, DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define EndsBeforeNullStartIvlEnds: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 20, 0, 0, 0, 0)] before or on NullStartIvl
+define AfterEndOfNullStartIvl: Interval[DateTime(2012, 3, 10, 0, 0, 0, 0), DateTime(2012, 3, 20, 0, 0, 0, 0)] before or on NullStartIvl
+define NullStartStartBeforeIvl: NullStartIvl before or on Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 4, 20, 0, 0, 0, 0)]
+define NullStartStartAfterIvl: NullStartIvl before or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 20, 0, 0, 0, 0)]
+define DateIvlBeforeNull: DateIvl before or on null
+define NullBeforeDateIvl: null before or on DateIvl
+define DateTimeBeforeDateIvl: DateTime(2012, 2, 20, 0, 0, 0, 0) before or on DateIvl
+define DateBeforeDateIvl: Date(2012, 2, 20) before or on DateIvl
+define DateIvlBeforeDateTime: DateIvl before or on DateTime(2012, 9, 20, 0, 0, 0, 0)
+define DateIvlBeforeDate: DateIvl before or on DateTime(2012, 9, 20)
+define DateOnlyIvl: Interval[Date(2012, 1, 1), Date(2012, 2, 20)]
+define DateOnlyIvlBeforeDateIvl: DateOnlyIvl before or on DateIvl
+define DateIvlAfterDateOnlyIvl: DateIvl before or on DateOnlyIvl
+define DateOnlyMeetsBeforeDateIvl: Interval[Date(2012, 1, 1), Date(2012, 3, 1)] before or on DateIvl
+*/
+
+module.exports['BeforeOrOn'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "1983",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "name" : "DateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvl", ": " ]
+            }, {
+              "r" : "263",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "231",
+                "s" : [ {
+                  "r" : "215",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "255",
+                "s" : [ {
+                  "r" : "239",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "266",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "267",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "263",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "264",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "265",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "231",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "232",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "233",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "234",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "235",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "236",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "237",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "238",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "219",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "256",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "257",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "258",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "259",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "260",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "262",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "243",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "244",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "270",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "270",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterDateIvl", ": " ]
+            }, {
+              "r" : "325",
+              "s" : [ {
+                "r" : "319",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "287",
+                  "s" : [ {
+                    "r" : "271",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "311",
+                  "s" : [ {
+                    "r" : "295",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "325",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "322",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "325",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "326",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "327",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "328",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "329",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "319",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "320",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "321",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "288",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "289",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "290",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "292",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "293",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "294",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "271",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "272",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "273",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "274",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "275",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "276",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "277",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "312",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "313",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "315",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "316",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "317",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "318",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "295",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "296",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "297",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "298",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "299",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "300",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "301",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "322",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "323",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "324",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "332",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "332",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsBeforeDateIvl", ": " ]
+            }, {
+              "r" : "387",
+              "s" : [ {
+                "r" : "381",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "349",
+                  "s" : [ {
+                    "r" : "333",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "373",
+                  "s" : [ {
+                    "r" : "357",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "387",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "384",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "387",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "388",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "389",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "390",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "391",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "381",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "382",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "383",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "349",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "350",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "351",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "352",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "353",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "354",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "355",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "356",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "333",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "334",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "335",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "336",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "337",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "338",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "339",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "373",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "374",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "375",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "376",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "377",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "378",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "379",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "380",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "357",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "358",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "359",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "360",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "361",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "362",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "363",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "384",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "385",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "386",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "394",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "394",
+            "s" : [ {
+              "value" : [ "", "define ", "AfterDateIvl", ": " ]
+            }, {
+              "r" : "449",
+              "s" : [ {
+                "r" : "443",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "411",
+                  "s" : [ {
+                    "r" : "395",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "11", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "435",
+                  "s" : [ {
+                    "r" : "419",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "449",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "446",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "449",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "450",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "451",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "452",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "453",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "443",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "444",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "445",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "411",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "412",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "413",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "414",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "415",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "416",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "417",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "418",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "395",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "396",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "397",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "11",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "398",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "399",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "400",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "401",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "435",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "436",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "437",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "438",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "439",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "440",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "441",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "442",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "419",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "420",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "421",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "29",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "422",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "423",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "424",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "425",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "446",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "447",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "448",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "456",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "BeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "456",
+            "s" : [ {
+              "value" : [ "", "define ", "BeforeDateIvl", ": " ]
+            }, {
+              "r" : "511",
+              "s" : [ {
+                "r" : "505",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "473",
+                  "s" : [ {
+                    "r" : "457",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "497",
+                  "s" : [ {
+                    "r" : "481",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "511",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "508",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "511",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "512",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "513",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "514",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "515",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "505",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "506",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "507",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "473",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "474",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "475",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "476",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "477",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "478",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "479",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "480",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "457",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "458",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "459",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "460",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "461",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "462",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "463",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "497",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "498",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "499",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "500",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "501",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "502",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "503",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "504",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "481",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "482",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "483",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "29",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "484",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "485",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "486",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "487",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "508",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "509",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "510",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "518",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetAfterImpreciseDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "518",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetAfterImpreciseDateIvl", ": " ]
+            }, {
+              "r" : "543",
+              "s" : [ {
+                "r" : "519",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "543",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "540",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "528",
+                  "s" : [ {
+                    "r" : "522",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "537",
+                  "s" : [ {
+                    "r" : "531",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "543",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "544",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "545",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "546",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "547",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "519",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "520",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "521",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "540",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "541",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "542",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "528",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "529",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "530",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "522",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "523",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "537",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "538",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "539",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "531",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "532",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "550",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetBeforeImpreciseDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "550",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetBeforeImpreciseDateIvl", ": " ]
+            }, {
+              "r" : "575",
+              "s" : [ {
+                "r" : "551",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "575",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "572",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "560",
+                  "s" : [ {
+                    "r" : "554",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "569",
+                  "s" : [ {
+                    "r" : "563",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "575",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "576",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "577",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "578",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "579",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "551",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "552",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "553",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "572",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "573",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "574",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "560",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "561",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "562",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "554",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "555",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "569",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "570",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "571",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "563",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "564",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "582",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsImpreciseDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "582",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsImpreciseDateIvl", ": " ]
+            }, {
+              "r" : "607",
+              "s" : [ {
+                "r" : "583",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "607",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "604",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "592",
+                  "s" : [ {
+                    "r" : "586",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "601",
+                  "s" : [ {
+                    "r" : "595",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "607",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "608",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "609",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "610",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "611",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "583",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "584",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "585",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "604",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "605",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "606",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "592",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "593",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "594",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "586",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "587",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "601",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "602",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "603",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "595",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "596",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "614",
+        "name" : "PrecisionDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "614",
+            "s" : [ {
+              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
+            }, {
+              "r" : "663",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "631",
+                "s" : [ {
+                  "r" : "615",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "655",
+                "s" : [ {
+                  "r" : "639",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "666",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "667",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "663",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "664",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "665",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "631",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "632",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "633",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "634",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "635",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "636",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "637",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "638",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "615",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "616",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "617",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "618",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "619",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "34",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "620",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "56",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "621",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "789",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "655",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "656",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "657",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "658",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "659",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "660",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "661",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "662",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "639",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "640",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "641",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "642",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "643",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "23",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "644",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "45",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "645",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "678",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "670",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "670",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterDayOfIvl", ": " ]
+            }, {
+              "r" : "725",
+              "s" : [ {
+                "r" : "671",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "725",
+                "value" : [ " ", "before or on day of", " " ]
+              }, {
+                "r" : "722",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "690",
+                  "s" : [ {
+                    "r" : "674",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "714",
+                  "s" : [ {
+                    "r" : "698",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "725",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "726",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "727",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "728",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "729",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "671",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "672",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "673",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "722",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "723",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "724",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "690",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "691",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "692",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "693",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "694",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "695",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "696",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "697",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "674",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "675",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "676",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "677",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "678",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "679",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "680",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "714",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "715",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "716",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "717",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "718",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "719",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "720",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "721",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "698",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "699",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "700",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "701",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "702",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "703",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "704",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "732",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "732",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsBeforeDayOfIvl", ": " ]
+            }, {
+              "r" : "787",
+              "s" : [ {
+                "r" : "733",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "787",
+                "value" : [ " ", "before or on day of", " " ]
+              }, {
+                "r" : "784",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "752",
+                  "s" : [ {
+                    "r" : "736",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "776",
+                  "s" : [ {
+                    "r" : "760",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "787",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "788",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "789",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "790",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "791",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "733",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "734",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "735",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "784",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "785",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "786",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "752",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "753",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "754",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "755",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "756",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "757",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "758",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "759",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "736",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "737",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "738",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "739",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "740",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "741",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "742",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "776",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "777",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "778",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "779",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "780",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "781",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "782",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "783",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "760",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "761",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "762",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "763",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "764",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "765",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "766",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "794",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "794",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsDayOfIvl", ": " ]
+            }, {
+              "r" : "849",
+              "s" : [ {
+                "r" : "795",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "849",
+                "value" : [ " ", "before or on day of", " " ]
+              }, {
+                "r" : "846",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "814",
+                  "s" : [ {
+                    "r" : "798",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "838",
+                  "s" : [ {
+                    "r" : "822",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "849",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "850",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "851",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "852",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "853",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "795",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "796",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "797",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "846",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "847",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "848",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "814",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "815",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "816",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "817",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "818",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "819",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "820",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "821",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "798",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "799",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "800",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "801",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "802",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "803",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "804",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "838",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "839",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "840",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "841",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "842",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "843",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "844",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "845",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "822",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "823",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "824",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "825",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "826",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "827",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "828",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "856",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsDayOfImpreciseIVL",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "856",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsDayOfImpreciseIVL", ": " ]
+            }, {
+              "r" : "881",
+              "s" : [ {
+                "r" : "857",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "881",
+                "value" : [ " ", "before or on day of", " " ]
+              }, {
+                "r" : "878",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "866",
+                  "s" : [ {
+                    "r" : "860",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "875",
+                  "s" : [ {
+                    "r" : "869",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "881",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "882",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "883",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "884",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "885",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "857",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "858",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "859",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "878",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "879",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "880",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "866",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "867",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "868",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "860",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "861",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "875",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "876",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "877",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "869",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "870",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "888",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetAfterDayOfImpreciseIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "888",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetAfterDayOfImpreciseIvl", ": " ]
+            }, {
+              "r" : "913",
+              "s" : [ {
+                "r" : "889",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "913",
+                "value" : [ " ", "before or on day of", " " ]
+              }, {
+                "r" : "910",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "898",
+                  "s" : [ {
+                    "r" : "892",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "907",
+                  "s" : [ {
+                    "r" : "901",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "913",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "914",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "915",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "916",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "917",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "889",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "890",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "891",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "910",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "911",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "912",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "898",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "899",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "900",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "892",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "893",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "907",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "908",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "909",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "901",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "902",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "920",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetBeforeDayOfImpreciseIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "920",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetBeforeDayOfImpreciseIvl", ": " ]
+            }, {
+              "r" : "945",
+              "s" : [ {
+                "r" : "921",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "945",
+                "value" : [ " ", "before or on day of", " " ]
+              }, {
+                "r" : "942",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "930",
+                  "s" : [ {
+                    "r" : "924",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "939",
+                  "s" : [ {
+                    "r" : "933",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "945",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "946",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "947",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "948",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "949",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "921",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "922",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "923",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "942",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "943",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "944",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "930",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "931",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "932",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "924",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "925",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "939",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "940",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "941",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "933",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "934",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "952",
+        "name" : "ImpDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "952",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpDateIvl", ": " ]
+            }, {
+              "r" : "971",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "959",
+                "s" : [ {
+                  "r" : "953",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "968",
+                "s" : [ {
+                  "r" : "962",
+                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "974",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "975",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "971",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "972",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "973",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "959",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "960",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "961",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "953",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "954",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "968",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "969",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "970",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "962",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "963",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "8",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "978",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseMayMeetAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "978",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseMayMeetAfterDateIvl", ": " ]
+            }, {
+              "r" : "1033",
+              "s" : [ {
+                "r" : "979",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1033",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1030",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "998",
+                  "s" : [ {
+                    "r" : "982",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1022",
+                  "s" : [ {
+                    "r" : "1006",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1033",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1034",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1035",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1036",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1037",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "979",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "980",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "981",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1030",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1031",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1032",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "998",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "999",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1000",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1001",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1002",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1003",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1004",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1005",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "982",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "983",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "984",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "985",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "986",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "987",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "988",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1022",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1023",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1024",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1025",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1026",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1027",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1028",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1029",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1006",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1007",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1008",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "29",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1009",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1010",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1011",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1012",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1040",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseMayMeetBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1040",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseMayMeetBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1095",
+              "s" : [ {
+                "r" : "1041",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1095",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1092",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1060",
+                  "s" : [ {
+                    "r" : "1044",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1084",
+                  "s" : [ {
+                    "r" : "1068",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1095",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1096",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1097",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1098",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1099",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1041",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1042",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1043",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1092",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1093",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1094",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1060",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1061",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1062",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1063",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1064",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1065",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1066",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1067",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1044",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1045",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1046",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1047",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1048",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1049",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1050",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1084",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1085",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1086",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1087",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1088",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1089",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1090",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1091",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1068",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1069",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1070",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1071",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1072",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1073",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1074",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1102",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseNotMeetsDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1102",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseNotMeetsDateIvl", ": " ]
+            }, {
+              "r" : "1157",
+              "s" : [ {
+                "r" : "1103",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1157",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1154",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1122",
+                  "s" : [ {
+                    "r" : "1106",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1146",
+                  "s" : [ {
+                    "r" : "1130",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1157",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1158",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1159",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1160",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1161",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1103",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1104",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1105",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1154",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1155",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1156",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1122",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1123",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1124",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1125",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1126",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1127",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1128",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1129",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1106",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1107",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1108",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1109",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1110",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1111",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1112",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1146",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1147",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1148",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1149",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1150",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1151",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1152",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1153",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1130",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1131",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1132",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1133",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1134",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1135",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1136",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1164",
+        "name" : "NullEndIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1164",
+            "s" : [ {
+              "value" : [ "", "define ", "NullEndIvl", ": " ]
+            }, {
+              "r" : "1190",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "1181",
+                "s" : [ {
+                  "r" : "1165",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "r" : "1189",
+                "value" : [ ", ", "null", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1194",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1195",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1190",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1192",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1193",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "1181",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1182",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1183",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1184",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1185",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1186",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1187",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1188",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1165",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1166",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1167",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "1168",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1169",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1170",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1171",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "As",
+            "localId" : "1191",
+            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1189",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1198",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "BeforeNullEndIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1198",
+            "s" : [ {
+              "value" : [ "", "define ", "BeforeNullEndIvl", ": " ]
+            }, {
+              "r" : "1253",
+              "s" : [ {
+                "r" : "1247",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1215",
+                  "s" : [ {
+                    "r" : "1199",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1239",
+                  "s" : [ {
+                    "r" : "1223",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1253",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1250",
+                "s" : [ {
+                  "value" : [ "NullEndIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1253",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1254",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1255",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1256",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1257",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1247",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1248",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1249",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1216",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1217",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1218",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1219",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1220",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1221",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1222",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1199",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1200",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1201",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1202",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1203",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1204",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1205",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1240",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1241",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1242",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1243",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1244",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1245",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1246",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1223",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1224",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1225",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1226",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1227",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1228",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1229",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1250",
+            "name" : "NullEndIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1251",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1252",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1260",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AfterStartNullEndIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1260",
+            "s" : [ {
+              "value" : [ "", "define ", "AfterStartNullEndIvl", ": " ]
+            }, {
+              "r" : "1315",
+              "s" : [ {
+                "r" : "1309",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1277",
+                  "s" : [ {
+                    "r" : "1261",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1301",
+                  "s" : [ {
+                    "r" : "1285",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1315",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1312",
+                "s" : [ {
+                  "value" : [ "NullEndIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1315",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1316",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1317",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1318",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1319",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1309",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1310",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1311",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1277",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1278",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1279",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1280",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1281",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1282",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1283",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1284",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1261",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1262",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1263",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1264",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1265",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1266",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1267",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1301",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1302",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1303",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1304",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1305",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1306",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1307",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1308",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1285",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1286",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1287",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1288",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1289",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1290",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1291",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1312",
+            "name" : "NullEndIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1313",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1314",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1322",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullEndStartBeforeIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1322",
+            "s" : [ {
+              "value" : [ "", "define ", "NullEndStartBeforeIvl", ": " ]
+            }, {
+              "r" : "1377",
+              "s" : [ {
+                "r" : "1323",
+                "s" : [ {
+                  "value" : [ "NullEndIvl" ]
+                } ]
+              }, {
+                "r" : "1377",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1374",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1342",
+                  "s" : [ {
+                    "r" : "1326",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1366",
+                  "s" : [ {
+                    "r" : "1350",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1377",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1378",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1379",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1380",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1381",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1323",
+            "name" : "NullEndIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1324",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1325",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1374",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1375",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1376",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1343",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1344",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1345",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1346",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1347",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1348",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1349",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1326",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1327",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1328",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1329",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1330",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1331",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1332",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1367",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1368",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1369",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1370",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1371",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1372",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1373",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1350",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1351",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1352",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1353",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1354",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1355",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1356",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1384",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullEndStartAfterIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1384",
+            "s" : [ {
+              "value" : [ "", "define ", "NullEndStartAfterIvl", ": " ]
+            }, {
+              "r" : "1439",
+              "s" : [ {
+                "r" : "1385",
+                "s" : [ {
+                  "value" : [ "NullEndIvl" ]
+                } ]
+              }, {
+                "r" : "1439",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1436",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1404",
+                  "s" : [ {
+                    "r" : "1388",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1428",
+                  "s" : [ {
+                    "r" : "1412",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1439",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1440",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1441",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1442",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1443",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1385",
+            "name" : "NullEndIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1386",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1387",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1436",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1437",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1438",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1405",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1406",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1407",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1408",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1409",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1410",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1411",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1388",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1389",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1390",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1391",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1392",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1393",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1394",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1428",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1429",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1430",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1431",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1432",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1433",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1434",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1435",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1412",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1413",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1414",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1415",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1416",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1417",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1418",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1446",
+        "name" : "NullStartIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1446",
+            "s" : [ {
+              "value" : [ "", "define ", "NullStartIvl", ": " ]
+            }, {
+              "r" : "1472",
+              "s" : [ {
+                "r" : "1447",
+                "value" : [ "Interval(", "null", ", " ]
+              }, {
+                "r" : "1464",
+                "s" : [ {
+                  "r" : "1448",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1476",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1477",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1472",
+          "lowClosed" : false,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1474",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1475",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "As",
+            "localId" : "1473",
+            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1447",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "1464",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1465",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1466",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1467",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1468",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1469",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1470",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1471",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1448",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1449",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1450",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "1451",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1452",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1453",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1454",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1480",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EndsBeforeNullStartIvlEnds",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1480",
+            "s" : [ {
+              "value" : [ "", "define ", "EndsBeforeNullStartIvlEnds", ": " ]
+            }, {
+              "r" : "1535",
+              "s" : [ {
+                "r" : "1529",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1497",
+                  "s" : [ {
+                    "r" : "1481",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1521",
+                  "s" : [ {
+                    "r" : "1505",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1535",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1532",
+                "s" : [ {
+                  "value" : [ "NullStartIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1535",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1536",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1537",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1538",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1539",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1529",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1530",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1531",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1497",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1498",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1499",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1500",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1501",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1502",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1503",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1504",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1481",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1482",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1483",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1484",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1485",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1486",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1487",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1521",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1522",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1523",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1524",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1525",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1526",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1527",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1528",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1505",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1506",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1507",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1508",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1509",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1510",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1511",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1532",
+            "name" : "NullStartIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1533",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1534",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1542",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AfterEndOfNullStartIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1542",
+            "s" : [ {
+              "value" : [ "", "define ", "AfterEndOfNullStartIvl", ": " ]
+            }, {
+              "r" : "1597",
+              "s" : [ {
+                "r" : "1591",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1559",
+                  "s" : [ {
+                    "r" : "1543",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1583",
+                  "s" : [ {
+                    "r" : "1567",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1597",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1594",
+                "s" : [ {
+                  "value" : [ "NullStartIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1597",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1598",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1599",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1600",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1601",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1591",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1592",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1593",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1559",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1560",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1561",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1562",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1563",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1564",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1565",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1566",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1543",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1544",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1545",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1546",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1547",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1548",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1549",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1583",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1584",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1585",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1586",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1587",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1588",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1589",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1590",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1567",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1568",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1569",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1570",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1571",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1572",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1573",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1594",
+            "name" : "NullStartIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1595",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1596",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1604",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullStartStartBeforeIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1604",
+            "s" : [ {
+              "value" : [ "", "define ", "NullStartStartBeforeIvl", ": " ]
+            }, {
+              "r" : "1659",
+              "s" : [ {
+                "r" : "1605",
+                "s" : [ {
+                  "value" : [ "NullStartIvl" ]
+                } ]
+              }, {
+                "r" : "1659",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1656",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1624",
+                  "s" : [ {
+                    "r" : "1608",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1648",
+                  "s" : [ {
+                    "r" : "1632",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1659",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1660",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1661",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1662",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1663",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1605",
+            "name" : "NullStartIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1606",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1607",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1656",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1657",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1658",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1624",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1625",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1626",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1627",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1628",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1629",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1630",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1631",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1608",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1609",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1610",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1611",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1612",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1613",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1614",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1648",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1649",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1650",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1651",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1652",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1653",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1654",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1655",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1632",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1633",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1634",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1635",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1636",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1637",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1638",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1666",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullStartStartAfterIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1666",
+            "s" : [ {
+              "value" : [ "", "define ", "NullStartStartAfterIvl", ": " ]
+            }, {
+              "r" : "1721",
+              "s" : [ {
+                "r" : "1667",
+                "s" : [ {
+                  "value" : [ "NullStartIvl" ]
+                } ]
+              }, {
+                "r" : "1721",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1718",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1686",
+                  "s" : [ {
+                    "r" : "1670",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1710",
+                  "s" : [ {
+                    "r" : "1694",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1721",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1722",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1723",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1724",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1725",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1667",
+            "name" : "NullStartIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1668",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1669",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1718",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1719",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1720",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1686",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1687",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1688",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1689",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1690",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1691",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1692",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1693",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1670",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1671",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1672",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1673",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1674",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1675",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1676",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1710",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1711",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1712",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1713",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1714",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1715",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1716",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1717",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1694",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1695",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1696",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1697",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1698",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1699",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1700",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1728",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateIvlBeforeNull",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1728",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvlBeforeNull", ": " ]
+            }, {
+              "r" : "1733",
+              "s" : [ {
+                "r" : "1729",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "1733",
+                "value" : [ " ", "before or on", " ", "null" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1733",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1737",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1738",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1739",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1740",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1729",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1730",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1731",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "As",
+            "localId" : "1734",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1732",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1735",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1736",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1743",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1743",
+            "s" : [ {
+              "value" : [ "", "define ", "NullBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1748",
+              "s" : [ {
+                "r" : "1744",
+                "value" : [ "null", " ", "before or on", " " ]
+              }, {
+                "r" : "1745",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1748",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1752",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1753",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1754",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1755",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "As",
+            "localId" : "1749",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1744",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1750",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1751",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1745",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1746",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1747",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1758",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateTimeBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1758",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTimeBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1786",
+              "s" : [ {
+                "r" : "1775",
+                "s" : [ {
+                  "r" : "1759",
+                  "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "r" : "1786",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1783",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1786",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1793",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1794",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1795",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1796",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "If",
+            "localId" : "1787",
+            "annotation" : [ ],
+            "condition" : {
+              "type" : "IsNull",
+              "localId" : "1788",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "DateTime",
+                "localId" : "1775",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1776",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1777",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1778",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1779",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1780",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1781",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1782",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1759",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1760",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1761",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1762",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1763",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1764",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1765",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "then" : {
+              "type" : "Null",
+              "localId" : "1789",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1790",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1791",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "else" : {
+              "type" : "Interval",
+              "localId" : "1792",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "1775",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1776",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1777",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1778",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1779",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1780",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1781",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1782",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1759",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1760",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1761",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1762",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1763",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1764",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1765",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "1775",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1776",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1777",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1778",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1779",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1780",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1781",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1782",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1759",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1760",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1761",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1762",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1763",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1764",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1765",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1783",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1784",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1785",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1799",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1799",
+            "s" : [ {
+              "value" : [ "", "define ", "DateBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1815",
+              "s" : [ {
+                "r" : "1808",
+                "s" : [ {
+                  "r" : "1800",
+                  "value" : [ "Date", "(", "2012", ", ", "2", ", ", "20", ")" ]
+                } ]
+              }, {
+                "r" : "1815",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1812",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1815",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1825",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1826",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1827",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1828",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "If",
+            "localId" : "1819",
+            "annotation" : [ ],
+            "condition" : {
+              "type" : "IsNull",
+              "localId" : "1820",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "ToDateTime",
+                "localId" : "1817",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1818",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "Date",
+                  "localId" : "1808",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1809",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1810",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1811",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1800",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1801",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1802",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "20",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "then" : {
+              "type" : "Null",
+              "localId" : "1821",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1822",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1823",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "else" : {
+              "type" : "Interval",
+              "localId" : "1824",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "low" : {
+                "type" : "ToDateTime",
+                "localId" : "1817",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1818",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "Date",
+                  "localId" : "1808",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1809",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1810",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1811",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1800",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1801",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1802",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "20",
+                    "annotation" : [ ]
+                  }
+                }
+              },
+              "high" : {
+                "type" : "ToDateTime",
+                "localId" : "1817",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1818",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "Date",
+                  "localId" : "1808",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1809",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1810",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1811",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1800",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1801",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1802",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "20",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1812",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1813",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1814",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1831",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateIvlBeforeDateTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1831",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvlBeforeDateTime", ": " ]
+            }, {
+              "r" : "1859",
+              "s" : [ {
+                "r" : "1832",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "1859",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1851",
+                "s" : [ {
+                  "r" : "1835",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1859",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1866",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1867",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1868",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1869",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1832",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1833",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1834",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "If",
+            "localId" : "1860",
+            "annotation" : [ ],
+            "condition" : {
+              "type" : "IsNull",
+              "localId" : "1861",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "DateTime",
+                "localId" : "1851",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1852",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1853",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1854",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1855",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1856",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1857",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1858",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1835",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1836",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1837",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1838",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1839",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1840",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1841",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "then" : {
+              "type" : "Null",
+              "localId" : "1862",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1863",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1864",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "else" : {
+              "type" : "Interval",
+              "localId" : "1865",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "1851",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1852",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1853",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1854",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1855",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1856",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1857",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1858",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1835",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1836",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1837",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1838",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1839",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1840",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1841",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "1851",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1852",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1853",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1854",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1855",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1856",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1857",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1858",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1835",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1836",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1837",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1838",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1839",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1840",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1841",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1872",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateIvlBeforeDate",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1872",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvlBeforeDate", ": " ]
+            }, {
+              "r" : "1888",
+              "s" : [ {
+                "r" : "1873",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "1888",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1884",
+                "s" : [ {
+                  "r" : "1876",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "20", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1888",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1895",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1896",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1897",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1898",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1873",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1874",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1875",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "If",
+            "localId" : "1889",
+            "annotation" : [ ],
+            "condition" : {
+              "type" : "IsNull",
+              "localId" : "1890",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "DateTime",
+                "localId" : "1884",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1885",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1886",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1887",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1876",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1877",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1878",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "then" : {
+              "type" : "Null",
+              "localId" : "1891",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1892",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1893",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "else" : {
+              "type" : "Interval",
+              "localId" : "1894",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "1884",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1885",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1886",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1887",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1876",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1877",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1878",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "1884",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1885",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1886",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1887",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1876",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1877",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1878",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1901",
+        "name" : "DateOnlyIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1901",
+            "s" : [ {
+              "value" : [ "", "define ", "DateOnlyIvl", ": " ]
+            }, {
+              "r" : "1926",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "1910",
+                "s" : [ {
+                  "r" : "1902",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "1922",
+                "s" : [ {
+                  "r" : "1914",
+                  "value" : [ "Date", "(", "2012", ", ", "2", ", ", "20", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1929",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1930",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1926",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1927",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1928",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Date",
+            "localId" : "1910",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1911",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1912",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1913",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1902",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1903",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1904",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "Date",
+            "localId" : "1922",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1923",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1924",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1925",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1914",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1915",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1916",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "20",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1933",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateOnlyIvlBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1933",
+            "s" : [ {
+              "value" : [ "", "define ", "DateOnlyIvlBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1940",
+              "s" : [ {
+                "r" : "1934",
+                "s" : [ {
+                  "value" : [ "DateOnlyIvl" ]
+                } ]
+              }, {
+                "r" : "1940",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1937",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1940",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1952",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1953",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1954",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1955",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1941",
+            "annotation" : [ ],
+            "low" : {
+              "type" : "ToDateTime",
+              "localId" : "1944",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1945",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "1942",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "ExpressionRef",
+                  "localId" : "1934",
+                  "name" : "DateOnlyIvl",
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "1935",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1936",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "1946",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "ExpressionRef",
+                "localId" : "1934",
+                "name" : "DateOnlyIvl",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "1935",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1936",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "high" : {
+              "type" : "ToDateTime",
+              "localId" : "1949",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1950",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "1947",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "ExpressionRef",
+                  "localId" : "1934",
+                  "name" : "DateOnlyIvl",
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "1935",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1936",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "1951",
+              "path" : "highClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "ExpressionRef",
+                "localId" : "1934",
+                "name" : "DateOnlyIvl",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "1935",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1936",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1937",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1938",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1939",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1958",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateIvlAfterDateOnlyIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1958",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvlAfterDateOnlyIvl", ": " ]
+            }, {
+              "r" : "1965",
+              "s" : [ {
+                "r" : "1959",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "1965",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "1962",
+                "s" : [ {
+                  "value" : [ "DateOnlyIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "1965",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1977",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1978",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1979",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1980",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1959",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1960",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1961",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1966",
+            "annotation" : [ ],
+            "low" : {
+              "type" : "ToDateTime",
+              "localId" : "1969",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1970",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "1967",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "ExpressionRef",
+                  "localId" : "1962",
+                  "name" : "DateOnlyIvl",
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "1963",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1964",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "1971",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "ExpressionRef",
+                "localId" : "1962",
+                "name" : "DateOnlyIvl",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "1963",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1964",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "high" : {
+              "type" : "ToDateTime",
+              "localId" : "1974",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1975",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "1972",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "ExpressionRef",
+                  "localId" : "1962",
+                  "name" : "DateOnlyIvl",
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "1963",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1964",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "1976",
+              "path" : "highClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "ExpressionRef",
+                "localId" : "1962",
+                "name" : "DateOnlyIvl",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "1963",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1964",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1983",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateOnlyMeetsBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1983",
+            "s" : [ {
+              "value" : [ "", "define ", "DateOnlyMeetsBeforeDateIvl", ": " ]
+            }, {
+              "r" : "2014",
+              "s" : [ {
+                "r" : "2008",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1992",
+                  "s" : [ {
+                    "r" : "1984",
+                    "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2004",
+                  "s" : [ {
+                    "r" : "1996",
+                    "value" : [ "Date", "(", "2012", ", ", "3", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "2014",
+                "value" : [ " ", "before or on", " " ]
+              }, {
+                "r" : "2011",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrBefore",
+          "localId" : "2014",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2026",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2027",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2028",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2029",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2015",
+            "annotation" : [ ],
+            "low" : {
+              "type" : "ToDateTime",
+              "localId" : "2018",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2019",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "2016",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "2008",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "2009",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2010",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Date",
+                    "localId" : "1992",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ],
+                    "signature" : [ {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1993",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1994",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1995",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    } ],
+                    "year" : {
+                      "type" : "Literal",
+                      "localId" : "1984",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "2012",
+                      "annotation" : [ ]
+                    },
+                    "month" : {
+                      "type" : "Literal",
+                      "localId" : "1985",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "1",
+                      "annotation" : [ ]
+                    },
+                    "day" : {
+                      "type" : "Literal",
+                      "localId" : "1986",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "1",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "high" : {
+                    "type" : "Date",
+                    "localId" : "2004",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ],
+                    "signature" : [ {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2005",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2006",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2007",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    } ],
+                    "year" : {
+                      "type" : "Literal",
+                      "localId" : "1996",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "2012",
+                      "annotation" : [ ]
+                    },
+                    "month" : {
+                      "type" : "Literal",
+                      "localId" : "1997",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "3",
+                      "annotation" : [ ]
+                    },
+                    "day" : {
+                      "type" : "Literal",
+                      "localId" : "1998",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "1",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "2020",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "2008",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "2009",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2010",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Date",
+                  "localId" : "1992",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1993",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1994",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1995",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1984",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1985",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1986",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  }
+                },
+                "high" : {
+                  "type" : "Date",
+                  "localId" : "2004",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2005",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2006",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2007",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1996",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1997",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "3",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1998",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "high" : {
+              "type" : "ToDateTime",
+              "localId" : "2023",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2024",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "2021",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "2008",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "2009",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2010",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Date",
+                    "localId" : "1992",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ],
+                    "signature" : [ {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1993",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1994",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1995",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    } ],
+                    "year" : {
+                      "type" : "Literal",
+                      "localId" : "1984",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "2012",
+                      "annotation" : [ ]
+                    },
+                    "month" : {
+                      "type" : "Literal",
+                      "localId" : "1985",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "1",
+                      "annotation" : [ ]
+                    },
+                    "day" : {
+                      "type" : "Literal",
+                      "localId" : "1986",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "1",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "high" : {
+                    "type" : "Date",
+                    "localId" : "2004",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ],
+                    "signature" : [ {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2005",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2006",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2007",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    } ],
+                    "year" : {
+                      "type" : "Literal",
+                      "localId" : "1996",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "2012",
+                      "annotation" : [ ]
+                    },
+                    "month" : {
+                      "type" : "Literal",
+                      "localId" : "1997",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "3",
+                      "annotation" : [ ]
+                    },
+                    "day" : {
+                      "type" : "Literal",
+                      "localId" : "1998",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "1",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "2025",
+              "path" : "highClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "2008",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "2009",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2010",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Date",
+                  "localId" : "1992",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1993",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1994",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1995",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1984",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1985",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1986",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  }
+                },
+                "high" : {
+                  "type" : "Date",
+                  "localId" : "2004",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2005",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2006",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2007",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1996",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1997",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "3",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1998",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "2011",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2012",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2013",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* AfterOrOn
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)]
+define MeetsAfterDateIvl: Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)) after or on DateIvl
+define MeetsBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) after or on DateIvl
+define AfterDateIvl: Interval[DateTime(2012, 10, 11, 0, 0, 0, 0), DateTime(2012, 10, 29, 0, 0, 0, 0)) after or on DateIvl
+define BeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 0, 0, 0, 0)) after or on DateIvl
+define MayMeetAfterImpreciseDateIvl: DateIvl after or on Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define MayMeetBeforeImpreciseDateIvl: DateIvl after or on Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define NotMeetsImpreciseDateIvl: DateIvl after or on Interval[DateTime(2012, 1), DateTime(2012, 12)]
+define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
+define MeetsAfterDayOfIvl: PrecisionDateIvl after or on day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define MeetsBeforeDayOfIvl: PrecisionDateIvl after or on day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
+define NotMeetsDayOfIvl: PrecisionDateIvl after or on day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define NotMeetsDayOfImpreciseIVL: PrecisionDateIvl after or on day of Interval[DateTime(2012, 1), DateTime(2012, 2)]
+define MayMeetAfterDayOfImpreciseIvl: PrecisionDateIvl after or on day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define MayMeetBeforeDayOfImpreciseIvl: PrecisionDateIvl after or on day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
+define ImpreciseMayMeetAfterDateIvl: ImpDateIvl after or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 23, 59, 59, 999)]
+define ImpreciseMayMeetBeforeDateIvl: ImpDateIvl after or on Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999)]
+define ImpreciseNotMeetsDateIvl: ImpDateIvl after or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999))
+define NullEndIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), null)
+define BeforeNullEndIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 20, 0, 0, 0, 0)] after or on NullEndIvl
+define AfterStartNullEndIvl: Interval[DateTime(2012, 3, 10, 0, 0, 0, 0), DateTime(2012, 3, 20, 0, 0, 0, 0)] after or on NullEndIvl
+define NullEndStartBeforeIvl: NullEndIvl after or on Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 4, 20, 0, 0, 0, 0)]
+define NullEndStartAfterIvl: NullEndIvl after or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 20, 0, 0, 0, 0)]
+define NullStartIvl: Interval(null, DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define EndsBeforeNullStartIvlEnds: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 20, 0, 0, 0, 0)] after or on NullStartIvl
+define AfterEndOfNullStartIvl: Interval[DateTime(2012, 3, 10, 0, 0, 0, 0), DateTime(2012, 3, 20, 0, 0, 0, 0)] after or on NullStartIvl
+define NullStartStartBeforeIvl: NullStartIvl after or on Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 4, 20, 0, 0, 0, 0)]
+define NullStartStartAfterIvl: NullStartIvl after or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 20, 0, 0, 0, 0)]
+define DateIvlBeforeNull: DateIvl after or on null
+define NullBeforeDateIvl: null after or on DateIvl
+define DateTimeBeforeDateIvl: DateTime(2012, 2, 20, 0, 0, 0, 0) after or on DateIvl
+define DateBeforeDateIvl: Date(2012, 2, 20) after or on DateIvl
+define DateIvlBeforeDateTime: DateIvl after or on DateTime(2012, 9, 20, 0, 0, 0, 0)
+define DateIvlBeforeDate: DateIvl after or on DateTime(2012, 9, 20)
+define DateOnlyIvl: Interval[Date(2012, 1, 1), Date(2012, 2, 20)]
+define DateOnlyIvlBeforeDateIvl: DateOnlyIvl after or on DateIvl
+define DateIvlAfterDateOnlyIvl: DateIvl after or on DateOnlyIvl
+define DateOnlyMeetsAfterDateIvl: Interval[Date(2012, 9, 1), Date(2012, 10, 1)] after or on DateIvl
+*/
+
+module.exports['AfterOrOn'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "1983",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "name" : "DateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvl", ": " ]
+            }, {
+              "r" : "263",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "231",
+                "s" : [ {
+                  "r" : "215",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "255",
+                "s" : [ {
+                  "r" : "239",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "266",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "267",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "263",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "264",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "265",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "231",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "232",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "233",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "234",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "235",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "236",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "237",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "238",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "219",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "256",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "257",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "258",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "259",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "260",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "262",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "243",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "244",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "270",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "270",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterDateIvl", ": " ]
+            }, {
+              "r" : "325",
+              "s" : [ {
+                "r" : "319",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "287",
+                  "s" : [ {
+                    "r" : "271",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "311",
+                  "s" : [ {
+                    "r" : "295",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "325",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "322",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "325",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "326",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "327",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "328",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "329",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "319",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "320",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "321",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "288",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "289",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "290",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "292",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "293",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "294",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "271",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "272",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "273",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "274",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "275",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "276",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "277",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "312",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "313",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "315",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "316",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "317",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "318",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "295",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "296",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "297",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "298",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "299",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "300",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "301",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "322",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "323",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "324",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "332",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "332",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsBeforeDateIvl", ": " ]
+            }, {
+              "r" : "387",
+              "s" : [ {
+                "r" : "381",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "349",
+                  "s" : [ {
+                    "r" : "333",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "373",
+                  "s" : [ {
+                    "r" : "357",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "387",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "384",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "387",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "388",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "389",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "390",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "391",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "381",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "382",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "383",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "349",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "350",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "351",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "352",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "353",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "354",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "355",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "356",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "333",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "334",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "335",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "336",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "337",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "338",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "339",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "373",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "374",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "375",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "376",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "377",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "378",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "379",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "380",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "357",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "358",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "359",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "360",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "361",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "362",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "363",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "384",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "385",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "386",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "394",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "394",
+            "s" : [ {
+              "value" : [ "", "define ", "AfterDateIvl", ": " ]
+            }, {
+              "r" : "449",
+              "s" : [ {
+                "r" : "443",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "411",
+                  "s" : [ {
+                    "r" : "395",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "11", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "435",
+                  "s" : [ {
+                    "r" : "419",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "449",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "446",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "449",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "450",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "451",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "452",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "453",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "443",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "444",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "445",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "411",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "412",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "413",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "414",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "415",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "416",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "417",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "418",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "395",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "396",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "397",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "11",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "398",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "399",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "400",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "401",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "435",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "436",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "437",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "438",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "439",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "440",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "441",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "442",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "419",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "420",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "421",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "29",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "422",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "423",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "424",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "425",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "446",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "447",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "448",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "456",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "BeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "456",
+            "s" : [ {
+              "value" : [ "", "define ", "BeforeDateIvl", ": " ]
+            }, {
+              "r" : "511",
+              "s" : [ {
+                "r" : "505",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "473",
+                  "s" : [ {
+                    "r" : "457",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "497",
+                  "s" : [ {
+                    "r" : "481",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "511",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "508",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "511",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "512",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "513",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "514",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "515",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "505",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "506",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "507",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "473",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "474",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "475",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "476",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "477",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "478",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "479",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "480",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "457",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "458",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "459",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "460",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "461",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "462",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "463",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "497",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "498",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "499",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "500",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "501",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "502",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "503",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "504",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "481",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "482",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "483",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "29",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "484",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "485",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "486",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "487",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "508",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "509",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "510",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "518",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetAfterImpreciseDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "518",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetAfterImpreciseDateIvl", ": " ]
+            }, {
+              "r" : "543",
+              "s" : [ {
+                "r" : "519",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "543",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "540",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "528",
+                  "s" : [ {
+                    "r" : "522",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "537",
+                  "s" : [ {
+                    "r" : "531",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "543",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "544",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "545",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "546",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "547",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "519",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "520",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "521",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "540",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "541",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "542",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "528",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "529",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "530",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "522",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "523",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "537",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "538",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "539",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "531",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "532",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "550",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetBeforeImpreciseDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "550",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetBeforeImpreciseDateIvl", ": " ]
+            }, {
+              "r" : "575",
+              "s" : [ {
+                "r" : "551",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "575",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "572",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "560",
+                  "s" : [ {
+                    "r" : "554",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "569",
+                  "s" : [ {
+                    "r" : "563",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "575",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "576",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "577",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "578",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "579",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "551",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "552",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "553",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "572",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "573",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "574",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "560",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "561",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "562",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "554",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "555",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "569",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "570",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "571",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "563",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "564",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "582",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsImpreciseDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "582",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsImpreciseDateIvl", ": " ]
+            }, {
+              "r" : "607",
+              "s" : [ {
+                "r" : "583",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "607",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "604",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "592",
+                  "s" : [ {
+                    "r" : "586",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "601",
+                  "s" : [ {
+                    "r" : "595",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "607",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "608",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "609",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "610",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "611",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "583",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "584",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "585",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "604",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "605",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "606",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "592",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "593",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "594",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "586",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "587",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "601",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "602",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "603",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "595",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "596",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "614",
+        "name" : "PrecisionDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "614",
+            "s" : [ {
+              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
+            }, {
+              "r" : "663",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "631",
+                "s" : [ {
+                  "r" : "615",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "655",
+                "s" : [ {
+                  "r" : "639",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "666",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "667",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "663",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "664",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "665",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "631",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "632",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "633",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "634",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "635",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "636",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "637",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "638",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "615",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "616",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "617",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "618",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "619",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "34",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "620",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "56",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "621",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "789",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "655",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "656",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "657",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "658",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "659",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "660",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "661",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "662",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "639",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "640",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "641",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "642",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "643",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "23",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "644",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "45",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "645",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "678",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "670",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "670",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterDayOfIvl", ": " ]
+            }, {
+              "r" : "725",
+              "s" : [ {
+                "r" : "671",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "725",
+                "value" : [ " ", "after or on day of", " " ]
+              }, {
+                "r" : "722",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "690",
+                  "s" : [ {
+                    "r" : "674",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "714",
+                  "s" : [ {
+                    "r" : "698",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "725",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "726",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "727",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "728",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "729",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "671",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "672",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "673",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "722",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "723",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "724",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "690",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "691",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "692",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "693",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "694",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "695",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "696",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "697",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "674",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "675",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "676",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "677",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "678",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "679",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "680",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "714",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "715",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "716",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "717",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "718",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "719",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "720",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "721",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "698",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "699",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "700",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "701",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "702",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "703",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "704",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "732",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "732",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsBeforeDayOfIvl", ": " ]
+            }, {
+              "r" : "787",
+              "s" : [ {
+                "r" : "733",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "787",
+                "value" : [ " ", "after or on day of", " " ]
+              }, {
+                "r" : "784",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "752",
+                  "s" : [ {
+                    "r" : "736",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "776",
+                  "s" : [ {
+                    "r" : "760",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "787",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "788",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "789",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "790",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "791",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "733",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "734",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "735",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "784",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "785",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "786",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "752",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "753",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "754",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "755",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "756",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "757",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "758",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "759",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "736",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "737",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "738",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "739",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "740",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "741",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "742",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "776",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "777",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "778",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "779",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "780",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "781",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "782",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "783",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "760",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "761",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "762",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "763",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "764",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "765",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "766",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "794",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "794",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsDayOfIvl", ": " ]
+            }, {
+              "r" : "849",
+              "s" : [ {
+                "r" : "795",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "849",
+                "value" : [ " ", "after or on day of", " " ]
+              }, {
+                "r" : "846",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "814",
+                  "s" : [ {
+                    "r" : "798",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "838",
+                  "s" : [ {
+                    "r" : "822",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "849",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "850",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "851",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "852",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "853",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "795",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "796",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "797",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "846",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "847",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "848",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "814",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "815",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "816",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "817",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "818",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "819",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "820",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "821",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "798",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "799",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "800",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "801",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "802",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "803",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "804",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "838",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "839",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "840",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "841",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "842",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "843",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "844",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "845",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "822",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "823",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "824",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "825",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "826",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "827",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "828",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "856",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsDayOfImpreciseIVL",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "856",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsDayOfImpreciseIVL", ": " ]
+            }, {
+              "r" : "881",
+              "s" : [ {
+                "r" : "857",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "881",
+                "value" : [ " ", "after or on day of", " " ]
+              }, {
+                "r" : "878",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "866",
+                  "s" : [ {
+                    "r" : "860",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "875",
+                  "s" : [ {
+                    "r" : "869",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "881",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "882",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "883",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "884",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "885",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "857",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "858",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "859",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "878",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "879",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "880",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "866",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "867",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "868",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "860",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "861",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "875",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "876",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "877",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "869",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "870",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "888",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetAfterDayOfImpreciseIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "888",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetAfterDayOfImpreciseIvl", ": " ]
+            }, {
+              "r" : "913",
+              "s" : [ {
+                "r" : "889",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "913",
+                "value" : [ " ", "after or on day of", " " ]
+              }, {
+                "r" : "910",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "898",
+                  "s" : [ {
+                    "r" : "892",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "907",
+                  "s" : [ {
+                    "r" : "901",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "913",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "914",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "915",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "916",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "917",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "889",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "890",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "891",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "910",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "911",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "912",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "898",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "899",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "900",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "892",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "893",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "907",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "908",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "909",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "901",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "902",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "920",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetBeforeDayOfImpreciseIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "920",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetBeforeDayOfImpreciseIvl", ": " ]
+            }, {
+              "r" : "945",
+              "s" : [ {
+                "r" : "921",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "945",
+                "value" : [ " ", "after or on day of", " " ]
+              }, {
+                "r" : "942",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "930",
+                  "s" : [ {
+                    "r" : "924",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "939",
+                  "s" : [ {
+                    "r" : "933",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "945",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "946",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "947",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "948",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "949",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "921",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "922",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "923",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "942",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "943",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "944",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "930",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "931",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "932",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "924",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "925",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "939",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "940",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "941",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "933",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "934",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "952",
+        "name" : "ImpDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "952",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpDateIvl", ": " ]
+            }, {
+              "r" : "971",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "959",
+                "s" : [ {
+                  "r" : "953",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "968",
+                "s" : [ {
+                  "r" : "962",
+                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "974",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "975",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "971",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "972",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "973",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "959",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "960",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "961",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "953",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "954",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "968",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "969",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "970",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "962",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "963",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "8",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "978",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseMayMeetAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "978",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseMayMeetAfterDateIvl", ": " ]
+            }, {
+              "r" : "1033",
+              "s" : [ {
+                "r" : "979",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1033",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1030",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "998",
+                  "s" : [ {
+                    "r" : "982",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1022",
+                  "s" : [ {
+                    "r" : "1006",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1033",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1034",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1035",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1036",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1037",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "979",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "980",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "981",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1030",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1031",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1032",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "998",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "999",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1000",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1001",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1002",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1003",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1004",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1005",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "982",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "983",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "984",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "985",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "986",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "987",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "988",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1022",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1023",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1024",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1025",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1026",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1027",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1028",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1029",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1006",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1007",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1008",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "29",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1009",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1010",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1011",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1012",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1040",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseMayMeetBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1040",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseMayMeetBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1095",
+              "s" : [ {
+                "r" : "1041",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1095",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1092",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1060",
+                  "s" : [ {
+                    "r" : "1044",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1084",
+                  "s" : [ {
+                    "r" : "1068",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1095",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1096",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1097",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1098",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1099",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1041",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1042",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1043",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1092",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1093",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1094",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1060",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1061",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1062",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1063",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1064",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1065",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1066",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1067",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1044",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1045",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1046",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1047",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1048",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1049",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1050",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1084",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1085",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1086",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1087",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1088",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1089",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1090",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1091",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1068",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1069",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1070",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1071",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1072",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1073",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1074",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1102",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseNotMeetsDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1102",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseNotMeetsDateIvl", ": " ]
+            }, {
+              "r" : "1157",
+              "s" : [ {
+                "r" : "1103",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1157",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1154",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1122",
+                  "s" : [ {
+                    "r" : "1106",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1146",
+                  "s" : [ {
+                    "r" : "1130",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1157",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1158",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1159",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1160",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1161",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1103",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1104",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1105",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1154",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1155",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1156",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1122",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1123",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1124",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1125",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1126",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1127",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1128",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1129",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1106",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1107",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1108",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1109",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1110",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1111",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1112",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1146",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1147",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1148",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1149",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1150",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1151",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1152",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1153",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1130",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1131",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1132",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1133",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1134",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1135",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1136",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1164",
+        "name" : "NullEndIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1164",
+            "s" : [ {
+              "value" : [ "", "define ", "NullEndIvl", ": " ]
+            }, {
+              "r" : "1190",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "1181",
+                "s" : [ {
+                  "r" : "1165",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "r" : "1189",
+                "value" : [ ", ", "null", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1194",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1195",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1190",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1192",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1193",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "1181",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1182",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1183",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1184",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1185",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1186",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1187",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1188",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1165",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1166",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1167",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "1168",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1169",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1170",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1171",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "As",
+            "localId" : "1191",
+            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1189",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1198",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "BeforeNullEndIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1198",
+            "s" : [ {
+              "value" : [ "", "define ", "BeforeNullEndIvl", ": " ]
+            }, {
+              "r" : "1253",
+              "s" : [ {
+                "r" : "1247",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1215",
+                  "s" : [ {
+                    "r" : "1199",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1239",
+                  "s" : [ {
+                    "r" : "1223",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1253",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1250",
+                "s" : [ {
+                  "value" : [ "NullEndIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1253",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1254",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1255",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1256",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1257",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1247",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1248",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1249",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1216",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1217",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1218",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1219",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1220",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1221",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1222",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1199",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1200",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1201",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1202",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1203",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1204",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1205",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1240",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1241",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1242",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1243",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1244",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1245",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1246",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1223",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1224",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1225",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1226",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1227",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1228",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1229",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1250",
+            "name" : "NullEndIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1251",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1252",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1260",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AfterStartNullEndIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1260",
+            "s" : [ {
+              "value" : [ "", "define ", "AfterStartNullEndIvl", ": " ]
+            }, {
+              "r" : "1315",
+              "s" : [ {
+                "r" : "1309",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1277",
+                  "s" : [ {
+                    "r" : "1261",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1301",
+                  "s" : [ {
+                    "r" : "1285",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1315",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1312",
+                "s" : [ {
+                  "value" : [ "NullEndIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1315",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1316",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1317",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1318",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1319",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1309",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1310",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1311",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1277",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1278",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1279",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1280",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1281",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1282",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1283",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1284",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1261",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1262",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1263",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1264",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1265",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1266",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1267",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1301",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1302",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1303",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1304",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1305",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1306",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1307",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1308",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1285",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1286",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1287",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1288",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1289",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1290",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1291",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1312",
+            "name" : "NullEndIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1313",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1314",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1322",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullEndStartBeforeIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1322",
+            "s" : [ {
+              "value" : [ "", "define ", "NullEndStartBeforeIvl", ": " ]
+            }, {
+              "r" : "1377",
+              "s" : [ {
+                "r" : "1323",
+                "s" : [ {
+                  "value" : [ "NullEndIvl" ]
+                } ]
+              }, {
+                "r" : "1377",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1374",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1342",
+                  "s" : [ {
+                    "r" : "1326",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1366",
+                  "s" : [ {
+                    "r" : "1350",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1377",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1378",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1379",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1380",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1381",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1323",
+            "name" : "NullEndIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1324",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1325",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1374",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1375",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1376",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1343",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1344",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1345",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1346",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1347",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1348",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1349",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1326",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1327",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1328",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1329",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1330",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1331",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1332",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1367",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1368",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1369",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1370",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1371",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1372",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1373",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1350",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1351",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1352",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1353",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1354",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1355",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1356",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1384",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullEndStartAfterIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1384",
+            "s" : [ {
+              "value" : [ "", "define ", "NullEndStartAfterIvl", ": " ]
+            }, {
+              "r" : "1439",
+              "s" : [ {
+                "r" : "1385",
+                "s" : [ {
+                  "value" : [ "NullEndIvl" ]
+                } ]
+              }, {
+                "r" : "1439",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1436",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1404",
+                  "s" : [ {
+                    "r" : "1388",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1428",
+                  "s" : [ {
+                    "r" : "1412",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1439",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1440",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1441",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1442",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1443",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1385",
+            "name" : "NullEndIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1386",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1387",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1436",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1437",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1438",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1405",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1406",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1407",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1408",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1409",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1410",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1411",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1388",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1389",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1390",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1391",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1392",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1393",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1394",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1428",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1429",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1430",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1431",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1432",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1433",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1434",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1435",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1412",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1413",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1414",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1415",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1416",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1417",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1418",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1446",
+        "name" : "NullStartIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1446",
+            "s" : [ {
+              "value" : [ "", "define ", "NullStartIvl", ": " ]
+            }, {
+              "r" : "1472",
+              "s" : [ {
+                "r" : "1447",
+                "value" : [ "Interval(", "null", ", " ]
+              }, {
+                "r" : "1464",
+                "s" : [ {
+                  "r" : "1448",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1476",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1477",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1472",
+          "lowClosed" : false,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1474",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1475",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "As",
+            "localId" : "1473",
+            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1447",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "1464",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1465",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1466",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1467",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1468",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1469",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1470",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1471",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1448",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1449",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1450",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "1451",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1452",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1453",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1454",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1480",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EndsBeforeNullStartIvlEnds",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1480",
+            "s" : [ {
+              "value" : [ "", "define ", "EndsBeforeNullStartIvlEnds", ": " ]
+            }, {
+              "r" : "1535",
+              "s" : [ {
+                "r" : "1529",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1497",
+                  "s" : [ {
+                    "r" : "1481",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1521",
+                  "s" : [ {
+                    "r" : "1505",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1535",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1532",
+                "s" : [ {
+                  "value" : [ "NullStartIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1535",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1536",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1537",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1538",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1539",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1529",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1530",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1531",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1497",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1498",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1499",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1500",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1501",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1502",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1503",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1504",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1481",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1482",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1483",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1484",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1485",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1486",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1487",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1521",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1522",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1523",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1524",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1525",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1526",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1527",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1528",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1505",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1506",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1507",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1508",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1509",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1510",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1511",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1532",
+            "name" : "NullStartIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1533",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1534",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1542",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "AfterEndOfNullStartIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1542",
+            "s" : [ {
+              "value" : [ "", "define ", "AfterEndOfNullStartIvl", ": " ]
+            }, {
+              "r" : "1597",
+              "s" : [ {
+                "r" : "1591",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1559",
+                  "s" : [ {
+                    "r" : "1543",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1583",
+                  "s" : [ {
+                    "r" : "1567",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "1597",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1594",
+                "s" : [ {
+                  "value" : [ "NullStartIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1597",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1598",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1599",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1600",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1601",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1591",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1592",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1593",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1559",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1560",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1561",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1562",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1563",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1564",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1565",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1566",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1543",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1544",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1545",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1546",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1547",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1548",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1549",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1583",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1584",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1585",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1586",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1587",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1588",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1589",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1590",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1567",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1568",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1569",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1570",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1571",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1572",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1573",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1594",
+            "name" : "NullStartIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1595",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1596",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1604",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullStartStartBeforeIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1604",
+            "s" : [ {
+              "value" : [ "", "define ", "NullStartStartBeforeIvl", ": " ]
+            }, {
+              "r" : "1659",
+              "s" : [ {
+                "r" : "1605",
+                "s" : [ {
+                  "value" : [ "NullStartIvl" ]
+                } ]
+              }, {
+                "r" : "1659",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1656",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1624",
+                  "s" : [ {
+                    "r" : "1608",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1648",
+                  "s" : [ {
+                    "r" : "1632",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1659",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1660",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1661",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1662",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1663",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1605",
+            "name" : "NullStartIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1606",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1607",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1656",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1657",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1658",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1624",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1625",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1626",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1627",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1628",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1629",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1630",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1631",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1608",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1609",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1610",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1611",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1612",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1613",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1614",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1648",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1649",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1650",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1651",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1652",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1653",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1654",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1655",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1632",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1633",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1634",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1635",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1636",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1637",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1638",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1666",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullStartStartAfterIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1666",
+            "s" : [ {
+              "value" : [ "", "define ", "NullStartStartAfterIvl", ": " ]
+            }, {
+              "r" : "1721",
+              "s" : [ {
+                "r" : "1667",
+                "s" : [ {
+                  "value" : [ "NullStartIvl" ]
+                } ]
+              }, {
+                "r" : "1721",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1718",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1686",
+                  "s" : [ {
+                    "r" : "1670",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1710",
+                  "s" : [ {
+                    "r" : "1694",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1721",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1722",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1723",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1724",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1725",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1667",
+            "name" : "NullStartIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1668",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1669",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1718",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1719",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1720",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1686",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1687",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1688",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1689",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1690",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1691",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1692",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1693",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1670",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1671",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1672",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1673",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1674",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1675",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1676",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1710",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1711",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1712",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1713",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1714",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1715",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1716",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1717",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1694",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1695",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1696",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "20",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1697",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1698",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1699",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1700",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1728",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateIvlBeforeNull",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1728",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvlBeforeNull", ": " ]
+            }, {
+              "r" : "1733",
+              "s" : [ {
+                "r" : "1729",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "1733",
+                "value" : [ " ", "after or on", " ", "null" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1733",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1737",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1738",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1739",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1740",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1729",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1730",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1731",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "As",
+            "localId" : "1734",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1732",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1735",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1736",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1743",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1743",
+            "s" : [ {
+              "value" : [ "", "define ", "NullBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1748",
+              "s" : [ {
+                "r" : "1744",
+                "value" : [ "null", " ", "after or on", " " ]
+              }, {
+                "r" : "1745",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1748",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1752",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1753",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1754",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1755",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "As",
+            "localId" : "1749",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1744",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1750",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1751",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1745",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1746",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1747",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1758",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateTimeBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1758",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTimeBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1786",
+              "s" : [ {
+                "r" : "1775",
+                "s" : [ {
+                  "r" : "1759",
+                  "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "r" : "1786",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1783",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1786",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1793",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1794",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1795",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1796",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "If",
+            "localId" : "1787",
+            "annotation" : [ ],
+            "condition" : {
+              "type" : "IsNull",
+              "localId" : "1788",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "DateTime",
+                "localId" : "1775",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1776",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1777",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1778",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1779",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1780",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1781",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1782",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1759",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1760",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1761",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1762",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1763",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1764",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1765",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "then" : {
+              "type" : "Null",
+              "localId" : "1789",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1790",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1791",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "else" : {
+              "type" : "Interval",
+              "localId" : "1792",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "1775",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1776",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1777",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1778",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1779",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1780",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1781",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1782",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1759",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1760",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1761",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1762",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1763",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1764",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1765",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "1775",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1776",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1777",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1778",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1779",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1780",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1781",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1782",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1759",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1760",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1761",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1762",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1763",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1764",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1765",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1783",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1784",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1785",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1799",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1799",
+            "s" : [ {
+              "value" : [ "", "define ", "DateBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1815",
+              "s" : [ {
+                "r" : "1808",
+                "s" : [ {
+                  "r" : "1800",
+                  "value" : [ "Date", "(", "2012", ", ", "2", ", ", "20", ")" ]
+                } ]
+              }, {
+                "r" : "1815",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1812",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1815",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1825",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1826",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1827",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1828",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "If",
+            "localId" : "1819",
+            "annotation" : [ ],
+            "condition" : {
+              "type" : "IsNull",
+              "localId" : "1820",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "ToDateTime",
+                "localId" : "1817",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1818",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "Date",
+                  "localId" : "1808",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1809",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1810",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1811",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1800",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1801",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1802",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "20",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "then" : {
+              "type" : "Null",
+              "localId" : "1821",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1822",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1823",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "else" : {
+              "type" : "Interval",
+              "localId" : "1824",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "low" : {
+                "type" : "ToDateTime",
+                "localId" : "1817",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1818",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "Date",
+                  "localId" : "1808",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1809",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1810",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1811",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1800",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1801",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1802",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "20",
+                    "annotation" : [ ]
+                  }
+                }
+              },
+              "high" : {
+                "type" : "ToDateTime",
+                "localId" : "1817",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1818",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                } ],
+                "operand" : {
+                  "type" : "Date",
+                  "localId" : "1808",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1809",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1810",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1811",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1800",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1801",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1802",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "20",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1812",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1813",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1814",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1831",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateIvlBeforeDateTime",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1831",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvlBeforeDateTime", ": " ]
+            }, {
+              "r" : "1859",
+              "s" : [ {
+                "r" : "1832",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "1859",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1851",
+                "s" : [ {
+                  "r" : "1835",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1859",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1866",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1867",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1868",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1869",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1832",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1833",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1834",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "If",
+            "localId" : "1860",
+            "annotation" : [ ],
+            "condition" : {
+              "type" : "IsNull",
+              "localId" : "1861",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "DateTime",
+                "localId" : "1851",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1852",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1853",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1854",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1855",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1856",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1857",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1858",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1835",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1836",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1837",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1838",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1839",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1840",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1841",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "then" : {
+              "type" : "Null",
+              "localId" : "1862",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1863",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1864",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "else" : {
+              "type" : "Interval",
+              "localId" : "1865",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "1851",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1852",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1853",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1854",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1855",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1856",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1857",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1858",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1835",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1836",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1837",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1838",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1839",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1840",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1841",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "1851",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1852",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1853",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1854",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1855",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1856",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1857",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1858",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1835",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1836",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1837",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "1838",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "1839",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "1840",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "1841",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1872",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateIvlBeforeDate",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1872",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvlBeforeDate", ": " ]
+            }, {
+              "r" : "1888",
+              "s" : [ {
+                "r" : "1873",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "1888",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1884",
+                "s" : [ {
+                  "r" : "1876",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "20", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1888",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1895",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1896",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1897",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1898",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1873",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1874",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1875",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "If",
+            "localId" : "1889",
+            "annotation" : [ ],
+            "condition" : {
+              "type" : "IsNull",
+              "localId" : "1890",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "DateTime",
+                "localId" : "1884",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1885",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1886",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1887",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1876",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1877",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1878",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "then" : {
+              "type" : "Null",
+              "localId" : "1891",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1892",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1893",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "else" : {
+              "type" : "Interval",
+              "localId" : "1894",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "1884",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1885",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1886",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1887",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1876",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1877",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1878",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "1884",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1885",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1886",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1887",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "1876",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "1877",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "9",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "1878",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "20",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1901",
+        "name" : "DateOnlyIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1901",
+            "s" : [ {
+              "value" : [ "", "define ", "DateOnlyIvl", ": " ]
+            }, {
+              "r" : "1926",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "1910",
+                "s" : [ {
+                  "r" : "1902",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "1922",
+                "s" : [ {
+                  "r" : "1914",
+                  "value" : [ "Date", "(", "2012", ", ", "2", ", ", "20", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1929",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1930",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1926",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1927",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1928",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Date",
+            "localId" : "1910",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1911",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1912",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1913",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1902",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1903",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1904",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "Date",
+            "localId" : "1922",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1923",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1924",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1925",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1914",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1915",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1916",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "20",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1933",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateOnlyIvlBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1933",
+            "s" : [ {
+              "value" : [ "", "define ", "DateOnlyIvlBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1940",
+              "s" : [ {
+                "r" : "1934",
+                "s" : [ {
+                  "value" : [ "DateOnlyIvl" ]
+                } ]
+              }, {
+                "r" : "1940",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1937",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1940",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1952",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1953",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1954",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1955",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1941",
+            "annotation" : [ ],
+            "low" : {
+              "type" : "ToDateTime",
+              "localId" : "1944",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1945",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "1942",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "ExpressionRef",
+                  "localId" : "1934",
+                  "name" : "DateOnlyIvl",
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "1935",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1936",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "1946",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "ExpressionRef",
+                "localId" : "1934",
+                "name" : "DateOnlyIvl",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "1935",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1936",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "high" : {
+              "type" : "ToDateTime",
+              "localId" : "1949",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1950",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "1947",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "ExpressionRef",
+                  "localId" : "1934",
+                  "name" : "DateOnlyIvl",
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "1935",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1936",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "1951",
+              "path" : "highClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "ExpressionRef",
+                "localId" : "1934",
+                "name" : "DateOnlyIvl",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "1935",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1936",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "1937",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1938",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1939",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1958",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateIvlAfterDateOnlyIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1958",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvlAfterDateOnlyIvl", ": " ]
+            }, {
+              "r" : "1965",
+              "s" : [ {
+                "r" : "1959",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "1965",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "1962",
+                "s" : [ {
+                  "value" : [ "DateOnlyIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "1965",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1977",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1978",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1979",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1980",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1959",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1960",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1961",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1966",
+            "annotation" : [ ],
+            "low" : {
+              "type" : "ToDateTime",
+              "localId" : "1969",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1970",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "1967",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "ExpressionRef",
+                  "localId" : "1962",
+                  "name" : "DateOnlyIvl",
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "1963",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1964",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "1971",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "ExpressionRef",
+                "localId" : "1962",
+                "name" : "DateOnlyIvl",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "1963",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1964",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "high" : {
+              "type" : "ToDateTime",
+              "localId" : "1974",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1975",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "1972",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "ExpressionRef",
+                  "localId" : "1962",
+                  "name" : "DateOnlyIvl",
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "1963",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1964",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "1976",
+              "path" : "highClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "ExpressionRef",
+                "localId" : "1962",
+                "name" : "DateOnlyIvl",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "1963",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1964",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1983",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateOnlyMeetsAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1983",
+            "s" : [ {
+              "value" : [ "", "define ", "DateOnlyMeetsAfterDateIvl", ": " ]
+            }, {
+              "r" : "2014",
+              "s" : [ {
+                "r" : "2008",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1992",
+                  "s" : [ {
+                    "r" : "1984",
+                    "value" : [ "Date", "(", "2012", ", ", "9", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2004",
+                  "s" : [ {
+                    "r" : "1996",
+                    "value" : [ "Date", "(", "2012", ", ", "10", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "2014",
+                "value" : [ " ", "after or on", " " ]
+              }, {
+                "r" : "2011",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameOrAfter",
+          "localId" : "2014",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2026",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2027",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2028",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2029",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2015",
+            "annotation" : [ ],
+            "low" : {
+              "type" : "ToDateTime",
+              "localId" : "2018",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2019",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "2016",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "2008",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "2009",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2010",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Date",
+                    "localId" : "1992",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ],
+                    "signature" : [ {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1993",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1994",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1995",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    } ],
+                    "year" : {
+                      "type" : "Literal",
+                      "localId" : "1984",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "2012",
+                      "annotation" : [ ]
+                    },
+                    "month" : {
+                      "type" : "Literal",
+                      "localId" : "1985",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "9",
+                      "annotation" : [ ]
+                    },
+                    "day" : {
+                      "type" : "Literal",
+                      "localId" : "1986",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "1",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "high" : {
+                    "type" : "Date",
+                    "localId" : "2004",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ],
+                    "signature" : [ {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2005",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2006",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2007",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    } ],
+                    "year" : {
+                      "type" : "Literal",
+                      "localId" : "1996",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "2012",
+                      "annotation" : [ ]
+                    },
+                    "month" : {
+                      "type" : "Literal",
+                      "localId" : "1997",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "10",
+                      "annotation" : [ ]
+                    },
+                    "day" : {
+                      "type" : "Literal",
+                      "localId" : "1998",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "1",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "2020",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "2008",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "2009",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2010",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Date",
+                  "localId" : "1992",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1993",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1994",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1995",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1984",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1985",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "9",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1986",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  }
+                },
+                "high" : {
+                  "type" : "Date",
+                  "localId" : "2004",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2005",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2006",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2007",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1996",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1997",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "10",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1998",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "high" : {
+              "type" : "ToDateTime",
+              "localId" : "2023",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2024",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "2021",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "2008",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "2009",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2010",
+                      "name" : "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Date",
+                    "localId" : "1992",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ],
+                    "signature" : [ {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1993",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1994",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "1995",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    } ],
+                    "year" : {
+                      "type" : "Literal",
+                      "localId" : "1984",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "2012",
+                      "annotation" : [ ]
+                    },
+                    "month" : {
+                      "type" : "Literal",
+                      "localId" : "1985",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "9",
+                      "annotation" : [ ]
+                    },
+                    "day" : {
+                      "type" : "Literal",
+                      "localId" : "1986",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "1",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "high" : {
+                    "type" : "Date",
+                    "localId" : "2004",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ],
+                    "signature" : [ {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2005",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2006",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    }, {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "2007",
+                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation" : [ ]
+                    } ],
+                    "year" : {
+                      "type" : "Literal",
+                      "localId" : "1996",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "2012",
+                      "annotation" : [ ]
+                    },
+                    "month" : {
+                      "type" : "Literal",
+                      "localId" : "1997",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "10",
+                      "annotation" : [ ]
+                    },
+                    "day" : {
+                      "type" : "Literal",
+                      "localId" : "1998",
+                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                      "value" : "1",
+                      "annotation" : [ ]
+                    }
+                  }
+                }
+              }
+            },
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "2025",
+              "path" : "highClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "2008",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "2009",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2010",
+                    "name" : "{urn:hl7-org:elm-types:r1}Date",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Date",
+                  "localId" : "1992",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1993",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1994",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1995",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1984",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1985",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "9",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1986",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  }
+                },
+                "high" : {
+                  "type" : "Date",
+                  "localId" : "2004",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2005",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2006",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }, {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "2007",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "year" : {
+                    "type" : "Literal",
+                    "localId" : "1996",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "2012",
+                    "annotation" : [ ]
+                  },
+                  "month" : {
+                    "type" : "Literal",
+                    "localId" : "1997",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "10",
+                    "annotation" : [ ]
+                  },
+                  "day" : {
+                    "type" : "Literal",
+                    "localId" : "1998",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "2011",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2012",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2013",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* Meets
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define MeetsAfterIntIvl: Interval[11, 15] meets Interval[5, 10]
+define MeetsBeforeIntIvl: Interval[1, 4] meets Interval[5, 10]
+define NotMeetsIntIvl: Interval[1, 2] meets Interval[5, 10]
+define MeetsAfterLongIvl: Interval[11L, 15L] meets Interval[5L, 10L]
+define MeetsBeforeLongIvl: Interval[1L, 4L] meets Interval[5L, 10L]
+define NotMeetsLongIvl: Interval[1L, 2L] meets Interval[5L, 10L]
+define MeetsAfterRealIvl: Interval[1.50000001, 2.5] meets Interval[0.5, 1.5]
+define MeetsBeforeRealIvl: Interval[0.5, 1.5] meets Interval[1.50000001, 2.5]
+define NotMeetsRealIvl: Interval[0.0, 1.0] meets Interval[1.1, 2.0]
+define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
+define MeetsAfterDateIvl: Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)) meets DateIvl
+define MeetsBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) meets DateIvl
+define NotMeetsDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 0, 0, 0, 0)) meets DateIvl
+define MayMeetAfterImpreciseDateIvl: DateIvl meets Interval[DateTime(2012, 1), DateTime(2012, 2)]
+define MayMeetBeforeImpreciseDateIvl: DateIvl meets Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define NotMeetsImpreciseDateIvl: DateIvl meets Interval[DateTime(2012, 1), DateTime(2012, 12)]
+define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
+define MeetsAfterDayOfIvl: PrecisionDateIvl meets day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define MeetsBeforeDayOfIvl: PrecisionDateIvl meets day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
+define NotMeetsDayOfIvl: PrecisionDateIvl meets day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define NotMeetsDayOfImpreciseIVL: PrecisionDateIvl meets day of Interval[DateTime(2012, 1), DateTime(2012, 2)]
+define MayMeetAfterDayOfImpreciseIvl: PrecisionDateIvl meets day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define MayMeetBeforeDayOfImpreciseIvl: PrecisionDateIvl meets day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
+define ImpreciseMayMeetAfterDateIvl: ImpDateIvl meets Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 23, 59, 59, 999)]
+define ImpreciseMayMeetBeforeDateIvl: ImpDateIvl meets Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999)]
+define ImpreciseNotMeetsDateIvl: ImpDateIvl meets Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999))
+define NegInfBegMeetsBeforeIntIvl: Interval[null, 100] meets Interval[101, 200]
+define NegInfBegNotMeetsIntIvl: Interval[null, 100] meets Interval[100, 200]
+define IntIvlNotMeetsNegInfBeg: Interval[100, 200] meets Interval[null, 400]
+define UnknownBegMeetsBeforeIntIvl: Interval(null, 100] meets Interval[101, 200]
+define UnknownBegMayMeetAfterIntIvl: Interval(null, 100] meets Interval[0, 50]
+define UnknownBegNotMeetsIntIvl: Interval(null, 5] meets Interval[0, 100]
+define IntIvlMayMeetBeforeUnknownBeg: Interval[0, 100] meets Interval(null, 400)
+define PosInfEndMeetsAfterIntIvl: Interval[100, null] meets Interval[0, 99]
+define PosInfEndNotMeetsIntIvl: Interval[0, null] meets Interval[1000, 2000]
+define IntIvlNotMeetsPosInfEnd: Interval[100, 200] meets Interval[0, null]
+define UnknownEndMeetsAfterIntIvl: Interval[100, null) meets Interval[0, 99]
+define UnknownEndMayMeetBeforeIntIvl: Interval[0, null) meets Interval[50, 100]
+define UnknownEndNotMeetsIntIvl: Interval[0, null) meets Interval[0, 100]
+define IntIvlMayMeetAfterUnknownEnd: Interval[0, 100] meets Interval[-100, null)
+define NegInfBegMeetsBeforeLongIvl: Interval[null, 100L] meets Interval[101L, 200L]
+define NegInfBegNotMeetsLongIvl: Interval[null, 100L] meets Interval[100L, 200L]
+define LongIvlNotMeetsNegInfBeg: Interval[100L, 200L] meets Interval[null, 400L]
+define UnknownBegMeetsBeforeLongIvl: Interval(null, 100L] meets Interval[101L, 200L]
+define UnknownBegMayMeetAfterLongIvl: Interval(null, 100L] meets Interval[0L, 50L]
+define UnknownBegNotMeetsLongIvl: Interval(null, 5L] meets Interval[0L, 100L]
+define LongIvlMayMeetBeforeUnknownBeg: Interval[0L, 100L] meets Interval(null, 400L)
+define PosInfEndMeetsAfterLongIvl: Interval[100L, null] meets Interval[0L, 99L]
+define PosInfEndNotMeetsLongIvl: Interval[0L, null] meets Interval[1000L, 2000L]
+define LongIvlNotMeetsPosInfEnd: Interval[100L, 200L] meets Interval[0L, null]
+define UnknownEndMeetsAfterLongIvl: Interval[100L, null) meets Interval[0L, 99L]
+define UnknownEndMayMeetBeforeLongIvl: Interval[0L, null) meets Interval[50L, 100L]
+define UnknownEndNotMeetsLongIvl: Interval[0L, null) meets Interval[0L, 100L]
+define LongIvlMayMeetAfterUnknownEnd: Interval[0L, 100L] meets Interval[-100L, null)
+define NegInfBegMeetsBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
+define NegInfBegNotMeetsDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define DateIvlNotMeetsNegInfBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define UnknownBegMeetsBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
+define UnknownBegMayMeetAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define UnknownBegNotMeetsDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define DateIvlMayMeetBeforeUnknownBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define PosInfEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
+define PosInfEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define DateIvlNotMeetsPosInfEnd: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)] meets Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
+define UnknownEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets Interval[DateTime(2010, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
+define UnknownEndMayMeetBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
+define UnknownEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateIvlMayMeetAfterUnknownEnd: Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)] meets Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
+*/
+
+module.exports['Meets'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "2944",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterIntIvl", ": " ]
+            }, {
+              "r" : "225",
+              "s" : [ {
+                "r" : "217",
+                "s" : [ {
+                  "r" : "215",
+                  "value" : [ "Interval[", "11", ", ", "15", "]" ]
+                } ]
+              }, {
+                "r" : "225",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "222",
+                "s" : [ {
+                  "r" : "220",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "225",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "226",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "227",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "228",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "217",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "218",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "219",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "11",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "15",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "222",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "223",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "232",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "232",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsBeforeIntIvl", ": " ]
+            }, {
+              "r" : "243",
+              "s" : [ {
+                "r" : "235",
+                "s" : [ {
+                  "r" : "233",
+                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
+                } ]
+              }, {
+                "r" : "243",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "240",
+                "s" : [ {
+                  "r" : "238",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "243",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "244",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "245",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "246",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "247",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "235",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "236",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "237",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "233",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "240",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "241",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "242",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "238",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "250",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "250",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsIntIvl", ": " ]
+            }, {
+              "r" : "261",
+              "s" : [ {
+                "r" : "253",
+                "s" : [ {
+                  "r" : "251",
+                  "value" : [ "Interval[", "1", ", ", "2", "]" ]
+                } ]
+              }, {
+                "r" : "261",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "258",
+                "s" : [ {
+                  "r" : "256",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "261",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "262",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "263",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "264",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "265",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "253",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "254",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "255",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "251",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "258",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "259",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "260",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "257",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "268",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "268",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterLongIvl", ": " ]
+            }, {
+              "r" : "279",
+              "s" : [ {
+                "r" : "271",
+                "s" : [ {
+                  "r" : "269",
+                  "value" : [ "Interval[", "11L", ", ", "15L", "]" ]
+                } ]
+              }, {
+                "r" : "279",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "276",
+                "s" : [ {
+                  "r" : "274",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "279",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "280",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "281",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "282",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "283",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "271",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "272",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "273",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "11",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "15",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "276",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "277",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "278",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "286",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "286",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsBeforeLongIvl", ": " ]
+            }, {
+              "r" : "297",
+              "s" : [ {
+                "r" : "289",
+                "s" : [ {
+                  "r" : "287",
+                  "value" : [ "Interval[", "1L", ", ", "4L", "]" ]
+                } ]
+              }, {
+                "r" : "297",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "294",
+                "s" : [ {
+                  "r" : "292",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "297",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "298",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "299",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "300",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "301",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "289",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "290",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "294",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "295",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "296",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "293",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "304",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "304",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsLongIvl", ": " ]
+            }, {
+              "r" : "315",
+              "s" : [ {
+                "r" : "307",
+                "s" : [ {
+                  "r" : "305",
+                  "value" : [ "Interval[", "1L", ", ", "2L", "]" ]
+                } ]
+              }, {
+                "r" : "315",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "312",
+                "s" : [ {
+                  "r" : "310",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "315",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "316",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "318",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "319",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "307",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "308",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "309",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "312",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "313",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "310",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "322",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "322",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterRealIvl", ": " ]
+            }, {
+              "r" : "333",
+              "s" : [ {
+                "r" : "325",
+                "s" : [ {
+                  "r" : "323",
+                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                } ]
+              }, {
+                "r" : "333",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "330",
+                "s" : [ {
+                  "r" : "328",
+                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "333",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "334",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "335",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "336",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "337",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "325",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "326",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "327",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.50000001",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "324",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "330",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "331",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "332",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "340",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "340",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsBeforeRealIvl", ": " ]
+            }, {
+              "r" : "351",
+              "s" : [ {
+                "r" : "343",
+                "s" : [ {
+                  "r" : "341",
+                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                } ]
+              }, {
+                "r" : "351",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "348",
+                "s" : [ {
+                  "r" : "346",
+                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "351",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "352",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "353",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "354",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "355",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "343",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "344",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "345",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "348",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "349",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "350",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.50000001",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "358",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "358",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsRealIvl", ": " ]
+            }, {
+              "r" : "369",
+              "s" : [ {
+                "r" : "361",
+                "s" : [ {
+                  "r" : "359",
+                  "value" : [ "Interval[", "0.0", ", ", "1.0", "]" ]
+                } ]
+              }, {
+                "r" : "369",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "366",
+                "s" : [ {
+                  "r" : "364",
+                  "value" : [ "Interval[", "1.1", ", ", "2.0", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "369",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "370",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "372",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "361",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "362",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "363",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "359",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "360",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "366",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "367",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "376",
+        "name" : "DateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "376",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvl", ": " ]
+            }, {
+              "r" : "425",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "393",
+                "s" : [ {
+                  "r" : "377",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "417",
+                "s" : [ {
+                  "r" : "401",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "428",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "429",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "425",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "426",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "427",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "393",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "394",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "395",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "396",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "397",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "398",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "399",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "400",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "377",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "378",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "379",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "380",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "381",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "417",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "418",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "419",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "420",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "421",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "422",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "423",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "424",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "402",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "405",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "406",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "407",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "432",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "432",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterDateIvl", ": " ]
+            }, {
+              "r" : "487",
+              "s" : [ {
+                "r" : "481",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "449",
+                  "s" : [ {
+                    "r" : "433",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "473",
+                  "s" : [ {
+                    "r" : "457",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "487",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "484",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "487",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "488",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "489",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "490",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "491",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "481",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "482",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "483",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "449",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "450",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "451",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "452",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "453",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "454",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "455",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "456",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "433",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "434",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "435",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "436",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "437",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "438",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "439",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "473",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "474",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "475",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "476",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "477",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "478",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "479",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "480",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "457",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "458",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "459",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "460",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "461",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "462",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "463",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "484",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "485",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "486",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "494",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "494",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsBeforeDateIvl", ": " ]
+            }, {
+              "r" : "549",
+              "s" : [ {
+                "r" : "543",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "511",
+                  "s" : [ {
+                    "r" : "495",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "535",
+                  "s" : [ {
+                    "r" : "519",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "549",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "546",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "549",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "550",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "551",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "552",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "553",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "543",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "544",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "545",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "511",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "512",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "513",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "514",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "515",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "516",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "517",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "518",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "495",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "496",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "497",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "498",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "499",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "500",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "501",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "535",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "536",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "537",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "538",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "539",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "540",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "541",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "542",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "519",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "520",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "521",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "522",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "523",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "524",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "525",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "546",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "547",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "548",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "556",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "556",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsDateIvl", ": " ]
+            }, {
+              "r" : "611",
+              "s" : [ {
+                "r" : "605",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "573",
+                  "s" : [ {
+                    "r" : "557",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "597",
+                  "s" : [ {
+                    "r" : "581",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "611",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "608",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "611",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "612",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "613",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "614",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "615",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "605",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "606",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "607",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "573",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "574",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "575",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "576",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "577",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "578",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "579",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "580",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "557",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "558",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "559",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "560",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "561",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "562",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "563",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "597",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "598",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "599",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "600",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "601",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "602",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "603",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "604",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "581",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "582",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "583",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "29",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "584",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "585",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "586",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "587",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "608",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "609",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "610",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "618",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetAfterImpreciseDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "618",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetAfterImpreciseDateIvl", ": " ]
+            }, {
+              "r" : "643",
+              "s" : [ {
+                "r" : "619",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "643",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "640",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "628",
+                  "s" : [ {
+                    "r" : "622",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "637",
+                  "s" : [ {
+                    "r" : "631",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "643",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "644",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "645",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "646",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "647",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "619",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "620",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "621",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "640",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "641",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "642",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "628",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "629",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "630",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "622",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "623",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "637",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "638",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "639",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "631",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "632",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "650",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetBeforeImpreciseDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "650",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetBeforeImpreciseDateIvl", ": " ]
+            }, {
+              "r" : "675",
+              "s" : [ {
+                "r" : "651",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "675",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "672",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "660",
+                  "s" : [ {
+                    "r" : "654",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "669",
+                  "s" : [ {
+                    "r" : "663",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "675",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "676",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "677",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "678",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "679",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "651",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "652",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "653",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "672",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "673",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "674",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "660",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "661",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "662",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "654",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "655",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "669",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "670",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "671",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "663",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "664",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "682",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsImpreciseDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "682",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsImpreciseDateIvl", ": " ]
+            }, {
+              "r" : "707",
+              "s" : [ {
+                "r" : "683",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              }, {
+                "r" : "707",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "704",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "692",
+                  "s" : [ {
+                    "r" : "686",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "701",
+                  "s" : [ {
+                    "r" : "695",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "707",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "708",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "709",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "710",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "711",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "683",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "684",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "685",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "704",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "705",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "706",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "692",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "693",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "694",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "686",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "687",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "701",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "702",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "703",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "695",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "696",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "714",
+        "name" : "PrecisionDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "714",
+            "s" : [ {
+              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
+            }, {
+              "r" : "763",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "731",
+                "s" : [ {
+                  "r" : "715",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "755",
+                "s" : [ {
+                  "r" : "739",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "766",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "767",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "763",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "764",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "765",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "731",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "732",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "733",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "734",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "735",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "736",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "737",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "738",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "715",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "716",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "717",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "718",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "719",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "34",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "720",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "56",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "721",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "789",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "755",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "756",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "757",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "758",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "759",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "760",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "761",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "762",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "739",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "740",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "741",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "742",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "743",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "23",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "744",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "45",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "745",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "678",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "770",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "770",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterDayOfIvl", ": " ]
+            }, {
+              "r" : "825",
+              "s" : [ {
+                "r" : "771",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "825",
+                "value" : [ " ", "meets day of", " " ]
+              }, {
+                "r" : "822",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "790",
+                  "s" : [ {
+                    "r" : "774",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "814",
+                  "s" : [ {
+                    "r" : "798",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "825",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "826",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "827",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "828",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "829",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "771",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "772",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "773",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "822",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "823",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "824",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "790",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "791",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "792",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "793",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "794",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "795",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "796",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "797",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "774",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "775",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "776",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "777",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "778",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "779",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "780",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "814",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "815",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "816",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "817",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "818",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "819",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "820",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "821",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "798",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "799",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "800",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "801",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "802",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "803",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "804",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "832",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "832",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsBeforeDayOfIvl", ": " ]
+            }, {
+              "r" : "887",
+              "s" : [ {
+                "r" : "833",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "887",
+                "value" : [ " ", "meets day of", " " ]
+              }, {
+                "r" : "884",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "852",
+                  "s" : [ {
+                    "r" : "836",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "876",
+                  "s" : [ {
+                    "r" : "860",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "887",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "888",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "889",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "890",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "891",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "833",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "834",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "835",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "884",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "885",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "886",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "852",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "853",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "854",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "855",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "856",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "857",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "858",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "859",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "836",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "837",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "838",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "839",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "840",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "841",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "842",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "876",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "877",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "878",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "879",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "880",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "881",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "882",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "883",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "860",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "861",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "862",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "863",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "864",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "865",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "866",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "894",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "894",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsDayOfIvl", ": " ]
+            }, {
+              "r" : "949",
+              "s" : [ {
+                "r" : "895",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "949",
+                "value" : [ " ", "meets day of", " " ]
+              }, {
+                "r" : "946",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "914",
+                  "s" : [ {
+                    "r" : "898",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "938",
+                  "s" : [ {
+                    "r" : "922",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "949",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "950",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "951",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "952",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "953",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "895",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "896",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "897",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "946",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "947",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "948",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "914",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "915",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "916",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "917",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "918",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "919",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "920",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "921",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "898",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "899",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "900",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "901",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "902",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "903",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "904",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "938",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "939",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "940",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "941",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "942",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "943",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "944",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "945",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "922",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "923",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "924",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "925",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "926",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "927",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "928",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "956",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsDayOfImpreciseIVL",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "956",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsDayOfImpreciseIVL", ": " ]
+            }, {
+              "r" : "981",
+              "s" : [ {
+                "r" : "957",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "981",
+                "value" : [ " ", "meets day of", " " ]
+              }, {
+                "r" : "978",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "966",
+                  "s" : [ {
+                    "r" : "960",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "975",
+                  "s" : [ {
+                    "r" : "969",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "981",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "982",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "983",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "984",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "985",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "957",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "958",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "959",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "978",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "979",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "980",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "966",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "967",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "968",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "960",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "961",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "975",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "976",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "977",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "969",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "970",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "988",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetAfterDayOfImpreciseIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "988",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetAfterDayOfImpreciseIvl", ": " ]
+            }, {
+              "r" : "1013",
+              "s" : [ {
+                "r" : "989",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "1013",
+                "value" : [ " ", "meets day of", " " ]
+              }, {
+                "r" : "1010",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "998",
+                  "s" : [ {
+                    "r" : "992",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1007",
+                  "s" : [ {
+                    "r" : "1001",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1013",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1014",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1015",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1016",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1017",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "989",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "990",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "991",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1010",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1011",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1012",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "998",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "999",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1000",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "992",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "993",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1007",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1008",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1009",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1001",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1002",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1020",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayMeetBeforeDayOfImpreciseIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1020",
+            "s" : [ {
+              "value" : [ "", "define ", "MayMeetBeforeDayOfImpreciseIvl", ": " ]
+            }, {
+              "r" : "1045",
+              "s" : [ {
+                "r" : "1021",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "1045",
+                "value" : [ " ", "meets day of", " " ]
+              }, {
+                "r" : "1042",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1030",
+                  "s" : [ {
+                    "r" : "1024",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1039",
+                  "s" : [ {
+                    "r" : "1033",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1045",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1046",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1047",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1048",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1049",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1021",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1022",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1023",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1042",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1043",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1044",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1030",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1031",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1032",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1024",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1025",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1039",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1040",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1041",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1033",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1034",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1052",
+        "name" : "ImpDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1052",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpDateIvl", ": " ]
+            }, {
+              "r" : "1071",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "1059",
+                "s" : [ {
+                  "r" : "1053",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "1068",
+                "s" : [ {
+                  "r" : "1062",
+                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1074",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1075",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1071",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1072",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1073",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "1059",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1060",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1061",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1053",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1054",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "1068",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1069",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1070",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1062",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1063",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "8",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1078",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseMayMeetAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1078",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseMayMeetAfterDateIvl", ": " ]
+            }, {
+              "r" : "1133",
+              "s" : [ {
+                "r" : "1079",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1133",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1130",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1098",
+                  "s" : [ {
+                    "r" : "1082",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1122",
+                  "s" : [ {
+                    "r" : "1106",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1133",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1134",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1135",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1136",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1137",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1079",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1080",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1081",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1130",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1131",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1132",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1098",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1099",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1100",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1101",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1102",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1103",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1104",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1105",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1082",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1083",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1084",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1085",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1086",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1087",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1088",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1122",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1123",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1124",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1125",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1126",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1127",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1128",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1129",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1106",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1107",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1108",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "29",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1109",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1110",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1111",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1112",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1140",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseMayMeetBeforeDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1140",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseMayMeetBeforeDateIvl", ": " ]
+            }, {
+              "r" : "1195",
+              "s" : [ {
+                "r" : "1141",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1195",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1192",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1160",
+                  "s" : [ {
+                    "r" : "1144",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1184",
+                  "s" : [ {
+                    "r" : "1168",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1195",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1196",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1197",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1198",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1199",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1141",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1142",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1143",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1192",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1193",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1194",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1160",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1161",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1162",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1163",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1164",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1165",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1166",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1167",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1144",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1145",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1146",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1147",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1148",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1149",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1150",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1184",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1185",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1186",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1187",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1188",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1189",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1190",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1191",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1168",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1169",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1170",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1171",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1172",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1173",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1174",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1202",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseNotMeetsDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1202",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseNotMeetsDateIvl", ": " ]
+            }, {
+              "r" : "1257",
+              "s" : [ {
+                "r" : "1203",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1257",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1254",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1222",
+                  "s" : [ {
+                    "r" : "1206",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1246",
+                  "s" : [ {
+                    "r" : "1230",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1257",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1258",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1259",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1260",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1261",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1203",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1204",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1205",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1254",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1255",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1256",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1222",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1223",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1225",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1226",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1227",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1228",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1229",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1206",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1207",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1208",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1209",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1210",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1211",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1212",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1246",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1247",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1248",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1249",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1250",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1251",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1252",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1253",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1230",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1231",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1232",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "31",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1233",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1234",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1235",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1236",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegMeetsBeforeIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1264",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegMeetsBeforeIntIvl", ": " ]
+            }, {
+              "r" : "1276",
+              "s" : [ {
+                "r" : "1267",
+                "s" : [ {
+                  "r" : "1265",
+                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1276",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1273",
+                "s" : [ {
+                  "r" : "1271",
+                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1276",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1277",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1278",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1279",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1280",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1267",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1269",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1270",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1268",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1265",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1273",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1274",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1275",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1271",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1272",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1283",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegNotMeetsIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1283",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegNotMeetsIntIvl", ": " ]
+            }, {
+              "r" : "1295",
+              "s" : [ {
+                "r" : "1286",
+                "s" : [ {
+                  "r" : "1284",
+                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1295",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1292",
+                "s" : [ {
+                  "r" : "1290",
+                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1295",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1296",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1297",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1298",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1299",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1286",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1288",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1289",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1287",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1284",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1285",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1292",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1293",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1294",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1290",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1302",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntIvlNotMeetsNegInfBeg",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1302",
+            "s" : [ {
+              "value" : [ "", "define ", "IntIvlNotMeetsNegInfBeg", ": " ]
+            }, {
+              "r" : "1314",
+              "s" : [ {
+                "r" : "1305",
+                "s" : [ {
+                  "r" : "1303",
+                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                } ]
+              }, {
+                "r" : "1314",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1310",
+                "s" : [ {
+                  "r" : "1308",
+                  "value" : [ "Interval[", "null", ", ", "400", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1314",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1315",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1316",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1317",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1318",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1305",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1306",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1307",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1303",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1304",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1310",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1312",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1313",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1311",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1308",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1309",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "400",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1321",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegMeetsBeforeIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1321",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegMeetsBeforeIntIvl", ": " ]
+            }, {
+              "r" : "1333",
+              "s" : [ {
+                "r" : "1324",
+                "s" : [ {
+                  "r" : "1322",
+                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1333",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1330",
+                "s" : [ {
+                  "r" : "1328",
+                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1333",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1334",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1335",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1336",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1337",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1324",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1326",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1327",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1325",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1322",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1330",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1331",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1332",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1340",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegMayMeetAfterIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1340",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegMayMeetAfterIntIvl", ": " ]
+            }, {
+              "r" : "1352",
+              "s" : [ {
+                "r" : "1343",
+                "s" : [ {
+                  "r" : "1341",
+                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1352",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1349",
+                "s" : [ {
+                  "r" : "1347",
+                  "value" : [ "Interval[", "0", ", ", "50", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1352",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1353",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1354",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1355",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1356",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1343",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1345",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1346",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1344",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1341",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1349",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1350",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1351",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1348",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "50",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1359",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegNotMeetsIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1359",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegNotMeetsIntIvl", ": " ]
+            }, {
+              "r" : "1371",
+              "s" : [ {
+                "r" : "1362",
+                "s" : [ {
+                  "r" : "1360",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
+                } ]
+              }, {
+                "r" : "1371",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1368",
+                "s" : [ {
+                  "r" : "1366",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1371",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1372",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1373",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1374",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1375",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1362",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1364",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1365",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1363",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1360",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1361",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1368",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1369",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1370",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1367",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1378",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntIvlMayMeetBeforeUnknownBeg",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1378",
+            "s" : [ {
+              "value" : [ "", "define ", "IntIvlMayMeetBeforeUnknownBeg", ": " ]
+            }, {
+              "r" : "1390",
+              "s" : [ {
+                "r" : "1381",
+                "s" : [ {
+                  "r" : "1379",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1390",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1386",
+                "s" : [ {
+                  "r" : "1384",
+                  "value" : [ "Interval(", "null", ", ", "400", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1390",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1391",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1392",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1393",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1394",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1381",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1382",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1383",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1379",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1380",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1386",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1388",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1389",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1387",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1384",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1385",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "400",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1397",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndMeetsAfterIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1397",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndMeetsAfterIntIvl", ": " ]
+            }, {
+              "r" : "1409",
+              "s" : [ {
+                "r" : "1400",
+                "s" : [ {
+                  "r" : "1398",
+                  "value" : [ "Interval[", "100", ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "1409",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1406",
+                "s" : [ {
+                  "r" : "1404",
+                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1409",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1410",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1411",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1412",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1413",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1400",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1402",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1403",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1398",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1401",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1399",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1406",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1407",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1408",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1405",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "99",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1416",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndNotMeetsIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1416",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndNotMeetsIntIvl", ": " ]
+            }, {
+              "r" : "1428",
+              "s" : [ {
+                "r" : "1419",
+                "s" : [ {
+                  "r" : "1417",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "1428",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1425",
+                "s" : [ {
+                  "r" : "1423",
+                  "value" : [ "Interval[", "1000", ", ", "2000", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1428",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1429",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1430",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1431",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1432",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1419",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1421",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1422",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1417",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1420",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1418",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1425",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1426",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1427",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1423",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1000",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1424",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2000",
+              "annotation" : [ ]
+            }
+          } ]
+        }
       }, {
-        "localId" : "1872",
+        "localId" : "1435",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlBeforeDate",
+        "name" : "IntIvlNotMeetsPosInfEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1872",
+            "r" : "1435",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlBeforeDate", ": " ]
+              "value" : [ "", "define ", "IntIvlNotMeetsPosInfEnd", ": " ]
             }, {
-              "r" : "1888",
+              "r" : "1447",
               "s" : [ {
-                "r" : "1873",
+                "r" : "1438",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1436",
+                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
                 } ]
               }, {
-                "r" : "1888",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1447",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "1884",
+                "r" : "1443",
                 "s" : [ {
-                  "r" : "1876",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "20", ")" ]
+                  "r" : "1441",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1888",
+          "type" : "Meets",
+          "localId" : "1447",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1895",
+            "localId" : "1448",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1896",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1449",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1897",
+            "localId" : "1450",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1898",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1451",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1873",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1438",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1874",
+              "localId" : "1439",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1875",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1440",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1436",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1437",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "If",
-            "localId" : "1889",
+            "type" : "Interval",
+            "localId" : "1443",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "condition" : {
-              "type" : "IsNull",
-              "localId" : "1890",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1445",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1446",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1441",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1444",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
-                "type" : "DateTime",
-                "localId" : "1884",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1885",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1886",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1887",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1876",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1877",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1878",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                }
+                "type" : "Null",
+                "localId" : "1442",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
-            },
-            "then" : {
-              "type" : "Null",
-              "localId" : "1891",
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1454",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMeetsAfterIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1454",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMeetsAfterIntIvl", ": " ]
+            }, {
+              "r" : "1466",
+              "s" : [ {
+                "r" : "1457",
+                "s" : [ {
+                  "r" : "1455",
+                  "value" : [ "Interval[", "100", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "1466",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1463",
+                "s" : [ {
+                  "r" : "1461",
+                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1466",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1467",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1468",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1469",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1470",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1457",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1459",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1892",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1893",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1460",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }
             },
-            "else" : {
-              "type" : "Interval",
-              "localId" : "1894",
-              "lowClosed" : true,
-              "highClosed" : true,
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1455",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1458",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "low" : {
-                "type" : "DateTime",
-                "localId" : "1884",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1885",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1886",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1887",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1876",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1877",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1878",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "DateTime",
-                "localId" : "1884",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1885",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1886",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1887",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1876",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1877",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1878",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                }
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1456",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1463",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1464",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1465",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1461",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1462",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "99",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1901",
-        "name" : "DateOnlyIvl",
+        "localId" : "1473",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayMeetBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1901",
+            "r" : "1473",
             "s" : [ {
-              "value" : [ "", "define ", "DateOnlyIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayMeetBeforeIntIvl", ": " ]
             }, {
-              "r" : "1926",
+              "r" : "1485",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "1910",
+                "r" : "1476",
                 "s" : [ {
-                  "r" : "1902",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                  "r" : "1474",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "r" : "1485",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "1922",
+                "r" : "1482",
                 "s" : [ {
-                  "r" : "1914",
-                  "value" : [ "Date", "(", "2012", ", ", "2", ", ", "20", ")" ]
+                  "r" : "1480",
+                  "value" : [ "Interval[", "50", ", ", "100", "]" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1929",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1930",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "1926",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Meets",
+          "localId" : "1485",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1927",
+            "localId" : "1486",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1928",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "1487",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "Date",
-            "localId" : "1910",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1488",
             "annotation" : [ ],
-            "signature" : [ {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1911",
+              "localId" : "1489",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1476",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1478",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1479",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1474",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1477",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1475",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1482",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1483",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1484",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1480",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "50",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1481",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1492",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotMeetsIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1492",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotMeetsIntIvl", ": " ]
             }, {
+              "r" : "1504",
+              "s" : [ {
+                "r" : "1495",
+                "s" : [ {
+                  "r" : "1493",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "1504",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1501",
+                "s" : [ {
+                  "r" : "1499",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1504",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1505",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1912",
+              "localId" : "1506",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }, {
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1507",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1913",
+              "localId" : "1508",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1495",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1497",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1498",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "1902",
+              "localId" : "1493",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "high" : {
+              "type" : "As",
+              "localId" : "1496",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1494",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1501",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1502",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1503",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "1903",
+              "localId" : "1499",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1904",
+              "localId" : "1500",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "100",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "Date",
-            "localId" : "1922",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          } ]
+        }
+      }, {
+        "localId" : "1511",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntIvlMayMeetAfterUnknownEnd",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1511",
+            "s" : [ {
+              "value" : [ "", "define ", "IntIvlMayMeetAfterUnknownEnd", ": " ]
+            }, {
+              "r" : "1525",
+              "s" : [ {
+                "r" : "1514",
+                "s" : [ {
+                  "r" : "1512",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1525",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1521",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1517",
+                  "s" : [ {
+                    "r" : "1518",
+                    "value" : [ "-", "100" ]
+                  } ]
+                }, {
+                  "r" : "1520",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1525",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1526",
             "annotation" : [ ],
-            "signature" : [ {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1923",
+              "localId" : "1527",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }, {
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1528",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1924",
+              "localId" : "1529",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1514",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1515",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1516",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1512",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1513",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1521",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1523",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1524",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "1517",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1519",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1518",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "100",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1522",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1520",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1532",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegMeetsBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1532",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegMeetsBeforeLongIvl", ": " ]
+            }, {
+              "r" : "1544",
+              "s" : [ {
+                "r" : "1535",
+                "s" : [ {
+                  "r" : "1533",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
+                } ]
+              }, {
+                "r" : "1544",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1541",
+                "s" : [ {
+                  "r" : "1539",
+                  "value" : [ "Interval[", "101L", ", ", "200L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1544",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1545",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1546",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1547",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1548",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1535",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1537",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1538",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1536",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1533",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1534",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1541",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1542",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1543",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1539",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1540",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1551",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegNotMeetsLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1551",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegNotMeetsLongIvl", ": " ]
+            }, {
+              "r" : "1563",
+              "s" : [ {
+                "r" : "1554",
+                "s" : [ {
+                  "r" : "1552",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
+                } ]
+              }, {
+                "r" : "1563",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1560",
+                "s" : [ {
+                  "r" : "1558",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1563",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1564",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1565",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1566",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1567",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1554",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1556",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1557",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1555",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1552",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1553",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1560",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1561",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1562",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1558",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1559",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1570",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIvlNotMeetsNegInfBeg",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1570",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIvlNotMeetsNegInfBeg", ": " ]
             }, {
+              "r" : "1582",
+              "s" : [ {
+                "r" : "1573",
+                "s" : [ {
+                  "r" : "1571",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
+                } ]
+              }, {
+                "r" : "1582",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1578",
+                "s" : [ {
+                  "r" : "1576",
+                  "value" : [ "Interval[", "null", ", ", "400L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1582",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1583",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1925",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1584",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1585",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1586",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
-            } ],
-            "year" : {
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1573",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1574",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1575",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "1914",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "localId" : "1571",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
               "annotation" : [ ]
             },
-            "month" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1915",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "localId" : "1572",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
               "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1578",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1580",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1581",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "day" : {
+            "low" : {
+              "type" : "As",
+              "localId" : "1579",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1576",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "Literal",
-              "localId" : "1916",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "20",
+              "localId" : "1577",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "400",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "1933",
+        "localId" : "1589",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateOnlyIvlBeforeDateIvl",
+        "name" : "UnknownBegMeetsBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1933",
+            "r" : "1589",
             "s" : [ {
-              "value" : [ "", "define ", "DateOnlyIvlBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMeetsBeforeLongIvl", ": " ]
             }, {
-              "r" : "1940",
+              "r" : "1601",
               "s" : [ {
-                "r" : "1934",
+                "r" : "1592",
                 "s" : [ {
-                  "value" : [ "DateOnlyIvl" ]
+                  "r" : "1590",
+                  "value" : [ "Interval(", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1940",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1601",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "1937",
+                "r" : "1598",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1596",
+                  "value" : [ "Interval[", "101L", ", ", "200L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1940",
+          "type" : "Meets",
+          "localId" : "1601",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1952",
+            "localId" : "1602",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1953",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1603",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1954",
+            "localId" : "1604",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1955",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1605",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1941",
+            "localId" : "1592",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
-            "low" : {
-              "type" : "ToDateTime",
-              "localId" : "1944",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1594",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1945",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1595",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "1942",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "ExpressionRef",
-                  "localId" : "1934",
-                  "name" : "DateOnlyIvl",
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "1935",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1936",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
-              }
-            },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "1946",
-              "path" : "lowClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "ExpressionRef",
-                "localId" : "1934",
-                "name" : "DateOnlyIvl",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "1935",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1936",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                }
               }
             },
-            "high" : {
-              "type" : "ToDateTime",
-              "localId" : "1949",
+            "low" : {
+              "type" : "As",
+              "localId" : "1593",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1950",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ]
-              } ],
+              "signature" : [ ],
               "operand" : {
-                "type" : "Property",
-                "localId" : "1947",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "ExpressionRef",
-                  "localId" : "1934",
-                  "name" : "DateOnlyIvl",
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "1935",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1936",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
+                "type" : "Null",
+                "localId" : "1590",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
             },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "1951",
-              "path" : "highClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "ExpressionRef",
-                "localId" : "1934",
-                "name" : "DateOnlyIvl",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "1935",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1936",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                }
-              }
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1591",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1937",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1598",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1938",
+              "localId" : "1599",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1939",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1600",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1596",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1597",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1958",
+        "localId" : "1608",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlAfterDateOnlyIvl",
+        "name" : "UnknownBegMayMeetAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1958",
+            "r" : "1608",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlAfterDateOnlyIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayMeetAfterLongIvl", ": " ]
             }, {
-              "r" : "1965",
+              "r" : "1620",
               "s" : [ {
-                "r" : "1959",
+                "r" : "1611",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1609",
+                  "value" : [ "Interval(", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1965",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1620",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "1962",
+                "r" : "1617",
                 "s" : [ {
-                  "value" : [ "DateOnlyIvl" ]
+                  "r" : "1615",
+                  "value" : [ "Interval[", "0L", ", ", "50L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "1965",
+          "type" : "Meets",
+          "localId" : "1620",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1977",
+            "localId" : "1621",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1978",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1622",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1979",
+            "localId" : "1623",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1980",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1624",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1959",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1611",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1960",
+              "localId" : "1613",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1961",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1614",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1966",
-            "annotation" : [ ],
+            },
             "low" : {
-              "type" : "ToDateTime",
-              "localId" : "1969",
+              "type" : "As",
+              "localId" : "1612",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1970",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ]
-              } ],
+              "signature" : [ ],
               "operand" : {
-                "type" : "Property",
-                "localId" : "1967",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "ExpressionRef",
-                  "localId" : "1962",
-                  "name" : "DateOnlyIvl",
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "1963",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1964",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
-              }
-            },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "1971",
-              "path" : "lowClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "ExpressionRef",
-                "localId" : "1962",
-                "name" : "DateOnlyIvl",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "1963",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1964",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                }
+                "type" : "Null",
+                "localId" : "1609",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "ToDateTime",
-              "localId" : "1974",
+              "type" : "Literal",
+              "localId" : "1610",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1617",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1618",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1975",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1619",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "1972",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "ExpressionRef",
-                  "localId" : "1962",
-                  "name" : "DateOnlyIvl",
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "1963",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1964",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
               }
             },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "1976",
-              "path" : "highClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "ExpressionRef",
-                "localId" : "1962",
-                "name" : "DateOnlyIvl",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "1963",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1964",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                }
-              }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1615",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1616",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "50",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1983",
+        "localId" : "1627",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateOnlyMeetsBeforeDateIvl",
+        "name" : "UnknownBegNotMeetsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1983",
+            "r" : "1627",
             "s" : [ {
-              "value" : [ "", "define ", "DateOnlyMeetsBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotMeetsLongIvl", ": " ]
             }, {
-              "r" : "2014",
+              "r" : "1639",
               "s" : [ {
-                "r" : "2008",
+                "r" : "1630",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1992",
-                  "s" : [ {
-                    "r" : "1984",
-                    "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2004",
-                  "s" : [ {
-                    "r" : "1996",
-                    "value" : [ "Date", "(", "2012", ", ", "3", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1628",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "2014",
-                "value" : [ " ", "before or on", " " ]
+                "r" : "1639",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "2011",
+                "r" : "1636",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1634",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrBefore",
-          "localId" : "2014",
+          "type" : "Meets",
+          "localId" : "1639",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2026",
+            "localId" : "1640",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2027",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1641",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2028",
+            "localId" : "1642",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2029",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1643",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2015",
+            "localId" : "1630",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
-            "low" : {
-              "type" : "ToDateTime",
-              "localId" : "2018",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1632",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2019",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1633",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "2016",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "2008",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "2009",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2010",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Date",
-                    "localId" : "1992",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ],
-                    "signature" : [ {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1993",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1994",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1995",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    } ],
-                    "year" : {
-                      "type" : "Literal",
-                      "localId" : "1984",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "2012",
-                      "annotation" : [ ]
-                    },
-                    "month" : {
-                      "type" : "Literal",
-                      "localId" : "1985",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "1",
-                      "annotation" : [ ]
-                    },
-                    "day" : {
-                      "type" : "Literal",
-                      "localId" : "1986",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "1",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "high" : {
-                    "type" : "Date",
-                    "localId" : "2004",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ],
-                    "signature" : [ {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2005",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2006",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2007",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    } ],
-                    "year" : {
-                      "type" : "Literal",
-                      "localId" : "1996",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "2012",
-                      "annotation" : [ ]
-                    },
-                    "month" : {
-                      "type" : "Literal",
-                      "localId" : "1997",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "3",
-                      "annotation" : [ ]
-                    },
-                    "day" : {
-                      "type" : "Literal",
-                      "localId" : "1998",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "1",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
               }
             },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "2020",
-              "path" : "lowClosed",
+            "low" : {
+              "type" : "As",
+              "localId" : "1631",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "2008",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "2009",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2010",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Date",
-                  "localId" : "1992",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1993",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1994",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1995",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1984",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1985",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1986",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  }
-                },
-                "high" : {
-                  "type" : "Date",
-                  "localId" : "2004",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2005",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2006",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2007",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1996",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1997",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "3",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1998",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  }
-                }
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1628",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "ToDateTime",
-              "localId" : "2023",
+              "type" : "Literal",
+              "localId" : "1629",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1636",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1637",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2024",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1638",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "2021",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "2008",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "2009",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2010",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Date",
-                    "localId" : "1992",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ],
-                    "signature" : [ {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1993",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1994",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1995",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    } ],
-                    "year" : {
-                      "type" : "Literal",
-                      "localId" : "1984",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "2012",
-                      "annotation" : [ ]
-                    },
-                    "month" : {
-                      "type" : "Literal",
-                      "localId" : "1985",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "1",
-                      "annotation" : [ ]
-                    },
-                    "day" : {
-                      "type" : "Literal",
-                      "localId" : "1986",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "1",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "high" : {
-                    "type" : "Date",
-                    "localId" : "2004",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ],
-                    "signature" : [ {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2005",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2006",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2007",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    } ],
-                    "year" : {
-                      "type" : "Literal",
-                      "localId" : "1996",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "2012",
-                      "annotation" : [ ]
-                    },
-                    "month" : {
-                      "type" : "Literal",
-                      "localId" : "1997",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "3",
-                      "annotation" : [ ]
-                    },
-                    "day" : {
-                      "type" : "Literal",
-                      "localId" : "1998",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "1",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
               }
             },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "2025",
-              "path" : "highClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "2008",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "2009",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2010",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Date",
-                  "localId" : "1992",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1993",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1994",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1995",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1984",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1985",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1986",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  }
-                },
-                "high" : {
-                  "type" : "Date",
-                  "localId" : "2004",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2005",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2006",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2007",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1996",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1997",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "3",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1998",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  }
-                }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1634",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1635",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1646",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIvlMayMeetBeforeUnknownBeg",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1646",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIvlMayMeetBeforeUnknownBeg", ": " ]
+            }, {
+              "r" : "1658",
+              "s" : [ {
+                "r" : "1649",
+                "s" : [ {
+                  "r" : "1647",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
+                } ]
+              }, {
+                "r" : "1658",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1654",
+                "s" : [ {
+                  "r" : "1652",
+                  "value" : [ "Interval(", "null", ", ", "400L", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1658",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1659",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1660",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1661",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1662",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1649",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1650",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1651",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1647",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1648",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "2011",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1654",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2012",
+              "localId" : "1656",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2013",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1657",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1655",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1652",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1653",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "400",
+              "annotation" : [ ]
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* AfterOrOn
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0)]
-define MeetsAfterDateIvl: Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)) after or on DateIvl
-define MeetsBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) after or on DateIvl
-define AfterDateIvl: Interval[DateTime(2012, 10, 11, 0, 0, 0, 0), DateTime(2012, 10, 29, 0, 0, 0, 0)) after or on DateIvl
-define BeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 0, 0, 0, 0)) after or on DateIvl
-define MayMeetAfterImpreciseDateIvl: DateIvl after or on Interval[DateTime(2012, 1), DateTime(2012, 3)]
-define MayMeetBeforeImpreciseDateIvl: DateIvl after or on Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define NotMeetsImpreciseDateIvl: DateIvl after or on Interval[DateTime(2012, 1), DateTime(2012, 12)]
-define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define MeetsAfterDayOfIvl: PrecisionDateIvl after or on day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define MeetsBeforeDayOfIvl: PrecisionDateIvl after or on day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
-define NotMeetsDayOfIvl: PrecisionDateIvl after or on day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define NotMeetsDayOfImpreciseIVL: PrecisionDateIvl after or on day of Interval[DateTime(2012, 1), DateTime(2012, 2)]
-define MayMeetAfterDayOfImpreciseIvl: PrecisionDateIvl after or on day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
-define MayMeetBeforeDayOfImpreciseIvl: PrecisionDateIvl after or on day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
-define ImpreciseMayMeetAfterDateIvl: ImpDateIvl after or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 23, 59, 59, 999)]
-define ImpreciseMayMeetBeforeDateIvl: ImpDateIvl after or on Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999)]
-define ImpreciseNotMeetsDateIvl: ImpDateIvl after or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999))
-define NullEndIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), null)
-define BeforeNullEndIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 20, 0, 0, 0, 0)] after or on NullEndIvl
-define AfterStartNullEndIvl: Interval[DateTime(2012, 3, 10, 0, 0, 0, 0), DateTime(2012, 3, 20, 0, 0, 0, 0)] after or on NullEndIvl
-define NullEndStartBeforeIvl: NullEndIvl after or on Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 4, 20, 0, 0, 0, 0)]
-define NullEndStartAfterIvl: NullEndIvl after or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 20, 0, 0, 0, 0)]
-define NullStartIvl: Interval(null, DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define EndsBeforeNullStartIvlEnds: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 20, 0, 0, 0, 0)] after or on NullStartIvl
-define AfterEndOfNullStartIvl: Interval[DateTime(2012, 3, 10, 0, 0, 0, 0), DateTime(2012, 3, 20, 0, 0, 0, 0)] after or on NullStartIvl
-define NullStartStartBeforeIvl: NullStartIvl after or on Interval[DateTime(2012, 4, 1, 0, 0, 0, 0), DateTime(2012, 4, 20, 0, 0, 0, 0)]
-define NullStartStartAfterIvl: NullStartIvl after or on Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 20, 0, 0, 0, 0)]
-define DateIvlBeforeNull: DateIvl after or on null
-define NullBeforeDateIvl: null after or on DateIvl
-define DateTimeBeforeDateIvl: DateTime(2012, 2, 20, 0, 0, 0, 0) after or on DateIvl
-define DateBeforeDateIvl: Date(2012, 2, 20) after or on DateIvl
-define DateIvlBeforeDateTime: DateIvl after or on DateTime(2012, 9, 20, 0, 0, 0, 0)
-define DateIvlBeforeDate: DateIvl after or on DateTime(2012, 9, 20)
-define DateOnlyIvl: Interval[Date(2012, 1, 1), Date(2012, 2, 20)]
-define DateOnlyIvlBeforeDateIvl: DateOnlyIvl after or on DateIvl
-define DateIvlAfterDateOnlyIvl: DateIvl after or on DateOnlyIvl
-define DateOnlyMeetsAfterDateIvl: Interval[Date(2012, 9, 1), Date(2012, 10, 1)] after or on DateIvl
-*/
-
-module.exports['AfterOrOn'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "1983",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "1665",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndMeetsAfterLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "1665",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "PosInfEndMeetsAfterLongIvl", ": " ]
             }, {
+              "r" : "1677",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "1668",
+                "s" : [ {
+                  "r" : "1666",
+                  "value" : [ "Interval[", "100L", ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "1677",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1674",
+                "s" : [ {
+                  "r" : "1672",
+                  "value" : [ "Interval[", "0L", ", ", "99L", "]" ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "Meets",
+          "localId" : "1677",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1678",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1679",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1680",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1681",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1668",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1670",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1671",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1666",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1669",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1667",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1674",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1675",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1676",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1672",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1673",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "99",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "214",
-        "name" : "DateIvl",
+        "localId" : "1684",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndNotMeetsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "1684",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotMeetsLongIvl", ": " ]
             }, {
-              "r" : "263",
+              "r" : "1696",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "231",
+                "r" : "1687",
                 "s" : [ {
-                  "r" : "215",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1685",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "r" : "1696",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "255",
+                "r" : "1693",
                 "s" : [ {
-                  "r" : "239",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "1691",
+                  "value" : [ "Interval[", "1000L", ", ", "2000L", "]" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "266",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "267",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "263",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Meets",
+          "localId" : "1696",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
+            "localId" : "1697",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "265",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1698",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "231",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1699",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "232",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "233",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "234",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "235",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "236",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "237",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "238",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "localId" : "1700",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1687",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1689",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1690",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1685",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "219",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "As",
+              "localId" : "1688",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1686",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1693",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1694",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1695",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "1691",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1000",
               "annotation" : [ ]
             },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "1692",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2000",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "255",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "256",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "257",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "258",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "259",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "260",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1703",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIvlNotMeetsPosInfEnd",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1703",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIvlNotMeetsPosInfEnd", ": " ]
             }, {
+              "r" : "1715",
+              "s" : [ {
+                "r" : "1706",
+                "s" : [ {
+                  "r" : "1704",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
+                } ]
+              }, {
+                "r" : "1715",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1711",
+                "s" : [ {
+                  "r" : "1709",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1715",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1716",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "261",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1717",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
-            }, {
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1718",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "262",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "240",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "241",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "localId" : "1719",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1706",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1707",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1708",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "242",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "1704",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
               "annotation" : [ ]
             },
-            "minute" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "243",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "1705",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
               "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1711",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1713",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1714",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "244",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1709",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "245",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "As",
+              "localId" : "1712",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1710",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "270",
+        "localId" : "1722",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterDateIvl",
+        "name" : "UnknownEndMeetsAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "270",
+            "r" : "1722",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMeetsAfterLongIvl", ": " ]
             }, {
-              "r" : "325",
+              "r" : "1734",
               "s" : [ {
-                "r" : "319",
+                "r" : "1725",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "287",
-                  "s" : [ {
-                    "r" : "271",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "311",
-                  "s" : [ {
-                    "r" : "295",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1723",
+                  "value" : [ "Interval[", "100L", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "325",
-                "value" : [ " ", "after or on", " " ]
+                "r" : "1734",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "322",
+                "r" : "1731",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1729",
+                  "value" : [ "Interval[", "0L", ", ", "99L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "325",
+          "type" : "Meets",
+          "localId" : "1734",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "326",
+            "localId" : "1735",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "327",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1736",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "328",
+            "localId" : "1737",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "329",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1738",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "319",
+            "localId" : "1725",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "320",
+              "localId" : "1727",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "321",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1728",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "287",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "288",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "289",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "290",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "291",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "292",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "293",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "294",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "271",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "272",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "273",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "274",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "275",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "276",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "277",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1723",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "311",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1726",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "312",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "313",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "314",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "315",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "316",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "317",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "318",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "295",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "296",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "297",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "298",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "299",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "300",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "301",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1724",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "322",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1731",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "323",
+              "localId" : "1732",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "324",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1733",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1729",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1730",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "99",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "332",
+        "localId" : "1741",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeDateIvl",
+        "name" : "UnknownEndMayMeetBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "332",
+            "r" : "1741",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayMeetBeforeLongIvl", ": " ]
             }, {
-              "r" : "387",
+              "r" : "1753",
               "s" : [ {
-                "r" : "381",
+                "r" : "1744",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "349",
-                  "s" : [ {
-                    "r" : "333",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "373",
-                  "s" : [ {
-                    "r" : "357",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1742",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "1753",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1750",
+                "s" : [ {
+                  "r" : "1748",
+                  "value" : [ "Interval[", "50L", ", ", "100L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "1753",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1754",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1755",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1756",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1757",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1744",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1746",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1747",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1742",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1745",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1743",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1750",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1751",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1752",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1748",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "50",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1749",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1760",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndNotMeetsLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1760",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndNotMeetsLongIvl", ": " ]
+            }, {
+              "r" : "1772",
+              "s" : [ {
+                "r" : "1763",
+                "s" : [ {
+                  "r" : "1761",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "387",
-                "value" : [ " ", "after or on", " " ]
+                "r" : "1772",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "384",
+                "r" : "1769",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1767",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "387",
+          "type" : "Meets",
+          "localId" : "1772",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "388",
+            "localId" : "1773",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "389",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1774",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "390",
+            "localId" : "1775",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "391",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1776",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "381",
+            "localId" : "1763",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "382",
+              "localId" : "1765",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "383",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1766",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "349",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "350",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "351",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "352",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "353",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "354",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "355",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "356",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "333",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "334",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "335",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "336",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "337",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "338",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "339",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1761",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "373",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1764",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "374",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "375",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "376",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "377",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "378",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "379",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "380",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "357",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "358",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "359",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "360",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "361",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "362",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "363",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1762",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "384",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "1769",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "385",
+              "localId" : "1770",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "386",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1771",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1767",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1768",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "394",
+        "localId" : "1779",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterDateIvl",
+        "name" : "LongIvlMayMeetAfterUnknownEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "394",
+            "r" : "1779",
             "s" : [ {
-              "value" : [ "", "define ", "AfterDateIvl", ": " ]
+              "value" : [ "", "define ", "LongIvlMayMeetAfterUnknownEnd", ": " ]
             }, {
-              "r" : "449",
+              "r" : "1793",
               "s" : [ {
-                "r" : "443",
+                "r" : "1782",
+                "s" : [ {
+                  "r" : "1780",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
+                } ]
+              }, {
+                "r" : "1793",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1789",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "411",
-                  "s" : [ {
-                    "r" : "395",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "11", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "435",
+                  "r" : "1785",
                   "s" : [ {
-                    "r" : "419",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1786",
+                    "value" : [ "-", "100L" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "449",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "446",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1788",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "449",
+          "type" : "Meets",
+          "localId" : "1793",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "450",
+            "localId" : "1794",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "451",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1795",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "452",
+            "localId" : "1796",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "453",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1797",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "443",
+            "localId" : "1782",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "444",
+              "localId" : "1783",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "445",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1784",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "411",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1780",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1781",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1789",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1791",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "412",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "413",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "414",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "415",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "416",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "417",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "418",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "395",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "396",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "397",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "11",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "398",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "399",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "400",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "401",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1792",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "435",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "low" : {
+              "type" : "Negate",
+              "localId" : "1785",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "436",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "437",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "438",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "439",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "440",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "441",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "442",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1787",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "419",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "420",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "421",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "29",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "422",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "423",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "424",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "425",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1786",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "446",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "447",
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1790",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "448",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1788",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "456",
+        "localId" : "1800",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "BeforeDateIvl",
+        "name" : "NegInfBegMeetsBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "456",
+            "r" : "1800",
             "s" : [ {
-              "value" : [ "", "define ", "BeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegMeetsBeforeDateIvl", ": " ]
             }, {
-              "r" : "511",
+              "r" : "1881",
               "s" : [ {
-                "r" : "505",
+                "r" : "1826",
+                "s" : [ {
+                  "r" : "1801",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "1818",
+                  "s" : [ {
+                    "r" : "1802",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "1881",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "1878",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "473",
+                  "r" : "1846",
                   "s" : [ {
-                    "r" : "457",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1830",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "497",
+                  "r" : "1870",
                   "s" : [ {
-                    "r" : "481",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1854",
+                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "511",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "508",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "511",
+          "type" : "Meets",
+          "localId" : "1881",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "512",
+            "localId" : "1882",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "513",
+              "localId" : "1883",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "514",
+            "localId" : "1884",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "515",
+              "localId" : "1885",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "505",
+            "localId" : "1826",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "506",
+              "localId" : "1828",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "507",
+                "localId" : "1829",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "1827",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1801",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "473",
+              "localId" : "1818",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "474",
+                "localId" : "1819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "475",
+                "localId" : "1820",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "476",
+                "localId" : "1821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "477",
+                "localId" : "1822",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "478",
+                "localId" : "1823",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "479",
+                "localId" : "1824",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "480",
+                "localId" : "1825",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "457",
+                "localId" : "1802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "458",
+                "localId" : "1803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -91261,7 +120879,7 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "459",
+                "localId" : "1804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -91269,7 +120887,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "460",
+                "localId" : "1805",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -91277,7 +120895,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "461",
+                "localId" : "1806",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -91285,7 +120903,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "462",
+                "localId" : "1807",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -91293,81 +120911,98 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "463",
+                "localId" : "1808",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1878",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1879",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1880",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "high" : {
+            "low" : {
               "type" : "DateTime",
-              "localId" : "497",
+              "localId" : "1846",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "498",
+                "localId" : "1847",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "499",
+                "localId" : "1848",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "500",
+                "localId" : "1849",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "501",
+                "localId" : "1850",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "502",
+                "localId" : "1851",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "503",
+                "localId" : "1852",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "504",
+                "localId" : "1853",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "481",
+                "localId" : "1830",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "482",
+                "localId" : "1831",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "483",
+                "localId" : "1832",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "29",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "484",
+                "localId" : "1833",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -91375,7 +121010,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "485",
+                "localId" : "1834",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -91383,7 +121018,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "486",
+                "localId" : "1835",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -91391,421 +121026,162 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "487",
+                "localId" : "1836",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "508",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "509",
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1870",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "510",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1871",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "518",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetAfterImpreciseDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "518",
-            "s" : [ {
-              "value" : [ "", "define ", "MayMeetAfterImpreciseDateIvl", ": " ]
-            }, {
-              "r" : "543",
-              "s" : [ {
-                "r" : "519",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              }, {
-                "r" : "543",
-                "value" : [ " ", "after or on", " " ]
               }, {
-                "r" : "540",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "528",
-                  "s" : [ {
-                    "r" : "522",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "537",
-                  "s" : [ {
-                    "r" : "531",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "543",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "544",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "545",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "546",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "547",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "519",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "520",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "521",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1872",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "540",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "541",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "542",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1873",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "528",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "529",
+                "localId" : "1874",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "530",
+                "localId" : "1875",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "522",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "523",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "537",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "538",
+                "localId" : "1876",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "539",
+                "localId" : "1877",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "531",
+                "localId" : "1854",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2030",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "532",
+                "localId" : "1855",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "550",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetBeforeImpreciseDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "550",
-            "s" : [ {
-              "value" : [ "", "define ", "MayMeetBeforeImpreciseDateIvl", ": " ]
-            }, {
-              "r" : "575",
-              "s" : [ {
-                "r" : "551",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              }, {
-                "r" : "575",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "572",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "560",
-                  "s" : [ {
-                    "r" : "554",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "569",
-                  "s" : [ {
-                    "r" : "563",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "575",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "576",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "577",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "578",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "579",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "551",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "552",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "553",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "572",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "573",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "574",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "560",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "561",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "562",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1856",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "hour" : {
                 "type" : "Literal",
-                "localId" : "554",
+                "localId" : "1857",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "month" : {
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "555",
+                "localId" : "1858",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "569",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "570",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "571",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "second" : {
                 "type" : "Literal",
-                "localId" : "563",
+                "localId" : "1859",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "month" : {
+              "millisecond" : {
                 "type" : "Literal",
-                "localId" : "564",
+                "localId" : "1860",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "582",
+        "localId" : "1888",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsImpreciseDateIvl",
+        "name" : "NegInfBegNotMeetsDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "582",
+            "r" : "1888",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "607",
+              "r" : "1969",
               "s" : [ {
-                "r" : "583",
+                "r" : "1914",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "1889",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "1906",
+                  "s" : [ {
+                    "r" : "1890",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "607",
-                "value" : [ " ", "after or on", " " ]
+                "r" : "1969",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "604",
+                "r" : "1966",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "592",
+                  "r" : "1934",
                   "s" : [ {
-                    "r" : "586",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "1918",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "601",
+                  "r" : "1958",
                   "s" : [ {
-                    "r" : "595",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                    "r" : "1942",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -91815,553 +121191,228 @@ module.exports['AfterOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "607",
+          "type" : "Meets",
+          "localId" : "1969",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "608",
+            "localId" : "1970",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "609",
+              "localId" : "1971",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "610",
+            "localId" : "1972",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "611",
+              "localId" : "1973",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "583",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "584",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "585",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "604",
+            "localId" : "1914",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "605",
+              "localId" : "1916",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "606",
+                "localId" : "1917",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "1915",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1889",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "592",
+              "localId" : "1906",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "593",
+                "localId" : "1907",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "594",
+                "localId" : "1908",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1909",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1910",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1911",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1912",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1913",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "586",
+                "localId" : "1890",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "587",
+                "localId" : "1891",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "601",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "602",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1892",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "603",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1893",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "595",
+                "localId" : "1894",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "month" : {
+              "second" : {
                 "type" : "Literal",
-                "localId" : "596",
+                "localId" : "1895",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "0",
                 "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "614",
-        "name" : "PrecisionDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "614",
-            "s" : [ {
-              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
-            }, {
-              "r" : "663",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "631",
-                "s" : [ {
-                  "r" : "615",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "655",
-                "s" : [ {
-                  "r" : "639",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "666",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "667",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "663",
-          "lowClosed" : true,
-          "highClosed" : false,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "664",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "665",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "631",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "632",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "633",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "634",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "635",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "636",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "637",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "638",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "615",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "616",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "617",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "618",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "619",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "34",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "620",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "56",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "621",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "789",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "655",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "656",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "657",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "658",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "659",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "660",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "661",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "662",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "639",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "640",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "641",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "642",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "643",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "644",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "45",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "645",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "678",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "670",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterDayOfIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "670",
-            "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterDayOfIvl", ": " ]
-            }, {
-              "r" : "725",
-              "s" : [ {
-                "r" : "671",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "725",
-                "value" : [ " ", "after or on day of", " " ]
-              }, {
-                "r" : "722",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "690",
-                  "s" : [ {
-                    "r" : "674",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "714",
-                  "s" : [ {
-                    "r" : "698",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "725",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "726",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "727",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "728",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "729",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "671",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "672",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "673",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1896",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "722",
+            "localId" : "1966",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "723",
+              "localId" : "1967",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "724",
+                "localId" : "1968",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "690",
+              "localId" : "1934",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "691",
+                "localId" : "1935",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "692",
+                "localId" : "1936",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "693",
+                "localId" : "1937",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "694",
+                "localId" : "1938",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "695",
+                "localId" : "1939",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "696",
+                "localId" : "1940",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "697",
+                "localId" : "1941",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "674",
+                "localId" : "1918",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "675",
+                "localId" : "1919",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -92369,15 +121420,15 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "676",
+                "localId" : "1920",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "677",
+                "localId" : "1921",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92385,7 +121436,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "678",
+                "localId" : "1922",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92393,7 +121444,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "679",
+                "localId" : "1923",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92401,7 +121452,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "680",
+                "localId" : "1924",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92410,72 +121461,72 @@ module.exports['AfterOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "714",
+              "localId" : "1958",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "715",
+                "localId" : "1959",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "716",
+                "localId" : "1960",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "717",
+                "localId" : "1961",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "718",
+                "localId" : "1962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "719",
+                "localId" : "1963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "720",
+                "localId" : "1964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "721",
+                "localId" : "1965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "698",
+                "localId" : "1942",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "699",
+                "localId" : "1943",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "700",
+                "localId" : "1944",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "701",
+                "localId" : "1945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92483,7 +121534,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "702",
+                "localId" : "1946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92491,7 +121542,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "703",
+                "localId" : "1947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92499,7 +121550,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "704",
+                "localId" : "1948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92509,181 +121560,173 @@ module.exports['AfterOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "732",
+        "localId" : "1976",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeDayOfIvl",
+        "name" : "DateIvlNotMeetsNegInfBeg",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "732",
+            "r" : "1976",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeDayOfIvl", ": " ]
+              "value" : [ "", "define ", "DateIvlNotMeetsNegInfBeg", ": " ]
             }, {
-              "r" : "787",
+              "r" : "2057",
               "s" : [ {
-                "r" : "733",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "787",
-                "value" : [ " ", "after or on day of", " " ]
-              }, {
-                "r" : "784",
+                "r" : "2025",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "752",
+                  "r" : "1993",
                   "s" : [ {
-                    "r" : "736",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1977",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "776",
+                  "r" : "2017",
                   "s" : [ {
-                    "r" : "760",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2001",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "2057",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "2053",
+                "s" : [ {
+                  "r" : "2028",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "2045",
+                  "s" : [ {
+                    "r" : "2029",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "787",
+          "type" : "Meets",
+          "localId" : "2057",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "788",
+            "localId" : "2058",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "789",
+              "localId" : "2059",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "790",
+            "localId" : "2060",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "791",
+              "localId" : "2061",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "733",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "734",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "735",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "784",
+            "localId" : "2025",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "785",
+              "localId" : "2026",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "786",
+                "localId" : "2027",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "752",
+              "localId" : "1993",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "753",
+                "localId" : "1994",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "754",
+                "localId" : "1995",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "755",
+                "localId" : "1996",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "756",
+                "localId" : "1997",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "757",
+                "localId" : "1998",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "758",
+                "localId" : "1999",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "759",
+                "localId" : "2000",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "736",
+                "localId" : "1977",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "737",
+                "localId" : "1978",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "738",
+                "localId" : "1979",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "739",
+                "localId" : "1980",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92691,7 +121734,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "740",
+                "localId" : "1981",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92699,7 +121742,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "741",
+                "localId" : "1982",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92707,7 +121750,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "742",
+                "localId" : "1983",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92716,64 +121759,64 @@ module.exports['AfterOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "776",
+              "localId" : "2017",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "777",
+                "localId" : "2018",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "778",
+                "localId" : "2019",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "779",
+                "localId" : "2020",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "780",
+                "localId" : "2021",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "781",
+                "localId" : "2022",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "782",
+                "localId" : "2023",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "783",
+                "localId" : "2024",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "760",
+                "localId" : "2001",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "761",
+                "localId" : "2002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "762",
+                "localId" : "2003",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -92781,7 +121824,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "763",
+                "localId" : "2004",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92789,7 +121832,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "764",
+                "localId" : "2005",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92797,7 +121840,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "765",
+                "localId" : "2006",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92805,7 +121848,135 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "766",
+                "localId" : "2007",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2053",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2055",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2056",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "2054",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2028",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2045",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2046",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2047",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2048",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2049",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2050",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2051",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2052",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2029",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2030",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2031",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2032",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2033",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2034",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2035",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92815,45 +121986,54 @@ module.exports['AfterOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "794",
+        "localId" : "2064",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsDayOfIvl",
+        "name" : "UnknownBegMeetsBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "794",
+            "r" : "2064",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsDayOfIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMeetsBeforeDateIvl", ": " ]
             }, {
-              "r" : "849",
+              "r" : "2145",
               "s" : [ {
-                "r" : "795",
+                "r" : "2090",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "2065",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2082",
+                  "s" : [ {
+                    "r" : "2066",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "849",
-                "value" : [ " ", "after or on day of", " " ]
+                "r" : "2145",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "846",
+                "r" : "2142",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "814",
+                  "r" : "2110",
                   "s" : [ {
-                    "r" : "798",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2094",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "838",
+                  "r" : "2134",
                   "s" : [ {
-                    "r" : "822",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2118",
+                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -92863,117 +122043,228 @@ module.exports['AfterOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "849",
+          "type" : "Meets",
+          "localId" : "2145",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "850",
+            "localId" : "2146",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "851",
+              "localId" : "2147",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "852",
+            "localId" : "2148",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "853",
+              "localId" : "2149",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "795",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "2090",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "796",
+              "localId" : "2092",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "797",
+                "localId" : "2093",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "2091",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2065",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2082",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2083",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2084",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2085",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2086",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2087",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2088",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2089",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2066",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2067",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2068",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2069",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2070",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2071",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2072",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "846",
+            "localId" : "2142",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "847",
+              "localId" : "2143",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "848",
+                "localId" : "2144",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "814",
+              "localId" : "2110",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "815",
+                "localId" : "2111",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "816",
+                "localId" : "2112",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "817",
+                "localId" : "2113",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "818",
+                "localId" : "2114",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "819",
+                "localId" : "2115",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "820",
+                "localId" : "2116",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "821",
+                "localId" : "2117",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "798",
+                "localId" : "2094",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "799",
+                "localId" : "2095",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -92981,15 +122272,15 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "800",
+                "localId" : "2096",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "801",
+                "localId" : "2097",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -92997,7 +122288,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "802",
+                "localId" : "2098",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93005,7 +122296,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "803",
+                "localId" : "2099",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93013,7 +122304,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "804",
+                "localId" : "2100",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93022,72 +122313,72 @@ module.exports['AfterOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "838",
+              "localId" : "2134",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "839",
+                "localId" : "2135",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "840",
+                "localId" : "2136",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "841",
+                "localId" : "2137",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "842",
+                "localId" : "2138",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "843",
+                "localId" : "2139",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "844",
+                "localId" : "2140",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "845",
+                "localId" : "2141",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "822",
+                "localId" : "2118",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2030",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "823",
+                "localId" : "2119",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "824",
+                "localId" : "2120",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "825",
+                "localId" : "2121",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93095,7 +122386,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "826",
+                "localId" : "2122",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93103,7 +122394,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "827",
+                "localId" : "2123",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93111,7 +122402,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "828",
+                "localId" : "2124",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93121,45 +122412,54 @@ module.exports['AfterOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "856",
+        "localId" : "2152",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsDayOfImpreciseIVL",
+        "name" : "UnknownBegMayMeetAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "856",
+            "r" : "2152",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsDayOfImpreciseIVL", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayMeetAfterDateIvl", ": " ]
             }, {
-              "r" : "881",
+              "r" : "2233",
               "s" : [ {
-                "r" : "857",
+                "r" : "2178",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "2153",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2170",
+                  "s" : [ {
+                    "r" : "2154",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "881",
-                "value" : [ " ", "after or on day of", " " ]
+                "r" : "2233",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "878",
+                "r" : "2230",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "866",
+                  "r" : "2198",
                   "s" : [ {
-                    "r" : "860",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "2182",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "875",
+                  "r" : "2222",
                   "s" : [ {
-                    "r" : "869",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                    "r" : "2206",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -93169,349 +122469,423 @@ module.exports['AfterOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "881",
+          "type" : "Meets",
+          "localId" : "2233",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "882",
+            "localId" : "2234",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "883",
+              "localId" : "2235",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "884",
+            "localId" : "2236",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "885",
+              "localId" : "2237",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "857",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "2178",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "858",
+              "localId" : "2180",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "859",
+                "localId" : "2181",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "878",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "879",
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "2179",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "880",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2153",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
-            "low" : {
+            "high" : {
               "type" : "DateTime",
-              "localId" : "866",
+              "localId" : "2170",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "867",
+                "localId" : "2171",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "868",
+                "localId" : "2172",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2173",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2174",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2175",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2176",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2177",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "860",
+                "localId" : "2154",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "861",
+                "localId" : "2155",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "875",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "876",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2156",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "877",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2157",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "869",
+                "localId" : "2158",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "month" : {
+              "second" : {
                 "type" : "Literal",
-                "localId" : "870",
+                "localId" : "2159",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "0",
                 "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "888",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetAfterDayOfImpreciseIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "888",
-            "s" : [ {
-              "value" : [ "", "define ", "MayMeetAfterDayOfImpreciseIvl", ": " ]
-            }, {
-              "r" : "913",
-              "s" : [ {
-                "r" : "889",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "913",
-                "value" : [ " ", "after or on day of", " " ]
-              }, {
-                "r" : "910",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "898",
-                  "s" : [ {
-                    "r" : "892",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "907",
-                  "s" : [ {
-                    "r" : "901",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "913",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "914",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "915",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "916",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "917",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "889",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "890",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "891",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2160",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "910",
+            "localId" : "2230",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "911",
+              "localId" : "2231",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "912",
+                "localId" : "2232",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "898",
+              "localId" : "2198",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "899",
+                "localId" : "2199",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "900",
+                "localId" : "2200",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2201",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2202",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2203",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2204",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2205",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "892",
+                "localId" : "2182",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "893",
+                "localId" : "2183",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2184",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2185",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2186",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2187",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2188",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "907",
+              "localId" : "2222",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "908",
+                "localId" : "2223",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "909",
+                "localId" : "2224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2225",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2226",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2227",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2228",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2229",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "901",
+                "localId" : "2206",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "902",
+                "localId" : "2207",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2208",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2209",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2210",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2211",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2212",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "920",
+        "localId" : "2240",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetBeforeDayOfImpreciseIvl",
+        "name" : "UnknownBegNotMeetsDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "920",
+            "r" : "2240",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetBeforeDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "945",
+              "r" : "2321",
               "s" : [ {
-                "r" : "921",
+                "r" : "2266",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "2241",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2258",
+                  "s" : [ {
+                    "r" : "2242",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "945",
-                "value" : [ " ", "after or on day of", " " ]
+                "r" : "2321",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "942",
+                "r" : "2318",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "930",
+                  "r" : "2286",
                   "s" : [ {
-                    "r" : "924",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                    "r" : "2270",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "939",
+                  "r" : "2310",
                   "s" : [ {
-                    "r" : "933",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                    "r" : "2294",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -93521,423 +122895,228 @@ module.exports['AfterOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "945",
+          "type" : "Meets",
+          "localId" : "2321",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "946",
+            "localId" : "2322",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "947",
+              "localId" : "2323",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "948",
+            "localId" : "2324",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "949",
+              "localId" : "2325",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "921",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "2266",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "922",
+              "localId" : "2268",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "923",
+                "localId" : "2269",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "942",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "943",
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "2267",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "944",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2241",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
-            "low" : {
+            "high" : {
               "type" : "DateTime",
-              "localId" : "930",
+              "localId" : "2258",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "931",
+                "localId" : "2259",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "932",
+                "localId" : "2260",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2261",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2262",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2263",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2264",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2265",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "924",
+                "localId" : "2242",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "925",
+                "localId" : "2243",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "939",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "940",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2244",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "941",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2245",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "933",
+                "localId" : "2246",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "month" : {
+              "second" : {
                 "type" : "Literal",
-                "localId" : "934",
+                "localId" : "2247",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "0",
                 "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "952",
-        "name" : "ImpDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "952",
-            "s" : [ {
-              "value" : [ "", "define ", "ImpDateIvl", ": " ]
-            }, {
-              "r" : "971",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "959",
-                "s" : [ {
-                  "r" : "953",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "968",
-                "s" : [ {
-                  "r" : "962",
-                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
-                } ]
-              }, {
-                "value" : [ "]" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "974",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "975",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "971",
-          "lowClosed" : true,
-          "highClosed" : true,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "972",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "973",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "959",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "960",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "961",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "953",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "954",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "968",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "969",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "970",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "962",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "963",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "978",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayMeetAfterDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "978",
-            "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayMeetAfterDateIvl", ": " ]
-            }, {
-              "r" : "1033",
-              "s" : [ {
-                "r" : "979",
-                "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
-                } ]
-              }, {
-                "r" : "1033",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "1030",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "998",
-                  "s" : [ {
-                    "r" : "982",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1022",
-                  "s" : [ {
-                    "r" : "1006",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1033",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1034",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1035",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1036",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1037",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "979",
-            "name" : "ImpDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "980",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "981",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2248",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1030",
+            "localId" : "2318",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1031",
+              "localId" : "2319",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1032",
+                "localId" : "2320",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "998",
+              "localId" : "2286",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "999",
+                "localId" : "2287",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1000",
+                "localId" : "2288",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1001",
+                "localId" : "2289",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1002",
+                "localId" : "2290",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1003",
+                "localId" : "2291",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1004",
+                "localId" : "2292",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1005",
+                "localId" : "2293",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "982",
+                "localId" : "2270",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "983",
+                "localId" : "2271",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -93945,7 +123124,7 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "984",
+                "localId" : "2272",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -93953,7 +123132,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "985",
+                "localId" : "2273",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93961,7 +123140,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "986",
+                "localId" : "2274",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93969,7 +123148,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "987",
+                "localId" : "2275",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93977,7 +123156,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "988",
+                "localId" : "2276",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -93986,271 +123165,264 @@ module.exports['AfterOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1022",
+              "localId" : "2310",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1023",
+                "localId" : "2311",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1024",
+                "localId" : "2312",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1025",
+                "localId" : "2313",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1026",
+                "localId" : "2314",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1027",
+                "localId" : "2315",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1028",
+                "localId" : "2316",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1029",
+                "localId" : "2317",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1006",
+                "localId" : "2294",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1007",
+                "localId" : "2295",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1008",
+                "localId" : "2296",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "29",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1009",
+                "localId" : "2297",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1010",
+                "localId" : "2298",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1011",
+                "localId" : "2299",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1012",
+                "localId" : "2300",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1040",
+        "localId" : "2328",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayMeetBeforeDateIvl",
+        "name" : "DateIvlMayMeetBeforeUnknownBeg",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1040",
+            "r" : "2328",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayMeetBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "DateIvlMayMeetBeforeUnknownBeg", ": " ]
             }, {
-              "r" : "1095",
+              "r" : "2409",
               "s" : [ {
-                "r" : "1041",
-                "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
-                } ]
-              }, {
-                "r" : "1095",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "1092",
+                "r" : "2377",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1060",
+                  "r" : "2345",
                   "s" : [ {
-                    "r" : "1044",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2329",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1084",
+                  "r" : "2369",
                   "s" : [ {
-                    "r" : "1068",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "2353",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "2409",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "2405",
+                "s" : [ {
+                  "r" : "2380",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2397",
+                  "s" : [ {
+                    "r" : "2381",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1095",
+          "type" : "Meets",
+          "localId" : "2409",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1096",
+            "localId" : "2410",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1097",
+              "localId" : "2411",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1098",
+            "localId" : "2412",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1099",
+              "localId" : "2413",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1041",
-            "name" : "ImpDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1042",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1043",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "1092",
+            "localId" : "2377",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1093",
+              "localId" : "2378",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1094",
+                "localId" : "2379",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1060",
+              "localId" : "2345",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1061",
+                "localId" : "2346",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1062",
+                "localId" : "2347",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1063",
+                "localId" : "2348",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1064",
+                "localId" : "2349",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1065",
+                "localId" : "2350",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1066",
+                "localId" : "2351",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1067",
+                "localId" : "2352",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1044",
+                "localId" : "2329",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1045",
+                "localId" : "2330",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1046",
+                "localId" : "2331",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -94258,7 +123430,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1047",
+                "localId" : "2332",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -94266,7 +123438,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1048",
+                "localId" : "2333",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -94274,7 +123446,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1049",
+                "localId" : "2334",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -94282,7 +123454,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1050",
+                "localId" : "2335",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -94291,263 +123463,184 @@ module.exports['AfterOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1084",
+              "localId" : "2369",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1085",
+                "localId" : "2370",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1086",
+                "localId" : "2371",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1087",
+                "localId" : "2372",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1088",
+                "localId" : "2373",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1089",
+                "localId" : "2374",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1090",
+                "localId" : "2375",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1091",
+                "localId" : "2376",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1068",
+                "localId" : "2353",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1069",
+                "localId" : "2354",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1070",
+                "localId" : "2355",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1071",
+                "localId" : "2356",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1072",
+                "localId" : "2357",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1073",
+                "localId" : "2358",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1074",
+                "localId" : "2359",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1102",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseNotMeetsDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1102",
-            "s" : [ {
-              "value" : [ "", "define ", "ImpreciseNotMeetsDateIvl", ": " ]
-            }, {
-              "r" : "1157",
-              "s" : [ {
-                "r" : "1103",
-                "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
-                } ]
-              }, {
-                "r" : "1157",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "1154",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1122",
-                  "s" : [ {
-                    "r" : "1106",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1146",
-                  "s" : [ {
-                    "r" : "1130",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1157",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1158",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1159",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1160",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1161",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1103",
-            "name" : "ImpDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1104",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1105",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1154",
-            "lowClosed" : true,
+            "localId" : "2405",
+            "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1155",
+              "localId" : "2407",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1156",
+                "localId" : "2408",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2406",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2380",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "1122",
+              "localId" : "2397",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1123",
+                "localId" : "2398",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1124",
+                "localId" : "2399",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1125",
+                "localId" : "2400",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1126",
+                "localId" : "2401",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1127",
+                "localId" : "2402",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1128",
+                "localId" : "2403",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1129",
+                "localId" : "2404",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1106",
+                "localId" : "2381",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1107",
+                "localId" : "2382",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -94555,7 +123648,7 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1108",
+                "localId" : "2383",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -94563,7 +123656,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1109",
+                "localId" : "2384",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -94571,7 +123664,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1110",
+                "localId" : "2385",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -94579,7 +123672,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1111",
+                "localId" : "2386",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -94587,425 +123680,295 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1112",
+                "localId" : "2387",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2416",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndMeetsAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2416",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndMeetsAfterDateIvl", ": " ]
+            }, {
+              "r" : "2497",
+              "s" : [ {
+                "r" : "2442",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2433",
+                  "s" : [ {
+                    "r" : "2417",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2441",
+                  "value" : [ ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "2497",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "2494",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2462",
+                  "s" : [ {
+                    "r" : "2446",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2486",
+                  "s" : [ {
+                    "r" : "2470",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "2497",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2498",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2499",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2500",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2501",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2442",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2444",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2445",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "high" : {
+            "low" : {
               "type" : "DateTime",
-              "localId" : "1146",
+              "localId" : "2433",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1147",
+                "localId" : "2434",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1148",
+                "localId" : "2435",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1149",
+                "localId" : "2436",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1150",
+                "localId" : "2437",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1151",
+                "localId" : "2438",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1152",
+                "localId" : "2439",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1153",
+                "localId" : "2440",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1130",
+                "localId" : "2417",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1131",
+                "localId" : "2418",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1132",
+                "localId" : "2419",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1133",
+                "localId" : "2420",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1134",
+                "localId" : "2421",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1135",
+                "localId" : "2422",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1136",
+                "localId" : "2423",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1164",
-        "name" : "NullEndIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1164",
-            "s" : [ {
-              "value" : [ "", "define ", "NullEndIvl", ": " ]
-            }, {
-              "r" : "1190",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "1181",
-                "s" : [ {
-                  "r" : "1165",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "r" : "1189",
-                "value" : [ ", ", "null", ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1194",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1195",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "1190",
-          "lowClosed" : true,
-          "highClosed" : false,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1192",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1193",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "1181",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1182",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1183",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1184",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1185",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1186",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1187",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1188",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1165",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1166",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1167",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1168",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1169",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1170",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1171",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "As",
-            "localId" : "1191",
-            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1189",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "1198",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "BeforeNullEndIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1198",
-            "s" : [ {
-              "value" : [ "", "define ", "BeforeNullEndIvl", ": " ]
-            }, {
-              "r" : "1253",
-              "s" : [ {
-                "r" : "1247",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1215",
-                  "s" : [ {
-                    "r" : "1199",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1239",
-                  "s" : [ {
-                    "r" : "1223",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "r" : "1253",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "1250",
-                "s" : [ {
-                  "value" : [ "NullEndIvl" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1253",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1254",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1255",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "As",
+              "localId" : "2443",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2441",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1256",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1257",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1247",
+            "localId" : "2494",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1248",
+              "localId" : "2495",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1249",
+                "localId" : "2496",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1215",
+              "localId" : "2462",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1216",
+                "localId" : "2463",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1217",
+                "localId" : "2464",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1218",
+                "localId" : "2465",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1219",
+                "localId" : "2466",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1220",
+                "localId" : "2467",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1221",
+                "localId" : "2468",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1222",
+                "localId" : "2469",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1199",
+                "localId" : "2446",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1200",
+                "localId" : "2447",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -95013,7 +123976,7 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1201",
+                "localId" : "2448",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -95021,7 +123984,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1202",
+                "localId" : "2449",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95029,7 +123992,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1203",
+                "localId" : "2450",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95037,7 +124000,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1204",
+                "localId" : "2451",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95045,7 +124008,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1205",
+                "localId" : "2452",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95054,72 +124017,72 @@ module.exports['AfterOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1239",
+              "localId" : "2486",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1240",
+                "localId" : "2487",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1241",
+                "localId" : "2488",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1242",
+                "localId" : "2489",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1243",
+                "localId" : "2490",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1244",
+                "localId" : "2491",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1245",
+                "localId" : "2492",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1246",
+                "localId" : "2493",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1223",
+                "localId" : "2470",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1224",
+                "localId" : "2471",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1225",
+                "localId" : "2472",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1226",
+                "localId" : "2473",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95127,7 +124090,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1227",
+                "localId" : "2474",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95135,7 +124098,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1228",
+                "localId" : "2475",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95143,190 +124106,183 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1229",
+                "localId" : "2476",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1250",
-            "name" : "NullEndIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1251",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1252",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "1260",
+        "localId" : "2504",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterStartNullEndIvl",
+        "name" : "PosInfEndNotMeetsDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1260",
+            "r" : "2504",
             "s" : [ {
-              "value" : [ "", "define ", "AfterStartNullEndIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "1315",
+              "r" : "2585",
               "s" : [ {
-                "r" : "1309",
+                "r" : "2530",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1277",
+                  "r" : "2521",
                   "s" : [ {
-                    "r" : "1261",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2505",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2529",
+                  "value" : [ ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "2585",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "2582",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2550",
+                  "s" : [ {
+                    "r" : "2534",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1301",
+                  "r" : "2574",
                   "s" : [ {
-                    "r" : "1285",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2558",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
-              }, {
-                "r" : "1315",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "1312",
-                "s" : [ {
-                  "value" : [ "NullEndIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1315",
+          "type" : "Meets",
+          "localId" : "2585",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1316",
+            "localId" : "2586",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1317",
+              "localId" : "2587",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1318",
+            "localId" : "2588",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1319",
+              "localId" : "2589",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1309",
+            "localId" : "2530",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1310",
+              "localId" : "2532",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1311",
+                "localId" : "2533",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1277",
+              "localId" : "2521",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1278",
+                "localId" : "2522",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1279",
+                "localId" : "2523",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1280",
+                "localId" : "2524",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1281",
+                "localId" : "2525",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1282",
+                "localId" : "2526",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1283",
+                "localId" : "2527",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1284",
+                "localId" : "2528",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1261",
+                "localId" : "2505",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1262",
+                "localId" : "2506",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1263",
+                "localId" : "2507",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1264",
+                "localId" : "2508",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95334,7 +124290,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1265",
+                "localId" : "2509",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95342,7 +124298,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1266",
+                "localId" : "2510",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95350,7 +124306,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1267",
+                "localId" : "2511",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95358,73 +124314,103 @@ module.exports['AfterOrOn'] = {
               }
             },
             "high" : {
+              "type" : "As",
+              "localId" : "2531",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2529",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2582",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2583",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2584",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "DateTime",
-              "localId" : "1301",
+              "localId" : "2550",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1302",
+                "localId" : "2551",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1303",
+                "localId" : "2552",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1304",
+                "localId" : "2553",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1305",
+                "localId" : "2554",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1306",
+                "localId" : "2555",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1307",
+                "localId" : "2556",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1308",
+                "localId" : "2557",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1285",
+                "localId" : "2534",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1286",
+                "localId" : "2535",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1287",
+                "localId" : "2536",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1288",
+                "localId" : "2537",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95432,7 +124418,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1289",
+                "localId" : "2538",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95440,7 +124426,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1290",
+                "localId" : "2539",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95448,198 +124434,273 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1291",
+                "localId" : "2540",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1312",
-            "name" : "NullEndIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1313",
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2574",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1314",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2575",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2576",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2577",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2578",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2579",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2580",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2581",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2558",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2020",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2559",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2560",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2561",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2562",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2563",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2564",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1322",
+        "localId" : "2592",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullEndStartBeforeIvl",
+        "name" : "DateIvlNotMeetsPosInfEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1322",
+            "r" : "2592",
             "s" : [ {
-              "value" : [ "", "define ", "NullEndStartBeforeIvl", ": " ]
+              "value" : [ "", "define ", "DateIvlNotMeetsPosInfEnd", ": " ]
             }, {
-              "r" : "1377",
+              "r" : "2673",
               "s" : [ {
-                "r" : "1323",
-                "s" : [ {
-                  "value" : [ "NullEndIvl" ]
-                } ]
-              }, {
-                "r" : "1377",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "1374",
+                "r" : "2641",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1342",
+                  "r" : "2609",
                   "s" : [ {
-                    "r" : "1326",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2593",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1366",
+                  "r" : "2633",
                   "s" : [ {
-                    "r" : "1350",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2617",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "2673",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "2669",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2660",
+                  "s" : [ {
+                    "r" : "2644",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2668",
+                  "value" : [ ", ", "null", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1377",
+          "type" : "Meets",
+          "localId" : "2673",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1378",
+            "localId" : "2674",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1379",
+              "localId" : "2675",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1380",
+            "localId" : "2676",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1381",
+              "localId" : "2677",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1323",
-            "name" : "NullEndIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1324",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1325",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "1374",
+            "localId" : "2641",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1375",
+              "localId" : "2642",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1376",
+                "localId" : "2643",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1342",
+              "localId" : "2609",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1343",
+                "localId" : "2610",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1344",
+                "localId" : "2611",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1345",
+                "localId" : "2612",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1346",
+                "localId" : "2613",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1347",
+                "localId" : "2614",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1348",
+                "localId" : "2615",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1349",
+                "localId" : "2616",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1326",
+                "localId" : "2593",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1327",
+                "localId" : "2594",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1328",
+                "localId" : "2595",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -95647,7 +124708,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1329",
+                "localId" : "2596",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95655,7 +124716,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1330",
+                "localId" : "2597",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95663,7 +124724,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1331",
+                "localId" : "2598",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95671,7 +124732,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1332",
+                "localId" : "2599",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95680,72 +124741,72 @@ module.exports['AfterOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1366",
+              "localId" : "2633",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1367",
+                "localId" : "2634",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1368",
+                "localId" : "2635",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1369",
+                "localId" : "2636",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1370",
+                "localId" : "2637",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1371",
+                "localId" : "2638",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1372",
+                "localId" : "2639",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1373",
+                "localId" : "2640",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1350",
+                "localId" : "2617",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1351",
+                "localId" : "2618",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1352",
+                "localId" : "2619",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1353",
+                "localId" : "2620",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95753,7 +124814,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1354",
+                "localId" : "2621",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95761,7 +124822,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1355",
+                "localId" : "2622",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95769,174 +124830,82 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1356",
+                "localId" : "2623",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          } ]
-        }
-      }, {
-        "localId" : "1384",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullEndStartAfterIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1384",
-            "s" : [ {
-              "value" : [ "", "define ", "NullEndStartAfterIvl", ": " ]
-            }, {
-              "r" : "1439",
-              "s" : [ {
-                "r" : "1385",
-                "s" : [ {
-                  "value" : [ "NullEndIvl" ]
-                } ]
-              }, {
-                "r" : "1439",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "1436",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1404",
-                  "s" : [ {
-                    "r" : "1388",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1428",
-                  "s" : [ {
-                    "r" : "1412",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1439",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1440",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1441",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1442",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1443",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1385",
-            "name" : "NullEndIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1386",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1387",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           }, {
             "type" : "Interval",
-            "localId" : "1436",
+            "localId" : "2669",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1437",
+              "localId" : "2671",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1438",
+                "localId" : "2672",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1404",
+              "localId" : "2660",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1405",
+                "localId" : "2661",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1406",
+                "localId" : "2662",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1407",
+                "localId" : "2663",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1408",
+                "localId" : "2664",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1409",
+                "localId" : "2665",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1410",
+                "localId" : "2666",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1411",
+                "localId" : "2667",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1388",
+                "localId" : "2644",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1389",
+                "localId" : "2645",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -95944,7 +124913,7 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1390",
+                "localId" : "2646",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -95952,7 +124921,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1391",
+                "localId" : "2647",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95960,7 +124929,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1392",
+                "localId" : "2648",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95968,7 +124937,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1393",
+                "localId" : "2649",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95976,7 +124945,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1394",
+                "localId" : "2650",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -95984,57 +124953,172 @@ module.exports['AfterOrOn'] = {
               }
             },
             "high" : {
+              "type" : "As",
+              "localId" : "2670",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2668",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2680",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMeetsAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2680",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMeetsAfterDateIvl", ": " ]
+            }, {
+              "r" : "2761",
+              "s" : [ {
+                "r" : "2706",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2697",
+                  "s" : [ {
+                    "r" : "2681",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2705",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2761",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "2758",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2726",
+                  "s" : [ {
+                    "r" : "2710",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2750",
+                  "s" : [ {
+                    "r" : "2734",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Meets",
+          "localId" : "2761",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2762",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2763",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2764",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2765",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2706",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2708",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2709",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "DateTime",
-              "localId" : "1428",
+              "localId" : "2697",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1429",
+                "localId" : "2698",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1430",
+                "localId" : "2699",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1431",
+                "localId" : "2700",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1432",
+                "localId" : "2701",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1433",
+                "localId" : "2702",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1434",
+                "localId" : "2703",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1435",
+                "localId" : "2704",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1412",
+                "localId" : "2681",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1413",
+                "localId" : "2682",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -96042,15 +125126,15 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1414",
+                "localId" : "2683",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1415",
+                "localId" : "2684",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96058,7 +125142,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1416",
+                "localId" : "2685",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96066,7 +125150,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1417",
+                "localId" : "2686",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96074,327 +125158,95 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1418",
+                "localId" : "2687",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1446",
-        "name" : "NullStartIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1446",
-            "s" : [ {
-              "value" : [ "", "define ", "NullStartIvl", ": " ]
-            }, {
-              "r" : "1472",
-              "s" : [ {
-                "r" : "1447",
-                "value" : [ "Interval(", "null", ", " ]
-              }, {
-                "r" : "1464",
-                "s" : [ {
-                  "r" : "1448",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "value" : [ "]" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1476",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1477",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "1472",
-          "lowClosed" : false,
-          "highClosed" : true,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1474",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1475",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "As",
-            "localId" : "1473",
-            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1447",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "1464",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1465",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1466",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1467",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1468",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1469",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1470",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1471",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1448",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1449",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1450",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1451",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1452",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1453",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1454",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "1480",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EndsBeforeNullStartIvlEnds",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1480",
-            "s" : [ {
-              "value" : [ "", "define ", "EndsBeforeNullStartIvlEnds", ": " ]
-            }, {
-              "r" : "1535",
-              "s" : [ {
-                "r" : "1529",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1497",
-                  "s" : [ {
-                    "r" : "1481",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1521",
-                  "s" : [ {
-                    "r" : "1505",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "r" : "1535",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "1532",
-                "s" : [ {
-                  "value" : [ "NullStartIvl" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1535",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1536",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1537",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "As",
+              "localId" : "2707",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2705",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1538",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1539",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1529",
+            "localId" : "2758",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1530",
+              "localId" : "2759",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1531",
+                "localId" : "2760",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1497",
+              "localId" : "2726",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1498",
+                "localId" : "2727",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1499",
+                "localId" : "2728",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1500",
+                "localId" : "2729",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1501",
+                "localId" : "2730",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1502",
+                "localId" : "2731",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1503",
+                "localId" : "2732",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1504",
+                "localId" : "2733",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1481",
+                "localId" : "2710",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1482",
+                "localId" : "2711",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -96402,7 +125254,7 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1483",
+                "localId" : "2712",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -96410,7 +125262,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1484",
+                "localId" : "2713",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96418,7 +125270,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1485",
+                "localId" : "2714",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96426,7 +125278,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1486",
+                "localId" : "2715",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96434,7 +125286,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1487",
+                "localId" : "2716",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96443,72 +125295,72 @@ module.exports['AfterOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1521",
+              "localId" : "2750",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1522",
+                "localId" : "2751",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1523",
+                "localId" : "2752",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1524",
+                "localId" : "2753",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1525",
+                "localId" : "2754",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1526",
+                "localId" : "2755",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1527",
+                "localId" : "2756",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1528",
+                "localId" : "2757",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1505",
+                "localId" : "2734",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1506",
+                "localId" : "2735",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1507",
+                "localId" : "2736",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1508",
+                "localId" : "2737",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96516,7 +125368,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1509",
+                "localId" : "2738",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96524,7 +125376,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1510",
+                "localId" : "2739",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96532,190 +125384,183 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1511",
+                "localId" : "2740",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1532",
-            "name" : "NullStartIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1533",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1534",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "1542",
+        "localId" : "2768",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "AfterEndOfNullStartIvl",
+        "name" : "UnknownEndMayMeetBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1542",
+            "r" : "2768",
             "s" : [ {
-              "value" : [ "", "define ", "AfterEndOfNullStartIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayMeetBeforeDateIvl", ": " ]
             }, {
-              "r" : "1597",
+              "r" : "2849",
               "s" : [ {
-                "r" : "1591",
+                "r" : "2794",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1559",
+                  "r" : "2785",
                   "s" : [ {
-                    "r" : "1543",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2769",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2793",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2849",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "2846",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2814",
+                  "s" : [ {
+                    "r" : "2798",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1583",
+                  "r" : "2838",
                   "s" : [ {
-                    "r" : "1567",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2822",
+                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
-              }, {
-                "r" : "1597",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "1594",
-                "s" : [ {
-                  "value" : [ "NullStartIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1597",
+          "type" : "Meets",
+          "localId" : "2849",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1598",
+            "localId" : "2850",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1599",
+              "localId" : "2851",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1600",
+            "localId" : "2852",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1601",
+              "localId" : "2853",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1591",
+            "localId" : "2794",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1592",
+              "localId" : "2796",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1593",
+                "localId" : "2797",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1559",
+              "localId" : "2785",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1560",
+                "localId" : "2786",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1561",
+                "localId" : "2787",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1562",
+                "localId" : "2788",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1563",
+                "localId" : "2789",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1564",
+                "localId" : "2790",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1565",
+                "localId" : "2791",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1566",
+                "localId" : "2792",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1543",
+                "localId" : "2769",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1544",
+                "localId" : "2770",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1545",
+                "localId" : "2771",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1546",
+                "localId" : "2772",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96723,7 +125568,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1547",
+                "localId" : "2773",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96731,7 +125576,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1548",
+                "localId" : "2774",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96739,7 +125584,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1549",
+                "localId" : "2775",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96747,73 +125592,103 @@ module.exports['AfterOrOn'] = {
               }
             },
             "high" : {
+              "type" : "As",
+              "localId" : "2795",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2793",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2846",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2847",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2848",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "DateTime",
-              "localId" : "1583",
+              "localId" : "2814",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1584",
+                "localId" : "2815",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1585",
+                "localId" : "2816",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1586",
+                "localId" : "2817",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1587",
+                "localId" : "2818",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1588",
+                "localId" : "2819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1589",
+                "localId" : "2820",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1590",
+                "localId" : "2821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1567",
+                "localId" : "2798",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1568",
+                "localId" : "2799",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1569",
+                "localId" : "2800",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1570",
+                "localId" : "2801",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96821,7 +125696,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1571",
+                "localId" : "2802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96829,7 +125704,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1572",
+                "localId" : "2803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -96837,71 +125712,162 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1573",
+                "localId" : "2804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1594",
-            "name" : "NullStartIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1595",
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2838",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1596",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2839",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2840",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2841",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2842",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2843",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2844",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2845",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2822",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2040",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2823",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2824",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2825",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2826",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2827",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2828",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1604",
+        "localId" : "2856",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullStartStartBeforeIvl",
+        "name" : "UnknownEndNotMeetsDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1604",
+            "r" : "2856",
             "s" : [ {
-              "value" : [ "", "define ", "NullStartStartBeforeIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "1659",
+              "r" : "2937",
               "s" : [ {
-                "r" : "1605",
+                "r" : "2882",
                 "s" : [ {
-                  "value" : [ "NullStartIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2873",
+                  "s" : [ {
+                    "r" : "2857",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2881",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1659",
-                "value" : [ " ", "after or on", " " ]
+                "r" : "2937",
+                "value" : [ " ", "meets", " " ]
               }, {
-                "r" : "1656",
+                "r" : "2934",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1624",
+                  "r" : "2902",
                   "s" : [ {
-                    "r" : "1608",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2886",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1648",
+                  "r" : "2926",
                   "s" : [ {
-                    "r" : "1632",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2910",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -96911,124 +125877,236 @@ module.exports['AfterOrOn'] = {
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1659",
+          "type" : "Meets",
+          "localId" : "2937",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1660",
+            "localId" : "2938",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1661",
+              "localId" : "2939",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1662",
+            "localId" : "2940",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1663",
+              "localId" : "2941",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1605",
-            "name" : "NullStartIvl",
+            "type" : "Interval",
+            "localId" : "2882",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1606",
+              "localId" : "2884",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2885",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2873",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2874",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2875",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2876",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2877",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2878",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2879",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2880",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2857",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2858",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2859",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2860",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2861",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2862",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2863",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2883",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1607",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2881",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1656",
+            "localId" : "2934",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1657",
+              "localId" : "2935",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1658",
+                "localId" : "2936",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1624",
+              "localId" : "2902",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1625",
+                "localId" : "2903",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1626",
+                "localId" : "2904",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1627",
+                "localId" : "2905",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1628",
+                "localId" : "2906",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1629",
+                "localId" : "2907",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1630",
+                "localId" : "2908",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1631",
+                "localId" : "2909",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1608",
+                "localId" : "2886",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1609",
+                "localId" : "2887",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1610",
+                "localId" : "2888",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -97036,7 +126114,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1611",
+                "localId" : "2889",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97044,7 +126122,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1612",
+                "localId" : "2890",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97052,7 +126130,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1613",
+                "localId" : "2891",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97060,7 +126138,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1614",
+                "localId" : "2892",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97069,72 +126147,72 @@ module.exports['AfterOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1648",
+              "localId" : "2926",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1649",
+                "localId" : "2927",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1650",
+                "localId" : "2928",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1651",
+                "localId" : "2929",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1652",
+                "localId" : "2930",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1653",
+                "localId" : "2931",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1654",
+                "localId" : "2932",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1655",
+                "localId" : "2933",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1632",
+                "localId" : "2910",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1633",
+                "localId" : "2911",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1634",
+                "localId" : "2912",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1635",
+                "localId" : "2913",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97142,7 +126220,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1636",
+                "localId" : "2914",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97150,7 +126228,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1637",
+                "localId" : "2915",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97158,7 +126236,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1638",
+                "localId" : "2916",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97168,164 +126246,157 @@ module.exports['AfterOrOn'] = {
           } ]
         }
       }, {
-        "localId" : "1666",
+        "localId" : "2944",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullStartStartAfterIvl",
+        "name" : "DateIvlMayMeetAfterUnknownEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1666",
+            "r" : "2944",
             "s" : [ {
-              "value" : [ "", "define ", "NullStartStartAfterIvl", ": " ]
+              "value" : [ "", "define ", "DateIvlMayMeetAfterUnknownEnd", ": " ]
             }, {
-              "r" : "1721",
+              "r" : "3025",
               "s" : [ {
-                "r" : "1667",
-                "s" : [ {
-                  "value" : [ "NullStartIvl" ]
-                } ]
-              }, {
-                "r" : "1721",
-                "value" : [ " ", "after or on", " " ]
-              }, {
-                "r" : "1718",
+                "r" : "2993",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1686",
+                  "r" : "2961",
                   "s" : [ {
-                    "r" : "1670",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2945",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1710",
+                  "r" : "2985",
                   "s" : [ {
-                    "r" : "1694",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2969",
+                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "3025",
+                "value" : [ " ", "meets", " " ]
+              }, {
+                "r" : "3021",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "3012",
+                  "s" : [ {
+                    "r" : "2996",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "3020",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1721",
+          "type" : "Meets",
+          "localId" : "3025",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1722",
+            "localId" : "3026",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1723",
+              "localId" : "3027",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1724",
+            "localId" : "3028",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1725",
+              "localId" : "3029",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1667",
-            "name" : "NullStartIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1668",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1669",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "1718",
+            "localId" : "2993",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1719",
+              "localId" : "2994",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1720",
+                "localId" : "2995",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1686",
+              "localId" : "2961",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1687",
+                "localId" : "2962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1688",
+                "localId" : "2963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1689",
+                "localId" : "2964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1690",
+                "localId" : "2965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1691",
+                "localId" : "2966",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1692",
+                "localId" : "2967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1693",
+                "localId" : "2968",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1670",
+                "localId" : "2945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1671",
+                "localId" : "2946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -97333,7 +126404,7 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1672",
+                "localId" : "2947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -97341,7 +126412,7 @@ module.exports['AfterOrOn'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1673",
+                "localId" : "2948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97349,7 +126420,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1674",
+                "localId" : "2949",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97357,7 +126428,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1675",
+                "localId" : "2950",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97365,7 +126436,7 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1676",
+                "localId" : "2951",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97374,56 +126445,56 @@ module.exports['AfterOrOn'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1710",
+              "localId" : "2985",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1711",
+                "localId" : "2986",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1712",
+                "localId" : "2987",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1713",
+                "localId" : "2988",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1714",
+                "localId" : "2989",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1715",
+                "localId" : "2990",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1716",
+                "localId" : "2991",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1717",
+                "localId" : "2992",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1694",
+                "localId" : "2969",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2040",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1695",
+                "localId" : "2970",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -97431,15 +126502,15 @@ module.exports['AfterOrOn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1696",
+                "localId" : "2971",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "20",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1697",
+                "localId" : "2972",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97447,7 +126518,7 @@ module.exports['AfterOrOn'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1698",
+                "localId" : "2973",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97455,7 +126526,7 @@ module.exports['AfterOrOn'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1699",
+                "localId" : "2974",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -97463,3609 +126534,3189 @@ module.exports['AfterOrOn'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1700",
+                "localId" : "2975",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          } ]
-        }
-      }, {
-        "localId" : "1728",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlBeforeNull",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1728",
-            "s" : [ {
-              "value" : [ "", "define ", "DateIvlBeforeNull", ": " ]
-            }, {
-              "r" : "1733",
-              "s" : [ {
-                "r" : "1729",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              }, {
-                "r" : "1733",
-                "value" : [ " ", "after or on", " ", "null" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1733",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1737",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1738",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1739",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1740",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1729",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "3021",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1730",
+              "localId" : "3023",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1731",
+                "localId" : "3024",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "As",
-            "localId" : "1734",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1732",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
             },
-            "asTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1735",
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "3012",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1736",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "3013",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1743",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullBeforeDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1743",
-            "s" : [ {
-              "value" : [ "", "define ", "NullBeforeDateIvl", ": " ]
-            }, {
-              "r" : "1748",
-              "s" : [ {
-                "r" : "1744",
-                "value" : [ "null", " ", "after or on", " " ]
               }, {
-                "r" : "1745",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1748",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1752",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1753",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1754",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1755",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "As",
-            "localId" : "1749",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1744",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1750",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1751",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "3014",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1745",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1746",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1747",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "3015",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1758",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeBeforeDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1758",
-            "s" : [ {
-              "value" : [ "", "define ", "DateTimeBeforeDateIvl", ": " ]
-            }, {
-              "r" : "1786",
-              "s" : [ {
-                "r" : "1775",
-                "s" : [ {
-                  "r" : "1759",
-                  "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "r" : "1786",
-                "value" : [ " ", "after or on", " " ]
               }, {
-                "r" : "1783",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1786",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1793",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1794",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1795",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1796",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "If",
-            "localId" : "1787",
-            "annotation" : [ ],
-            "condition" : {
-              "type" : "IsNull",
-              "localId" : "1788",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "DateTime",
-                "localId" : "1775",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1776",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1777",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1778",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1779",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1780",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1781",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1782",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1759",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1760",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1761",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1762",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1763",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1764",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1765",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "then" : {
-              "type" : "Null",
-              "localId" : "1789",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1790",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1791",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "else" : {
-              "type" : "Interval",
-              "localId" : "1792",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "low" : {
-                "type" : "DateTime",
-                "localId" : "1775",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1776",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1777",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1778",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1779",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1780",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1781",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1782",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1759",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1760",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1761",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1762",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1763",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1764",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1765",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "DateTime",
-                "localId" : "1775",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1776",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1777",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1778",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1779",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1780",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1781",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1782",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1759",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1760",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1761",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1762",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1763",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1764",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1765",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1783",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1784",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1785",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "3016",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1799",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateBeforeDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1799",
-            "s" : [ {
-              "value" : [ "", "define ", "DateBeforeDateIvl", ": " ]
-            }, {
-              "r" : "1815",
-              "s" : [ {
-                "r" : "1808",
-                "s" : [ {
-                  "r" : "1800",
-                  "value" : [ "Date", "(", "2012", ", ", "2", ", ", "20", ")" ]
-                } ]
               }, {
-                "r" : "1815",
-                "value" : [ " ", "after or on", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3017",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "1812",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1815",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1825",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1826",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1827",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1828",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "If",
-            "localId" : "1819",
-            "annotation" : [ ],
-            "condition" : {
-              "type" : "IsNull",
-              "localId" : "1820",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "ToDateTime",
-                "localId" : "1817",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1818",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "Date",
-                  "localId" : "1808",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1809",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1810",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1811",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1800",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1801",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1802",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "20",
-                    "annotation" : [ ]
-                  }
-                }
-              }
-            },
-            "then" : {
-              "type" : "Null",
-              "localId" : "1821",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1822",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1823",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "else" : {
-              "type" : "Interval",
-              "localId" : "1824",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "low" : {
-                "type" : "ToDateTime",
-                "localId" : "1817",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1818",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "Date",
-                  "localId" : "1808",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1809",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1810",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1811",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1800",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1801",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1802",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "20",
-                    "annotation" : [ ]
-                  }
-                }
-              },
-              "high" : {
-                "type" : "ToDateTime",
-                "localId" : "1817",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1818",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ]
-                } ],
-                "operand" : {
-                  "type" : "Date",
-                  "localId" : "1808",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1809",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1810",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1811",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1800",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1801",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1802",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "20",
-                    "annotation" : [ ]
-                  }
-                }
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3018",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3019",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2996",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2997",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2998",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2999",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "3000",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "3001",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "3002",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "1812",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1813",
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "3022",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1814",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "3020",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* MeetsAfter
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define MeetsAfterIntIvl: Interval[11, 15] meets after Interval[5, 10]
+define MeetsBeforeIntIvl: Interval[1, 4] meets after Interval[5, 10]
+define NotMeetsIntIvl: Interval[1, 2] meets after Interval[5, 10]
+define MeetsAfterLongIvl: Interval[11L, 15L] meets after Interval[5L, 10L]
+define MeetsBeforeLongIvl: Interval[1L, 4L] meets after Interval[5L, 10L]
+define NotMeetsLongIvl: Interval[1L, 2L] meets after Interval[5L, 10L]
+define MeetsAfterRealIvl: Interval[1.50000001, 2.5] meets after Interval[0.5, 1.5]
+define MeetsBeforeRealIvl: Interval[0.5, 1.5] meets after Interval[1.50000001, 2.5]
+define NotMeetsRealIvl: Interval[0.0, 1.0] meets after Interval[1.1, 2.0]
+define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
+define MeetsAfterDateIvl: Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)) meets after DateIvl
+define MeetsBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) meets after DateIvl
+define NotMeetsDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 0, 0, 0, 0)) meets after DateIvl
+define MayMeetAfterImpreciseDateIvl: DateIvl meets after Interval[DateTime(2012, 1), DateTime(2012, 2)]
+define MayMeetBeforeImpreciseDateIvl: DateIvl meets after Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define NotMeetsImpreciseDateIvl: DateIvl meets after Interval[DateTime(2012, 1), DateTime(2012, 12)]
+define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
+define MeetsAfterDayOfIvl: PrecisionDateIvl meets after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define MeetsBeforeDayOfIvl: PrecisionDateIvl meets after day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
+define NotMeetsDayOfIvl: PrecisionDateIvl meets after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define NotMeetsDayOfImpreciseIVL: PrecisionDateIvl meets after day of Interval[DateTime(2012, 1), DateTime(2012, 2)]
+define MayMeetAfterDayOfImpreciseIvl: PrecisionDateIvl meets after day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define MayMeetBeforeDayOfImpreciseIvl: PrecisionDateIvl meets after day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
+define ImpreciseMayMeetAfterDateIvl: ImpDateIvl meets after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 23, 59, 59, 999)]
+define ImpreciseMayMeetBeforeDateIvl: ImpDateIvl meets after Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999)]
+define ImpreciseNotMeetsDateIvl: ImpDateIvl meets after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999))
+define NegInfBegMeetsBeforeIntIvl: Interval[null, 100] meets after Interval[101, 200]
+define NegInfBegNotMeetsIntIvl: Interval[null, 100] meets after Interval[100, 200]
+define IntIvlNotMeetsNegInfBeg: Interval[100, 200] meets after Interval[null, 400]
+define UnknownBegMeetsBeforeIntIvl: Interval(null, 100] meets after Interval[101, 200]
+define UnknownBegMayMeetAfterIntIvl: Interval(null, 100] meets after Interval[0, 50]
+define UnknownBegNotMeetsIntIvl: Interval(null, 5] meets after Interval[0, 100]
+define IntIvlMayMeetBeforeUnknownBeg: Interval[0, 100] meets after Interval(null, 400)
+define PosInfEndMeetsAfterIntIvl: Interval[100, null] meets after Interval[0, 99]
+define PosInfEndNotMeetsIntIvl: Interval[0, null] meets after Interval[1000, 2000]
+define IntIvlNotMeetsPosInfEnd: Interval[100, 200] meets after Interval[0, null]
+define UnknownEndMeetsAfterIntIvl: Interval[100, null) meets after Interval[0, 99]
+define UnknownEndMayMeetBeforeIntIvl: Interval[0, null) meets after Interval[50, 100]
+define UnknownEndNotMeetsIntIvl: Interval[0, null) meets after Interval[0, 100]
+define IntIvlMayMeetAfterUnknownEnd: Interval[0, 100] meets after Interval[-100, null)
+define NegInfBegMeetsBeforeLongIvl: Interval[null, 100L] meets after Interval[101L, 200L]
+define NegInfBegNotMeetsLongIvl: Interval[null, 100L] meets after Interval[100L, 200L]
+define LongIvlNotMeetsNegInfBeg: Interval[100L, 200L] meets after Interval[null, 400L]
+define UnknownBegMeetsBeforeLongIvl: Interval(null, 100L] meets after Interval[101L, 200L]
+define UnknownBegMayMeetAfterLongIvl: Interval(null, 100L] meets after Interval[0L, 50L]
+define UnknownBegNotMeetsLongIvl: Interval(null, 5L] meets after Interval[0L, 100L]
+define LongIvlMayMeetBeforeUnknownBeg: Interval[0L, 100L] meets after Interval(null, 400L)
+define PosInfEndMeetsAfterLongIvl: Interval[100L, null] meets after Interval[0L, 99L]
+define PosInfEndNotMeetsLongIvl: Interval[0L, null] meets after Interval[1000L, 2000L]
+define LongIvlNotMeetsPosInfEnd: Interval[100L, 200L] meets after Interval[0L, null]
+define UnknownEndMeetsAfterLongIvl: Interval[100L, null) meets after Interval[0L, 99L]
+define UnknownEndMayMeetBeforeLongIvl: Interval[0L, null) meets after Interval[50L, 100L]
+define UnknownEndNotMeetsLongIvl: Interval[0L, null) meets after Interval[0L, 100L]
+define LongIvlMayMeetAfterUnknownEnd: Interval[0L, 100L] meets after Interval[-100L, null)
+define NegInfBegMeetsBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
+define NegInfBegNotMeetsDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define DateIvlNotMeetsNegInfBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets after Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define UnknownBegMeetsBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
+define UnknownBegMayMeetAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define UnknownBegNotMeetsDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define DateIvlMayMeetBeforeUnknownBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets after Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define PosInfEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
+define PosInfEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define DateIvlNotMeetsPosInfEnd: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)] meets after Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
+define UnknownEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets after Interval[DateTime(2010, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
+define UnknownEndMayMeetBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets after Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
+define UnknownEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateIvlMayMeetAfterUnknownEnd: Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)] meets after Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
+*/
+
+module.exports['MeetsAfter'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "2944",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "1831",
+        "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlBeforeDateTime",
+        "name" : "MeetsAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1831",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlBeforeDateTime", ": " ]
+              "value" : [ "", "define ", "MeetsAfterIntIvl", ": " ]
             }, {
-              "r" : "1859",
+              "r" : "225",
               "s" : [ {
-                "r" : "1832",
+                "r" : "217",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "215",
+                  "value" : [ "Interval[", "11", ", ", "15", "]" ]
                 } ]
               }, {
-                "r" : "1859",
-                "value" : [ " ", "after or on", " " ]
+                "r" : "225",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1851",
+                "r" : "222",
                 "s" : [ {
-                  "r" : "1835",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "20", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "220",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1859",
+          "type" : "MeetsAfter",
+          "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1866",
+            "localId" : "226",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1867",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "227",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1868",
+            "localId" : "228",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1869",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1832",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "217",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1833",
+              "localId" : "218",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1834",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "219",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "11",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "15",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "If",
-            "localId" : "1860",
+            "type" : "Interval",
+            "localId" : "222",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "condition" : {
-              "type" : "IsNull",
-              "localId" : "1861",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "223",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "DateTime",
-                "localId" : "1851",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1852",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1853",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1854",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1855",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1856",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1857",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1858",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1835",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1836",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1837",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1838",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1839",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1840",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1841",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }
             },
-            "then" : {
-              "type" : "Null",
-              "localId" : "1862",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1863",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1864",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             },
-            "else" : {
-              "type" : "Interval",
-              "localId" : "1865",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "low" : {
-                "type" : "DateTime",
-                "localId" : "1851",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1852",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1853",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1854",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1855",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1856",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1857",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1858",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1835",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1836",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1837",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1838",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1839",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1840",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1841",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "DateTime",
-                "localId" : "1851",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1852",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1853",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1854",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1855",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1856",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1857",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1858",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1835",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1836",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1837",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1838",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1839",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "1840",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "1841",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
-              }
+            "high" : {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1872",
+        "localId" : "232",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlBeforeDate",
+        "name" : "MeetsBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1872",
+            "r" : "232",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlBeforeDate", ": " ]
+              "value" : [ "", "define ", "MeetsBeforeIntIvl", ": " ]
             }, {
-              "r" : "1888",
+              "r" : "243",
               "s" : [ {
-                "r" : "1873",
+                "r" : "235",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "233",
+                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
                 } ]
               }, {
-                "r" : "1888",
-                "value" : [ " ", "after or on", " " ]
+                "r" : "243",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1884",
+                "r" : "240",
                 "s" : [ {
-                  "r" : "1876",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "20", ")" ]
+                  "r" : "238",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1888",
+          "type" : "MeetsAfter",
+          "localId" : "243",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1895",
+            "localId" : "244",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1896",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "245",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1897",
+            "localId" : "246",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1898",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "247",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1873",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "235",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1874",
+              "localId" : "236",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1875",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "237",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "233",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "If",
-            "localId" : "1889",
+            "type" : "Interval",
+            "localId" : "240",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "condition" : {
-              "type" : "IsNull",
-              "localId" : "1890",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "241",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "DateTime",
-                "localId" : "1884",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1885",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1886",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1887",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1876",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1877",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1878",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "242",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }
             },
-            "then" : {
-              "type" : "Null",
-              "localId" : "1891",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1892",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1893",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "238",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             },
-            "else" : {
-              "type" : "Interval",
-              "localId" : "1894",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "low" : {
-                "type" : "DateTime",
-                "localId" : "1884",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1885",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1886",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1887",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1876",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1877",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1878",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "DateTime",
-                "localId" : "1884",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1885",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1886",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1887",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1876",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1877",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "9",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1878",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "20",
-                  "annotation" : [ ]
-                }
-              }
+            "high" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1901",
-        "name" : "DateOnlyIvl",
+        "localId" : "250",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1901",
+            "r" : "250",
             "s" : [ {
-              "value" : [ "", "define ", "DateOnlyIvl", ": " ]
+              "value" : [ "", "define ", "NotMeetsIntIvl", ": " ]
             }, {
-              "r" : "1926",
+              "r" : "261",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "1910",
+                "r" : "253",
                 "s" : [ {
-                  "r" : "1902",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                  "r" : "251",
+                  "value" : [ "Interval[", "1", ", ", "2", "]" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "r" : "261",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1922",
+                "r" : "258",
                 "s" : [ {
-                  "r" : "1914",
-                  "value" : [ "Date", "(", "2012", ", ", "2", ", ", "20", ")" ]
+                  "r" : "256",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1929",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1930",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "1926",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "MeetsAfter",
+          "localId" : "261",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1927",
+            "localId" : "262",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1928",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "Date",
-            "localId" : "1910",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1911",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1912",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1913",
+              "localId" : "263",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1902",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1903",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1904",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "Date",
-            "localId" : "1922",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "264",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1923",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1924",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1925",
+              "localId" : "265",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "253",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "254",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "255",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "1914",
+              "localId" : "251",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "1",
               "annotation" : [ ]
             },
-            "month" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1915",
+              "localId" : "252",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "258",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "259",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "260",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             },
-            "day" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1916",
+              "localId" : "257",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "20",
+              "value" : "10",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "1933",
+        "localId" : "268",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateOnlyIvlBeforeDateIvl",
+        "name" : "MeetsAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1933",
+            "r" : "268",
             "s" : [ {
-              "value" : [ "", "define ", "DateOnlyIvlBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "MeetsAfterLongIvl", ": " ]
             }, {
-              "r" : "1940",
+              "r" : "279",
               "s" : [ {
-                "r" : "1934",
+                "r" : "271",
                 "s" : [ {
-                  "value" : [ "DateOnlyIvl" ]
+                  "r" : "269",
+                  "value" : [ "Interval[", "11L", ", ", "15L", "]" ]
                 } ]
               }, {
-                "r" : "1940",
-                "value" : [ " ", "after or on", " " ]
+                "r" : "279",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1937",
+                "r" : "276",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "274",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1940",
+          "type" : "MeetsAfter",
+          "localId" : "279",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1952",
+            "localId" : "280",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1953",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "281",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1954",
+            "localId" : "282",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1955",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "283",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1941",
+            "localId" : "271",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "low" : {
-              "type" : "ToDateTime",
-              "localId" : "1944",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "272",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1945",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "273",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "1942",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "ExpressionRef",
-                  "localId" : "1934",
-                  "name" : "DateOnlyIvl",
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "1935",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1936",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
               }
             },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "1946",
-              "path" : "lowClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "ExpressionRef",
-                "localId" : "1934",
-                "name" : "DateOnlyIvl",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "1935",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1936",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                }
-              }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "11",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "ToDateTime",
-              "localId" : "1949",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1950",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "1947",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "ExpressionRef",
-                  "localId" : "1934",
-                  "name" : "DateOnlyIvl",
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "1935",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1936",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
-              }
-            },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "1951",
-              "path" : "highClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "ExpressionRef",
-                "localId" : "1934",
-                "name" : "DateOnlyIvl",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "1935",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1936",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                }
-              }
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "15",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "1937",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "276",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1938",
+              "localId" : "277",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1939",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "278",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1958",
+        "localId" : "286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlAfterDateOnlyIvl",
+        "name" : "MeetsBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1958",
+            "r" : "286",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlAfterDateOnlyIvl", ": " ]
+              "value" : [ "", "define ", "MeetsBeforeLongIvl", ": " ]
             }, {
-              "r" : "1965",
+              "r" : "297",
               "s" : [ {
-                "r" : "1959",
+                "r" : "289",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "287",
+                  "value" : [ "Interval[", "1L", ", ", "4L", "]" ]
                 } ]
               }, {
-                "r" : "1965",
-                "value" : [ " ", "after or on", " " ]
+                "r" : "297",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1962",
+                "r" : "294",
                 "s" : [ {
-                  "value" : [ "DateOnlyIvl" ]
+                  "r" : "292",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "1965",
+          "type" : "MeetsAfter",
+          "localId" : "297",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1977",
+            "localId" : "298",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1978",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "299",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1979",
+            "localId" : "300",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1980",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "301",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1959",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "289",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1960",
+              "localId" : "290",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1961",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1966",
+            "localId" : "294",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "low" : {
-              "type" : "ToDateTime",
-              "localId" : "1969",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "295",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1970",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "296",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "1967",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "ExpressionRef",
-                  "localId" : "1962",
-                  "name" : "DateOnlyIvl",
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "1963",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1964",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
               }
             },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "1971",
-              "path" : "lowClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "ExpressionRef",
-                "localId" : "1962",
-                "name" : "DateOnlyIvl",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "1963",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1964",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                }
-              }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "ToDateTime",
-              "localId" : "1974",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1975",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "1972",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "ExpressionRef",
-                  "localId" : "1962",
-                  "name" : "DateOnlyIvl",
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "1963",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1964",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
-              }
-            },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "1976",
-              "path" : "highClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "ExpressionRef",
-                "localId" : "1962",
-                "name" : "DateOnlyIvl",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "1963",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1964",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                }
-              }
+              "type" : "Literal",
+              "localId" : "293",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1983",
+        "localId" : "304",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateOnlyMeetsAfterDateIvl",
+        "name" : "NotMeetsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1983",
+            "r" : "304",
             "s" : [ {
-              "value" : [ "", "define ", "DateOnlyMeetsAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "NotMeetsLongIvl", ": " ]
             }, {
-              "r" : "2014",
+              "r" : "315",
               "s" : [ {
-                "r" : "2008",
+                "r" : "307",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1992",
-                  "s" : [ {
-                    "r" : "1984",
-                    "value" : [ "Date", "(", "2012", ", ", "9", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2004",
-                  "s" : [ {
-                    "r" : "1996",
-                    "value" : [ "Date", "(", "2012", ", ", "10", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "305",
+                  "value" : [ "Interval[", "1L", ", ", "2L", "]" ]
                 } ]
               }, {
-                "r" : "2014",
-                "value" : [ " ", "after or on", " " ]
+                "r" : "315",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "2011",
+                "r" : "312",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "r" : "310",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "SameOrAfter",
-          "localId" : "2014",
+          "type" : "MeetsAfter",
+          "localId" : "315",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2026",
+            "localId" : "316",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2027",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2028",
+            "localId" : "318",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2029",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "319",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2015",
+            "localId" : "307",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "low" : {
-              "type" : "ToDateTime",
-              "localId" : "2018",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "308",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2019",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "309",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "2016",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "2008",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "2009",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2010",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Date",
-                    "localId" : "1992",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ],
-                    "signature" : [ {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1993",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1994",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1995",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    } ],
-                    "year" : {
-                      "type" : "Literal",
-                      "localId" : "1984",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "2012",
-                      "annotation" : [ ]
-                    },
-                    "month" : {
-                      "type" : "Literal",
-                      "localId" : "1985",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "9",
-                      "annotation" : [ ]
-                    },
-                    "day" : {
-                      "type" : "Literal",
-                      "localId" : "1986",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "1",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "high" : {
-                    "type" : "Date",
-                    "localId" : "2004",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ],
-                    "signature" : [ {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2005",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2006",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2007",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    } ],
-                    "year" : {
-                      "type" : "Literal",
-                      "localId" : "1996",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "2012",
-                      "annotation" : [ ]
-                    },
-                    "month" : {
-                      "type" : "Literal",
-                      "localId" : "1997",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "10",
-                      "annotation" : [ ]
-                    },
-                    "day" : {
-                      "type" : "Literal",
-                      "localId" : "1998",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "1",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
               }
             },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "2020",
-              "path" : "lowClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "2008",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "2009",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2010",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Date",
-                  "localId" : "1992",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1993",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1994",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1995",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1984",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1985",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "9",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1986",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  }
-                },
-                "high" : {
-                  "type" : "Date",
-                  "localId" : "2004",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2005",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2006",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2007",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1996",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1997",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "10",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1998",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  }
-                }
-              }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "ToDateTime",
-              "localId" : "2023",
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "312",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "313",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2024",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "2021",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "2008",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "2009",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2010",
-                      "name" : "{urn:hl7-org:elm-types:r1}Date",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Date",
-                    "localId" : "1992",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ],
-                    "signature" : [ {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1993",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1994",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "1995",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    } ],
-                    "year" : {
-                      "type" : "Literal",
-                      "localId" : "1984",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "2012",
-                      "annotation" : [ ]
-                    },
-                    "month" : {
-                      "type" : "Literal",
-                      "localId" : "1985",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "9",
-                      "annotation" : [ ]
-                    },
-                    "day" : {
-                      "type" : "Literal",
-                      "localId" : "1986",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "1",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "high" : {
-                    "type" : "Date",
-                    "localId" : "2004",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ],
-                    "signature" : [ {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2005",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2006",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    }, {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "2007",
-                      "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "annotation" : [ ]
-                    } ],
-                    "year" : {
-                      "type" : "Literal",
-                      "localId" : "1996",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "2012",
-                      "annotation" : [ ]
-                    },
-                    "month" : {
-                      "type" : "Literal",
-                      "localId" : "1997",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "10",
-                      "annotation" : [ ]
-                    },
-                    "day" : {
-                      "type" : "Literal",
-                      "localId" : "1998",
-                      "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                      "value" : "1",
-                      "annotation" : [ ]
-                    }
-                  }
-                }
               }
             },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "2025",
-              "path" : "highClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "2008",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "2009",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2010",
-                    "name" : "{urn:hl7-org:elm-types:r1}Date",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Date",
-                  "localId" : "1992",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1993",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1994",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1995",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1984",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1985",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "9",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1986",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  }
-                },
-                "high" : {
-                  "type" : "Date",
-                  "localId" : "2004",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2005",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2006",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }, {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "2007",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "year" : {
-                    "type" : "Literal",
-                    "localId" : "1996",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "2012",
-                    "annotation" : [ ]
-                  },
-                  "month" : {
-                    "type" : "Literal",
-                    "localId" : "1997",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "10",
-                    "annotation" : [ ]
-                  },
-                  "day" : {
-                    "type" : "Literal",
-                    "localId" : "1998",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  }
-                }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "310",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "322",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "322",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterRealIvl", ": " ]
+            }, {
+              "r" : "333",
+              "s" : [ {
+                "r" : "325",
+                "s" : [ {
+                  "r" : "323",
+                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                } ]
+              }, {
+                "r" : "333",
+                "value" : [ " ", "meets after", " " ]
+              }, {
+                "r" : "330",
+                "s" : [ {
+                  "r" : "328",
+                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsAfter",
+          "localId" : "333",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "334",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "335",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "336",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "337",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "325",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "326",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "327",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.50000001",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "324",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.5",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "2011",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "330",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2012",
+              "localId" : "331",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2013",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "332",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.5",
+              "annotation" : [ ]
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Meets
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define MeetsAfterIntIvl: Interval[11, 15] meets Interval[5, 10]
-define MeetsBeforeIntIvl: Interval[1, 4] meets Interval[5, 10]
-define NotMeetsIntIvl: Interval[1, 2] meets Interval[5, 10]
-define MeetsAfterRealIvl: Interval[1.50000001, 2.5] meets Interval[0.5, 1.5]
-define MeetsBeforeRealIvl: Interval[0.5, 1.5] meets Interval[1.50000001, 2.5]
-define NotMeetsRealIvl: Interval[0.0, 1.0] meets Interval[1.1, 2.0]
-define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define MeetsAfterDateIvl: Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)) meets DateIvl
-define MeetsBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) meets DateIvl
-define NotMeetsDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 0, 0, 0, 0)) meets DateIvl
-define MayMeetAfterImpreciseDateIvl: DateIvl meets Interval[DateTime(2012, 1), DateTime(2012, 2)]
-define MayMeetBeforeImpreciseDateIvl: DateIvl meets Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define NotMeetsImpreciseDateIvl: DateIvl meets Interval[DateTime(2012, 1), DateTime(2012, 12)]
-define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define MeetsAfterDayOfIvl: PrecisionDateIvl meets day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define MeetsBeforeDayOfIvl: PrecisionDateIvl meets day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
-define NotMeetsDayOfIvl: PrecisionDateIvl meets day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define NotMeetsDayOfImpreciseIVL: PrecisionDateIvl meets day of Interval[DateTime(2012, 1), DateTime(2012, 2)]
-define MayMeetAfterDayOfImpreciseIvl: PrecisionDateIvl meets day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
-define MayMeetBeforeDayOfImpreciseIvl: PrecisionDateIvl meets day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
-define ImpreciseMayMeetAfterDateIvl: ImpDateIvl meets Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 23, 59, 59, 999)]
-define ImpreciseMayMeetBeforeDateIvl: ImpDateIvl meets Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999)]
-define ImpreciseNotMeetsDateIvl: ImpDateIvl meets Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999))
-define NegInfBegMeetsBeforeIntIvl: Interval[null, 100] meets Interval[101, 200]
-define NegInfBegNotMeetsIntIvl: Interval[null, 100] meets Interval[100, 200]
-define IntIvlNotMeetsNegInfBeg: Interval[100, 200] meets Interval[null, 400]
-define UnknownBegMeetsBeforeIntIvl: Interval(null, 100] meets Interval[101, 200]
-define UnknownBegMayMeetAfterIntIvl: Interval(null, 100] meets Interval[0, 50]
-define UnknownBegNotMeetsIntIvl: Interval(null, 5] meets Interval[0, 100]
-define IntIvlMayMeetBeforeUnknownBeg: Interval[0, 100] meets Interval(null, 400)
-define PosInfEndMeetsAfterIntIvl: Interval[100, null] meets Interval[0, 99]
-define PosInfEndNotMeetsIntIvl: Interval[0, null] meets Interval[1000, 2000]
-define IntIvlNotMeetsPosInfEnd: Interval[100, 200] meets Interval[0, null]
-define UnknownEndMeetsAfterIntIvl: Interval[100, null) meets Interval[0, 99]
-define UnknownEndMayMeetBeforeIntIvl: Interval[0, null) meets Interval[50, 100]
-define UnknownEndNotMeetsIntIvl: Interval[0, null) meets Interval[0, 100]
-define IntIvlMayMeetAfterUnknownEnd: Interval[0, 100] meets Interval[-100, null)
-define NegInfBegMeetsBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
-define NegInfBegNotMeetsDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define DateIvlNotMeetsNegInfBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownBegMeetsBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
-define UnknownBegMayMeetAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define UnknownBegNotMeetsDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define DateIvlMayMeetBeforeUnknownBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define PosInfEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
-define PosInfEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define DateIvlNotMeetsPosInfEnd: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)] meets Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
-define UnknownEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets Interval[DateTime(2010, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownEndMayMeetBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
-define UnknownEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateIvlMayMeetAfterUnknownEnd: Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)] meets Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
-*/
-
-module.exports['Meets'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "2622",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "340",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "340",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "MeetsBeforeRealIvl", ": " ]
             }, {
+              "r" : "351",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "343",
+                "s" : [ {
+                  "r" : "341",
+                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                } ]
+              }, {
+                "r" : "351",
+                "value" : [ " ", "meets after", " " ]
+              }, {
+                "r" : "348",
+                "s" : [ {
+                  "r" : "346",
+                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "MeetsAfter",
+          "localId" : "351",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "352",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "353",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "354",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "355",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "343",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "344",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "345",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "348",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "349",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "350",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.50000001",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.5",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "358",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterIntIvl",
+        "name" : "NotMeetsRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "358",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "NotMeetsRealIvl", ": " ]
             }, {
-              "r" : "225",
+              "r" : "369",
               "s" : [ {
-                "r" : "217",
+                "r" : "361",
                 "s" : [ {
-                  "r" : "215",
-                  "value" : [ "Interval[", "11", ", ", "15", "]" ]
+                  "r" : "359",
+                  "value" : [ "Interval[", "0.0", ", ", "1.0", "]" ]
                 } ]
               }, {
-                "r" : "225",
-                "value" : [ " ", "meets", " " ]
+                "r" : "369",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "222",
+                "r" : "366",
                 "s" : [ {
-                  "r" : "220",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                  "r" : "364",
+                  "value" : [ "Interval[", "1.1", ", ", "2.0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "225",
+          "type" : "MeetsAfter",
+          "localId" : "369",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "226",
+            "localId" : "370",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "227",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "228",
+            "localId" : "372",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "217",
+            "localId" : "361",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "218",
+              "localId" : "362",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "219",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "363",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "11",
+              "localId" : "359",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "15",
+              "localId" : "360",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "222",
+            "localId" : "366",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "223",
+              "localId" : "367",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "224",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "220",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "376",
+        "name" : "DateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "376",
+            "s" : [ {
+              "value" : [ "", "define ", "DateIvl", ": " ]
+            }, {
+              "r" : "425",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "393",
+                "s" : [ {
+                  "r" : "377",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "417",
+                "s" : [ {
+                  "r" : "401",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "428",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "429",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "425",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "426",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "427",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "393",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "394",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "395",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "396",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "397",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "398",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "399",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "400",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "377",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "2012",
               "annotation" : [ ]
             },
-            "high" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "221",
+              "localId" : "378",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "379",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "380",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "381",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "417",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "418",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "419",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "420",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "421",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "422",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "423",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "424",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "402",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "405",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "406",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "407",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "432",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "432",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterDateIvl", ": " ]
+            }, {
+              "r" : "487",
+              "s" : [ {
+                "r" : "481",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "449",
+                  "s" : [ {
+                    "r" : "433",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "473",
+                  "s" : [ {
+                    "r" : "457",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              }, {
+                "r" : "487",
+                "value" : [ " ", "meets after", " " ]
+              }, {
+                "r" : "484",
+                "s" : [ {
+                  "value" : [ "DateIvl" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsAfter",
+          "localId" : "487",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "488",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "489",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "490",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "491",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "481",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "482",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "483",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "449",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "450",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "451",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "452",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "453",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "454",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "455",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "456",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "433",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "434",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "435",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "436",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "437",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "438",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "439",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "473",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "474",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "475",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "476",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "477",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "478",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "479",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "480",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "457",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "458",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "459",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "460",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "461",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "462",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "463",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "484",
+            "name" : "DateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "485",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "486",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
           } ]
         }
       }, {
-        "localId" : "232",
+        "localId" : "494",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeIntIvl",
+        "name" : "MeetsBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "232",
+            "r" : "494",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "MeetsBeforeDateIvl", ": " ]
             }, {
-              "r" : "243",
+              "r" : "549",
               "s" : [ {
-                "r" : "235",
+                "r" : "543",
                 "s" : [ {
-                  "r" : "233",
-                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "511",
+                  "s" : [ {
+                    "r" : "495",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "535",
+                  "s" : [ {
+                    "r" : "519",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "243",
-                "value" : [ " ", "meets", " " ]
+                "r" : "549",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "240",
+                "r" : "546",
                 "s" : [ {
-                  "r" : "238",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "243",
+          "type" : "MeetsAfter",
+          "localId" : "549",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "244",
+            "localId" : "550",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "245",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "551",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "246",
+            "localId" : "552",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "247",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "553",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "235",
+            "localId" : "543",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "236",
+              "localId" : "544",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "237",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "545",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "233",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "511",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "512",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "513",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "514",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "515",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "516",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "517",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "518",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "495",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "496",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "497",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "498",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "499",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "500",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "501",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "234",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "535",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "536",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "537",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "538",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "539",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "540",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "541",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "542",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "519",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "520",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "521",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "522",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "523",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "524",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "525",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "240",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "546",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "241",
+              "localId" : "547",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "242",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "548",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "238",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "250",
+        "localId" : "556",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsIntIvl",
+        "name" : "NotMeetsDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "250",
+            "r" : "556",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsIntIvl", ": " ]
+              "value" : [ "", "define ", "NotMeetsDateIvl", ": " ]
             }, {
-              "r" : "261",
+              "r" : "611",
               "s" : [ {
-                "r" : "253",
+                "r" : "605",
                 "s" : [ {
-                  "r" : "251",
-                  "value" : [ "Interval[", "1", ", ", "2", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "573",
+                  "s" : [ {
+                    "r" : "557",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "597",
+                  "s" : [ {
+                    "r" : "581",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "261",
-                "value" : [ " ", "meets", " " ]
+                "r" : "611",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "258",
+                "r" : "608",
                 "s" : [ {
-                  "r" : "256",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "261",
+          "type" : "MeetsAfter",
+          "localId" : "611",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "262",
+            "localId" : "612",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "263",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "613",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
+            "localId" : "614",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "265",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "615",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "253",
+            "localId" : "605",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "254",
+              "localId" : "606",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "255",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "607",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "573",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "574",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "575",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "576",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "577",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "578",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "579",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "580",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "557",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "558",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "559",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "560",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "561",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "562",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "563",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "597",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "598",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "599",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "600",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "601",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "602",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "603",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "604",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "581",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "582",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "583",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "29",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "584",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "585",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "586",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "587",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "258",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "608",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "259",
+              "localId" : "609",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "260",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "610",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "256",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "257",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "268",
+        "localId" : "618",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterRealIvl",
+        "name" : "MayMeetAfterImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "268",
+            "r" : "618",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterRealIvl", ": " ]
+              "value" : [ "", "define ", "MayMeetAfterImpreciseDateIvl", ": " ]
             }, {
-              "r" : "279",
+              "r" : "643",
               "s" : [ {
-                "r" : "271",
+                "r" : "619",
                 "s" : [ {
-                  "r" : "269",
-                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "279",
-                "value" : [ " ", "meets", " " ]
+                "r" : "643",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "276",
+                "r" : "640",
                 "s" : [ {
-                  "r" : "274",
-                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "628",
+                  "s" : [ {
+                    "r" : "622",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "637",
+                  "s" : [ {
+                    "r" : "631",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "279",
+          "type" : "MeetsAfter",
+          "localId" : "643",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "280",
+            "localId" : "644",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "281",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "645",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "282",
+            "localId" : "646",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "283",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "647",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "271",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "619",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "272",
+              "localId" : "620",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "273",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "621",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.50000001",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.5",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "276",
+            "localId" : "640",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "277",
+              "localId" : "641",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "278",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "642",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "628",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "629",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "630",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "622",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "623",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "637",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "638",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "639",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "631",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "632",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "286",
+        "localId" : "650",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeRealIvl",
+        "name" : "MayMeetBeforeImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "286",
+            "r" : "650",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeRealIvl", ": " ]
+              "value" : [ "", "define ", "MayMeetBeforeImpreciseDateIvl", ": " ]
             }, {
-              "r" : "297",
+              "r" : "675",
               "s" : [ {
-                "r" : "289",
+                "r" : "651",
                 "s" : [ {
-                  "r" : "287",
-                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "297",
-                "value" : [ " ", "meets", " " ]
+                "r" : "675",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "294",
+                "r" : "672",
                 "s" : [ {
-                  "r" : "292",
-                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "660",
+                  "s" : [ {
+                    "r" : "654",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "669",
+                  "s" : [ {
+                    "r" : "663",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "297",
+          "type" : "MeetsAfter",
+          "localId" : "675",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "298",
+            "localId" : "676",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "299",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "677",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "300",
+            "localId" : "678",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "301",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "679",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "289",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "651",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "290",
+              "localId" : "652",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "291",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "653",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "287",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "288",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.5",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "294",
+            "localId" : "672",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "295",
+              "localId" : "673",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "296",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "674",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.50000001",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "660",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "661",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "662",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "654",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "655",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "669",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "670",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "671",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "663",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "664",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "304",
+        "localId" : "682",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsRealIvl",
+        "name" : "NotMeetsImpreciseDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "304",
+            "r" : "682",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsRealIvl", ": " ]
+              "value" : [ "", "define ", "NotMeetsImpreciseDateIvl", ": " ]
             }, {
-              "r" : "315",
+              "r" : "707",
               "s" : [ {
-                "r" : "307",
+                "r" : "683",
                 "s" : [ {
-                  "r" : "305",
-                  "value" : [ "Interval[", "0.0", ", ", "1.0", "]" ]
+                  "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "315",
-                "value" : [ " ", "meets", " " ]
+                "r" : "707",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "312",
+                "r" : "704",
                 "s" : [ {
-                  "r" : "310",
-                  "value" : [ "Interval[", "1.1", ", ", "2.0", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "692",
+                  "s" : [ {
+                    "r" : "686",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "701",
+                  "s" : [ {
+                    "r" : "695",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "315",
+          "type" : "MeetsAfter",
+          "localId" : "707",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "316",
+            "localId" : "708",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "317",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "709",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "318",
+            "localId" : "710",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "319",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "711",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "307",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "683",
+            "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "308",
+              "localId" : "684",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "309",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "685",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "305",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "306",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "312",
+            "localId" : "704",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "313",
+              "localId" : "705",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "314",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "706",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "310",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.1",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "692",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "693",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "694",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "686",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "687",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "311",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.0",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "701",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "702",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "703",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "695",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "696",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "322",
-        "name" : "DateIvl",
+        "localId" : "714",
+        "name" : "PrecisionDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "322",
+            "r" : "714",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvl", ": " ]
+              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
             }, {
-              "r" : "371",
+              "r" : "763",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "339",
+                "r" : "731",
                 "s" : [ {
-                  "r" : "323",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "715",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "363",
+                "r" : "755",
                 "s" : [ {
-                  "r" : "347",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "739",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -101075,76 +129726,76 @@ module.exports['Meets'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "374",
+          "localId" : "766",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "375",
+            "localId" : "767",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "371",
+          "localId" : "763",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "372",
+            "localId" : "764",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "373",
+              "localId" : "765",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "339",
+            "localId" : "731",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "340",
+              "localId" : "732",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "341",
+              "localId" : "733",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "342",
+              "localId" : "734",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "343",
+              "localId" : "735",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "344",
+              "localId" : "736",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "345",
+              "localId" : "737",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "346",
+              "localId" : "738",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "323",
+              "localId" : "715",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -101152,7 +129803,7 @@ module.exports['Meets'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "324",
+              "localId" : "716",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -101160,89 +129811,89 @@ module.exports['Meets'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "325",
+              "localId" : "717",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "2",
               "annotation" : [ ]
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "326",
+              "localId" : "718",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "12",
               "annotation" : [ ]
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "327",
+              "localId" : "719",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "34",
               "annotation" : [ ]
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "328",
+              "localId" : "720",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "56",
               "annotation" : [ ]
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "329",
+              "localId" : "721",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "789",
               "annotation" : [ ]
             }
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "363",
+            "localId" : "755",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "364",
+              "localId" : "756",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "365",
+              "localId" : "757",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "366",
+              "localId" : "758",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "367",
+              "localId" : "759",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "368",
+              "localId" : "760",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "369",
+              "localId" : "761",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "370",
+              "localId" : "762",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "347",
+              "localId" : "739",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -101250,7 +129901,7 @@ module.exports['Meets'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "348",
+              "localId" : "740",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -101258,181 +129909,198 @@ module.exports['Meets'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "349",
+              "localId" : "741",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "2",
               "annotation" : [ ]
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "350",
+              "localId" : "742",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "1",
               "annotation" : [ ]
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "351",
+              "localId" : "743",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "23",
               "annotation" : [ ]
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "352",
+              "localId" : "744",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "45",
               "annotation" : [ ]
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "353",
+              "localId" : "745",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "678",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "378",
+        "localId" : "770",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterDateIvl",
+        "name" : "MeetsAfterDayOfIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "378",
+            "r" : "770",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "MeetsAfterDayOfIvl", ": " ]
             }, {
-              "r" : "433",
+              "r" : "825",
               "s" : [ {
-                "r" : "427",
+                "r" : "771",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "825",
+                "value" : [ " ", "meets after day of", " " ]
+              }, {
+                "r" : "822",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "395",
+                  "r" : "790",
                   "s" : [ {
-                    "r" : "379",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "774",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "419",
+                  "r" : "814",
                   "s" : [ {
-                    "r" : "403",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "798",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "433",
-                "value" : [ " ", "meets", " " ]
-              }, {
-                "r" : "430",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "433",
+          "type" : "MeetsAfter",
+          "localId" : "825",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "434",
+            "localId" : "826",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "435",
+              "localId" : "827",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "436",
+            "localId" : "828",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "437",
+              "localId" : "829",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "771",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "772",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "773",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "427",
+            "localId" : "822",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "428",
+              "localId" : "823",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "429",
+                "localId" : "824",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "395",
+              "localId" : "790",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "396",
+                "localId" : "791",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "397",
+                "localId" : "792",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "398",
+                "localId" : "793",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "399",
+                "localId" : "794",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "400",
+                "localId" : "795",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "401",
+                "localId" : "796",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "402",
+                "localId" : "797",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "379",
+                "localId" : "774",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -101440,23 +130108,23 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "380",
+                "localId" : "775",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "381",
+                "localId" : "776",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "382",
+                "localId" : "777",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101464,7 +130132,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "383",
+                "localId" : "778",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101472,7 +130140,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "384",
+                "localId" : "779",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101480,7 +130148,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "385",
+                "localId" : "780",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101489,48 +130157,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "419",
+              "localId" : "814",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "420",
+                "localId" : "815",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "421",
+                "localId" : "816",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "422",
+                "localId" : "817",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "423",
+                "localId" : "818",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "424",
+                "localId" : "819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "425",
+                "localId" : "820",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "426",
+                "localId" : "821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "403",
+                "localId" : "798",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -101538,15 +130206,15 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "404",
+                "localId" : "799",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "405",
+                "localId" : "800",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -101554,7 +130222,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "406",
+                "localId" : "801",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101562,7 +130230,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "407",
+                "localId" : "802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101570,7 +130238,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "408",
+                "localId" : "803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101578,166 +130246,167 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "409",
+                "localId" : "804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "430",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "431",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "432",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "440",
+        "localId" : "832",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeDateIvl",
+        "name" : "MeetsBeforeDayOfIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "440",
+            "r" : "832",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "MeetsBeforeDayOfIvl", ": " ]
             }, {
-              "r" : "495",
+              "r" : "887",
               "s" : [ {
-                "r" : "489",
+                "r" : "833",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "887",
+                "value" : [ " ", "meets after day of", " " ]
+              }, {
+                "r" : "884",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "457",
+                  "r" : "852",
                   "s" : [ {
-                    "r" : "441",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "836",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "481",
+                  "r" : "876",
                   "s" : [ {
-                    "r" : "465",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "860",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "495",
-                "value" : [ " ", "meets", " " ]
-              }, {
-                "r" : "492",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "495",
+          "type" : "MeetsAfter",
+          "localId" : "887",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "496",
+            "localId" : "888",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "497",
+              "localId" : "889",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "498",
+            "localId" : "890",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "499",
+              "localId" : "891",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "833",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "834",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "835",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "489",
+            "localId" : "884",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "490",
+              "localId" : "885",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "491",
+                "localId" : "886",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "457",
+              "localId" : "852",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "458",
+                "localId" : "853",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "459",
+                "localId" : "854",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "460",
+                "localId" : "855",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "461",
+                "localId" : "856",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "462",
+                "localId" : "857",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "463",
+                "localId" : "858",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "464",
+                "localId" : "859",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "441",
+                "localId" : "836",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -101745,23 +130414,23 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "442",
+                "localId" : "837",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "443",
+                "localId" : "838",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "444",
+                "localId" : "839",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101769,7 +130438,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "445",
+                "localId" : "840",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101777,7 +130446,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "446",
+                "localId" : "841",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101785,7 +130454,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "447",
+                "localId" : "842",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101794,48 +130463,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "481",
+              "localId" : "876",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "482",
+                "localId" : "877",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "483",
+                "localId" : "878",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "484",
+                "localId" : "879",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "485",
+                "localId" : "880",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "486",
+                "localId" : "881",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "487",
+                "localId" : "882",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "488",
+                "localId" : "883",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "465",
+                "localId" : "860",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -101843,15 +130512,15 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "466",
+                "localId" : "861",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "12",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "467",
+                "localId" : "862",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -101859,7 +130528,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "468",
+                "localId" : "863",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101867,7 +130536,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "469",
+                "localId" : "864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101875,7 +130544,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "470",
+                "localId" : "865",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -101883,166 +130552,167 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "471",
+                "localId" : "866",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "492",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "493",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "494",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "502",
+        "localId" : "894",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsDateIvl",
+        "name" : "NotMeetsDayOfIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "502",
+            "r" : "894",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "NotMeetsDayOfIvl", ": " ]
             }, {
-              "r" : "557",
+              "r" : "949",
               "s" : [ {
-                "r" : "551",
+                "r" : "895",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "949",
+                "value" : [ " ", "meets after day of", " " ]
+              }, {
+                "r" : "946",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "519",
+                  "r" : "914",
                   "s" : [ {
-                    "r" : "503",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "898",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "543",
+                  "r" : "938",
                   "s" : [ {
-                    "r" : "527",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "922",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
-                } ]
-              }, {
-                "r" : "557",
-                "value" : [ " ", "meets", " " ]
-              }, {
-                "r" : "554",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "557",
+          "type" : "MeetsAfter",
+          "localId" : "949",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "558",
+            "localId" : "950",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "559",
+              "localId" : "951",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "560",
+            "localId" : "952",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "561",
+              "localId" : "953",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "895",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "896",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "897",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "551",
+            "localId" : "946",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "552",
+              "localId" : "947",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "553",
+                "localId" : "948",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "519",
+              "localId" : "914",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "520",
+                "localId" : "915",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "521",
+                "localId" : "916",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "522",
+                "localId" : "917",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "523",
+                "localId" : "918",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "524",
+                "localId" : "919",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "525",
+                "localId" : "920",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "526",
+                "localId" : "921",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "503",
+                "localId" : "898",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -102050,7 +130720,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "504",
+                "localId" : "899",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -102058,15 +130728,15 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "505",
+                "localId" : "900",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "506",
+                "localId" : "901",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -102074,7 +130744,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "507",
+                "localId" : "902",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -102082,7 +130752,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "508",
+                "localId" : "903",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -102090,7 +130760,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "509",
+                "localId" : "904",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -102099,48 +130769,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "543",
+              "localId" : "938",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "544",
+                "localId" : "939",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "545",
+                "localId" : "940",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "546",
+                "localId" : "941",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "547",
+                "localId" : "942",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "548",
+                "localId" : "943",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "549",
+                "localId" : "944",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "550",
+                "localId" : "945",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "527",
+                "localId" : "922",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -102148,23 +130818,23 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "528",
+                "localId" : "923",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "529",
+                "localId" : "924",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "29",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "530",
+                "localId" : "925",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -102172,7 +130842,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "531",
+                "localId" : "926",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -102180,7 +130850,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "532",
+                "localId" : "927",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -102188,70 +130858,54 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "533",
+                "localId" : "928",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "554",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "555",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "556",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
           } ]
         }
       }, {
-        "localId" : "564",
+        "localId" : "956",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetAfterImpreciseDateIvl",
+        "name" : "NotMeetsDayOfImpreciseIVL",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "564",
+            "r" : "956",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetAfterImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "NotMeetsDayOfImpreciseIVL", ": " ]
             }, {
-              "r" : "589",
+              "r" : "981",
               "s" : [ {
-                "r" : "565",
+                "r" : "957",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "589",
-                "value" : [ " ", "meets", " " ]
+                "r" : "981",
+                "value" : [ " ", "meets after day of", " " ]
               }, {
-                "r" : "586",
+                "r" : "978",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "574",
+                  "r" : "966",
                   "s" : [ {
-                    "r" : "568",
+                    "r" : "960",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "583",
+                  "r" : "975",
                   "s" : [ {
-                    "r" : "577",
+                    "r" : "969",
                     "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
                   } ]
                 }, {
@@ -102262,83 +130916,84 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "589",
+          "type" : "MeetsAfter",
+          "localId" : "981",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "590",
+            "localId" : "982",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "591",
+              "localId" : "983",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "592",
+            "localId" : "984",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "593",
+              "localId" : "985",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "565",
-            "name" : "DateIvl",
+            "localId" : "957",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "566",
+              "localId" : "958",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "567",
+                "localId" : "959",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "586",
+            "localId" : "978",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "587",
+              "localId" : "979",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "588",
+                "localId" : "980",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "574",
+              "localId" : "966",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "575",
+                "localId" : "967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "576",
+                "localId" : "968",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "568",
+                "localId" : "960",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -102346,7 +131001,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "569",
+                "localId" : "961",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -102355,23 +131010,23 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "583",
+              "localId" : "975",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "584",
+                "localId" : "976",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "585",
+                "localId" : "977",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "577",
+                "localId" : "969",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -102379,7 +131034,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "578",
+                "localId" : "970",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -102389,45 +131044,45 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "596",
+        "localId" : "988",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetBeforeImpreciseDateIvl",
+        "name" : "MayMeetAfterDayOfImpreciseIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "596",
+            "r" : "988",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetBeforeImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "MayMeetAfterDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "621",
+              "r" : "1013",
               "s" : [ {
-                "r" : "597",
+                "r" : "989",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "621",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1013",
+                "value" : [ " ", "meets after day of", " " ]
               }, {
-                "r" : "618",
+                "r" : "1010",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "606",
+                  "r" : "998",
                   "s" : [ {
-                    "r" : "600",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                    "r" : "992",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "615",
+                  "r" : "1007",
                   "s" : [ {
-                    "r" : "609",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                    "r" : "1001",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -102437,83 +131092,84 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "621",
+          "type" : "MeetsAfter",
+          "localId" : "1013",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "622",
+            "localId" : "1014",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "623",
+              "localId" : "1015",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "624",
+            "localId" : "1016",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "625",
+              "localId" : "1017",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "597",
-            "name" : "DateIvl",
+            "localId" : "989",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "598",
+              "localId" : "990",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "599",
+                "localId" : "991",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "618",
+            "localId" : "1010",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "619",
+              "localId" : "1011",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "620",
+                "localId" : "1012",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "606",
+              "localId" : "998",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "607",
+                "localId" : "999",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "608",
+                "localId" : "1000",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "600",
+                "localId" : "992",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -102521,32 +131177,32 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "601",
+                "localId" : "993",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "615",
+              "localId" : "1007",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "616",
+                "localId" : "1008",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "617",
+                "localId" : "1009",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "609",
+                "localId" : "1001",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -102554,54 +131210,54 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "610",
+                "localId" : "1002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "3",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "628",
+        "localId" : "1020",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsImpreciseDateIvl",
+        "name" : "MayMeetBeforeDayOfImpreciseIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "628",
+            "r" : "1020",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "MayMeetBeforeDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "653",
+              "r" : "1045",
               "s" : [ {
-                "r" : "629",
+                "r" : "1021",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "653",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1045",
+                "value" : [ " ", "meets after day of", " " ]
               }, {
-                "r" : "650",
+                "r" : "1042",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "638",
+                  "r" : "1030",
                   "s" : [ {
-                    "r" : "632",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "1024",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "647",
+                  "r" : "1039",
                   "s" : [ {
-                    "r" : "641",
+                    "r" : "1033",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
                   } ]
                 }, {
@@ -102612,83 +131268,84 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "653",
+          "type" : "MeetsAfter",
+          "localId" : "1045",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "654",
+            "localId" : "1046",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "655",
+              "localId" : "1047",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "656",
+            "localId" : "1048",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "657",
+              "localId" : "1049",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "629",
-            "name" : "DateIvl",
+            "localId" : "1021",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "630",
+              "localId" : "1022",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "631",
+                "localId" : "1023",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "650",
+            "localId" : "1042",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "651",
+              "localId" : "1043",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "652",
+                "localId" : "1044",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "638",
+              "localId" : "1030",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "639",
+                "localId" : "1031",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "640",
+                "localId" : "1032",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "632",
+                "localId" : "1024",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -102696,32 +131353,32 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "633",
+                "localId" : "1025",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "9",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "647",
+              "localId" : "1039",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "648",
+                "localId" : "1040",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "649",
+                "localId" : "1041",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "641",
+                "localId" : "1033",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -102729,7 +131386,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "642",
+                "localId" : "1034",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -102739,113 +131396,88 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "660",
-        "name" : "PrecisionDateIvl",
+        "localId" : "1052",
+        "name" : "ImpDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "660",
+            "r" : "1052",
             "s" : [ {
-              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
+              "value" : [ "", "define ", "ImpDateIvl", ": " ]
             }, {
-              "r" : "709",
+              "r" : "1071",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "677",
+                "r" : "1059",
                 "s" : [ {
-                  "r" : "661",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
+                  "r" : "1053",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "701",
+                "r" : "1068",
                 "s" : [ {
-                  "r" : "685",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
+                  "r" : "1062",
+                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "712",
+          "localId" : "1074",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "713",
+            "localId" : "1075",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "709",
+          "localId" : "1071",
           "lowClosed" : true,
-          "highClosed" : false,
+          "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "710",
+            "localId" : "1072",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "711",
+              "localId" : "1073",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "677",
+            "localId" : "1059",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "678",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "679",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "680",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "681",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "682",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "683",
+              "localId" : "1060",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "684",
+              "localId" : "1061",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "661",
+              "localId" : "1053",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -102853,97 +131485,32 @@ module.exports['Meets'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "662",
+              "localId" : "1054",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "663",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "664",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "665",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "34",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "666",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "56",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "667",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "789",
-              "annotation" : [ ]
             }
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "701",
+            "localId" : "1068",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "702",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "703",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "704",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "705",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "706",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "707",
+              "localId" : "1069",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "708",
+              "localId" : "1070",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "685",
+              "localId" : "1062",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -102951,94 +131518,359 @@ module.exports['Meets'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "686",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "687",
+              "localId" : "1063",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "8",
               "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "688",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+            }
+          }
+        }
+      }, {
+        "localId" : "1078",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseMayMeetAfterDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1078",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseMayMeetAfterDateIvl", ": " ]
+            }, {
+              "r" : "1133",
+              "s" : [ {
+                "r" : "1079",
+                "s" : [ {
+                  "value" : [ "ImpDateIvl" ]
+                } ]
+              }, {
+                "r" : "1133",
+                "value" : [ " ", "meets after", " " ]
+              }, {
+                "r" : "1130",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1098",
+                  "s" : [ {
+                    "r" : "1082",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1122",
+                  "s" : [ {
+                    "r" : "1106",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsAfter",
+          "localId" : "1133",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1134",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1135",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "689",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1136",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1137",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1079",
+            "name" : "ImpDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1080",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1081",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1130",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1131",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1132",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "690",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "45",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1098",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1099",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1100",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1101",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1102",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1103",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1104",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1105",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1082",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1083",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1084",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1085",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1086",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1087",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1088",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "691",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "678",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1122",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1123",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1124",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1125",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1126",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1127",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1128",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1129",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1106",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1107",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1108",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "29",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1109",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "23",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1110",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1111",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1112",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "716",
+        "localId" : "1140",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterDayOfIvl",
+        "name" : "ImpreciseMayMeetBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "716",
+            "r" : "1140",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterDayOfIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseMayMeetBeforeDateIvl", ": " ]
             }, {
-              "r" : "771",
+              "r" : "1195",
               "s" : [ {
-                "r" : "717",
+                "r" : "1141",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "771",
-                "value" : [ " ", "meets day of", " " ]
+                "r" : "1195",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "768",
+                "r" : "1192",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "736",
+                  "r" : "1160",
                   "s" : [ {
-                    "r" : "720",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1144",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "760",
+                  "r" : "1184",
                   "s" : [ {
-                    "r" : "744",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1168",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -103048,109 +131880,108 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "771",
+          "type" : "MeetsAfter",
+          "localId" : "1195",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "772",
+            "localId" : "1196",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "773",
+              "localId" : "1197",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "774",
+            "localId" : "1198",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "775",
+              "localId" : "1199",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "717",
-            "name" : "PrecisionDateIvl",
+            "localId" : "1141",
+            "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "718",
+              "localId" : "1142",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "719",
+                "localId" : "1143",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "768",
+            "localId" : "1192",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "769",
+              "localId" : "1193",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "770",
+                "localId" : "1194",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "736",
+              "localId" : "1160",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "737",
+                "localId" : "1161",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "738",
+                "localId" : "1162",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "739",
+                "localId" : "1163",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "740",
+                "localId" : "1164",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "741",
+                "localId" : "1165",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "742",
+                "localId" : "1166",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "743",
+                "localId" : "1167",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "720",
+                "localId" : "1144",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -103158,23 +131989,23 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "721",
+                "localId" : "1145",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "722",
+                "localId" : "1146",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "723",
+                "localId" : "1147",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -103182,7 +132013,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "724",
+                "localId" : "1148",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -103190,7 +132021,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "725",
+                "localId" : "1149",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -103198,7 +132029,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "726",
+                "localId" : "1150",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -103207,48 +132038,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "760",
+              "localId" : "1184",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "761",
+                "localId" : "1185",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "762",
+                "localId" : "1186",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "763",
+                "localId" : "1187",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "764",
+                "localId" : "1188",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "765",
+                "localId" : "1189",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
+                "localId" : "1190",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "767",
+                "localId" : "1191",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "744",
+                "localId" : "1168",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -103256,207 +132087,206 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "745",
+                "localId" : "1169",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "12",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "746",
+                "localId" : "1170",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "31",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "747",
+                "localId" : "1171",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "23",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "748",
+                "localId" : "1172",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "749",
+                "localId" : "1173",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "750",
+                "localId" : "1174",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "999",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "778",
+        "localId" : "1202",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeDayOfIvl",
+        "name" : "ImpreciseNotMeetsDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "778",
+            "r" : "1202",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeDayOfIvl", ": " ]
+              "value" : [ "", "define ", "ImpreciseNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "833",
+              "r" : "1257",
               "s" : [ {
-                "r" : "779",
+                "r" : "1203",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "833",
-                "value" : [ " ", "meets day of", " " ]
+                "r" : "1257",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "830",
+                "r" : "1254",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "798",
+                  "r" : "1222",
                   "s" : [ {
-                    "r" : "782",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1206",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "822",
+                  "r" : "1246",
                   "s" : [ {
-                    "r" : "806",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1230",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "833",
+          "type" : "MeetsAfter",
+          "localId" : "1257",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "834",
+            "localId" : "1258",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "835",
+              "localId" : "1259",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "836",
+            "localId" : "1260",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "837",
+              "localId" : "1261",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "779",
-            "name" : "PrecisionDateIvl",
+            "localId" : "1203",
+            "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "780",
+              "localId" : "1204",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "781",
+                "localId" : "1205",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "830",
+            "localId" : "1254",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "831",
+              "localId" : "1255",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "832",
+                "localId" : "1256",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "798",
+              "localId" : "1222",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "799",
+                "localId" : "1223",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "800",
+                "localId" : "1224",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "801",
+                "localId" : "1225",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "802",
+                "localId" : "1226",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "803",
+                "localId" : "1227",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "804",
+                "localId" : "1228",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "805",
+                "localId" : "1229",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "782",
+                "localId" : "1206",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -103464,23 +132294,23 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "783",
+                "localId" : "1207",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "784",
+                "localId" : "1208",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "785",
+                "localId" : "1209",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -103488,7 +132318,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "786",
+                "localId" : "1210",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -103496,7 +132326,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "787",
+                "localId" : "1211",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -103504,7 +132334,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "788",
+                "localId" : "1212",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -103513,48 +132343,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "822",
+              "localId" : "1246",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "823",
+                "localId" : "1247",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "824",
+                "localId" : "1248",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "825",
+                "localId" : "1249",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "826",
+                "localId" : "1250",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "827",
+                "localId" : "1251",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "828",
+                "localId" : "1252",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "829",
+                "localId" : "1253",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "806",
+                "localId" : "1230",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -103562,7 +132392,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "807",
+                "localId" : "1231",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -103570,3251 +132400,3253 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "808",
+                "localId" : "1232",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "31",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "809",
+                "localId" : "1233",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "23",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "810",
+                "localId" : "1234",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1235",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "59",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1236",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "999",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1264",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegMeetsBeforeIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1264",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegMeetsBeforeIntIvl", ": " ]
+            }, {
+              "r" : "1276",
+              "s" : [ {
+                "r" : "1267",
+                "s" : [ {
+                  "r" : "1265",
+                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1276",
+                "value" : [ " ", "meets after", " " ]
+              }, {
+                "r" : "1273",
+                "s" : [ {
+                  "r" : "1271",
+                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsAfter",
+          "localId" : "1276",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1277",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1278",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1279",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1280",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1267",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1269",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1270",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1268",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1265",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1273",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1274",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1275",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1271",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1272",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1283",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegNotMeetsIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1283",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegNotMeetsIntIvl", ": " ]
+            }, {
+              "r" : "1295",
+              "s" : [ {
+                "r" : "1286",
+                "s" : [ {
+                  "r" : "1284",
+                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1295",
+                "value" : [ " ", "meets after", " " ]
+              }, {
+                "r" : "1292",
+                "s" : [ {
+                  "r" : "1290",
+                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsAfter",
+          "localId" : "1295",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1296",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1297",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1298",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1299",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1286",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1288",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1289",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1287",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1284",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1285",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1292",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1293",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1294",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1290",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1302",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntIvlNotMeetsNegInfBeg",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1302",
+            "s" : [ {
+              "value" : [ "", "define ", "IntIvlNotMeetsNegInfBeg", ": " ]
+            }, {
+              "r" : "1314",
+              "s" : [ {
+                "r" : "1305",
+                "s" : [ {
+                  "r" : "1303",
+                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                } ]
+              }, {
+                "r" : "1314",
+                "value" : [ " ", "meets after", " " ]
+              }, {
+                "r" : "1310",
+                "s" : [ {
+                  "r" : "1308",
+                  "value" : [ "Interval[", "null", ", ", "400", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsAfter",
+          "localId" : "1314",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1315",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1316",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1317",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1318",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1305",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1306",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1307",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1303",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1304",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1310",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1312",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1313",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1311",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1308",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1309",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "400",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1321",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegMeetsBeforeIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1321",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegMeetsBeforeIntIvl", ": " ]
+            }, {
+              "r" : "1333",
+              "s" : [ {
+                "r" : "1324",
+                "s" : [ {
+                  "r" : "1322",
+                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1333",
+                "value" : [ " ", "meets after", " " ]
+              }, {
+                "r" : "1330",
+                "s" : [ {
+                  "r" : "1328",
+                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsAfter",
+          "localId" : "1333",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1334",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1335",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1336",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1337",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1324",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1326",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1327",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1325",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1322",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1330",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1331",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1332",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1340",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegMayMeetAfterIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1340",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegMayMeetAfterIntIvl", ": " ]
+            }, {
+              "r" : "1352",
+              "s" : [ {
+                "r" : "1343",
+                "s" : [ {
+                  "r" : "1341",
+                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
+                } ]
+              }, {
+                "r" : "1352",
+                "value" : [ " ", "meets after", " " ]
+              }, {
+                "r" : "1349",
+                "s" : [ {
+                  "r" : "1347",
+                  "value" : [ "Interval[", "0", ", ", "50", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsAfter",
+          "localId" : "1352",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1353",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1354",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1355",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1356",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1343",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1345",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1346",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "811",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1344",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1341",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "812",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1349",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1350",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1351",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1348",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "50",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "840",
+        "localId" : "1359",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsDayOfIvl",
+        "name" : "UnknownBegNotMeetsIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "840",
+            "r" : "1359",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsDayOfIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotMeetsIntIvl", ": " ]
             }, {
-              "r" : "895",
+              "r" : "1371",
               "s" : [ {
-                "r" : "841",
+                "r" : "1362",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "1360",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "895",
-                "value" : [ " ", "meets day of", " " ]
+                "r" : "1371",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "892",
+                "r" : "1368",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "860",
-                  "s" : [ {
-                    "r" : "844",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "884",
-                  "s" : [ {
-                    "r" : "868",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1366",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "895",
+          "type" : "MeetsAfter",
+          "localId" : "1371",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "896",
+            "localId" : "1372",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "897",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1373",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "898",
+            "localId" : "1374",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "899",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1375",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "841",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1362",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "842",
+              "localId" : "1364",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "843",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1365",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1363",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1360",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1361",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "892",
+            "localId" : "1368",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "893",
+              "localId" : "1369",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "894",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1370",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "860",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "861",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "862",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "863",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "864",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "865",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "866",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "867",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "844",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "845",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "846",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "847",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "848",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "849",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "850",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "884",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "885",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "886",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "887",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "888",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "889",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "890",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "891",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "868",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "869",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "870",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "871",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "872",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "873",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "874",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1367",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "902",
+        "localId" : "1378",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsDayOfImpreciseIVL",
+        "name" : "IntIvlMayMeetBeforeUnknownBeg",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "902",
+            "r" : "1378",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsDayOfImpreciseIVL", ": " ]
+              "value" : [ "", "define ", "IntIvlMayMeetBeforeUnknownBeg", ": " ]
             }, {
-              "r" : "927",
+              "r" : "1390",
               "s" : [ {
-                "r" : "903",
+                "r" : "1381",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "1379",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "927",
-                "value" : [ " ", "meets day of", " " ]
+                "r" : "1390",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "924",
+                "r" : "1386",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "912",
-                  "s" : [ {
-                    "r" : "906",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "921",
-                  "s" : [ {
-                    "r" : "915",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1384",
+                  "value" : [ "Interval(", "null", ", ", "400", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "927",
+          "type" : "MeetsAfter",
+          "localId" : "1390",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "928",
+            "localId" : "1391",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "929",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1392",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "930",
+            "localId" : "1393",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "931",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1394",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "903",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1381",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "904",
+              "localId" : "1382",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "905",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1383",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1379",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1380",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "924",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "1386",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "925",
+              "localId" : "1388",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "926",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1389",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "912",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1387",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "913",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "914",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "906",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "907",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1384",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "921",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "922",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "923",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "915",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "916",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1385",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "400",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "934",
+        "localId" : "1397",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetAfterDayOfImpreciseIvl",
+        "name" : "PosInfEndMeetsAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "934",
+            "r" : "1397",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetAfterDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndMeetsAfterIntIvl", ": " ]
             }, {
-              "r" : "959",
+              "r" : "1409",
               "s" : [ {
-                "r" : "935",
+                "r" : "1400",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "1398",
+                  "value" : [ "Interval[", "100", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "959",
-                "value" : [ " ", "meets day of", " " ]
+                "r" : "1409",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "956",
+                "r" : "1406",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "944",
-                  "s" : [ {
-                    "r" : "938",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "953",
-                  "s" : [ {
-                    "r" : "947",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1404",
+                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "959",
+          "type" : "MeetsAfter",
+          "localId" : "1409",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "960",
+            "localId" : "1410",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "961",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1411",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "962",
+            "localId" : "1412",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "963",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1413",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "935",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1400",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "936",
+              "localId" : "1402",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "937",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1403",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1398",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1401",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1399",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "956",
+            "localId" : "1406",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "957",
+              "localId" : "1407",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "958",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1408",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "944",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "945",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "1404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1405",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "99",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1416",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndNotMeetsIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1416",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndNotMeetsIntIvl", ": " ]
+            }, {
+              "r" : "1428",
+              "s" : [ {
+                "r" : "1419",
+                "s" : [ {
+                  "r" : "1417",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "1428",
+                "value" : [ " ", "meets after", " " ]
               }, {
+                "r" : "1425",
+                "s" : [ {
+                  "r" : "1423",
+                  "value" : [ "Interval[", "1000", ", ", "2000", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsAfter",
+          "localId" : "1428",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1429",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1430",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1431",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1432",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1419",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1421",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "946",
+                "localId" : "1422",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "938",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "939",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1417",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "953",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1420",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "954",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1418",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1425",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1426",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "955",
+                "localId" : "1427",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "947",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "948",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1423",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1000",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1424",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2000",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "966",
+        "localId" : "1435",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetBeforeDayOfImpreciseIvl",
+        "name" : "IntIvlNotMeetsPosInfEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "966",
+            "r" : "1435",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetBeforeDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "IntIvlNotMeetsPosInfEnd", ": " ]
             }, {
-              "r" : "991",
+              "r" : "1447",
               "s" : [ {
-                "r" : "967",
+                "r" : "1438",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "1436",
+                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
                 } ]
               }, {
-                "r" : "991",
-                "value" : [ " ", "meets day of", " " ]
+                "r" : "1447",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "988",
+                "r" : "1443",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "976",
-                  "s" : [ {
-                    "r" : "970",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "985",
-                  "s" : [ {
-                    "r" : "979",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1441",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "991",
+          "type" : "MeetsAfter",
+          "localId" : "1447",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "992",
+            "localId" : "1448",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "993",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1449",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "994",
+            "localId" : "1450",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "995",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1451",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "967",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "1438",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "968",
+              "localId" : "1439",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "969",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1440",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1436",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1437",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "988",
+            "localId" : "1443",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "989",
+              "localId" : "1445",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "990",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1446",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "976",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "977",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "978",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "970",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "971",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1441",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "985",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1444",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "986",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "987",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "979",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "980",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1442",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "998",
-        "name" : "ImpDateIvl",
+        "localId" : "1454",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMeetsAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "998",
+            "r" : "1454",
             "s" : [ {
-              "value" : [ "", "define ", "ImpDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMeetsAfterIntIvl", ": " ]
             }, {
-              "r" : "1017",
+              "r" : "1466",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "1005",
+                "r" : "1457",
                 "s" : [ {
-                  "r" : "999",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  "r" : "1455",
+                  "value" : [ "Interval[", "100", ", ", "null", ")" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "r" : "1466",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1014",
+                "r" : "1463",
                 "s" : [ {
-                  "r" : "1008",
-                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
+                  "r" : "1461",
+                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1020",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1021",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "1017",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "MeetsAfter",
+          "localId" : "1466",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1018",
+            "localId" : "1467",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1019",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1468",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "1005",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1469",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1006",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1007",
+              "localId" : "1470",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "999",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1457",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1459",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1460",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "month" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "1000",
+              "localId" : "1455",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "100",
               "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1458",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1456",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "1014",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "Interval",
+            "localId" : "1463",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1015",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1016",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1464",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1465",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "1008",
+              "localId" : "1461",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1009",
+              "localId" : "1462",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
+              "value" : "99",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "1024",
+        "localId" : "1473",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayMeetAfterDateIvl",
+        "name" : "UnknownEndMayMeetBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1024",
+            "r" : "1473",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayMeetAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayMeetBeforeIntIvl", ": " ]
             }, {
-              "r" : "1079",
+              "r" : "1485",
               "s" : [ {
-                "r" : "1025",
+                "r" : "1476",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "r" : "1474",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1079",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1485",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1076",
+                "r" : "1482",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1044",
-                  "s" : [ {
-                    "r" : "1028",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1068",
-                  "s" : [ {
-                    "r" : "1052",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1480",
+                  "value" : [ "Interval[", "50", ", ", "100", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1079",
+          "type" : "MeetsAfter",
+          "localId" : "1485",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1080",
+            "localId" : "1486",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1081",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1487",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1082",
+            "localId" : "1488",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1083",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1489",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1025",
-            "name" : "ImpDateIvl",
+            "type" : "Interval",
+            "localId" : "1476",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1026",
+              "localId" : "1478",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1027",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1479",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1474",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1477",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1475",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1076",
+            "localId" : "1482",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1077",
+              "localId" : "1483",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1078",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1484",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1044",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1045",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1046",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1047",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1048",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1049",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1050",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1051",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1028",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1029",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1030",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1031",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1032",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1033",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1034",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1480",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "50",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1068",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1069",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1070",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1071",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1072",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1073",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1074",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1075",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1052",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1053",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1054",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "29",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1055",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1056",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1057",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1058",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1481",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1086",
+        "localId" : "1492",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayMeetBeforeDateIvl",
+        "name" : "UnknownEndNotMeetsIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1086",
+            "r" : "1492",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayMeetBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotMeetsIntIvl", ": " ]
             }, {
-              "r" : "1141",
+              "r" : "1504",
               "s" : [ {
-                "r" : "1087",
+                "r" : "1495",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "r" : "1493",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1141",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1504",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1138",
+                "r" : "1501",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1106",
-                  "s" : [ {
-                    "r" : "1090",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1130",
-                  "s" : [ {
-                    "r" : "1114",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1499",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1141",
+          "type" : "MeetsAfter",
+          "localId" : "1504",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1142",
+            "localId" : "1505",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1143",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1506",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1144",
+            "localId" : "1507",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1145",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1508",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1087",
-            "name" : "ImpDateIvl",
+            "type" : "Interval",
+            "localId" : "1495",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1088",
+              "localId" : "1497",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1089",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1498",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1493",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1496",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1494",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1138",
+            "localId" : "1501",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1139",
+              "localId" : "1502",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1140",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1503",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1106",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1107",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1108",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1109",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1110",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1111",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1112",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1113",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1090",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1091",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1092",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1093",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1094",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1095",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1096",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1499",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1130",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1131",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1132",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1133",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1134",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1135",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1136",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1137",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1114",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1115",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1116",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1117",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1118",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1119",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1120",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1500",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1148",
+        "localId" : "1511",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseNotMeetsDateIvl",
+        "name" : "IntIvlMayMeetAfterUnknownEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1148",
+            "r" : "1511",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseNotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "IntIvlMayMeetAfterUnknownEnd", ": " ]
             }, {
-              "r" : "1203",
+              "r" : "1525",
               "s" : [ {
-                "r" : "1149",
+                "r" : "1514",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "r" : "1512",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "1203",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1525",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1200",
+                "r" : "1521",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1168",
-                  "s" : [ {
-                    "r" : "1152",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1192",
+                  "r" : "1517",
                   "s" : [ {
-                    "r" : "1176",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "r" : "1518",
+                    "value" : [ "-", "100" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "r" : "1520",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1203",
+          "type" : "MeetsAfter",
+          "localId" : "1525",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1204",
+            "localId" : "1526",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1205",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1527",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1206",
+            "localId" : "1528",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1207",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1529",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1149",
-            "name" : "ImpDateIvl",
+            "type" : "Interval",
+            "localId" : "1514",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1150",
+              "localId" : "1515",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1151",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1516",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1512",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1513",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1200",
+            "localId" : "1521",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1201",
+              "localId" : "1523",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1202",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1524",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1168",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1517",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1169",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1170",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1171",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1172",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1173",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1174",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1175",
+                "localId" : "1519",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1152",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1153",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1154",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1155",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1156",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1157",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "1158",
+                "localId" : "1518",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1192",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1522",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1193",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1194",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1195",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1196",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1197",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1198",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1199",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1176",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1177",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1178",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1179",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1180",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1181",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1182",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1520",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1210",
+        "localId" : "1532",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegMeetsBeforeIntIvl",
+        "name" : "NegInfBegMeetsBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1210",
+            "r" : "1532",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegMeetsBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegMeetsBeforeLongIvl", ": " ]
             }, {
-              "r" : "1222",
+              "r" : "1544",
               "s" : [ {
-                "r" : "1213",
+                "r" : "1535",
                 "s" : [ {
-                  "r" : "1211",
-                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                  "r" : "1533",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1222",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1544",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1219",
+                "r" : "1541",
                 "s" : [ {
-                  "r" : "1217",
-                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
+                  "r" : "1539",
+                  "value" : [ "Interval[", "101L", ", ", "200L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1222",
+          "type" : "MeetsAfter",
+          "localId" : "1544",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1223",
+            "localId" : "1545",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1224",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1546",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1225",
+            "localId" : "1547",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1226",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1548",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1213",
+            "localId" : "1535",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1215",
+              "localId" : "1537",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1216",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1538",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1214",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1536",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1211",
+                "localId" : "1533",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1212",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1534",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1219",
+            "localId" : "1541",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1220",
+              "localId" : "1542",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1221",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1543",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1539",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "101",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1540",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "200",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1229",
+        "localId" : "1551",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotMeetsIntIvl",
+        "name" : "NegInfBegNotMeetsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1229",
+            "r" : "1551",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotMeetsIntIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotMeetsLongIvl", ": " ]
             }, {
-              "r" : "1241",
+              "r" : "1563",
               "s" : [ {
-                "r" : "1232",
+                "r" : "1554",
                 "s" : [ {
-                  "r" : "1230",
-                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                  "r" : "1552",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1241",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1563",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1238",
+                "r" : "1560",
                 "s" : [ {
-                  "r" : "1236",
-                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                  "r" : "1558",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1241",
+          "type" : "MeetsAfter",
+          "localId" : "1563",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1242",
+            "localId" : "1564",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1243",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1565",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1244",
+            "localId" : "1566",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1245",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1567",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1232",
+            "localId" : "1554",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1234",
+              "localId" : "1556",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1235",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1557",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1233",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1555",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1230",
+                "localId" : "1552",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1231",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1553",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1238",
+            "localId" : "1560",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1239",
+              "localId" : "1561",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1240",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1562",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1236",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1558",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1237",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1559",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "200",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1248",
+        "localId" : "1570",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlNotMeetsNegInfBeg",
+        "name" : "LongIvlNotMeetsNegInfBeg",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1248",
+            "r" : "1570",
             "s" : [ {
-              "value" : [ "", "define ", "IntIvlNotMeetsNegInfBeg", ": " ]
+              "value" : [ "", "define ", "LongIvlNotMeetsNegInfBeg", ": " ]
             }, {
-              "r" : "1260",
+              "r" : "1582",
               "s" : [ {
-                "r" : "1251",
+                "r" : "1573",
                 "s" : [ {
-                  "r" : "1249",
-                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                  "r" : "1571",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
                 } ]
               }, {
-                "r" : "1260",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1582",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1256",
+                "r" : "1578",
                 "s" : [ {
-                  "r" : "1254",
-                  "value" : [ "Interval[", "null", ", ", "400", "]" ]
+                  "r" : "1576",
+                  "value" : [ "Interval[", "null", ", ", "400L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1260",
+          "type" : "MeetsAfter",
+          "localId" : "1582",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1261",
+            "localId" : "1583",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1262",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1584",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1263",
+            "localId" : "1585",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1264",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1586",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1251",
+            "localId" : "1573",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1252",
+              "localId" : "1574",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1253",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1575",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1249",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1571",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1250",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1572",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "200",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1256",
+            "localId" : "1578",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1258",
+              "localId" : "1580",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1259",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1581",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1257",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1579",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1254",
+                "localId" : "1576",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1255",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1577",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "400",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1267",
+        "localId" : "1589",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMeetsBeforeIntIvl",
+        "name" : "UnknownBegMeetsBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1267",
+            "r" : "1589",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMeetsBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMeetsBeforeLongIvl", ": " ]
             }, {
-              "r" : "1279",
+              "r" : "1601",
               "s" : [ {
-                "r" : "1270",
+                "r" : "1592",
                 "s" : [ {
-                  "r" : "1268",
-                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
+                  "r" : "1590",
+                  "value" : [ "Interval(", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1279",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1601",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1276",
+                "r" : "1598",
                 "s" : [ {
-                  "r" : "1274",
-                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
+                  "r" : "1596",
+                  "value" : [ "Interval[", "101L", ", ", "200L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1279",
+          "type" : "MeetsAfter",
+          "localId" : "1601",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1280",
+            "localId" : "1602",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1281",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1603",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1282",
+            "localId" : "1604",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1283",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1605",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1270",
+            "localId" : "1592",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1272",
+              "localId" : "1594",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1273",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1595",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1271",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1593",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1268",
+                "localId" : "1590",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1591",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1276",
+            "localId" : "1598",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1277",
+              "localId" : "1599",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1278",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1600",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1596",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "101",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1597",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "200",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1286",
+        "localId" : "1608",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayMeetAfterIntIvl",
+        "name" : "UnknownBegMayMeetAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1286",
+            "r" : "1608",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayMeetAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayMeetAfterLongIvl", ": " ]
             }, {
-              "r" : "1298",
+              "r" : "1620",
               "s" : [ {
-                "r" : "1289",
+                "r" : "1611",
                 "s" : [ {
-                  "r" : "1287",
-                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
+                  "r" : "1609",
+                  "value" : [ "Interval(", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1298",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1620",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1295",
+                "r" : "1617",
                 "s" : [ {
-                  "r" : "1293",
-                  "value" : [ "Interval[", "0", ", ", "50", "]" ]
+                  "r" : "1615",
+                  "value" : [ "Interval[", "0L", ", ", "50L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1298",
+          "type" : "MeetsAfter",
+          "localId" : "1620",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1299",
+            "localId" : "1621",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1300",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1622",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1301",
+            "localId" : "1623",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1302",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1624",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1289",
+            "localId" : "1611",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1291",
+              "localId" : "1613",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1292",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1614",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1290",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1612",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1287",
+                "localId" : "1609",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1288",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1610",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1295",
+            "localId" : "1617",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1296",
+              "localId" : "1618",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1297",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1619",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1615",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1294",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1616",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "50",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1305",
+        "localId" : "1627",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotMeetsIntIvl",
+        "name" : "UnknownBegNotMeetsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1305",
+            "r" : "1627",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotMeetsIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotMeetsLongIvl", ": " ]
             }, {
-              "r" : "1317",
+              "r" : "1639",
               "s" : [ {
-                "r" : "1308",
+                "r" : "1630",
                 "s" : [ {
-                  "r" : "1306",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
+                  "r" : "1628",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "1317",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1639",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1314",
+                "r" : "1636",
                 "s" : [ {
-                  "r" : "1312",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                  "r" : "1634",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1317",
+          "type" : "MeetsAfter",
+          "localId" : "1639",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1318",
+            "localId" : "1640",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1319",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1641",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1320",
+            "localId" : "1642",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1321",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1643",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1308",
+            "localId" : "1630",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1310",
+              "localId" : "1632",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1311",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1633",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1309",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1631",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1306",
+                "localId" : "1628",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1307",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1629",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1314",
+            "localId" : "1636",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1315",
+              "localId" : "1637",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1316",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1638",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1312",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1634",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1313",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1635",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1324",
+        "localId" : "1646",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlMayMeetBeforeUnknownBeg",
+        "name" : "LongIvlMayMeetBeforeUnknownBeg",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1324",
+            "r" : "1646",
             "s" : [ {
-              "value" : [ "", "define ", "IntIvlMayMeetBeforeUnknownBeg", ": " ]
+              "value" : [ "", "define ", "LongIvlMayMeetBeforeUnknownBeg", ": " ]
             }, {
-              "r" : "1336",
+              "r" : "1658",
               "s" : [ {
-                "r" : "1327",
+                "r" : "1649",
                 "s" : [ {
-                  "r" : "1325",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                  "r" : "1647",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1336",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1658",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1332",
+                "r" : "1654",
                 "s" : [ {
-                  "r" : "1330",
-                  "value" : [ "Interval(", "null", ", ", "400", ")" ]
+                  "r" : "1652",
+                  "value" : [ "Interval(", "null", ", ", "400L", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1336",
+          "type" : "MeetsAfter",
+          "localId" : "1658",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1337",
+            "localId" : "1659",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1338",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1660",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1339",
+            "localId" : "1661",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1340",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1662",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1327",
+            "localId" : "1649",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1328",
+              "localId" : "1650",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1329",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1651",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1325",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1647",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1326",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1648",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1332",
+            "localId" : "1654",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1334",
+              "localId" : "1656",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1335",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1657",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1333",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1655",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1330",
+                "localId" : "1652",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1331",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1653",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "400",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1343",
+        "localId" : "1665",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndMeetsAfterIntIvl",
+        "name" : "PosInfEndMeetsAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1343",
+            "r" : "1665",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndMeetsAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndMeetsAfterLongIvl", ": " ]
             }, {
-              "r" : "1355",
+              "r" : "1677",
               "s" : [ {
-                "r" : "1346",
+                "r" : "1668",
                 "s" : [ {
-                  "r" : "1344",
-                  "value" : [ "Interval[", "100", ", ", "null", "]" ]
+                  "r" : "1666",
+                  "value" : [ "Interval[", "100L", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1355",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1677",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1352",
+                "r" : "1674",
                 "s" : [ {
-                  "r" : "1350",
-                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
+                  "r" : "1672",
+                  "value" : [ "Interval[", "0L", ", ", "99L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1355",
+          "type" : "MeetsAfter",
+          "localId" : "1677",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1356",
+            "localId" : "1678",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1357",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1679",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1358",
+            "localId" : "1680",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1359",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1681",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1346",
+            "localId" : "1668",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1348",
+              "localId" : "1670",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1349",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1671",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1344",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1666",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "1347",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1669",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1345",
+                "localId" : "1667",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1352",
+            "localId" : "1674",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1353",
+              "localId" : "1675",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1354",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1676",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1350",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1672",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1351",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1673",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "99",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1362",
+        "localId" : "1684",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotMeetsIntIvl",
+        "name" : "PosInfEndNotMeetsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1362",
+            "r" : "1684",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotMeetsIntIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotMeetsLongIvl", ": " ]
             }, {
-              "r" : "1374",
+              "r" : "1696",
               "s" : [ {
-                "r" : "1365",
+                "r" : "1687",
                 "s" : [ {
-                  "r" : "1363",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                  "r" : "1685",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1374",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1696",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1371",
+                "r" : "1693",
                 "s" : [ {
-                  "r" : "1369",
-                  "value" : [ "Interval[", "1000", ", ", "2000", "]" ]
+                  "r" : "1691",
+                  "value" : [ "Interval[", "1000L", ", ", "2000L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1374",
+          "type" : "MeetsAfter",
+          "localId" : "1696",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1375",
+            "localId" : "1697",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1376",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1698",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1377",
+            "localId" : "1699",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1378",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1700",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1365",
+            "localId" : "1687",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1367",
+              "localId" : "1689",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1368",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1690",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1363",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1685",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "1366",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1688",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1364",
+                "localId" : "1686",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1371",
+            "localId" : "1693",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1372",
+              "localId" : "1694",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1373",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1695",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1369",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1691",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1000",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1370",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1692",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2000",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1381",
+        "localId" : "1703",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlNotMeetsPosInfEnd",
+        "name" : "LongIvlNotMeetsPosInfEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1381",
+            "r" : "1703",
             "s" : [ {
-              "value" : [ "", "define ", "IntIvlNotMeetsPosInfEnd", ": " ]
+              "value" : [ "", "define ", "LongIvlNotMeetsPosInfEnd", ": " ]
             }, {
-              "r" : "1393",
+              "r" : "1715",
               "s" : [ {
-                "r" : "1384",
+                "r" : "1706",
                 "s" : [ {
-                  "r" : "1382",
-                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                  "r" : "1704",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
                 } ]
               }, {
-                "r" : "1393",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1715",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1389",
+                "r" : "1711",
                 "s" : [ {
-                  "r" : "1387",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                  "r" : "1709",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1393",
+          "type" : "MeetsAfter",
+          "localId" : "1715",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1394",
+            "localId" : "1716",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1395",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1717",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1396",
+            "localId" : "1718",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1397",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1719",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1384",
+            "localId" : "1706",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1385",
+              "localId" : "1707",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1386",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1708",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1382",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1704",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1383",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1705",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "200",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1389",
+            "localId" : "1711",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1391",
+              "localId" : "1713",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1392",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1714",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1387",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1709",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "1390",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1712",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1388",
+                "localId" : "1710",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -106822,440 +135654,440 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "1400",
+        "localId" : "1722",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMeetsAfterIntIvl",
+        "name" : "UnknownEndMeetsAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1400",
+            "r" : "1722",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMeetsAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMeetsAfterLongIvl", ": " ]
             }, {
-              "r" : "1412",
+              "r" : "1734",
               "s" : [ {
-                "r" : "1403",
+                "r" : "1725",
                 "s" : [ {
-                  "r" : "1401",
-                  "value" : [ "Interval[", "100", ", ", "null", ")" ]
+                  "r" : "1723",
+                  "value" : [ "Interval[", "100L", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1412",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1734",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1409",
+                "r" : "1731",
                 "s" : [ {
-                  "r" : "1407",
-                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
+                  "r" : "1729",
+                  "value" : [ "Interval[", "0L", ", ", "99L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1412",
+          "type" : "MeetsAfter",
+          "localId" : "1734",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1413",
+            "localId" : "1735",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1414",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1736",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1415",
+            "localId" : "1737",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1416",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1738",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1403",
+            "localId" : "1725",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1405",
+              "localId" : "1727",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1406",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1728",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1401",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1723",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "1404",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1726",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1402",
+                "localId" : "1724",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1409",
+            "localId" : "1731",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1410",
+              "localId" : "1732",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1411",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1733",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1407",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1729",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1408",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1730",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "99",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1419",
+        "localId" : "1741",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayMeetBeforeIntIvl",
+        "name" : "UnknownEndMayMeetBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1419",
+            "r" : "1741",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayMeetBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayMeetBeforeLongIvl", ": " ]
             }, {
-              "r" : "1431",
+              "r" : "1753",
               "s" : [ {
-                "r" : "1422",
+                "r" : "1744",
                 "s" : [ {
-                  "r" : "1420",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                  "r" : "1742",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1431",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1753",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1428",
+                "r" : "1750",
                 "s" : [ {
-                  "r" : "1426",
-                  "value" : [ "Interval[", "50", ", ", "100", "]" ]
+                  "r" : "1748",
+                  "value" : [ "Interval[", "50L", ", ", "100L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1431",
+          "type" : "MeetsAfter",
+          "localId" : "1753",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1432",
+            "localId" : "1754",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1433",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1755",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1434",
+            "localId" : "1756",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1435",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1757",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1422",
+            "localId" : "1744",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1424",
+              "localId" : "1746",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1425",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1747",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1420",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1742",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "1423",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1745",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1421",
+                "localId" : "1743",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1428",
+            "localId" : "1750",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1429",
+              "localId" : "1751",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1430",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1752",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1426",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1748",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "50",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1427",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1749",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1438",
+        "localId" : "1760",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotMeetsIntIvl",
+        "name" : "UnknownEndNotMeetsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1438",
+            "r" : "1760",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotMeetsIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotMeetsLongIvl", ": " ]
             }, {
-              "r" : "1450",
+              "r" : "1772",
               "s" : [ {
-                "r" : "1441",
+                "r" : "1763",
                 "s" : [ {
-                  "r" : "1439",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                  "r" : "1761",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1450",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1772",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1447",
+                "r" : "1769",
                 "s" : [ {
-                  "r" : "1445",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                  "r" : "1767",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1450",
+          "type" : "MeetsAfter",
+          "localId" : "1772",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1451",
+            "localId" : "1773",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1452",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1774",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1453",
+            "localId" : "1775",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1454",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1776",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1441",
+            "localId" : "1763",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1443",
+              "localId" : "1765",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1444",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1766",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1439",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1761",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "1442",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1764",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1440",
+                "localId" : "1762",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1447",
+            "localId" : "1769",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1448",
+              "localId" : "1770",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1449",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1771",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1445",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1767",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1446",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1768",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1457",
+        "localId" : "1779",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlMayMeetAfterUnknownEnd",
+        "name" : "LongIvlMayMeetAfterUnknownEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1457",
+            "r" : "1779",
             "s" : [ {
-              "value" : [ "", "define ", "IntIvlMayMeetAfterUnknownEnd", ": " ]
+              "value" : [ "", "define ", "LongIvlMayMeetAfterUnknownEnd", ": " ]
             }, {
-              "r" : "1471",
+              "r" : "1793",
               "s" : [ {
-                "r" : "1460",
+                "r" : "1782",
                 "s" : [ {
-                  "r" : "1458",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                  "r" : "1780",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1471",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1793",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1467",
+                "r" : "1789",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1463",
+                  "r" : "1785",
                   "s" : [ {
-                    "r" : "1464",
-                    "value" : [ "-", "100" ]
+                    "r" : "1786",
+                    "value" : [ "-", "100L" ]
                   } ]
                 }, {
-                  "r" : "1466",
+                  "r" : "1788",
                   "value" : [ ", ", "null", ")" ]
                 } ]
               } ]
@@ -107263,110 +136095,110 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1471",
+          "type" : "MeetsAfter",
+          "localId" : "1793",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1472",
+            "localId" : "1794",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1473",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1795",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1474",
+            "localId" : "1796",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1475",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1797",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1460",
+            "localId" : "1782",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1461",
+              "localId" : "1783",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1462",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1784",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1458",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1780",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1459",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1781",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "100",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1467",
+            "localId" : "1789",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1469",
+              "localId" : "1791",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1470",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1792",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Negate",
-              "localId" : "1463",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1785",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1465",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1787",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "1464",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1786",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "As",
-              "localId" : "1468",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1790",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1466",
+                "localId" : "1788",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -107374,7 +136206,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "1478",
+        "localId" : "1800",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NegInfBegMeetsBeforeDateIvl",
         "context" : "Patient",
@@ -107383,44 +136215,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1478",
+            "r" : "1800",
             "s" : [ {
               "value" : [ "", "define ", "NegInfBegMeetsBeforeDateIvl", ": " ]
             }, {
-              "r" : "1559",
+              "r" : "1881",
               "s" : [ {
-                "r" : "1504",
+                "r" : "1826",
                 "s" : [ {
-                  "r" : "1479",
+                  "r" : "1801",
                   "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "1496",
+                  "r" : "1818",
                   "s" : [ {
-                    "r" : "1480",
+                    "r" : "1802",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "1559",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1881",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1556",
+                "r" : "1878",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1524",
+                  "r" : "1846",
                   "s" : [ {
-                    "r" : "1508",
+                    "r" : "1830",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1548",
+                  "r" : "1870",
                   "s" : [ {
-                    "r" : "1532",
+                    "r" : "1854",
                     "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -107431,105 +136263,105 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1559",
+          "type" : "MeetsAfter",
+          "localId" : "1881",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1560",
+            "localId" : "1882",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1561",
+              "localId" : "1883",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1562",
+            "localId" : "1884",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1563",
+              "localId" : "1885",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1504",
+            "localId" : "1826",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1506",
+              "localId" : "1828",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1507",
+                "localId" : "1829",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1505",
+              "localId" : "1827",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1479",
+                "localId" : "1801",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1496",
+              "localId" : "1818",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1497",
+                "localId" : "1819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1498",
+                "localId" : "1820",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1499",
+                "localId" : "1821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1500",
+                "localId" : "1822",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1501",
+                "localId" : "1823",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1502",
+                "localId" : "1824",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1503",
+                "localId" : "1825",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1480",
+                "localId" : "1802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -107537,7 +136369,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1481",
+                "localId" : "1803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -107545,7 +136377,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1482",
+                "localId" : "1804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -107553,7 +136385,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1483",
+                "localId" : "1805",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107561,7 +136393,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1484",
+                "localId" : "1806",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107569,7 +136401,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1485",
+                "localId" : "1807",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107577,7 +136409,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1486",
+                "localId" : "1808",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107586,65 +136418,65 @@ module.exports['Meets'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1556",
+            "localId" : "1878",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1557",
+              "localId" : "1879",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1558",
+                "localId" : "1880",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1524",
+              "localId" : "1846",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1525",
+                "localId" : "1847",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1526",
+                "localId" : "1848",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1527",
+                "localId" : "1849",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1528",
+                "localId" : "1850",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1529",
+                "localId" : "1851",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1530",
+                "localId" : "1852",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1531",
+                "localId" : "1853",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1508",
+                "localId" : "1830",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -107652,7 +136484,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1509",
+                "localId" : "1831",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -107660,7 +136492,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1510",
+                "localId" : "1832",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -107668,7 +136500,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1511",
+                "localId" : "1833",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107676,7 +136508,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1512",
+                "localId" : "1834",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107684,7 +136516,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1513",
+                "localId" : "1835",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107692,7 +136524,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1514",
+                "localId" : "1836",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107701,48 +136533,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1548",
+              "localId" : "1870",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1549",
+                "localId" : "1871",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1550",
+                "localId" : "1872",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1551",
+                "localId" : "1873",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1552",
+                "localId" : "1874",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1553",
+                "localId" : "1875",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1554",
+                "localId" : "1876",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1555",
+                "localId" : "1877",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1532",
+                "localId" : "1854",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2030",
@@ -107750,7 +136582,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1533",
+                "localId" : "1855",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -107758,7 +136590,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1534",
+                "localId" : "1856",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -107766,7 +136598,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1535",
+                "localId" : "1857",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107774,7 +136606,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1536",
+                "localId" : "1858",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107782,7 +136614,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1537",
+                "localId" : "1859",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107790,7 +136622,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1538",
+                "localId" : "1860",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107800,7 +136632,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "1566",
+        "localId" : "1888",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NegInfBegNotMeetsDateIvl",
         "context" : "Patient",
@@ -107809,44 +136641,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1566",
+            "r" : "1888",
             "s" : [ {
               "value" : [ "", "define ", "NegInfBegNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "1647",
+              "r" : "1969",
               "s" : [ {
-                "r" : "1592",
+                "r" : "1914",
                 "s" : [ {
-                  "r" : "1567",
+                  "r" : "1889",
                   "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "1584",
+                  "r" : "1906",
                   "s" : [ {
-                    "r" : "1568",
+                    "r" : "1890",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "1647",
-                "value" : [ " ", "meets", " " ]
+                "r" : "1969",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1644",
+                "r" : "1966",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1612",
+                  "r" : "1934",
                   "s" : [ {
-                    "r" : "1596",
+                    "r" : "1918",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1636",
+                  "r" : "1958",
                   "s" : [ {
-                    "r" : "1620",
+                    "r" : "1942",
                     "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -107857,105 +136689,105 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1647",
+          "type" : "MeetsAfter",
+          "localId" : "1969",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1648",
+            "localId" : "1970",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1649",
+              "localId" : "1971",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1650",
+            "localId" : "1972",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1651",
+              "localId" : "1973",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1592",
+            "localId" : "1914",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1594",
+              "localId" : "1916",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1595",
+                "localId" : "1917",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1593",
+              "localId" : "1915",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1567",
+                "localId" : "1889",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1584",
+              "localId" : "1906",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1585",
+                "localId" : "1907",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1586",
+                "localId" : "1908",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1587",
+                "localId" : "1909",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1588",
+                "localId" : "1910",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1589",
+                "localId" : "1911",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1590",
+                "localId" : "1912",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1591",
+                "localId" : "1913",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1568",
+                "localId" : "1890",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -107963,7 +136795,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1569",
+                "localId" : "1891",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -107971,7 +136803,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1570",
+                "localId" : "1892",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -107979,7 +136811,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1571",
+                "localId" : "1893",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107987,7 +136819,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1572",
+                "localId" : "1894",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -107995,7 +136827,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1573",
+                "localId" : "1895",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108003,7 +136835,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1574",
+                "localId" : "1896",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108012,65 +136844,65 @@ module.exports['Meets'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1644",
+            "localId" : "1966",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1645",
+              "localId" : "1967",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1646",
+                "localId" : "1968",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1612",
+              "localId" : "1934",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1613",
+                "localId" : "1935",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1614",
+                "localId" : "1936",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1615",
+                "localId" : "1937",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1616",
+                "localId" : "1938",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1617",
+                "localId" : "1939",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1618",
+                "localId" : "1940",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1619",
+                "localId" : "1941",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1596",
+                "localId" : "1918",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -108078,7 +136910,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1597",
+                "localId" : "1919",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108086,7 +136918,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1598",
+                "localId" : "1920",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108094,7 +136926,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1599",
+                "localId" : "1921",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108102,7 +136934,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1600",
+                "localId" : "1922",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108110,7 +136942,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1601",
+                "localId" : "1923",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108118,7 +136950,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1602",
+                "localId" : "1924",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108127,48 +136959,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1636",
+              "localId" : "1958",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1637",
+                "localId" : "1959",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1638",
+                "localId" : "1960",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1639",
+                "localId" : "1961",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1640",
+                "localId" : "1962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1641",
+                "localId" : "1963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1642",
+                "localId" : "1964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1643",
+                "localId" : "1965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1620",
+                "localId" : "1942",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2010",
@@ -108176,7 +137008,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1621",
+                "localId" : "1943",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108184,7 +137016,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1622",
+                "localId" : "1944",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108192,7 +137024,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1623",
+                "localId" : "1945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108200,7 +137032,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1624",
+                "localId" : "1946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108208,7 +137040,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1625",
+                "localId" : "1947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108216,7 +137048,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1626",
+                "localId" : "1948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108226,7 +137058,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "1654",
+        "localId" : "1976",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateIvlNotMeetsNegInfBeg",
         "context" : "Patient",
@@ -108235,44 +137067,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1654",
+            "r" : "1976",
             "s" : [ {
               "value" : [ "", "define ", "DateIvlNotMeetsNegInfBeg", ": " ]
             }, {
-              "r" : "1735",
+              "r" : "2057",
               "s" : [ {
-                "r" : "1703",
+                "r" : "2025",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1671",
+                  "r" : "1993",
                   "s" : [ {
-                    "r" : "1655",
+                    "r" : "1977",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1695",
+                  "r" : "2017",
                   "s" : [ {
-                    "r" : "1679",
+                    "r" : "2001",
                     "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "1735",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2057",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1731",
+                "r" : "2053",
                 "s" : [ {
-                  "r" : "1706",
+                  "r" : "2028",
                   "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "1723",
+                  "r" : "2045",
                   "s" : [ {
-                    "r" : "1707",
+                    "r" : "2029",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -108283,92 +137115,92 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1735",
+          "type" : "MeetsAfter",
+          "localId" : "2057",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1736",
+            "localId" : "2058",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1737",
+              "localId" : "2059",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1738",
+            "localId" : "2060",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1739",
+              "localId" : "2061",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1703",
+            "localId" : "2025",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1704",
+              "localId" : "2026",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1705",
+                "localId" : "2027",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1671",
+              "localId" : "1993",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1672",
+                "localId" : "1994",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1673",
+                "localId" : "1995",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1674",
+                "localId" : "1996",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1675",
+                "localId" : "1997",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1676",
+                "localId" : "1998",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1677",
+                "localId" : "1999",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1678",
+                "localId" : "2000",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1655",
+                "localId" : "1977",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -108376,7 +137208,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1656",
+                "localId" : "1978",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108384,7 +137216,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1657",
+                "localId" : "1979",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108392,7 +137224,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1658",
+                "localId" : "1980",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108400,7 +137232,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1659",
+                "localId" : "1981",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108408,7 +137240,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1660",
+                "localId" : "1982",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108416,7 +137248,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1661",
+                "localId" : "1983",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108425,48 +137257,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1695",
+              "localId" : "2017",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1696",
+                "localId" : "2018",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1697",
+                "localId" : "2019",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1698",
+                "localId" : "2020",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1699",
+                "localId" : "2021",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1700",
+                "localId" : "2022",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1701",
+                "localId" : "2023",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1702",
+                "localId" : "2024",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1679",
+                "localId" : "2001",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2010",
@@ -108474,7 +137306,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1680",
+                "localId" : "2002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108482,7 +137314,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1681",
+                "localId" : "2003",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108490,7 +137322,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1682",
+                "localId" : "2004",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108498,7 +137330,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1683",
+                "localId" : "2005",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108506,7 +137338,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1684",
+                "localId" : "2006",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108514,7 +137346,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1685",
+                "localId" : "2007",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108523,78 +137355,78 @@ module.exports['Meets'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1731",
+            "localId" : "2053",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1733",
+              "localId" : "2055",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1734",
+                "localId" : "2056",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1732",
+              "localId" : "2054",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1706",
+                "localId" : "2028",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1723",
+              "localId" : "2045",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1724",
+                "localId" : "2046",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1725",
+                "localId" : "2047",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1726",
+                "localId" : "2048",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1727",
+                "localId" : "2049",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1728",
+                "localId" : "2050",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1729",
+                "localId" : "2051",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1730",
+                "localId" : "2052",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1707",
+                "localId" : "2029",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -108602,7 +137434,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1708",
+                "localId" : "2030",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108610,7 +137442,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1709",
+                "localId" : "2031",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108618,7 +137450,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1710",
+                "localId" : "2032",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108626,7 +137458,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1711",
+                "localId" : "2033",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108634,7 +137466,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1712",
+                "localId" : "2034",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108642,7 +137474,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1713",
+                "localId" : "2035",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108652,7 +137484,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "1742",
+        "localId" : "2064",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownBegMeetsBeforeDateIvl",
         "context" : "Patient",
@@ -108661,44 +137493,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1742",
+            "r" : "2064",
             "s" : [ {
               "value" : [ "", "define ", "UnknownBegMeetsBeforeDateIvl", ": " ]
             }, {
-              "r" : "1823",
+              "r" : "2145",
               "s" : [ {
-                "r" : "1768",
+                "r" : "2090",
                 "s" : [ {
-                  "r" : "1743",
+                  "r" : "2065",
                   "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "1760",
+                  "r" : "2082",
                   "s" : [ {
-                    "r" : "1744",
+                    "r" : "2066",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "1823",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2145",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1820",
+                "r" : "2142",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1788",
+                  "r" : "2110",
                   "s" : [ {
-                    "r" : "1772",
+                    "r" : "2094",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1812",
+                  "r" : "2134",
                   "s" : [ {
-                    "r" : "1796",
+                    "r" : "2118",
                     "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -108709,105 +137541,105 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1823",
+          "type" : "MeetsAfter",
+          "localId" : "2145",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1824",
+            "localId" : "2146",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1825",
+              "localId" : "2147",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1826",
+            "localId" : "2148",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1827",
+              "localId" : "2149",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1768",
+            "localId" : "2090",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1770",
+              "localId" : "2092",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1771",
+                "localId" : "2093",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1769",
+              "localId" : "2091",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1743",
+                "localId" : "2065",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1760",
+              "localId" : "2082",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1761",
+                "localId" : "2083",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1762",
+                "localId" : "2084",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1763",
+                "localId" : "2085",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1764",
+                "localId" : "2086",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1765",
+                "localId" : "2087",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1766",
+                "localId" : "2088",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1767",
+                "localId" : "2089",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1744",
+                "localId" : "2066",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -108815,7 +137647,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1745",
+                "localId" : "2067",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108823,7 +137655,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1746",
+                "localId" : "2068",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108831,7 +137663,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1747",
+                "localId" : "2069",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108839,7 +137671,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1748",
+                "localId" : "2070",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108847,7 +137679,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1749",
+                "localId" : "2071",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108855,7 +137687,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1750",
+                "localId" : "2072",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108864,65 +137696,65 @@ module.exports['Meets'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1820",
+            "localId" : "2142",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1821",
+              "localId" : "2143",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1822",
+                "localId" : "2144",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1788",
+              "localId" : "2110",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1789",
+                "localId" : "2111",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1790",
+                "localId" : "2112",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1791",
+                "localId" : "2113",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1792",
+                "localId" : "2114",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1793",
+                "localId" : "2115",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1794",
+                "localId" : "2116",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1795",
+                "localId" : "2117",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1772",
+                "localId" : "2094",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -108930,7 +137762,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1773",
+                "localId" : "2095",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108938,7 +137770,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1774",
+                "localId" : "2096",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -108946,7 +137778,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1775",
+                "localId" : "2097",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108954,7 +137786,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1776",
+                "localId" : "2098",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108962,7 +137794,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1777",
+                "localId" : "2099",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108970,7 +137802,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1778",
+                "localId" : "2100",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -108979,48 +137811,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1812",
+              "localId" : "2134",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1813",
+                "localId" : "2135",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1814",
+                "localId" : "2136",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1815",
+                "localId" : "2137",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1816",
+                "localId" : "2138",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1817",
+                "localId" : "2139",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1818",
+                "localId" : "2140",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1819",
+                "localId" : "2141",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1796",
+                "localId" : "2118",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2030",
@@ -109028,7 +137860,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1797",
+                "localId" : "2119",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109036,7 +137868,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1798",
+                "localId" : "2120",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109044,7 +137876,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1799",
+                "localId" : "2121",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109052,7 +137884,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1800",
+                "localId" : "2122",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109060,7 +137892,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1801",
+                "localId" : "2123",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109068,7 +137900,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1802",
+                "localId" : "2124",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109078,7 +137910,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "1830",
+        "localId" : "2152",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownBegMayMeetAfterDateIvl",
         "context" : "Patient",
@@ -109087,44 +137919,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1830",
+            "r" : "2152",
             "s" : [ {
               "value" : [ "", "define ", "UnknownBegMayMeetAfterDateIvl", ": " ]
             }, {
-              "r" : "1911",
+              "r" : "2233",
               "s" : [ {
-                "r" : "1856",
+                "r" : "2178",
                 "s" : [ {
-                  "r" : "1831",
+                  "r" : "2153",
                   "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "1848",
+                  "r" : "2170",
                   "s" : [ {
-                    "r" : "1832",
+                    "r" : "2154",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "1911",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2233",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1908",
+                "r" : "2230",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1876",
+                  "r" : "2198",
                   "s" : [ {
-                    "r" : "1860",
+                    "r" : "2182",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1900",
+                  "r" : "2222",
                   "s" : [ {
-                    "r" : "1884",
+                    "r" : "2206",
                     "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -109135,105 +137967,105 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1911",
+          "type" : "MeetsAfter",
+          "localId" : "2233",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1912",
+            "localId" : "2234",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1913",
+              "localId" : "2235",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1914",
+            "localId" : "2236",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1915",
+              "localId" : "2237",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1856",
+            "localId" : "2178",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1858",
+              "localId" : "2180",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1859",
+                "localId" : "2181",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1857",
+              "localId" : "2179",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1831",
+                "localId" : "2153",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1848",
+              "localId" : "2170",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1849",
+                "localId" : "2171",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1850",
+                "localId" : "2172",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1851",
+                "localId" : "2173",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1852",
+                "localId" : "2174",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1853",
+                "localId" : "2175",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1854",
+                "localId" : "2176",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1855",
+                "localId" : "2177",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1832",
+                "localId" : "2154",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -109241,7 +138073,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1833",
+                "localId" : "2155",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109249,7 +138081,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1834",
+                "localId" : "2156",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109257,7 +138089,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1835",
+                "localId" : "2157",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109265,7 +138097,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1836",
+                "localId" : "2158",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109273,7 +138105,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1837",
+                "localId" : "2159",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109281,7 +138113,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1838",
+                "localId" : "2160",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109290,65 +138122,65 @@ module.exports['Meets'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1908",
+            "localId" : "2230",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1909",
+              "localId" : "2231",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1910",
+                "localId" : "2232",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1876",
+              "localId" : "2198",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1877",
+                "localId" : "2199",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1878",
+                "localId" : "2200",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1879",
+                "localId" : "2201",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1880",
+                "localId" : "2202",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1881",
+                "localId" : "2203",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1882",
+                "localId" : "2204",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1883",
+                "localId" : "2205",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1860",
+                "localId" : "2182",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -109356,7 +138188,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1861",
+                "localId" : "2183",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109364,7 +138196,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1862",
+                "localId" : "2184",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109372,7 +138204,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1863",
+                "localId" : "2185",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109380,7 +138212,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1864",
+                "localId" : "2186",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109388,7 +138220,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1865",
+                "localId" : "2187",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109396,7 +138228,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1866",
+                "localId" : "2188",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109405,48 +138237,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1900",
+              "localId" : "2222",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1901",
+                "localId" : "2223",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1902",
+                "localId" : "2224",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1903",
+                "localId" : "2225",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1904",
+                "localId" : "2226",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1905",
+                "localId" : "2227",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1906",
+                "localId" : "2228",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1907",
+                "localId" : "2229",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1884",
+                "localId" : "2206",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2010",
@@ -109454,7 +138286,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1885",
+                "localId" : "2207",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109462,7 +138294,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1886",
+                "localId" : "2208",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109470,7 +138302,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1887",
+                "localId" : "2209",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109478,7 +138310,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1888",
+                "localId" : "2210",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109486,7 +138318,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1889",
+                "localId" : "2211",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109494,7 +138326,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1890",
+                "localId" : "2212",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109504,7 +138336,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "1918",
+        "localId" : "2240",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownBegNotMeetsDateIvl",
         "context" : "Patient",
@@ -109513,44 +138345,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1918",
+            "r" : "2240",
             "s" : [ {
               "value" : [ "", "define ", "UnknownBegNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "1999",
+              "r" : "2321",
               "s" : [ {
-                "r" : "1944",
+                "r" : "2266",
                 "s" : [ {
-                  "r" : "1919",
+                  "r" : "2241",
                   "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "1936",
+                  "r" : "2258",
                   "s" : [ {
-                    "r" : "1920",
+                    "r" : "2242",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "1999",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2321",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "1996",
+                "r" : "2318",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1964",
+                  "r" : "2286",
                   "s" : [ {
-                    "r" : "1948",
+                    "r" : "2270",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1988",
+                  "r" : "2310",
                   "s" : [ {
-                    "r" : "1972",
+                    "r" : "2294",
                     "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -109561,105 +138393,105 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "1999",
+          "type" : "MeetsAfter",
+          "localId" : "2321",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2000",
+            "localId" : "2322",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2001",
+              "localId" : "2323",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2002",
+            "localId" : "2324",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2003",
+              "localId" : "2325",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1944",
+            "localId" : "2266",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1946",
+              "localId" : "2268",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1947",
+                "localId" : "2269",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1945",
+              "localId" : "2267",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1919",
+                "localId" : "2241",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1936",
+              "localId" : "2258",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1937",
+                "localId" : "2259",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1938",
+                "localId" : "2260",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1939",
+                "localId" : "2261",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1940",
+                "localId" : "2262",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1941",
+                "localId" : "2263",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1942",
+                "localId" : "2264",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1943",
+                "localId" : "2265",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1920",
+                "localId" : "2242",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -109667,7 +138499,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1921",
+                "localId" : "2243",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109675,7 +138507,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1922",
+                "localId" : "2244",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109683,7 +138515,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1923",
+                "localId" : "2245",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109691,7 +138523,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1924",
+                "localId" : "2246",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109699,7 +138531,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1925",
+                "localId" : "2247",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109707,7 +138539,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1926",
+                "localId" : "2248",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109716,65 +138548,65 @@ module.exports['Meets'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1996",
+            "localId" : "2318",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1997",
+              "localId" : "2319",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1998",
+                "localId" : "2320",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1964",
+              "localId" : "2286",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1965",
+                "localId" : "2287",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1966",
+                "localId" : "2288",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1967",
+                "localId" : "2289",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1968",
+                "localId" : "2290",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1969",
+                "localId" : "2291",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1970",
+                "localId" : "2292",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1971",
+                "localId" : "2293",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1948",
+                "localId" : "2270",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -109782,7 +138614,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1949",
+                "localId" : "2271",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109790,7 +138622,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1950",
+                "localId" : "2272",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109798,7 +138630,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1951",
+                "localId" : "2273",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109806,7 +138638,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1952",
+                "localId" : "2274",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109814,7 +138646,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1953",
+                "localId" : "2275",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109822,7 +138654,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1954",
+                "localId" : "2276",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109831,48 +138663,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1988",
+              "localId" : "2310",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1989",
+                "localId" : "2311",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1990",
+                "localId" : "2312",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1991",
+                "localId" : "2313",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1992",
+                "localId" : "2314",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1993",
+                "localId" : "2315",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1994",
+                "localId" : "2316",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1995",
+                "localId" : "2317",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1972",
+                "localId" : "2294",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2020",
@@ -109880,7 +138712,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1973",
+                "localId" : "2295",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109888,7 +138720,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1974",
+                "localId" : "2296",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -109896,7 +138728,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1975",
+                "localId" : "2297",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109904,7 +138736,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1976",
+                "localId" : "2298",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109912,7 +138744,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1977",
+                "localId" : "2299",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109920,7 +138752,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1978",
+                "localId" : "2300",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -109930,7 +138762,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "2006",
+        "localId" : "2328",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateIvlMayMeetBeforeUnknownBeg",
         "context" : "Patient",
@@ -109939,44 +138771,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2006",
+            "r" : "2328",
             "s" : [ {
               "value" : [ "", "define ", "DateIvlMayMeetBeforeUnknownBeg", ": " ]
             }, {
-              "r" : "2087",
+              "r" : "2409",
               "s" : [ {
-                "r" : "2055",
+                "r" : "2377",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2023",
+                  "r" : "2345",
                   "s" : [ {
-                    "r" : "2007",
+                    "r" : "2329",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2047",
+                  "r" : "2369",
                   "s" : [ {
-                    "r" : "2031",
+                    "r" : "2353",
                     "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "2087",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2409",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "2083",
+                "r" : "2405",
                 "s" : [ {
-                  "r" : "2058",
+                  "r" : "2380",
                   "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "2075",
+                  "r" : "2397",
                   "s" : [ {
-                    "r" : "2059",
+                    "r" : "2381",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -109987,92 +138819,92 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "2087",
+          "type" : "MeetsAfter",
+          "localId" : "2409",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2088",
+            "localId" : "2410",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2089",
+              "localId" : "2411",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2090",
+            "localId" : "2412",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2091",
+              "localId" : "2413",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2055",
+            "localId" : "2377",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2056",
+              "localId" : "2378",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2057",
+                "localId" : "2379",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2023",
+              "localId" : "2345",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2024",
+                "localId" : "2346",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2025",
+                "localId" : "2347",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2026",
+                "localId" : "2348",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2027",
+                "localId" : "2349",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2028",
+                "localId" : "2350",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2029",
+                "localId" : "2351",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2030",
+                "localId" : "2352",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2007",
+                "localId" : "2329",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -110080,7 +138912,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2008",
+                "localId" : "2330",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110088,7 +138920,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2009",
+                "localId" : "2331",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110096,7 +138928,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2010",
+                "localId" : "2332",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110104,7 +138936,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2011",
+                "localId" : "2333",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110112,7 +138944,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2012",
+                "localId" : "2334",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110120,7 +138952,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2013",
+                "localId" : "2335",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110129,48 +138961,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2047",
+              "localId" : "2369",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2048",
+                "localId" : "2370",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2049",
+                "localId" : "2371",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2050",
+                "localId" : "2372",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2051",
+                "localId" : "2373",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2052",
+                "localId" : "2374",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2053",
+                "localId" : "2375",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2054",
+                "localId" : "2376",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2031",
+                "localId" : "2353",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2010",
@@ -110178,7 +139010,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2032",
+                "localId" : "2354",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110186,7 +139018,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2033",
+                "localId" : "2355",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110194,7 +139026,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2034",
+                "localId" : "2356",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110202,7 +139034,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2035",
+                "localId" : "2357",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110210,7 +139042,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2036",
+                "localId" : "2358",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110218,7 +139050,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2037",
+                "localId" : "2359",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110227,78 +139059,78 @@ module.exports['Meets'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "2083",
+            "localId" : "2405",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2085",
+              "localId" : "2407",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2086",
+                "localId" : "2408",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "2084",
+              "localId" : "2406",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2058",
+                "localId" : "2380",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2075",
+              "localId" : "2397",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2076",
+                "localId" : "2398",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2077",
+                "localId" : "2399",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2078",
+                "localId" : "2400",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2079",
+                "localId" : "2401",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2080",
+                "localId" : "2402",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2081",
+                "localId" : "2403",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2082",
+                "localId" : "2404",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2059",
+                "localId" : "2381",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -110306,7 +139138,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2060",
+                "localId" : "2382",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110314,7 +139146,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2061",
+                "localId" : "2383",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110322,7 +139154,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2062",
+                "localId" : "2384",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110330,7 +139162,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2063",
+                "localId" : "2385",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110338,7 +139170,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2064",
+                "localId" : "2386",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110346,7 +139178,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2065",
+                "localId" : "2387",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110356,7 +139188,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "2094",
+        "localId" : "2416",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PosInfEndMeetsAfterDateIvl",
         "context" : "Patient",
@@ -110365,44 +139197,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2094",
+            "r" : "2416",
             "s" : [ {
               "value" : [ "", "define ", "PosInfEndMeetsAfterDateIvl", ": " ]
             }, {
-              "r" : "2175",
+              "r" : "2497",
               "s" : [ {
-                "r" : "2120",
+                "r" : "2442",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2111",
+                  "r" : "2433",
                   "s" : [ {
-                    "r" : "2095",
+                    "r" : "2417",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2119",
+                  "r" : "2441",
                   "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "2175",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2497",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "2172",
+                "r" : "2494",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2140",
+                  "r" : "2462",
                   "s" : [ {
-                    "r" : "2124",
+                    "r" : "2446",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2164",
+                  "r" : "2486",
                   "s" : [ {
-                    "r" : "2148",
+                    "r" : "2470",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -110413,92 +139245,92 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "2175",
+          "type" : "MeetsAfter",
+          "localId" : "2497",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2176",
+            "localId" : "2498",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2177",
+              "localId" : "2499",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2178",
+            "localId" : "2500",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2179",
+              "localId" : "2501",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2120",
+            "localId" : "2442",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2122",
+              "localId" : "2444",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2123",
+                "localId" : "2445",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2111",
+              "localId" : "2433",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2112",
+                "localId" : "2434",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2113",
+                "localId" : "2435",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2114",
+                "localId" : "2436",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2115",
+                "localId" : "2437",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2116",
+                "localId" : "2438",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2117",
+                "localId" : "2439",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2118",
+                "localId" : "2440",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2095",
+                "localId" : "2417",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -110506,7 +139338,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2096",
+                "localId" : "2418",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110514,7 +139346,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2097",
+                "localId" : "2419",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110522,7 +139354,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2098",
+                "localId" : "2420",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110530,7 +139362,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2099",
+                "localId" : "2421",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110538,7 +139370,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2100",
+                "localId" : "2422",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110546,7 +139378,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2101",
+                "localId" : "2423",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110555,78 +139387,78 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "2121",
+              "localId" : "2443",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2119",
+                "localId" : "2441",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2172",
+            "localId" : "2494",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2173",
+              "localId" : "2495",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2174",
+                "localId" : "2496",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2140",
+              "localId" : "2462",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2141",
+                "localId" : "2463",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2142",
+                "localId" : "2464",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2143",
+                "localId" : "2465",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2144",
+                "localId" : "2466",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2145",
+                "localId" : "2467",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2146",
+                "localId" : "2468",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2147",
+                "localId" : "2469",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2124",
+                "localId" : "2446",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -110634,7 +139466,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2125",
+                "localId" : "2447",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110642,7 +139474,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2126",
+                "localId" : "2448",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110650,7 +139482,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2127",
+                "localId" : "2449",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110658,7 +139490,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2128",
+                "localId" : "2450",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110666,7 +139498,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2129",
+                "localId" : "2451",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110674,7 +139506,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2130",
+                "localId" : "2452",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110683,48 +139515,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2164",
+              "localId" : "2486",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2165",
+                "localId" : "2487",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2166",
+                "localId" : "2488",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2167",
+                "localId" : "2489",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2168",
+                "localId" : "2490",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2169",
+                "localId" : "2491",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2170",
+                "localId" : "2492",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2171",
+                "localId" : "2493",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2148",
+                "localId" : "2470",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -110732,7 +139564,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2149",
+                "localId" : "2471",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110740,7 +139572,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2150",
+                "localId" : "2472",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110748,7 +139580,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2151",
+                "localId" : "2473",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110756,7 +139588,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2152",
+                "localId" : "2474",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110764,7 +139596,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2153",
+                "localId" : "2475",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110772,7 +139604,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2154",
+                "localId" : "2476",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110782,7 +139614,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "2182",
+        "localId" : "2504",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "PosInfEndNotMeetsDateIvl",
         "context" : "Patient",
@@ -110791,44 +139623,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2182",
+            "r" : "2504",
             "s" : [ {
               "value" : [ "", "define ", "PosInfEndNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "2263",
+              "r" : "2585",
               "s" : [ {
-                "r" : "2208",
+                "r" : "2530",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2199",
+                  "r" : "2521",
                   "s" : [ {
-                    "r" : "2183",
+                    "r" : "2505",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2207",
+                  "r" : "2529",
                   "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "2263",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2585",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "2260",
+                "r" : "2582",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2228",
+                  "r" : "2550",
                   "s" : [ {
-                    "r" : "2212",
+                    "r" : "2534",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2252",
+                  "r" : "2574",
                   "s" : [ {
-                    "r" : "2236",
+                    "r" : "2558",
                     "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -110839,92 +139671,92 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "2263",
+          "type" : "MeetsAfter",
+          "localId" : "2585",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2264",
+            "localId" : "2586",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2265",
+              "localId" : "2587",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2266",
+            "localId" : "2588",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2267",
+              "localId" : "2589",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2208",
+            "localId" : "2530",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2210",
+              "localId" : "2532",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2211",
+                "localId" : "2533",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2199",
+              "localId" : "2521",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2200",
+                "localId" : "2522",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2201",
+                "localId" : "2523",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2202",
+                "localId" : "2524",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2203",
+                "localId" : "2525",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2204",
+                "localId" : "2526",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2205",
+                "localId" : "2527",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2206",
+                "localId" : "2528",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2183",
+                "localId" : "2505",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -110932,7 +139764,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2184",
+                "localId" : "2506",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110940,7 +139772,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2185",
+                "localId" : "2507",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -110948,7 +139780,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2186",
+                "localId" : "2508",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110956,7 +139788,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2187",
+                "localId" : "2509",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110964,7 +139796,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2188",
+                "localId" : "2510",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110972,7 +139804,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2189",
+                "localId" : "2511",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -110981,78 +139813,78 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "2209",
+              "localId" : "2531",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2207",
+                "localId" : "2529",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2260",
+            "localId" : "2582",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2261",
+              "localId" : "2583",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2262",
+                "localId" : "2584",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2228",
+              "localId" : "2550",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2229",
+                "localId" : "2551",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2230",
+                "localId" : "2552",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2231",
+                "localId" : "2553",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2232",
+                "localId" : "2554",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2233",
+                "localId" : "2555",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2234",
+                "localId" : "2556",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2235",
+                "localId" : "2557",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2212",
+                "localId" : "2534",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -111060,7 +139892,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2213",
+                "localId" : "2535",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111068,7 +139900,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2214",
+                "localId" : "2536",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111076,7 +139908,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2215",
+                "localId" : "2537",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111084,7 +139916,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2216",
+                "localId" : "2538",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111092,7 +139924,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2217",
+                "localId" : "2539",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111100,7 +139932,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2218",
+                "localId" : "2540",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111109,48 +139941,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2252",
+              "localId" : "2574",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2253",
+                "localId" : "2575",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2254",
+                "localId" : "2576",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2255",
+                "localId" : "2577",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2256",
+                "localId" : "2578",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2257",
+                "localId" : "2579",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2258",
+                "localId" : "2580",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2259",
+                "localId" : "2581",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2236",
+                "localId" : "2558",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2020",
@@ -111158,7 +139990,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2237",
+                "localId" : "2559",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111166,7 +139998,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2238",
+                "localId" : "2560",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111174,7 +140006,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2239",
+                "localId" : "2561",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111182,7 +140014,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2240",
+                "localId" : "2562",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111190,7 +140022,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2241",
+                "localId" : "2563",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111198,7 +140030,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2242",
+                "localId" : "2564",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111208,7 +140040,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "2270",
+        "localId" : "2592",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateIvlNotMeetsPosInfEnd",
         "context" : "Patient",
@@ -111217,47 +140049,47 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2270",
+            "r" : "2592",
             "s" : [ {
               "value" : [ "", "define ", "DateIvlNotMeetsPosInfEnd", ": " ]
             }, {
-              "r" : "2351",
+              "r" : "2673",
               "s" : [ {
-                "r" : "2319",
+                "r" : "2641",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2287",
+                  "r" : "2609",
                   "s" : [ {
-                    "r" : "2271",
+                    "r" : "2593",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2311",
+                  "r" : "2633",
                   "s" : [ {
-                    "r" : "2295",
+                    "r" : "2617",
                     "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "2351",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2673",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "2347",
+                "r" : "2669",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2338",
+                  "r" : "2660",
                   "s" : [ {
-                    "r" : "2322",
+                    "r" : "2644",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2346",
+                  "r" : "2668",
                   "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
@@ -111265,92 +140097,92 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "2351",
+          "type" : "MeetsAfter",
+          "localId" : "2673",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2352",
+            "localId" : "2674",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2353",
+              "localId" : "2675",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2354",
+            "localId" : "2676",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2355",
+              "localId" : "2677",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2319",
+            "localId" : "2641",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2320",
+              "localId" : "2642",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2321",
+                "localId" : "2643",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2287",
+              "localId" : "2609",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2288",
+                "localId" : "2610",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2289",
+                "localId" : "2611",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2290",
+                "localId" : "2612",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2291",
+                "localId" : "2613",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2292",
+                "localId" : "2614",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2293",
+                "localId" : "2615",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2294",
+                "localId" : "2616",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2271",
+                "localId" : "2593",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -111358,7 +140190,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2272",
+                "localId" : "2594",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111366,7 +140198,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2273",
+                "localId" : "2595",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111374,7 +140206,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2274",
+                "localId" : "2596",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111382,7 +140214,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2275",
+                "localId" : "2597",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111390,7 +140222,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2276",
+                "localId" : "2598",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111398,7 +140230,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2277",
+                "localId" : "2599",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111407,48 +140239,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2311",
+              "localId" : "2633",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2312",
+                "localId" : "2634",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2313",
+                "localId" : "2635",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2314",
+                "localId" : "2636",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2315",
+                "localId" : "2637",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2316",
+                "localId" : "2638",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2317",
+                "localId" : "2639",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2318",
+                "localId" : "2640",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2295",
+                "localId" : "2617",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2020",
@@ -111456,7 +140288,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2296",
+                "localId" : "2618",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111464,7 +140296,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2297",
+                "localId" : "2619",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111472,7 +140304,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2298",
+                "localId" : "2620",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111480,7 +140312,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2299",
+                "localId" : "2621",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111488,7 +140320,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2300",
+                "localId" : "2622",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111496,7 +140328,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2301",
+                "localId" : "2623",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111505,65 +140337,65 @@ module.exports['Meets'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "2347",
+            "localId" : "2669",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2349",
+              "localId" : "2671",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2350",
+                "localId" : "2672",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2338",
+              "localId" : "2660",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2339",
+                "localId" : "2661",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2340",
+                "localId" : "2662",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2341",
+                "localId" : "2663",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2342",
+                "localId" : "2664",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2343",
+                "localId" : "2665",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2344",
+                "localId" : "2666",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2345",
+                "localId" : "2667",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2322",
+                "localId" : "2644",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -111571,7 +140403,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2323",
+                "localId" : "2645",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111579,7 +140411,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2324",
+                "localId" : "2646",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111587,7 +140419,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2325",
+                "localId" : "2647",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111595,7 +140427,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2326",
+                "localId" : "2648",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111603,7 +140435,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2327",
+                "localId" : "2649",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111611,7 +140443,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2328",
+                "localId" : "2650",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111620,13 +140452,13 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "2348",
+              "localId" : "2670",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2346",
+                "localId" : "2668",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -111634,7 +140466,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "2358",
+        "localId" : "2680",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownEndMeetsAfterDateIvl",
         "context" : "Patient",
@@ -111643,44 +140475,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2358",
+            "r" : "2680",
             "s" : [ {
               "value" : [ "", "define ", "UnknownEndMeetsAfterDateIvl", ": " ]
             }, {
-              "r" : "2439",
+              "r" : "2761",
               "s" : [ {
-                "r" : "2384",
+                "r" : "2706",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2375",
+                  "r" : "2697",
                   "s" : [ {
-                    "r" : "2359",
+                    "r" : "2681",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2383",
+                  "r" : "2705",
                   "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "2439",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2761",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "2436",
+                "r" : "2758",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2404",
+                  "r" : "2726",
                   "s" : [ {
-                    "r" : "2388",
+                    "r" : "2710",
                     "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2428",
+                  "r" : "2750",
                   "s" : [ {
-                    "r" : "2412",
+                    "r" : "2734",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -111691,92 +140523,92 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "2439",
+          "type" : "MeetsAfter",
+          "localId" : "2761",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2440",
+            "localId" : "2762",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2441",
+              "localId" : "2763",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2442",
+            "localId" : "2764",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2443",
+              "localId" : "2765",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2384",
+            "localId" : "2706",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2386",
+              "localId" : "2708",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2387",
+                "localId" : "2709",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2375",
+              "localId" : "2697",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2376",
+                "localId" : "2698",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2377",
+                "localId" : "2699",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2378",
+                "localId" : "2700",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2379",
+                "localId" : "2701",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2380",
+                "localId" : "2702",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2381",
+                "localId" : "2703",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2382",
+                "localId" : "2704",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2359",
+                "localId" : "2681",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -111784,7 +140616,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2360",
+                "localId" : "2682",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111792,7 +140624,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2361",
+                "localId" : "2683",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111800,7 +140632,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2362",
+                "localId" : "2684",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111808,7 +140640,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2363",
+                "localId" : "2685",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111816,7 +140648,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2364",
+                "localId" : "2686",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111824,7 +140656,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2365",
+                "localId" : "2687",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111833,78 +140665,78 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "2385",
+              "localId" : "2707",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2383",
+                "localId" : "2705",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2436",
+            "localId" : "2758",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2437",
+              "localId" : "2759",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2438",
+                "localId" : "2760",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2404",
+              "localId" : "2726",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2405",
+                "localId" : "2727",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2406",
+                "localId" : "2728",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2407",
+                "localId" : "2729",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2408",
+                "localId" : "2730",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2409",
+                "localId" : "2731",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2410",
+                "localId" : "2732",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2411",
+                "localId" : "2733",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2388",
+                "localId" : "2710",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2010",
@@ -111912,7 +140744,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2389",
+                "localId" : "2711",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111920,7 +140752,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2390",
+                "localId" : "2712",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -111928,7 +140760,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2391",
+                "localId" : "2713",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111936,7 +140768,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2392",
+                "localId" : "2714",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111944,7 +140776,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2393",
+                "localId" : "2715",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111952,7 +140784,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2394",
+                "localId" : "2716",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -111961,48 +140793,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2428",
+              "localId" : "2750",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2429",
+                "localId" : "2751",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2430",
+                "localId" : "2752",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2431",
+                "localId" : "2753",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2432",
+                "localId" : "2754",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2433",
+                "localId" : "2755",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2434",
+                "localId" : "2756",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2435",
+                "localId" : "2757",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2412",
+                "localId" : "2734",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -112010,7 +140842,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2413",
+                "localId" : "2735",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112018,7 +140850,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2414",
+                "localId" : "2736",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112026,7 +140858,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2415",
+                "localId" : "2737",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112034,7 +140866,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2416",
+                "localId" : "2738",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112042,7 +140874,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2417",
+                "localId" : "2739",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112050,7 +140882,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2418",
+                "localId" : "2740",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112060,7 +140892,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "2446",
+        "localId" : "2768",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownEndMayMeetBeforeDateIvl",
         "context" : "Patient",
@@ -112069,44 +140901,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2446",
+            "r" : "2768",
             "s" : [ {
               "value" : [ "", "define ", "UnknownEndMayMeetBeforeDateIvl", ": " ]
             }, {
-              "r" : "2527",
+              "r" : "2849",
               "s" : [ {
-                "r" : "2472",
+                "r" : "2794",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2463",
+                  "r" : "2785",
                   "s" : [ {
-                    "r" : "2447",
+                    "r" : "2769",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2471",
+                  "r" : "2793",
                   "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "2527",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2849",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "2524",
+                "r" : "2846",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2492",
+                  "r" : "2814",
                   "s" : [ {
-                    "r" : "2476",
+                    "r" : "2798",
                     "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2516",
+                  "r" : "2838",
                   "s" : [ {
-                    "r" : "2500",
+                    "r" : "2822",
                     "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -112117,92 +140949,92 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "2527",
+          "type" : "MeetsAfter",
+          "localId" : "2849",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2528",
+            "localId" : "2850",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2529",
+              "localId" : "2851",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2530",
+            "localId" : "2852",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2531",
+              "localId" : "2853",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2472",
+            "localId" : "2794",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2474",
+              "localId" : "2796",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2475",
+                "localId" : "2797",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2463",
+              "localId" : "2785",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2464",
+                "localId" : "2786",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2465",
+                "localId" : "2787",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2466",
+                "localId" : "2788",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2467",
+                "localId" : "2789",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2468",
+                "localId" : "2790",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2469",
+                "localId" : "2791",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2470",
+                "localId" : "2792",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2447",
+                "localId" : "2769",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -112210,7 +141042,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2448",
+                "localId" : "2770",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112218,7 +141050,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2449",
+                "localId" : "2771",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112226,7 +141058,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2450",
+                "localId" : "2772",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112234,7 +141066,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2451",
+                "localId" : "2773",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112242,7 +141074,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2452",
+                "localId" : "2774",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112250,7 +141082,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2453",
+                "localId" : "2775",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112259,78 +141091,78 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "2473",
+              "localId" : "2795",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2471",
+                "localId" : "2793",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2524",
+            "localId" : "2846",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2525",
+              "localId" : "2847",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2526",
+                "localId" : "2848",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2492",
+              "localId" : "2814",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2493",
+                "localId" : "2815",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2494",
+                "localId" : "2816",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2495",
+                "localId" : "2817",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2496",
+                "localId" : "2818",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2497",
+                "localId" : "2819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2498",
+                "localId" : "2820",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2499",
+                "localId" : "2821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2476",
+                "localId" : "2798",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2020",
@@ -112338,7 +141170,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2477",
+                "localId" : "2799",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112346,7 +141178,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2478",
+                "localId" : "2800",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112354,7 +141186,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2479",
+                "localId" : "2801",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112362,7 +141194,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2480",
+                "localId" : "2802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112370,7 +141202,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2481",
+                "localId" : "2803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112378,7 +141210,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2482",
+                "localId" : "2804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112387,48 +141219,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2516",
+              "localId" : "2838",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2517",
+                "localId" : "2839",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2518",
+                "localId" : "2840",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2519",
+                "localId" : "2841",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2520",
+                "localId" : "2842",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2521",
+                "localId" : "2843",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2522",
+                "localId" : "2844",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2523",
+                "localId" : "2845",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2500",
+                "localId" : "2822",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2040",
@@ -112436,7 +141268,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2501",
+                "localId" : "2823",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112444,7 +141276,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2502",
+                "localId" : "2824",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112452,7 +141284,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2503",
+                "localId" : "2825",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112460,7 +141292,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2504",
+                "localId" : "2826",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112468,7 +141300,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2505",
+                "localId" : "2827",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112476,7 +141308,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2506",
+                "localId" : "2828",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112486,7 +141318,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "2534",
+        "localId" : "2856",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownEndNotMeetsDateIvl",
         "context" : "Patient",
@@ -112495,44 +141327,44 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2534",
+            "r" : "2856",
             "s" : [ {
               "value" : [ "", "define ", "UnknownEndNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "2615",
+              "r" : "2937",
               "s" : [ {
-                "r" : "2560",
+                "r" : "2882",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2551",
+                  "r" : "2873",
                   "s" : [ {
-                    "r" : "2535",
+                    "r" : "2857",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2559",
+                  "r" : "2881",
                   "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "2615",
-                "value" : [ " ", "meets", " " ]
+                "r" : "2937",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "2612",
+                "r" : "2934",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2580",
+                  "r" : "2902",
                   "s" : [ {
-                    "r" : "2564",
+                    "r" : "2886",
                     "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2604",
+                  "r" : "2926",
                   "s" : [ {
-                    "r" : "2588",
+                    "r" : "2910",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -112543,92 +141375,92 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "2615",
+          "type" : "MeetsAfter",
+          "localId" : "2937",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2616",
+            "localId" : "2938",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2617",
+              "localId" : "2939",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2618",
+            "localId" : "2940",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2619",
+              "localId" : "2941",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2560",
+            "localId" : "2882",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2562",
+              "localId" : "2884",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2563",
+                "localId" : "2885",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2551",
+              "localId" : "2873",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2552",
+                "localId" : "2874",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2553",
+                "localId" : "2875",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2554",
+                "localId" : "2876",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2555",
+                "localId" : "2877",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2556",
+                "localId" : "2878",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2557",
+                "localId" : "2879",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2558",
+                "localId" : "2880",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2535",
+                "localId" : "2857",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -112636,7 +141468,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2536",
+                "localId" : "2858",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112644,7 +141476,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2537",
+                "localId" : "2859",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112652,7 +141484,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2538",
+                "localId" : "2860",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112660,7 +141492,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2539",
+                "localId" : "2861",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112668,7 +141500,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2540",
+                "localId" : "2862",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112676,7 +141508,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2541",
+                "localId" : "2863",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112685,78 +141517,78 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "2561",
+              "localId" : "2883",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2559",
+                "localId" : "2881",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2612",
+            "localId" : "2934",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2613",
+              "localId" : "2935",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2614",
+                "localId" : "2936",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2580",
+              "localId" : "2902",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2581",
+                "localId" : "2903",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2582",
+                "localId" : "2904",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2583",
+                "localId" : "2905",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2584",
+                "localId" : "2906",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2585",
+                "localId" : "2907",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2586",
+                "localId" : "2908",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2587",
+                "localId" : "2909",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2564",
+                "localId" : "2886",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2000",
@@ -112764,7 +141596,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2565",
+                "localId" : "2887",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112772,7 +141604,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2566",
+                "localId" : "2888",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112780,7 +141612,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2567",
+                "localId" : "2889",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112788,7 +141620,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2568",
+                "localId" : "2890",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112796,7 +141628,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2569",
+                "localId" : "2891",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112804,7 +141636,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2570",
+                "localId" : "2892",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112813,48 +141645,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2604",
+              "localId" : "2926",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2605",
+                "localId" : "2927",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2606",
+                "localId" : "2928",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2607",
+                "localId" : "2929",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2608",
+                "localId" : "2930",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2609",
+                "localId" : "2931",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2610",
+                "localId" : "2932",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2611",
+                "localId" : "2933",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2588",
+                "localId" : "2910",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -112862,7 +141694,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2589",
+                "localId" : "2911",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112870,7 +141702,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2590",
+                "localId" : "2912",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -112878,7 +141710,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2591",
+                "localId" : "2913",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112886,7 +141718,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2592",
+                "localId" : "2914",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112894,7 +141726,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2593",
+                "localId" : "2915",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112902,7 +141734,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2594",
+                "localId" : "2916",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -112912,7 +141744,7 @@ module.exports['Meets'] = {
           } ]
         }
       }, {
-        "localId" : "2622",
+        "localId" : "2944",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DateIvlMayMeetAfterUnknownEnd",
         "context" : "Patient",
@@ -112921,47 +141753,47 @@ module.exports['Meets'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2622",
+            "r" : "2944",
             "s" : [ {
               "value" : [ "", "define ", "DateIvlMayMeetAfterUnknownEnd", ": " ]
             }, {
-              "r" : "2703",
+              "r" : "3025",
               "s" : [ {
-                "r" : "2671",
+                "r" : "2993",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2639",
+                  "r" : "2961",
                   "s" : [ {
-                    "r" : "2623",
+                    "r" : "2945",
                     "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2663",
+                  "r" : "2985",
                   "s" : [ {
-                    "r" : "2647",
+                    "r" : "2969",
                     "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "2703",
-                "value" : [ " ", "meets", " " ]
+                "r" : "3025",
+                "value" : [ " ", "meets after", " " ]
               }, {
-                "r" : "2699",
+                "r" : "3021",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2690",
+                  "r" : "3012",
                   "s" : [ {
-                    "r" : "2674",
+                    "r" : "2996",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2698",
+                  "r" : "3020",
                   "value" : [ ", ", "null", ")" ]
                 } ]
               } ]
@@ -112969,92 +141801,92 @@ module.exports['Meets'] = {
           }
         } ],
         "expression" : {
-          "type" : "Meets",
-          "localId" : "2703",
+          "type" : "MeetsAfter",
+          "localId" : "3025",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2704",
+            "localId" : "3026",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2705",
+              "localId" : "3027",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2706",
+            "localId" : "3028",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2707",
+              "localId" : "3029",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2671",
+            "localId" : "2993",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2672",
+              "localId" : "2994",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2673",
+                "localId" : "2995",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2639",
+              "localId" : "2961",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2640",
+                "localId" : "2962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2641",
+                "localId" : "2963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2642",
+                "localId" : "2964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2643",
+                "localId" : "2965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2644",
+                "localId" : "2966",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2645",
+                "localId" : "2967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2646",
+                "localId" : "2968",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2623",
+                "localId" : "2945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2020",
@@ -113062,7 +141894,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2624",
+                "localId" : "2946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -113070,7 +141902,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2625",
+                "localId" : "2947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -113078,7 +141910,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2626",
+                "localId" : "2948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113086,7 +141918,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2627",
+                "localId" : "2949",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113094,7 +141926,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2628",
+                "localId" : "2950",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113102,7 +141934,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2629",
+                "localId" : "2951",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113111,48 +141943,48 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2663",
+              "localId" : "2985",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2664",
+                "localId" : "2986",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2665",
+                "localId" : "2987",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2666",
+                "localId" : "2988",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2667",
+                "localId" : "2989",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2668",
+                "localId" : "2990",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2669",
+                "localId" : "2991",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2670",
+                "localId" : "2992",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2647",
+                "localId" : "2969",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2040",
@@ -113160,7 +141992,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2648",
+                "localId" : "2970",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -113168,7 +142000,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2649",
+                "localId" : "2971",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -113176,7 +142008,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2650",
+                "localId" : "2972",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113184,7 +142016,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2651",
+                "localId" : "2973",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113192,7 +142024,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2652",
+                "localId" : "2974",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113200,7 +142032,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2653",
+                "localId" : "2975",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113209,65 +142041,65 @@ module.exports['Meets'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "2699",
+            "localId" : "3021",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2701",
+              "localId" : "3023",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2702",
+                "localId" : "3024",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2690",
+              "localId" : "3012",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2691",
+                "localId" : "3013",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2692",
+                "localId" : "3014",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2693",
+                "localId" : "3015",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2694",
+                "localId" : "3016",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2695",
+                "localId" : "3017",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2696",
+                "localId" : "3018",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2697",
+                "localId" : "3019",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2674",
+                "localId" : "2996",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -113275,7 +142107,7 @@ module.exports['Meets'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2675",
+                "localId" : "2997",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -113283,7 +142115,7 @@ module.exports['Meets'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2676",
+                "localId" : "2998",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -113291,7 +142123,7 @@ module.exports['Meets'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2677",
+                "localId" : "2999",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113299,7 +142131,7 @@ module.exports['Meets'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2678",
+                "localId" : "3000",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113307,7 +142139,7 @@ module.exports['Meets'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2679",
+                "localId" : "3001",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113315,7 +142147,7 @@ module.exports['Meets'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2680",
+                "localId" : "3002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -113324,13 +142156,13 @@ module.exports['Meets'] = {
             },
             "high" : {
               "type" : "As",
-              "localId" : "2700",
+              "localId" : "3022",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2698",
+                "localId" : "3020",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -113342,65 +142174,82 @@ module.exports['Meets'] = {
   }
 }
 
-/* MeetsAfter
+/* MeetsBefore
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define MeetsAfterIntIvl: Interval[11, 15] meets after Interval[5, 10]
-define MeetsBeforeIntIvl: Interval[1, 4] meets after Interval[5, 10]
-define NotMeetsIntIvl: Interval[1, 2] meets after Interval[5, 10]
-define MeetsAfterRealIvl: Interval[1.50000001, 2.5] meets after Interval[0.5, 1.5]
-define MeetsBeforeRealIvl: Interval[0.5, 1.5] meets after Interval[1.50000001, 2.5]
-define NotMeetsRealIvl: Interval[0.0, 1.0] meets after Interval[1.1, 2.0]
+define MeetsAfterIntIvl: Interval[11, 15] meets before Interval[5, 10]
+define MeetsBeforeIntIvl: Interval[1, 4] meets before Interval[5, 10]
+define NotMeetsIntIvl: Interval[1, 2] meets before Interval[5, 10]
+define MeetsAfterLongIvl: Interval[11L, 15L] meets before Interval[5L, 10L]
+define MeetsBeforeLongIvl: Interval[1L, 4L] meets before Interval[5L, 10L]
+define NotMeetsLongIvl: Interval[1L, 2L] meets before Interval[5L, 10L]
+define MeetsAfterRealIvl: Interval[1.50000001, 2.5] meets before Interval[0.5, 1.5]
+define MeetsBeforeRealIvl: Interval[0.5, 1.5] meets before Interval[1.50000001, 2.5]
+define NotMeetsRealIvl: Interval[0.0, 1.0] meets before Interval[1.1, 2.0]
 define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define MeetsAfterDateIvl: Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)) meets after DateIvl
-define MeetsBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) meets after DateIvl
-define NotMeetsDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 0, 0, 0, 0)) meets after DateIvl
-define MayMeetAfterImpreciseDateIvl: DateIvl meets after Interval[DateTime(2012, 1), DateTime(2012, 2)]
-define MayMeetBeforeImpreciseDateIvl: DateIvl meets after Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define NotMeetsImpreciseDateIvl: DateIvl meets after Interval[DateTime(2012, 1), DateTime(2012, 12)]
+define MeetsAfterDateIvl: Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)) meets before DateIvl
+define MeetsBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) meets before DateIvl
+define NotMeetsDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 0, 0, 0, 0)) meets before DateIvl
+define MayMeetAfterImpreciseDateIvl: DateIvl meets before Interval[DateTime(2012, 1), DateTime(2012, 2)]
+define MayMeetBeforeImpreciseDateIvl: DateIvl meets before Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define NotMeetsImpreciseDateIvl: DateIvl meets before Interval[DateTime(2012, 1), DateTime(2012, 12)]
 define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define MeetsAfterDayOfIvl: PrecisionDateIvl meets after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define MeetsBeforeDayOfIvl: PrecisionDateIvl meets after day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
-define NotMeetsDayOfIvl: PrecisionDateIvl meets after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define NotMeetsDayOfImpreciseIVL: PrecisionDateIvl meets after day of Interval[DateTime(2012, 1), DateTime(2012, 2)]
-define MayMeetAfterDayOfImpreciseIvl: PrecisionDateIvl meets after day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
-define MayMeetBeforeDayOfImpreciseIvl: PrecisionDateIvl meets after day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
+define MeetsAfterDayOfIvl: PrecisionDateIvl meets before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define MeetsBeforeDayOfIvl: PrecisionDateIvl meets before day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
+define NotMeetsDayOfIvl: PrecisionDateIvl meets before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define NotMeetsDayOfImpreciseIVL: PrecisionDateIvl meets before day of Interval[DateTime(2012, 1), DateTime(2012, 2)]
+define MayMeetAfterDayOfImpreciseIvl: PrecisionDateIvl meets before day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define MayMeetBeforeDayOfImpreciseIvl: PrecisionDateIvl meets before day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
 define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
-define ImpreciseMayMeetAfterDateIvl: ImpDateIvl meets after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 23, 59, 59, 999)]
-define ImpreciseMayMeetBeforeDateIvl: ImpDateIvl meets after Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999)]
-define ImpreciseNotMeetsDateIvl: ImpDateIvl meets after Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999))
-define NegInfBegMeetsBeforeIntIvl: Interval[null, 100] meets after Interval[101, 200]
-define NegInfBegNotMeetsIntIvl: Interval[null, 100] meets after Interval[100, 200]
-define IntIvlNotMeetsNegInfBeg: Interval[100, 200] meets after Interval[null, 400]
-define UnknownBegMeetsBeforeIntIvl: Interval(null, 100] meets after Interval[101, 200]
-define UnknownBegMayMeetAfterIntIvl: Interval(null, 100] meets after Interval[0, 50]
-define UnknownBegNotMeetsIntIvl: Interval(null, 5] meets after Interval[0, 100]
-define IntIvlMayMeetBeforeUnknownBeg: Interval[0, 100] meets after Interval(null, 400)
-define PosInfEndMeetsAfterIntIvl: Interval[100, null] meets after Interval[0, 99]
-define PosInfEndNotMeetsIntIvl: Interval[0, null] meets after Interval[1000, 2000]
-define IntIvlNotMeetsPosInfEnd: Interval[100, 200] meets after Interval[0, null]
-define UnknownEndMeetsAfterIntIvl: Interval[100, null) meets after Interval[0, 99]
-define UnknownEndMayMeetBeforeIntIvl: Interval[0, null) meets after Interval[50, 100]
-define UnknownEndNotMeetsIntIvl: Interval[0, null) meets after Interval[0, 100]
-define IntIvlMayMeetAfterUnknownEnd: Interval[0, 100] meets after Interval[-100, null)
-define NegInfBegMeetsBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
-define NegInfBegNotMeetsDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define DateIvlNotMeetsNegInfBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets after Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownBegMeetsBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
-define UnknownBegMayMeetAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define UnknownBegNotMeetsDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define DateIvlMayMeetBeforeUnknownBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets after Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define PosInfEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
-define PosInfEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define DateIvlNotMeetsPosInfEnd: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)] meets after Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
-define UnknownEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets after Interval[DateTime(2010, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownEndMayMeetBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets after Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
-define UnknownEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets after Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateIvlMayMeetAfterUnknownEnd: Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)] meets after Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
+define ImpreciseMayMeetAfterDateIvl: ImpDateIvl meets before Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 23, 59, 59, 999)]
+define ImpreciseMayMeetBeforeDateIvl: ImpDateIvl meets before Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999)]
+define ImpreciseNotMeetsDateIvl: ImpDateIvl meets before Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999))
+define NegInfBegMeetsBeforeIntIvl: Interval[null, 100] meets before Interval[101, 200]
+define NegInfBegNotMeetsIntIvl: Interval[null, 100] meets before Interval[100, 200]
+define IntIvlNotMeetsNegInfBeg: Interval[100, 200] meets before Interval[null, 400]
+define UnknownBegMeetsBeforeIntIvl: Interval(null, 100] meets before Interval[101, 200]
+define UnknownBegMayMeetAfterIntIvl: Interval(null, 100] meets before Interval[0, 50]
+define UnknownBegNotMeetsIntIvl: Interval(null, 5] meets before Interval[0, 100]
+define IntIvlMayMeetBeforeUnknownBeg: Interval[0, 100] meets before Interval(null, 400)
+define PosInfEndMeetsAfterIntIvl: Interval[100, null] meets before Interval[0, 99]
+define PosInfEndNotMeetsIntIvl: Interval[0, null] meets before Interval[1000, 2000]
+define IntIvlNotMeetsPosInfEnd: Interval[100, 200] meets before Interval[0, null]
+define UnknownEndMeetsAfterIntIvl: Interval[100, null) meets before Interval[0, 99]
+define UnknownEndMayMeetBeforeIntIvl: Interval[0, null) meets before Interval[50, 100]
+define UnknownEndNotMeetsIntIvl: Interval[0, null) meets before Interval[0, 100]
+define IntIvlMayMeetAfterUnknownEnd: Interval[0, 100] meets before Interval[-100, null)
+define NegInfBegMeetsBeforeLongIvl: Interval[null, 100L] meets before Interval[101L, 200L]
+define NegInfBegNotMeetsLongIvl: Interval[null, 100L] meets before Interval[100L, 200L]
+define LongIvlNotMeetsNegInfBeg: Interval[100L, 200L] meets before Interval[null, 400L]
+define UnknownBegMeetsBeforeLongIvl: Interval(null, 100L] meets before Interval[101L, 200L]
+define UnknownBegMayMeetAfterLongIvl: Interval(null, 100L] meets before Interval[0L, 50L]
+define UnknownBegNotMeetsLongIvl: Interval(null, 5L] meets before Interval[0L, 100L]
+define LongIvlMayMeetBeforeUnknownBeg: Interval[0L, 100L] meets before Interval(null, 400L)
+define PosInfEndMeetsAfterLongIvl: Interval[100L, null] meets before Interval[0L, 99L]
+define PosInfEndNotMeetsLongIvl: Interval[0L, null] meets before Interval[1000L, 2000L]
+define LongIvlNotMeetsPosInfEnd: Interval[100L, 200L] meets before Interval[0L, null]
+define UnknownEndMeetsAfterLongIvl: Interval[100L, null) meets before Interval[0L, 99L]
+define UnknownEndMayMeetBeforeLongIvl: Interval[0L, null) meets before Interval[50L, 100L]
+define UnknownEndNotMeetsLongIvl: Interval[0L, null) meets before Interval[0L, 100L]
+define LongIvlMayMeetAfterUnknownEnd: Interval[0L, 100L] meets before Interval[-100L, null)
+define NegInfBegMeetsBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
+define NegInfBegNotMeetsDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define DateIvlNotMeetsNegInfBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets before Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define UnknownBegMeetsBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
+define UnknownBegMayMeetAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
+define UnknownBegNotMeetsDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define DateIvlMayMeetBeforeUnknownBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets before Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
+define PosInfEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
+define PosInfEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
+define DateIvlNotMeetsPosInfEnd: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)] meets before Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
+define UnknownEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets before Interval[DateTime(2010, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
+define UnknownEndMayMeetBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets before Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
+define UnknownEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateIvlMayMeetAfterUnknownEnd: Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)] meets before Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
 */
 
-module.exports['MeetsAfter'] = {
+module.exports['MeetsBefore'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -113412,7 +142261,7 @@ module.exports['MeetsAfter'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "2622",
+        "r" : "2944",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -113507,7 +142356,7 @@ module.exports['MeetsAfter'] = {
                 } ]
               }, {
                 "r" : "225",
-                "value" : [ " ", "meets after", " " ]
+                "value" : [ " ", "meets before", " " ]
               }, {
                 "r" : "222",
                 "s" : [ {
@@ -113519,7 +142368,7 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
+          "type" : "MeetsBefore",
           "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -113635,7 +142484,7 @@ module.exports['MeetsAfter'] = {
                 } ]
               }, {
                 "r" : "243",
-                "value" : [ " ", "meets after", " " ]
+                "value" : [ " ", "meets before", " " ]
               }, {
                 "r" : "240",
                 "s" : [ {
@@ -113647,7 +142496,7 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
+          "type" : "MeetsBefore",
           "localId" : "243",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -113763,7 +142612,7 @@ module.exports['MeetsAfter'] = {
                 } ]
               }, {
                 "r" : "261",
-                "value" : [ " ", "meets after", " " ]
+                "value" : [ " ", "meets before", " " ]
               }, {
                 "r" : "258",
                 "s" : [ {
@@ -113775,7 +142624,7 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
+          "type" : "MeetsBefore",
           "localId" : "261",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -113871,7 +142720,7 @@ module.exports['MeetsAfter'] = {
       }, {
         "localId" : "268",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterRealIvl",
+        "name" : "MeetsAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -113880,30 +142729,30 @@ module.exports['MeetsAfter'] = {
           "s" : {
             "r" : "268",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterRealIvl", ": " ]
+              "value" : [ "", "define ", "MeetsAfterLongIvl", ": " ]
             }, {
               "r" : "279",
               "s" : [ {
                 "r" : "271",
                 "s" : [ {
                   "r" : "269",
-                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                  "value" : [ "Interval[", "11L", ", ", "15L", "]" ]
                 } ]
               }, {
                 "r" : "279",
-                "value" : [ " ", "meets after", " " ]
+                "value" : [ " ", "meets before", " " ]
               }, {
                 "r" : "276",
                 "s" : [ {
                   "r" : "274",
-                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
+          "type" : "MeetsBefore",
           "localId" : "279",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -113914,7 +142763,7 @@ module.exports['MeetsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "281",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -113924,7 +142773,7 @@ module.exports['MeetsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "283",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -113941,24 +142790,24 @@ module.exports['MeetsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "273",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.50000001",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "11",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.5",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "15",
               "annotation" : [ ]
             }
           }, {
@@ -113974,24 +142823,24 @@ module.exports['MeetsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "278",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.5",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.5",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
@@ -113999,7 +142848,7 @@ module.exports['MeetsAfter'] = {
       }, {
         "localId" : "286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeRealIvl",
+        "name" : "MeetsBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -114008,30 +142857,30 @@ module.exports['MeetsAfter'] = {
           "s" : {
             "r" : "286",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeRealIvl", ": " ]
+              "value" : [ "", "define ", "MeetsBeforeLongIvl", ": " ]
             }, {
               "r" : "297",
               "s" : [ {
                 "r" : "289",
                 "s" : [ {
                   "r" : "287",
-                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "4L", "]" ]
                 } ]
               }, {
                 "r" : "297",
-                "value" : [ " ", "meets after", " " ]
+                "value" : [ " ", "meets before", " " ]
               }, {
                 "r" : "294",
                 "s" : [ {
                   "r" : "292",
-                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
+          "type" : "MeetsBefore",
           "localId" : "297",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -114042,7 +142891,7 @@ module.exports['MeetsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "299",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -114052,7 +142901,7 @@ module.exports['MeetsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "301",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -114069,24 +142918,24 @@ module.exports['MeetsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "291",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "287",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.5",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "288",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.5",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
             }
           }, {
@@ -114102,24 +142951,24 @@ module.exports['MeetsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "296",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.50000001",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.5",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
@@ -114127,7 +142976,7 @@ module.exports['MeetsAfter'] = {
       }, {
         "localId" : "304",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsRealIvl",
+        "name" : "NotMeetsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -114136,30 +142985,30 @@ module.exports['MeetsAfter'] = {
           "s" : {
             "r" : "304",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsRealIvl", ": " ]
+              "value" : [ "", "define ", "NotMeetsLongIvl", ": " ]
             }, {
               "r" : "315",
               "s" : [ {
                 "r" : "307",
                 "s" : [ {
                   "r" : "305",
-                  "value" : [ "Interval[", "0.0", ", ", "1.0", "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "2L", "]" ]
                 } ]
               }, {
                 "r" : "315",
-                "value" : [ " ", "meets after", " " ]
+                "value" : [ " ", "meets before", " " ]
               }, {
                 "r" : "312",
                 "s" : [ {
                   "r" : "310",
-                  "value" : [ "Interval[", "1.1", ", ", "2.0", "]" ]
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
+          "type" : "MeetsBefore",
           "localId" : "315",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -114170,7 +143019,7 @@ module.exports['MeetsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "317",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -114180,7 +143029,7 @@ module.exports['MeetsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "319",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -114197,13 +143046,397 @@ module.exports['MeetsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "309",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "312",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "313",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "310",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "322",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsAfterRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "322",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsAfterRealIvl", ": " ]
+            }, {
+              "r" : "333",
+              "s" : [ {
+                "r" : "325",
+                "s" : [ {
+                  "r" : "323",
+                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                } ]
+              }, {
+                "r" : "333",
+                "value" : [ " ", "meets before", " " ]
+              }, {
+                "r" : "330",
+                "s" : [ {
+                  "r" : "328",
+                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "333",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "334",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "335",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "336",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "337",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "325",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "326",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "327",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.50000001",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "324",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "330",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "331",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "332",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "340",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MeetsBeforeRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "340",
+            "s" : [ {
+              "value" : [ "", "define ", "MeetsBeforeRealIvl", ": " ]
+            }, {
+              "r" : "351",
+              "s" : [ {
+                "r" : "343",
+                "s" : [ {
+                  "r" : "341",
+                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                } ]
+              }, {
+                "r" : "351",
+                "value" : [ " ", "meets before", " " ]
+              }, {
+                "r" : "348",
+                "s" : [ {
+                  "r" : "346",
+                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "351",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "352",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "353",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "354",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "355",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "343",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "344",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "345",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "0.5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "348",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "349",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "350",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.50000001",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "358",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NotMeetsRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "358",
+            "s" : [ {
+              "value" : [ "", "define ", "NotMeetsRealIvl", ": " ]
+            }, {
+              "r" : "369",
+              "s" : [ {
+                "r" : "361",
+                "s" : [ {
+                  "r" : "359",
+                  "value" : [ "Interval[", "0.0", ", ", "1.0", "]" ]
+                } ]
+              }, {
+                "r" : "369",
+                "value" : [ " ", "meets before", " " ]
+              }, {
+                "r" : "366",
+                "s" : [ {
+                  "r" : "364",
+                  "value" : [ "Interval[", "1.1", ", ", "2.0", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "369",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "370",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "372",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "361",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "362",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "363",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "359",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "0.0",
@@ -114211,7 +143444,7 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "306",
+              "localId" : "360",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -114219,24 +143452,24 @@ module.exports['MeetsAfter'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "312",
+            "localId" : "366",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "313",
+              "localId" : "367",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "314",
+                "localId" : "368",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "310",
+              "localId" : "364",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.1",
@@ -114244,7 +143477,7 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "311",
+              "localId" : "365",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "2.0",
@@ -114253,7 +143486,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "322",
+        "localId" : "376",
         "name" : "DateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -114261,25 +143494,25 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "322",
+            "r" : "376",
             "s" : [ {
               "value" : [ "", "define ", "DateIvl", ": " ]
             }, {
-              "r" : "371",
+              "r" : "425",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "339",
+                "r" : "393",
                 "s" : [ {
-                  "r" : "323",
+                  "r" : "377",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "363",
+                "r" : "417",
                 "s" : [ {
-                  "r" : "347",
+                  "r" : "401",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
@@ -114290,76 +143523,76 @@ module.exports['MeetsAfter'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "374",
+          "localId" : "428",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "375",
+            "localId" : "429",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "371",
+          "localId" : "425",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "372",
+            "localId" : "426",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "373",
+              "localId" : "427",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "339",
+            "localId" : "393",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "340",
+              "localId" : "394",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "341",
+              "localId" : "395",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "342",
+              "localId" : "396",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "343",
+              "localId" : "397",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "344",
+              "localId" : "398",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "345",
+              "localId" : "399",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "346",
+              "localId" : "400",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "323",
+              "localId" : "377",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -114367,7 +143600,7 @@ module.exports['MeetsAfter'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "324",
+              "localId" : "378",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -114375,7 +143608,7 @@ module.exports['MeetsAfter'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "325",
+              "localId" : "379",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -114383,7 +143616,7 @@ module.exports['MeetsAfter'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "326",
+              "localId" : "380",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -114391,7 +143624,7 @@ module.exports['MeetsAfter'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "327",
+              "localId" : "381",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -114399,7 +143632,7 @@ module.exports['MeetsAfter'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "328",
+              "localId" : "382",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -114407,7 +143640,7 @@ module.exports['MeetsAfter'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "329",
+              "localId" : "383",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -114416,48 +143649,48 @@ module.exports['MeetsAfter'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "363",
+            "localId" : "417",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "364",
+              "localId" : "418",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "365",
+              "localId" : "419",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "366",
+              "localId" : "420",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "367",
+              "localId" : "421",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "368",
+              "localId" : "422",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "369",
+              "localId" : "423",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "370",
+              "localId" : "424",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "347",
+              "localId" : "401",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -114465,7 +143698,7 @@ module.exports['MeetsAfter'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "348",
+              "localId" : "402",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -114473,7 +143706,7 @@ module.exports['MeetsAfter'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "349",
+              "localId" : "403",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -114481,7 +143714,7 @@ module.exports['MeetsAfter'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "350",
+              "localId" : "404",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -114489,7 +143722,7 @@ module.exports['MeetsAfter'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "351",
+              "localId" : "405",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -114497,7 +143730,7 @@ module.exports['MeetsAfter'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "352",
+              "localId" : "406",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -114505,7 +143738,7 @@ module.exports['MeetsAfter'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "353",
+              "localId" : "407",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -114514,7 +143747,7 @@ module.exports['MeetsAfter'] = {
           }
         }
       }, {
-        "localId" : "378",
+        "localId" : "432",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MeetsAfterDateIvl",
         "context" : "Patient",
@@ -114523,37 +143756,37 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "378",
+            "r" : "432",
             "s" : [ {
               "value" : [ "", "define ", "MeetsAfterDateIvl", ": " ]
             }, {
-              "r" : "433",
+              "r" : "487",
               "s" : [ {
-                "r" : "427",
+                "r" : "481",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "395",
+                  "r" : "449",
                   "s" : [ {
-                    "r" : "379",
+                    "r" : "433",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "419",
+                  "r" : "473",
                   "s" : [ {
-                    "r" : "403",
+                    "r" : "457",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "433",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "487",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "430",
+                "r" : "484",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
@@ -114562,92 +143795,92 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "433",
+          "type" : "MeetsBefore",
+          "localId" : "487",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "434",
+            "localId" : "488",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "435",
+              "localId" : "489",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "436",
+            "localId" : "490",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "437",
+              "localId" : "491",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "427",
+            "localId" : "481",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "428",
+              "localId" : "482",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "429",
+                "localId" : "483",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "395",
+              "localId" : "449",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "396",
+                "localId" : "450",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "397",
+                "localId" : "451",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "398",
+                "localId" : "452",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "399",
+                "localId" : "453",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "400",
+                "localId" : "454",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "401",
+                "localId" : "455",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "402",
+                "localId" : "456",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "379",
+                "localId" : "433",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -114655,7 +143888,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "380",
+                "localId" : "434",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -114663,7 +143896,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "381",
+                "localId" : "435",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -114671,7 +143904,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "382",
+                "localId" : "436",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -114679,7 +143912,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "383",
+                "localId" : "437",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -114687,7 +143920,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "384",
+                "localId" : "438",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -114695,7 +143928,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "385",
+                "localId" : "439",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -114704,48 +143937,48 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "419",
+              "localId" : "473",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "420",
+                "localId" : "474",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "421",
+                "localId" : "475",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "422",
+                "localId" : "476",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "423",
+                "localId" : "477",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "424",
+                "localId" : "478",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "425",
+                "localId" : "479",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "426",
+                "localId" : "480",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "403",
+                "localId" : "457",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -114753,7 +143986,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "404",
+                "localId" : "458",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -114761,7 +143994,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "405",
+                "localId" : "459",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -114769,7 +144002,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "406",
+                "localId" : "460",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -114777,7 +144010,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "407",
+                "localId" : "461",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -114785,7 +144018,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "408",
+                "localId" : "462",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -114793,7 +144026,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "409",
+                "localId" : "463",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -114802,16 +144035,16 @@ module.exports['MeetsAfter'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "430",
+            "localId" : "484",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "431",
+              "localId" : "485",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "432",
+                "localId" : "486",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -114819,7 +144052,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "440",
+        "localId" : "494",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MeetsBeforeDateIvl",
         "context" : "Patient",
@@ -114828,37 +144061,37 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "440",
+            "r" : "494",
             "s" : [ {
               "value" : [ "", "define ", "MeetsBeforeDateIvl", ": " ]
             }, {
-              "r" : "495",
+              "r" : "549",
               "s" : [ {
-                "r" : "489",
+                "r" : "543",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "457",
+                  "r" : "511",
                   "s" : [ {
-                    "r" : "441",
+                    "r" : "495",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "481",
+                  "r" : "535",
                   "s" : [ {
-                    "r" : "465",
+                    "r" : "519",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "495",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "549",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "492",
+                "r" : "546",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
@@ -114867,92 +144100,92 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "495",
+          "type" : "MeetsBefore",
+          "localId" : "549",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "496",
+            "localId" : "550",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "497",
+              "localId" : "551",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "498",
+            "localId" : "552",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "499",
+              "localId" : "553",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "489",
+            "localId" : "543",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "490",
+              "localId" : "544",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "491",
+                "localId" : "545",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "457",
+              "localId" : "511",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "458",
+                "localId" : "512",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "459",
+                "localId" : "513",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "460",
+                "localId" : "514",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "461",
+                "localId" : "515",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "462",
+                "localId" : "516",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "463",
+                "localId" : "517",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "464",
+                "localId" : "518",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "441",
+                "localId" : "495",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -114960,7 +144193,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "442",
+                "localId" : "496",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -114968,7 +144201,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "443",
+                "localId" : "497",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -114976,7 +144209,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "444",
+                "localId" : "498",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -114984,7 +144217,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "445",
+                "localId" : "499",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -114992,7 +144225,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "446",
+                "localId" : "500",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115000,7 +144233,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "447",
+                "localId" : "501",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115009,48 +144242,48 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "481",
+              "localId" : "535",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "482",
+                "localId" : "536",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "483",
+                "localId" : "537",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "484",
+                "localId" : "538",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "485",
+                "localId" : "539",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "486",
+                "localId" : "540",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "487",
+                "localId" : "541",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "488",
+                "localId" : "542",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "465",
+                "localId" : "519",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -115058,7 +144291,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "466",
+                "localId" : "520",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -115066,7 +144299,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "467",
+                "localId" : "521",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -115074,7 +144307,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "468",
+                "localId" : "522",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115082,7 +144315,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "469",
+                "localId" : "523",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115090,7 +144323,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "470",
+                "localId" : "524",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115098,7 +144331,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "471",
+                "localId" : "525",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115107,16 +144340,16 @@ module.exports['MeetsAfter'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "492",
+            "localId" : "546",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "493",
+              "localId" : "547",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "494",
+                "localId" : "548",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -115124,7 +144357,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "502",
+        "localId" : "556",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotMeetsDateIvl",
         "context" : "Patient",
@@ -115133,37 +144366,37 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "502",
+            "r" : "556",
             "s" : [ {
               "value" : [ "", "define ", "NotMeetsDateIvl", ": " ]
             }, {
-              "r" : "557",
+              "r" : "611",
               "s" : [ {
-                "r" : "551",
+                "r" : "605",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "519",
+                  "r" : "573",
                   "s" : [ {
-                    "r" : "503",
+                    "r" : "557",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "543",
+                  "r" : "597",
                   "s" : [ {
-                    "r" : "527",
+                    "r" : "581",
                     "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "557",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "611",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "554",
+                "r" : "608",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
@@ -115172,92 +144405,92 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "557",
+          "type" : "MeetsBefore",
+          "localId" : "611",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "558",
+            "localId" : "612",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "559",
+              "localId" : "613",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "560",
+            "localId" : "614",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "561",
+              "localId" : "615",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "551",
+            "localId" : "605",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "552",
+              "localId" : "606",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "553",
+                "localId" : "607",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "519",
+              "localId" : "573",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "520",
+                "localId" : "574",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "521",
+                "localId" : "575",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "522",
+                "localId" : "576",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "523",
+                "localId" : "577",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "524",
+                "localId" : "578",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "525",
+                "localId" : "579",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "526",
+                "localId" : "580",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "503",
+                "localId" : "557",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -115265,7 +144498,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "504",
+                "localId" : "558",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -115273,7 +144506,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "505",
+                "localId" : "559",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -115281,7 +144514,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "506",
+                "localId" : "560",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115289,7 +144522,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "507",
+                "localId" : "561",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115297,7 +144530,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "508",
+                "localId" : "562",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115305,7 +144538,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "509",
+                "localId" : "563",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115314,48 +144547,48 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "543",
+              "localId" : "597",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "544",
+                "localId" : "598",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "545",
+                "localId" : "599",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "546",
+                "localId" : "600",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "547",
+                "localId" : "601",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "548",
+                "localId" : "602",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "549",
+                "localId" : "603",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "550",
+                "localId" : "604",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "527",
+                "localId" : "581",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -115363,7 +144596,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "528",
+                "localId" : "582",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -115371,7 +144604,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "529",
+                "localId" : "583",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "29",
@@ -115379,7 +144612,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "530",
+                "localId" : "584",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115387,7 +144620,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "531",
+                "localId" : "585",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115395,7 +144628,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "532",
+                "localId" : "586",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115403,7 +144636,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "533",
+                "localId" : "587",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -115412,16 +144645,16 @@ module.exports['MeetsAfter'] = {
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "554",
+            "localId" : "608",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "555",
+              "localId" : "609",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "556",
+                "localId" : "610",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -115429,7 +144662,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "564",
+        "localId" : "618",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayMeetAfterImpreciseDateIvl",
         "context" : "Patient",
@@ -115438,35 +144671,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "564",
+            "r" : "618",
             "s" : [ {
               "value" : [ "", "define ", "MayMeetAfterImpreciseDateIvl", ": " ]
             }, {
-              "r" : "589",
+              "r" : "643",
               "s" : [ {
-                "r" : "565",
+                "r" : "619",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "589",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "643",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "586",
+                "r" : "640",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "574",
+                  "r" : "628",
                   "s" : [ {
-                    "r" : "568",
+                    "r" : "622",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "583",
+                  "r" : "637",
                   "s" : [ {
-                    "r" : "577",
+                    "r" : "631",
                     "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
                   } ]
                 }, {
@@ -115477,83 +144710,83 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "589",
+          "type" : "MeetsBefore",
+          "localId" : "643",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "590",
+            "localId" : "644",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "591",
+              "localId" : "645",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "592",
+            "localId" : "646",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "593",
+              "localId" : "647",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "565",
+            "localId" : "619",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "566",
+              "localId" : "620",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "567",
+                "localId" : "621",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "586",
+            "localId" : "640",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "587",
+              "localId" : "641",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "588",
+                "localId" : "642",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "574",
+              "localId" : "628",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "575",
+                "localId" : "629",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "576",
+                "localId" : "630",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "568",
+                "localId" : "622",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -115561,7 +144794,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "569",
+                "localId" : "623",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -115570,23 +144803,23 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "583",
+              "localId" : "637",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "584",
+                "localId" : "638",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "585",
+                "localId" : "639",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "577",
+                "localId" : "631",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -115594,7 +144827,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "578",
+                "localId" : "632",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -115604,7 +144837,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "596",
+        "localId" : "650",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayMeetBeforeImpreciseDateIvl",
         "context" : "Patient",
@@ -115613,35 +144846,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "596",
+            "r" : "650",
             "s" : [ {
               "value" : [ "", "define ", "MayMeetBeforeImpreciseDateIvl", ": " ]
             }, {
-              "r" : "621",
+              "r" : "675",
               "s" : [ {
-                "r" : "597",
+                "r" : "651",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "621",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "675",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "618",
+                "r" : "672",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "606",
+                  "r" : "660",
                   "s" : [ {
-                    "r" : "600",
+                    "r" : "654",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "615",
+                  "r" : "669",
                   "s" : [ {
-                    "r" : "609",
+                    "r" : "663",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
                   } ]
                 }, {
@@ -115652,83 +144885,83 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "621",
+          "type" : "MeetsBefore",
+          "localId" : "675",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "622",
+            "localId" : "676",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "623",
+              "localId" : "677",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "624",
+            "localId" : "678",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "625",
+              "localId" : "679",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "597",
+            "localId" : "651",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "598",
+              "localId" : "652",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "599",
+                "localId" : "653",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "618",
+            "localId" : "672",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "619",
+              "localId" : "673",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "620",
+                "localId" : "674",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "606",
+              "localId" : "660",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "607",
+                "localId" : "661",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "608",
+                "localId" : "662",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "600",
+                "localId" : "654",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -115736,7 +144969,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "601",
+                "localId" : "655",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -115745,23 +144978,23 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "615",
+              "localId" : "669",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "616",
+                "localId" : "670",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "617",
+                "localId" : "671",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "609",
+                "localId" : "663",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -115769,7 +145002,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "610",
+                "localId" : "664",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -115779,7 +145012,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "628",
+        "localId" : "682",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotMeetsImpreciseDateIvl",
         "context" : "Patient",
@@ -115788,35 +145021,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "628",
+            "r" : "682",
             "s" : [ {
               "value" : [ "", "define ", "NotMeetsImpreciseDateIvl", ": " ]
             }, {
-              "r" : "653",
+              "r" : "707",
               "s" : [ {
-                "r" : "629",
+                "r" : "683",
                 "s" : [ {
                   "value" : [ "DateIvl" ]
                 } ]
               }, {
-                "r" : "653",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "707",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "650",
+                "r" : "704",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "638",
+                  "r" : "692",
                   "s" : [ {
-                    "r" : "632",
+                    "r" : "686",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "647",
+                  "r" : "701",
                   "s" : [ {
-                    "r" : "641",
+                    "r" : "695",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
                   } ]
                 }, {
@@ -115827,83 +145060,83 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "653",
+          "type" : "MeetsBefore",
+          "localId" : "707",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "654",
+            "localId" : "708",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "655",
+              "localId" : "709",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "656",
+            "localId" : "710",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "657",
+              "localId" : "711",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "629",
+            "localId" : "683",
             "name" : "DateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "630",
+              "localId" : "684",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "631",
+                "localId" : "685",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "650",
+            "localId" : "704",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "651",
+              "localId" : "705",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "652",
+                "localId" : "706",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "638",
+              "localId" : "692",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "639",
+                "localId" : "693",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "640",
+                "localId" : "694",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "632",
+                "localId" : "686",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -115911,7 +145144,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "633",
+                "localId" : "687",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -115920,23 +145153,23 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "647",
+              "localId" : "701",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "648",
+                "localId" : "702",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "649",
+                "localId" : "703",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "641",
+                "localId" : "695",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -115944,7 +145177,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "642",
+                "localId" : "696",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -115954,7 +145187,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "660",
+        "localId" : "714",
         "name" : "PrecisionDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -115962,25 +145195,25 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "660",
+            "r" : "714",
             "s" : [ {
               "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
             }, {
-              "r" : "709",
+              "r" : "763",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "677",
+                "r" : "731",
                 "s" : [ {
-                  "r" : "661",
+                  "r" : "715",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "701",
+                "r" : "755",
                 "s" : [ {
-                  "r" : "685",
+                  "r" : "739",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
               }, {
@@ -115991,76 +145224,76 @@ module.exports['MeetsAfter'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "712",
+          "localId" : "766",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "713",
+            "localId" : "767",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "709",
+          "localId" : "763",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "710",
+            "localId" : "764",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "711",
+              "localId" : "765",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "677",
+            "localId" : "731",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "678",
+              "localId" : "732",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "679",
+              "localId" : "733",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "680",
+              "localId" : "734",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "681",
+              "localId" : "735",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "682",
+              "localId" : "736",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "683",
+              "localId" : "737",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "684",
+              "localId" : "738",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "661",
+              "localId" : "715",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -116068,7 +145301,7 @@ module.exports['MeetsAfter'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "662",
+              "localId" : "716",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -116076,7 +145309,7 @@ module.exports['MeetsAfter'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "663",
+              "localId" : "717",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -116084,7 +145317,7 @@ module.exports['MeetsAfter'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "664",
+              "localId" : "718",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -116092,7 +145325,7 @@ module.exports['MeetsAfter'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "665",
+              "localId" : "719",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "34",
@@ -116100,7 +145333,7 @@ module.exports['MeetsAfter'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "666",
+              "localId" : "720",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "56",
@@ -116108,7 +145341,7 @@ module.exports['MeetsAfter'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "667",
+              "localId" : "721",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "789",
@@ -116117,48 +145350,48 @@ module.exports['MeetsAfter'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "701",
+            "localId" : "755",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "702",
+              "localId" : "756",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "703",
+              "localId" : "757",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "704",
+              "localId" : "758",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "705",
+              "localId" : "759",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "706",
+              "localId" : "760",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "707",
+              "localId" : "761",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "708",
+              "localId" : "762",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "685",
+              "localId" : "739",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -116166,7 +145399,7 @@ module.exports['MeetsAfter'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "686",
+              "localId" : "740",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -116174,7 +145407,7 @@ module.exports['MeetsAfter'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "687",
+              "localId" : "741",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -116182,7 +145415,7 @@ module.exports['MeetsAfter'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "688",
+              "localId" : "742",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -116190,7 +145423,7 @@ module.exports['MeetsAfter'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "689",
+              "localId" : "743",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -116198,7 +145431,7 @@ module.exports['MeetsAfter'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "690",
+              "localId" : "744",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "45",
@@ -116206,7 +145439,7 @@ module.exports['MeetsAfter'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "691",
+              "localId" : "745",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "678",
@@ -116215,7 +145448,7 @@ module.exports['MeetsAfter'] = {
           }
         }
       }, {
-        "localId" : "716",
+        "localId" : "770",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MeetsAfterDayOfIvl",
         "context" : "Patient",
@@ -116224,35 +145457,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "716",
+            "r" : "770",
             "s" : [ {
               "value" : [ "", "define ", "MeetsAfterDayOfIvl", ": " ]
             }, {
-              "r" : "771",
+              "r" : "825",
               "s" : [ {
-                "r" : "717",
+                "r" : "771",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "771",
-                "value" : [ " ", "meets after day of", " " ]
+                "r" : "825",
+                "value" : [ " ", "meets before day of", " " ]
               }, {
-                "r" : "768",
+                "r" : "822",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "736",
+                  "r" : "790",
                   "s" : [ {
-                    "r" : "720",
+                    "r" : "774",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "760",
+                  "r" : "814",
                   "s" : [ {
-                    "r" : "744",
+                    "r" : "798",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -116263,109 +145496,109 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "771",
+          "type" : "MeetsBefore",
+          "localId" : "825",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "772",
+            "localId" : "826",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "773",
+              "localId" : "827",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "774",
+            "localId" : "828",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "775",
+              "localId" : "829",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "717",
+            "localId" : "771",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "718",
+              "localId" : "772",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "719",
+                "localId" : "773",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "768",
+            "localId" : "822",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "769",
+              "localId" : "823",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "770",
+                "localId" : "824",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "736",
+              "localId" : "790",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "737",
+                "localId" : "791",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "738",
+                "localId" : "792",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "739",
+                "localId" : "793",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "740",
+                "localId" : "794",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "741",
+                "localId" : "795",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "742",
+                "localId" : "796",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "743",
+                "localId" : "797",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "720",
+                "localId" : "774",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -116373,7 +145606,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "721",
+                "localId" : "775",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -116381,7 +145614,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "722",
+                "localId" : "776",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -116389,7 +145622,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "723",
+                "localId" : "777",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116397,7 +145630,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "724",
+                "localId" : "778",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116405,7 +145638,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "725",
+                "localId" : "779",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116413,7 +145646,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "726",
+                "localId" : "780",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116422,48 +145655,48 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "760",
+              "localId" : "814",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "761",
+                "localId" : "815",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "762",
+                "localId" : "816",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "763",
+                "localId" : "817",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "764",
+                "localId" : "818",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "765",
+                "localId" : "819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
+                "localId" : "820",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "767",
+                "localId" : "821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "744",
+                "localId" : "798",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -116471,7 +145704,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "745",
+                "localId" : "799",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -116479,7 +145712,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "746",
+                "localId" : "800",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -116487,7 +145720,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "747",
+                "localId" : "801",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116495,7 +145728,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "748",
+                "localId" : "802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116503,7 +145736,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "749",
+                "localId" : "803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116511,7 +145744,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "750",
+                "localId" : "804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116521,7 +145754,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "778",
+        "localId" : "832",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MeetsBeforeDayOfIvl",
         "context" : "Patient",
@@ -116530,35 +145763,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "778",
+            "r" : "832",
             "s" : [ {
               "value" : [ "", "define ", "MeetsBeforeDayOfIvl", ": " ]
             }, {
-              "r" : "833",
+              "r" : "887",
               "s" : [ {
-                "r" : "779",
+                "r" : "833",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "833",
-                "value" : [ " ", "meets after day of", " " ]
+                "r" : "887",
+                "value" : [ " ", "meets before day of", " " ]
               }, {
-                "r" : "830",
+                "r" : "884",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "798",
+                  "r" : "852",
                   "s" : [ {
-                    "r" : "782",
+                    "r" : "836",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "822",
+                  "r" : "876",
                   "s" : [ {
-                    "r" : "806",
+                    "r" : "860",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -116569,109 +145802,109 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "833",
+          "type" : "MeetsBefore",
+          "localId" : "887",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "834",
+            "localId" : "888",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "835",
+              "localId" : "889",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "836",
+            "localId" : "890",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "837",
+              "localId" : "891",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "779",
+            "localId" : "833",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "780",
+              "localId" : "834",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "781",
+                "localId" : "835",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "830",
+            "localId" : "884",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "831",
+              "localId" : "885",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "832",
+                "localId" : "886",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "798",
+              "localId" : "852",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "799",
+                "localId" : "853",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "800",
+                "localId" : "854",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "801",
+                "localId" : "855",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "802",
+                "localId" : "856",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "803",
+                "localId" : "857",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "804",
+                "localId" : "858",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "805",
+                "localId" : "859",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "782",
+                "localId" : "836",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -116679,7 +145912,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "783",
+                "localId" : "837",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -116687,7 +145920,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "784",
+                "localId" : "838",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -116695,7 +145928,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "785",
+                "localId" : "839",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116703,7 +145936,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "786",
+                "localId" : "840",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116711,7 +145944,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "787",
+                "localId" : "841",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116719,7 +145952,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "788",
+                "localId" : "842",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116728,48 +145961,48 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "822",
+              "localId" : "876",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "823",
+                "localId" : "877",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "824",
+                "localId" : "878",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "825",
+                "localId" : "879",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "826",
+                "localId" : "880",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "827",
+                "localId" : "881",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "828",
+                "localId" : "882",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "829",
+                "localId" : "883",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "806",
+                "localId" : "860",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -116777,7 +146010,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "807",
+                "localId" : "861",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -116785,7 +146018,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "808",
+                "localId" : "862",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -116793,7 +146026,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "809",
+                "localId" : "863",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116801,7 +146034,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "810",
+                "localId" : "864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116809,7 +146042,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "811",
+                "localId" : "865",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116817,7 +146050,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "812",
+                "localId" : "866",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -116827,7 +146060,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "840",
+        "localId" : "894",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotMeetsDayOfIvl",
         "context" : "Patient",
@@ -116836,35 +146069,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "840",
+            "r" : "894",
             "s" : [ {
               "value" : [ "", "define ", "NotMeetsDayOfIvl", ": " ]
             }, {
-              "r" : "895",
+              "r" : "949",
               "s" : [ {
-                "r" : "841",
+                "r" : "895",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "895",
-                "value" : [ " ", "meets after day of", " " ]
+                "r" : "949",
+                "value" : [ " ", "meets before day of", " " ]
               }, {
-                "r" : "892",
+                "r" : "946",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "860",
+                  "r" : "914",
                   "s" : [ {
-                    "r" : "844",
+                    "r" : "898",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "884",
+                  "r" : "938",
                   "s" : [ {
-                    "r" : "868",
+                    "r" : "922",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -116875,109 +146108,109 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "895",
+          "type" : "MeetsBefore",
+          "localId" : "949",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "896",
+            "localId" : "950",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "897",
+              "localId" : "951",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "898",
+            "localId" : "952",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "899",
+              "localId" : "953",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "841",
+            "localId" : "895",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "842",
+              "localId" : "896",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "843",
+                "localId" : "897",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "892",
+            "localId" : "946",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "893",
+              "localId" : "947",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "894",
+                "localId" : "948",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "860",
+              "localId" : "914",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "861",
+                "localId" : "915",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "862",
+                "localId" : "916",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "863",
+                "localId" : "917",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "864",
+                "localId" : "918",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "865",
+                "localId" : "919",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "866",
+                "localId" : "920",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "867",
+                "localId" : "921",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "844",
+                "localId" : "898",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -116985,7 +146218,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "845",
+                "localId" : "899",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -116993,7 +146226,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "846",
+                "localId" : "900",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -117001,7 +146234,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "847",
+                "localId" : "901",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117009,7 +146242,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "848",
+                "localId" : "902",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117017,7 +146250,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "849",
+                "localId" : "903",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117025,7 +146258,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "850",
+                "localId" : "904",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117034,48 +146267,48 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "884",
+              "localId" : "938",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "885",
+                "localId" : "939",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "886",
+                "localId" : "940",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "887",
+                "localId" : "941",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "888",
+                "localId" : "942",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "889",
+                "localId" : "943",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "890",
+                "localId" : "944",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "891",
+                "localId" : "945",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "868",
+                "localId" : "922",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -117083,7 +146316,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "869",
+                "localId" : "923",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -117091,7 +146324,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "870",
+                "localId" : "924",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -117099,7 +146332,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "871",
+                "localId" : "925",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117107,7 +146340,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "872",
+                "localId" : "926",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117115,7 +146348,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "873",
+                "localId" : "927",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117123,7 +146356,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "874",
+                "localId" : "928",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117133,7 +146366,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "902",
+        "localId" : "956",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotMeetsDayOfImpreciseIVL",
         "context" : "Patient",
@@ -117142,35 +146375,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "902",
+            "r" : "956",
             "s" : [ {
               "value" : [ "", "define ", "NotMeetsDayOfImpreciseIVL", ": " ]
             }, {
-              "r" : "927",
+              "r" : "981",
               "s" : [ {
-                "r" : "903",
+                "r" : "957",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "927",
-                "value" : [ " ", "meets after day of", " " ]
+                "r" : "981",
+                "value" : [ " ", "meets before day of", " " ]
               }, {
-                "r" : "924",
+                "r" : "978",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "912",
+                  "r" : "966",
                   "s" : [ {
-                    "r" : "906",
+                    "r" : "960",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "921",
+                  "r" : "975",
                   "s" : [ {
-                    "r" : "915",
+                    "r" : "969",
                     "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
                   } ]
                 }, {
@@ -117181,84 +146414,84 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "927",
+          "type" : "MeetsBefore",
+          "localId" : "981",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "928",
+            "localId" : "982",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "929",
+              "localId" : "983",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "930",
+            "localId" : "984",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "931",
+              "localId" : "985",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "903",
+            "localId" : "957",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "904",
+              "localId" : "958",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "905",
+                "localId" : "959",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "924",
+            "localId" : "978",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "925",
+              "localId" : "979",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "926",
+                "localId" : "980",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "912",
+              "localId" : "966",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "913",
+                "localId" : "967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "914",
+                "localId" : "968",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "906",
+                "localId" : "960",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -117266,7 +146499,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "907",
+                "localId" : "961",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -117275,23 +146508,23 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "921",
+              "localId" : "975",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "922",
+                "localId" : "976",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "923",
+                "localId" : "977",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "915",
+                "localId" : "969",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -117299,7 +146532,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "916",
+                "localId" : "970",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -117309,7 +146542,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "934",
+        "localId" : "988",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayMeetAfterDayOfImpreciseIvl",
         "context" : "Patient",
@@ -117318,35 +146551,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "934",
+            "r" : "988",
             "s" : [ {
               "value" : [ "", "define ", "MayMeetAfterDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "959",
+              "r" : "1013",
               "s" : [ {
-                "r" : "935",
+                "r" : "989",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "959",
-                "value" : [ " ", "meets after day of", " " ]
+                "r" : "1013",
+                "value" : [ " ", "meets before day of", " " ]
               }, {
-                "r" : "956",
+                "r" : "1010",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "944",
+                  "r" : "998",
                   "s" : [ {
-                    "r" : "938",
+                    "r" : "992",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "953",
+                  "r" : "1007",
                   "s" : [ {
-                    "r" : "947",
+                    "r" : "1001",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                   } ]
                 }, {
@@ -117357,84 +146590,84 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "959",
+          "type" : "MeetsBefore",
+          "localId" : "1013",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "960",
+            "localId" : "1014",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "961",
+              "localId" : "1015",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "962",
+            "localId" : "1016",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "963",
+              "localId" : "1017",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "935",
+            "localId" : "989",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "936",
+              "localId" : "990",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "937",
+                "localId" : "991",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "956",
+            "localId" : "1010",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "957",
+              "localId" : "1011",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "958",
+                "localId" : "1012",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "944",
+              "localId" : "998",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "945",
+                "localId" : "999",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "946",
+                "localId" : "1000",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "938",
+                "localId" : "992",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -117442,7 +146675,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "939",
+                "localId" : "993",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -117451,23 +146684,23 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "953",
+              "localId" : "1007",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "954",
+                "localId" : "1008",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "955",
+                "localId" : "1009",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "947",
+                "localId" : "1001",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -117475,7 +146708,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "948",
+                "localId" : "1002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -117485,7 +146718,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "966",
+        "localId" : "1020",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayMeetBeforeDayOfImpreciseIvl",
         "context" : "Patient",
@@ -117494,35 +146727,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "966",
+            "r" : "1020",
             "s" : [ {
               "value" : [ "", "define ", "MayMeetBeforeDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "991",
+              "r" : "1045",
               "s" : [ {
-                "r" : "967",
+                "r" : "1021",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "991",
-                "value" : [ " ", "meets after day of", " " ]
+                "r" : "1045",
+                "value" : [ " ", "meets before day of", " " ]
               }, {
-                "r" : "988",
+                "r" : "1042",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "976",
+                  "r" : "1030",
                   "s" : [ {
-                    "r" : "970",
+                    "r" : "1024",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "985",
+                  "r" : "1039",
                   "s" : [ {
-                    "r" : "979",
+                    "r" : "1033",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
                   } ]
                 }, {
@@ -117533,84 +146766,84 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "991",
+          "type" : "MeetsBefore",
+          "localId" : "1045",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "992",
+            "localId" : "1046",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "993",
+              "localId" : "1047",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "994",
+            "localId" : "1048",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "995",
+              "localId" : "1049",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "967",
+            "localId" : "1021",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "968",
+              "localId" : "1022",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "969",
+                "localId" : "1023",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "988",
+            "localId" : "1042",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "989",
+              "localId" : "1043",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "990",
+                "localId" : "1044",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "976",
+              "localId" : "1030",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "977",
+                "localId" : "1031",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "978",
+                "localId" : "1032",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "970",
+                "localId" : "1024",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -117618,7 +146851,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "971",
+                "localId" : "1025",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -117627,23 +146860,23 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "985",
+              "localId" : "1039",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "986",
+                "localId" : "1040",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "987",
+                "localId" : "1041",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "979",
+                "localId" : "1033",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -117651,7 +146884,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "980",
+                "localId" : "1034",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -117661,7 +146894,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "998",
+        "localId" : "1052",
         "name" : "ImpDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -117669,25 +146902,25 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "998",
+            "r" : "1052",
             "s" : [ {
               "value" : [ "", "define ", "ImpDateIvl", ": " ]
             }, {
-              "r" : "1017",
+              "r" : "1071",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "1005",
+                "r" : "1059",
                 "s" : [ {
-                  "r" : "999",
+                  "r" : "1053",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "1014",
+                "r" : "1068",
                 "s" : [ {
-                  "r" : "1008",
+                  "r" : "1062",
                   "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
                 } ]
               }, {
@@ -117698,51 +146931,51 @@ module.exports['MeetsAfter'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1020",
+          "localId" : "1074",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1021",
+            "localId" : "1075",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "1017",
+          "localId" : "1071",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1018",
+            "localId" : "1072",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1019",
+              "localId" : "1073",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "1005",
+            "localId" : "1059",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1006",
+              "localId" : "1060",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1007",
+              "localId" : "1061",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "999",
+              "localId" : "1053",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -117750,7 +146983,7 @@ module.exports['MeetsAfter'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1000",
+              "localId" : "1054",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -117759,23 +146992,23 @@ module.exports['MeetsAfter'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "1014",
+            "localId" : "1068",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1015",
+              "localId" : "1069",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1016",
+              "localId" : "1070",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "1008",
+              "localId" : "1062",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -117783,7 +147016,7 @@ module.exports['MeetsAfter'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "1009",
+              "localId" : "1063",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "8",
@@ -117792,7 +147025,7 @@ module.exports['MeetsAfter'] = {
           }
         }
       }, {
-        "localId" : "1024",
+        "localId" : "1078",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpreciseMayMeetAfterDateIvl",
         "context" : "Patient",
@@ -117801,35 +147034,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1024",
+            "r" : "1078",
             "s" : [ {
               "value" : [ "", "define ", "ImpreciseMayMeetAfterDateIvl", ": " ]
             }, {
-              "r" : "1079",
+              "r" : "1133",
               "s" : [ {
-                "r" : "1025",
+                "r" : "1079",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "1079",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1133",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1076",
+                "r" : "1130",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1044",
+                  "r" : "1098",
                   "s" : [ {
-                    "r" : "1028",
+                    "r" : "1082",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1068",
+                  "r" : "1122",
                   "s" : [ {
-                    "r" : "1052",
+                    "r" : "1106",
                     "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
@@ -117840,108 +147073,108 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1079",
+          "type" : "MeetsBefore",
+          "localId" : "1133",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1080",
+            "localId" : "1134",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1081",
+              "localId" : "1135",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1082",
+            "localId" : "1136",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1083",
+              "localId" : "1137",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1025",
+            "localId" : "1079",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1026",
+              "localId" : "1080",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1027",
+                "localId" : "1081",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1076",
+            "localId" : "1130",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1077",
+              "localId" : "1131",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1078",
+                "localId" : "1132",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1044",
+              "localId" : "1098",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1045",
+                "localId" : "1099",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1046",
+                "localId" : "1100",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1047",
+                "localId" : "1101",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1048",
+                "localId" : "1102",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1049",
+                "localId" : "1103",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1050",
+                "localId" : "1104",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1051",
+                "localId" : "1105",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1028",
+                "localId" : "1082",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -117949,7 +147182,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1029",
+                "localId" : "1083",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -117957,7 +147190,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1030",
+                "localId" : "1084",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -117965,7 +147198,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1031",
+                "localId" : "1085",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117973,7 +147206,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1032",
+                "localId" : "1086",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117981,7 +147214,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1033",
+                "localId" : "1087",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117989,7 +147222,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1034",
+                "localId" : "1088",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -117998,48 +147231,48 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1068",
+              "localId" : "1122",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1069",
+                "localId" : "1123",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1070",
+                "localId" : "1124",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1071",
+                "localId" : "1125",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1072",
+                "localId" : "1126",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1073",
+                "localId" : "1127",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1074",
+                "localId" : "1128",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1075",
+                "localId" : "1129",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1052",
+                "localId" : "1106",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -118047,7 +147280,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1053",
+                "localId" : "1107",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -118055,7 +147288,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1054",
+                "localId" : "1108",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "29",
@@ -118063,7 +147296,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1055",
+                "localId" : "1109",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "23",
@@ -118071,7 +147304,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1056",
+                "localId" : "1110",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "59",
@@ -118079,7 +147312,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1057",
+                "localId" : "1111",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "59",
@@ -118087,7 +147320,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1058",
+                "localId" : "1112",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "999",
@@ -118097,7 +147330,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "1086",
+        "localId" : "1140",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpreciseMayMeetBeforeDateIvl",
         "context" : "Patient",
@@ -118106,35 +147339,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1086",
+            "r" : "1140",
             "s" : [ {
               "value" : [ "", "define ", "ImpreciseMayMeetBeforeDateIvl", ": " ]
             }, {
-              "r" : "1141",
+              "r" : "1195",
               "s" : [ {
-                "r" : "1087",
+                "r" : "1141",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "1141",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1195",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1138",
+                "r" : "1192",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1106",
+                  "r" : "1160",
                   "s" : [ {
-                    "r" : "1090",
+                    "r" : "1144",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1130",
+                  "r" : "1184",
                   "s" : [ {
-                    "r" : "1114",
+                    "r" : "1168",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
@@ -118145,108 +147378,108 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1141",
+          "type" : "MeetsBefore",
+          "localId" : "1195",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1142",
+            "localId" : "1196",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1143",
+              "localId" : "1197",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1144",
+            "localId" : "1198",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1145",
+              "localId" : "1199",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1087",
+            "localId" : "1141",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1088",
+              "localId" : "1142",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1089",
+                "localId" : "1143",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1138",
+            "localId" : "1192",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1139",
+              "localId" : "1193",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1140",
+                "localId" : "1194",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1106",
+              "localId" : "1160",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1107",
+                "localId" : "1161",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1108",
+                "localId" : "1162",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1109",
+                "localId" : "1163",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1110",
+                "localId" : "1164",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1111",
+                "localId" : "1165",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1112",
+                "localId" : "1166",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1113",
+                "localId" : "1167",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1090",
+                "localId" : "1144",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -118254,7 +147487,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1091",
+                "localId" : "1145",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -118262,7 +147495,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1092",
+                "localId" : "1146",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -118270,7 +147503,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1093",
+                "localId" : "1147",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -118278,7 +147511,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1094",
+                "localId" : "1148",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -118286,7 +147519,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1095",
+                "localId" : "1149",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -118294,7 +147527,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1096",
+                "localId" : "1150",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -118303,48 +147536,48 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1130",
+              "localId" : "1184",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1131",
+                "localId" : "1185",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1132",
+                "localId" : "1186",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1133",
+                "localId" : "1187",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1134",
+                "localId" : "1188",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1135",
+                "localId" : "1189",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1136",
+                "localId" : "1190",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1137",
+                "localId" : "1191",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1114",
+                "localId" : "1168",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -118352,7 +147585,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1115",
+                "localId" : "1169",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -118360,7 +147593,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1116",
+                "localId" : "1170",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "31",
@@ -118368,7 +147601,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1117",
+                "localId" : "1171",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "23",
@@ -118376,7 +147609,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1118",
+                "localId" : "1172",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "59",
@@ -118384,7 +147617,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1119",
+                "localId" : "1173",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "59",
@@ -118392,7 +147625,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1120",
+                "localId" : "1174",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "999",
@@ -118402,7 +147635,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "1148",
+        "localId" : "1202",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "ImpreciseNotMeetsDateIvl",
         "context" : "Patient",
@@ -118411,35 +147644,35 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1148",
+            "r" : "1202",
             "s" : [ {
               "value" : [ "", "define ", "ImpreciseNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "1203",
+              "r" : "1257",
               "s" : [ {
-                "r" : "1149",
+                "r" : "1203",
                 "s" : [ {
                   "value" : [ "ImpDateIvl" ]
                 } ]
               }, {
-                "r" : "1203",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1257",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1200",
+                "r" : "1254",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1168",
+                  "r" : "1222",
                   "s" : [ {
-                    "r" : "1152",
+                    "r" : "1206",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1192",
+                  "r" : "1246",
                   "s" : [ {
-                    "r" : "1176",
+                    "r" : "1230",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
@@ -118450,108 +147683,108 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1203",
+          "type" : "MeetsBefore",
+          "localId" : "1257",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1204",
+            "localId" : "1258",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1205",
+              "localId" : "1259",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1206",
+            "localId" : "1260",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1207",
+              "localId" : "1261",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1149",
+            "localId" : "1203",
             "name" : "ImpDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1150",
+              "localId" : "1204",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1151",
+                "localId" : "1205",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1200",
+            "localId" : "1254",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1201",
+              "localId" : "1255",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1202",
+                "localId" : "1256",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1168",
+              "localId" : "1222",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1169",
+                "localId" : "1223",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1170",
+                "localId" : "1224",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1171",
+                "localId" : "1225",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1172",
+                "localId" : "1226",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1173",
+                "localId" : "1227",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1174",
+                "localId" : "1228",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1175",
+                "localId" : "1229",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1152",
+                "localId" : "1206",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -118559,7 +147792,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1153",
+                "localId" : "1207",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -118567,7 +147800,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1154",
+                "localId" : "1208",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -118575,7 +147808,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1155",
+                "localId" : "1209",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -118583,7 +147816,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1156",
+                "localId" : "1210",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -118591,7 +147824,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1157",
+                "localId" : "1211",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -118599,7 +147832,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1158",
+                "localId" : "1212",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -118608,48 +147841,48 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1192",
+              "localId" : "1246",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1193",
+                "localId" : "1247",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1194",
+                "localId" : "1248",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1195",
+                "localId" : "1249",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1196",
+                "localId" : "1250",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1197",
+                "localId" : "1251",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1198",
+                "localId" : "1252",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1199",
+                "localId" : "1253",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1176",
+                "localId" : "1230",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -118657,7 +147890,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1177",
+                "localId" : "1231",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -118665,7 +147898,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1178",
+                "localId" : "1232",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "31",
@@ -118673,7 +147906,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1179",
+                "localId" : "1233",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "23",
@@ -118681,7 +147914,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1180",
+                "localId" : "1234",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "59",
@@ -118689,7 +147922,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1181",
+                "localId" : "1235",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "59",
@@ -118697,7 +147930,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1182",
+                "localId" : "1236",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "999",
@@ -118707,7 +147940,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "1210",
+        "localId" : "1264",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NegInfBegMeetsBeforeIntIvl",
         "context" : "Patient",
@@ -118716,24 +147949,24 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1210",
+            "r" : "1264",
             "s" : [ {
               "value" : [ "", "define ", "NegInfBegMeetsBeforeIntIvl", ": " ]
             }, {
-              "r" : "1222",
+              "r" : "1276",
               "s" : [ {
-                "r" : "1213",
+                "r" : "1267",
                 "s" : [ {
-                  "r" : "1211",
+                  "r" : "1265",
                   "value" : [ "Interval[", "null", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "1222",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1276",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1219",
+                "r" : "1273",
                 "s" : [ {
-                  "r" : "1217",
+                  "r" : "1271",
                   "value" : [ "Interval[", "101", ", ", "200", "]" ]
                 } ]
               } ]
@@ -118741,64 +147974,64 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1222",
+          "type" : "MeetsBefore",
+          "localId" : "1276",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1223",
+            "localId" : "1277",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1224",
+              "localId" : "1278",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1225",
+            "localId" : "1279",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1226",
+              "localId" : "1280",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1213",
+            "localId" : "1267",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1215",
+              "localId" : "1269",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1216",
+                "localId" : "1270",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1214",
+              "localId" : "1268",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1211",
+                "localId" : "1265",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1212",
+              "localId" : "1266",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "100",
@@ -118806,24 +148039,24 @@ module.exports['MeetsAfter'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1219",
+            "localId" : "1273",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1220",
+              "localId" : "1274",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1221",
+                "localId" : "1275",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1217",
+              "localId" : "1271",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "101",
@@ -118831,7 +148064,7 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1218",
+              "localId" : "1272",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -118840,7 +148073,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "1229",
+        "localId" : "1283",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NegInfBegNotMeetsIntIvl",
         "context" : "Patient",
@@ -118849,24 +148082,24 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1229",
+            "r" : "1283",
             "s" : [ {
               "value" : [ "", "define ", "NegInfBegNotMeetsIntIvl", ": " ]
             }, {
-              "r" : "1241",
+              "r" : "1295",
               "s" : [ {
-                "r" : "1232",
+                "r" : "1286",
                 "s" : [ {
-                  "r" : "1230",
+                  "r" : "1284",
                   "value" : [ "Interval[", "null", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "1241",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1295",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1238",
+                "r" : "1292",
                 "s" : [ {
-                  "r" : "1236",
+                  "r" : "1290",
                   "value" : [ "Interval[", "100", ", ", "200", "]" ]
                 } ]
               } ]
@@ -118874,64 +148107,64 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1241",
+          "type" : "MeetsBefore",
+          "localId" : "1295",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1242",
+            "localId" : "1296",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1243",
+              "localId" : "1297",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1244",
+            "localId" : "1298",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1245",
+              "localId" : "1299",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1232",
+            "localId" : "1286",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1234",
+              "localId" : "1288",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1235",
+                "localId" : "1289",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1233",
+              "localId" : "1287",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1230",
+                "localId" : "1284",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1231",
+              "localId" : "1285",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "100",
@@ -118939,24 +148172,24 @@ module.exports['MeetsAfter'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1238",
+            "localId" : "1292",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1239",
+              "localId" : "1293",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1240",
+                "localId" : "1294",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1236",
+              "localId" : "1290",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "100",
@@ -118964,7 +148197,7 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1237",
+              "localId" : "1291",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -118973,7 +148206,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "1248",
+        "localId" : "1302",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IntIvlNotMeetsNegInfBeg",
         "context" : "Patient",
@@ -118982,24 +148215,24 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1248",
+            "r" : "1302",
             "s" : [ {
               "value" : [ "", "define ", "IntIvlNotMeetsNegInfBeg", ": " ]
             }, {
-              "r" : "1260",
+              "r" : "1314",
               "s" : [ {
-                "r" : "1251",
+                "r" : "1305",
                 "s" : [ {
-                  "r" : "1249",
+                  "r" : "1303",
                   "value" : [ "Interval[", "100", ", ", "200", "]" ]
                 } ]
               }, {
-                "r" : "1260",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1314",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1256",
+                "r" : "1310",
                 "s" : [ {
-                  "r" : "1254",
+                  "r" : "1308",
                   "value" : [ "Interval[", "null", ", ", "400", "]" ]
                 } ]
               } ]
@@ -119007,51 +148240,51 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1260",
+          "type" : "MeetsBefore",
+          "localId" : "1314",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1261",
+            "localId" : "1315",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1262",
+              "localId" : "1316",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1263",
+            "localId" : "1317",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1264",
+              "localId" : "1318",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1251",
+            "localId" : "1305",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1252",
+              "localId" : "1306",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1253",
+                "localId" : "1307",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1249",
+              "localId" : "1303",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "100",
@@ -119059,7 +148292,7 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1250",
+              "localId" : "1304",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -119067,37 +148300,37 @@ module.exports['MeetsAfter'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1256",
+            "localId" : "1310",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1258",
+              "localId" : "1312",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1259",
+                "localId" : "1313",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1257",
+              "localId" : "1311",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1254",
+                "localId" : "1308",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1255",
+              "localId" : "1309",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "400",
@@ -119106,7 +148339,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "1267",
+        "localId" : "1321",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownBegMeetsBeforeIntIvl",
         "context" : "Patient",
@@ -119115,24 +148348,24 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1267",
+            "r" : "1321",
             "s" : [ {
               "value" : [ "", "define ", "UnknownBegMeetsBeforeIntIvl", ": " ]
             }, {
-              "r" : "1279",
+              "r" : "1333",
               "s" : [ {
-                "r" : "1270",
+                "r" : "1324",
                 "s" : [ {
-                  "r" : "1268",
+                  "r" : "1322",
                   "value" : [ "Interval(", "null", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "1279",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1333",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1276",
+                "r" : "1330",
                 "s" : [ {
-                  "r" : "1274",
+                  "r" : "1328",
                   "value" : [ "Interval[", "101", ", ", "200", "]" ]
                 } ]
               } ]
@@ -119140,64 +148373,64 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1279",
+          "type" : "MeetsBefore",
+          "localId" : "1333",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1280",
+            "localId" : "1334",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1281",
+              "localId" : "1335",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1282",
+            "localId" : "1336",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1283",
+              "localId" : "1337",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1270",
+            "localId" : "1324",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1272",
+              "localId" : "1326",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1273",
+                "localId" : "1327",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1271",
+              "localId" : "1325",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1268",
+                "localId" : "1322",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1269",
+              "localId" : "1323",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "100",
@@ -119205,24 +148438,24 @@ module.exports['MeetsAfter'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "1276",
+            "localId" : "1330",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1277",
+              "localId" : "1331",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1278",
+                "localId" : "1332",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1274",
+              "localId" : "1328",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "101",
@@ -119230,7 +148463,7 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1275",
+              "localId" : "1329",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "200",
@@ -119239,7 +148472,7 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "1286",
+        "localId" : "1340",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnknownBegMayMeetAfterIntIvl",
         "context" : "Patient",
@@ -119248,24 +148481,24 @@ module.exports['MeetsAfter'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1286",
+            "r" : "1340",
             "s" : [ {
               "value" : [ "", "define ", "UnknownBegMayMeetAfterIntIvl", ": " ]
             }, {
-              "r" : "1298",
+              "r" : "1352",
               "s" : [ {
-                "r" : "1289",
+                "r" : "1343",
                 "s" : [ {
-                  "r" : "1287",
+                  "r" : "1341",
                   "value" : [ "Interval(", "null", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "1298",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1352",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1295",
+                "r" : "1349",
                 "s" : [ {
-                  "r" : "1293",
+                  "r" : "1347",
                   "value" : [ "Interval[", "0", ", ", "50", "]" ]
                 } ]
               } ]
@@ -119273,887 +148506,89 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1298",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1299",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1300",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1301",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1302",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1289",
-            "lowClosed" : false,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1291",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1292",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1290",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1287",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1288",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1295",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1296",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1297",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1294",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "50",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1305",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotMeetsIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1305",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotMeetsIntIvl", ": " ]
-            }, {
-              "r" : "1317",
-              "s" : [ {
-                "r" : "1308",
-                "s" : [ {
-                  "r" : "1306",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
-                } ]
-              }, {
-                "r" : "1317",
-                "value" : [ " ", "meets after", " " ]
-              }, {
-                "r" : "1314",
-                "s" : [ {
-                  "r" : "1312",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1317",
+          "type" : "MeetsBefore",
+          "localId" : "1352",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1318",
+            "localId" : "1353",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1319",
+              "localId" : "1354",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1320",
+            "localId" : "1355",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1321",
+              "localId" : "1356",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1308",
+            "localId" : "1343",
             "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1310",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1311",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1309",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1306",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1307",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1314",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1315",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1316",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1312",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1313",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1324",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlMayMeetBeforeUnknownBeg",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1324",
-            "s" : [ {
-              "value" : [ "", "define ", "IntIvlMayMeetBeforeUnknownBeg", ": " ]
-            }, {
-              "r" : "1336",
-              "s" : [ {
-                "r" : "1327",
-                "s" : [ {
-                  "r" : "1325",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
-                } ]
-              }, {
-                "r" : "1336",
-                "value" : [ " ", "meets after", " " ]
-              }, {
-                "r" : "1332",
-                "s" : [ {
-                  "r" : "1330",
-                  "value" : [ "Interval(", "null", ", ", "400", ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1336",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1337",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1338",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1339",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1340",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1327",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1328",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1329",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1325",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1326",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1332",
-            "lowClosed" : false,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1334",
+              "localId" : "1345",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1335",
+                "localId" : "1346",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1333",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1330",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1331",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "400",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1343",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndMeetsAfterIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1343",
-            "s" : [ {
-              "value" : [ "", "define ", "PosInfEndMeetsAfterIntIvl", ": " ]
-            }, {
-              "r" : "1355",
-              "s" : [ {
-                "r" : "1346",
-                "s" : [ {
-                  "r" : "1344",
-                  "value" : [ "Interval[", "100", ", ", "null", "]" ]
-                } ]
-              }, {
-                "r" : "1355",
-                "value" : [ " ", "meets after", " " ]
-              }, {
-                "r" : "1352",
-                "s" : [ {
-                  "r" : "1350",
-                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1355",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1356",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1357",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1358",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1359",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1346",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1348",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1349",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
               "localId" : "1344",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1347",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1345",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1352",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1353",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1354",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1350",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1351",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "99",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1362",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotMeetsIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1362",
-            "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotMeetsIntIvl", ": " ]
-            }, {
-              "r" : "1374",
-              "s" : [ {
-                "r" : "1365",
-                "s" : [ {
-                  "r" : "1363",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
-                } ]
-              }, {
-                "r" : "1374",
-                "value" : [ " ", "meets after", " " ]
-              }, {
-                "r" : "1371",
-                "s" : [ {
-                  "r" : "1369",
-                  "value" : [ "Interval[", "1000", ", ", "2000", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1374",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1375",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1376",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1377",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1378",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1365",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1367",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1368",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1363",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1366",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1364",
+                "localId" : "1341",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1371",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1372",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1373",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1369",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1000",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1370",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2000",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1381",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlNotMeetsPosInfEnd",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1381",
-            "s" : [ {
-              "value" : [ "", "define ", "IntIvlNotMeetsPosInfEnd", ": " ]
-            }, {
-              "r" : "1393",
-              "s" : [ {
-                "r" : "1384",
-                "s" : [ {
-                  "r" : "1382",
-                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
-                } ]
-              }, {
-                "r" : "1393",
-                "value" : [ " ", "meets after", " " ]
-              }, {
-                "r" : "1389",
-                "s" : [ {
-                  "r" : "1387",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1393",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1394",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1395",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1396",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1397",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1384",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1385",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1386",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1382",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1383",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1389",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1391",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1392",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1387",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1390",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1388",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1400",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMeetsAfterIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1400",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMeetsAfterIntIvl", ": " ]
-            }, {
-              "r" : "1412",
-              "s" : [ {
-                "r" : "1403",
-                "s" : [ {
-                  "r" : "1401",
-                  "value" : [ "Interval[", "100", ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "1412",
-                "value" : [ " ", "meets after", " " ]
-              }, {
-                "r" : "1409",
-                "s" : [ {
-                  "r" : "1407",
-                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1412",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1413",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1414",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1415",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1416",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1403",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1405",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1406",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
               "type" : "Literal",
-              "localId" : "1401",
+              "localId" : "1342",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "100",
               "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1404",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1402",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1409",
+            "localId" : "1349",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1410",
+              "localId" : "1350",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1411",
+                "localId" : "1351",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1407",
+              "localId" : "1347",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
@@ -120161,140 +148596,140 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1408",
+              "localId" : "1348",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "99",
+              "value" : "50",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1419",
+        "localId" : "1359",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayMeetBeforeIntIvl",
+        "name" : "UnknownBegNotMeetsIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1419",
+            "r" : "1359",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayMeetBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotMeetsIntIvl", ": " ]
             }, {
-              "r" : "1431",
+              "r" : "1371",
               "s" : [ {
-                "r" : "1422",
+                "r" : "1362",
                 "s" : [ {
-                  "r" : "1420",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                  "r" : "1360",
+                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "1431",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1371",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1428",
+                "r" : "1368",
                 "s" : [ {
-                  "r" : "1426",
-                  "value" : [ "Interval[", "50", ", ", "100", "]" ]
+                  "r" : "1366",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1431",
+          "type" : "MeetsBefore",
+          "localId" : "1371",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1432",
+            "localId" : "1372",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1433",
+              "localId" : "1373",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1434",
+            "localId" : "1374",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1435",
+              "localId" : "1375",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1422",
-            "lowClosed" : true,
-            "highClosed" : false,
+            "localId" : "1362",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1424",
+              "localId" : "1364",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1425",
+                "localId" : "1365",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1420",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
               "type" : "As",
-              "localId" : "1423",
+              "localId" : "1363",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1421",
+                "localId" : "1360",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1361",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1428",
+            "localId" : "1368",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1429",
+              "localId" : "1369",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1430",
+                "localId" : "1370",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1426",
+              "localId" : "1366",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "50",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1427",
+              "localId" : "1367",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "100",
@@ -120303,4277 +148738,3136 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "1438",
+        "localId" : "1378",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotMeetsIntIvl",
+        "name" : "IntIvlMayMeetBeforeUnknownBeg",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1438",
+            "r" : "1378",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotMeetsIntIvl", ": " ]
+              "value" : [ "", "define ", "IntIvlMayMeetBeforeUnknownBeg", ": " ]
             }, {
-              "r" : "1450",
+              "r" : "1390",
               "s" : [ {
-                "r" : "1441",
+                "r" : "1381",
                 "s" : [ {
-                  "r" : "1439",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                  "r" : "1379",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
                 } ]
               }, {
-                "r" : "1450",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1390",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1447",
+                "r" : "1386",
                 "s" : [ {
-                  "r" : "1445",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                  "r" : "1384",
+                  "value" : [ "Interval(", "null", ", ", "400", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1450",
+          "type" : "MeetsBefore",
+          "localId" : "1390",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1451",
+            "localId" : "1391",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1452",
+              "localId" : "1392",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1453",
+            "localId" : "1393",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1454",
+              "localId" : "1394",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1441",
+            "localId" : "1381",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1443",
+              "localId" : "1382",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1444",
+                "localId" : "1383",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1439",
+              "localId" : "1379",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1442",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1440",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1380",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1447",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "1386",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1448",
+              "localId" : "1388",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1449",
+                "localId" : "1389",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1445",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1387",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1384",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1446",
+              "localId" : "1385",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "value" : "400",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1457",
+        "localId" : "1397",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlMayMeetAfterUnknownEnd",
+        "name" : "PosInfEndMeetsAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1457",
+            "r" : "1397",
             "s" : [ {
-              "value" : [ "", "define ", "IntIvlMayMeetAfterUnknownEnd", ": " ]
+              "value" : [ "", "define ", "PosInfEndMeetsAfterIntIvl", ": " ]
             }, {
-              "r" : "1471",
+              "r" : "1409",
               "s" : [ {
-                "r" : "1460",
+                "r" : "1400",
                 "s" : [ {
-                  "r" : "1458",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                  "r" : "1398",
+                  "value" : [ "Interval[", "100", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1471",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1409",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1467",
+                "r" : "1406",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1463",
-                  "s" : [ {
-                    "r" : "1464",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "r" : "1466",
-                  "value" : [ ", ", "null", ")" ]
+                  "r" : "1404",
+                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1471",
+          "type" : "MeetsBefore",
+          "localId" : "1409",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1472",
+            "localId" : "1410",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1473",
+              "localId" : "1411",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1474",
+            "localId" : "1412",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1475",
+              "localId" : "1413",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1460",
+            "localId" : "1400",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1461",
+              "localId" : "1402",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1462",
+                "localId" : "1403",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1458",
+              "localId" : "1398",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "100",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1459",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "1401",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1399",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1467",
+            "localId" : "1406",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1469",
+              "localId" : "1407",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1470",
+                "localId" : "1408",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Negate",
-              "localId" : "1463",
+              "type" : "Literal",
+              "localId" : "1404",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1465",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1464",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
-                "annotation" : [ ]
-              }
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "1468",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1466",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1405",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "99",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1478",
+        "localId" : "1416",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegMeetsBeforeDateIvl",
+        "name" : "PosInfEndNotMeetsIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1478",
+            "r" : "1416",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegMeetsBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotMeetsIntIvl", ": " ]
             }, {
-              "r" : "1559",
+              "r" : "1428",
               "s" : [ {
-                "r" : "1504",
+                "r" : "1419",
                 "s" : [ {
-                  "r" : "1479",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1496",
-                  "s" : [ {
-                    "r" : "1480",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1417",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1559",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1428",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1556",
+                "r" : "1425",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1524",
-                  "s" : [ {
-                    "r" : "1508",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1548",
-                  "s" : [ {
-                    "r" : "1532",
-                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1423",
+                  "value" : [ "Interval[", "1000", ", ", "2000", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1559",
+          "type" : "MeetsBefore",
+          "localId" : "1428",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1560",
+            "localId" : "1429",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1561",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1430",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1562",
+            "localId" : "1431",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1563",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1432",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1504",
+            "localId" : "1419",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1506",
+              "localId" : "1421",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1507",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1422",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "Literal",
+              "localId" : "1417",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "1505",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1420",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1479",
+                "localId" : "1418",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1496",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1497",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1498",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1499",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1500",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1501",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1502",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1503",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1480",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1481",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1482",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1483",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1484",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1485",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1486",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1556",
+            "localId" : "1425",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1557",
+              "localId" : "1426",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1558",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1427",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1524",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1525",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1526",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1527",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1528",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1529",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1530",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1531",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1508",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1509",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1510",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1511",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1512",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1513",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1514",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1423",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1000",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1548",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1549",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1550",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1551",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1552",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1553",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1554",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1555",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1532",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2030",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1533",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1534",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1535",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1536",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1537",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1538",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1424",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2000",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1566",
+        "localId" : "1435",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotMeetsDateIvl",
+        "name" : "IntIvlNotMeetsPosInfEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1566",
+            "r" : "1435",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "IntIvlNotMeetsPosInfEnd", ": " ]
             }, {
-              "r" : "1647",
+              "r" : "1447",
               "s" : [ {
-                "r" : "1592",
+                "r" : "1438",
                 "s" : [ {
-                  "r" : "1567",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1584",
-                  "s" : [ {
-                    "r" : "1568",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1436",
+                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
                 } ]
               }, {
-                "r" : "1647",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1447",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1644",
+                "r" : "1443",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1612",
-                  "s" : [ {
-                    "r" : "1596",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1636",
-                  "s" : [ {
-                    "r" : "1620",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1441",
+                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1647",
+          "type" : "MeetsBefore",
+          "localId" : "1447",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1648",
+            "localId" : "1448",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1649",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1449",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1650",
+            "localId" : "1450",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1651",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1451",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1592",
+            "localId" : "1438",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1594",
+              "localId" : "1439",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1595",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1440",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1593",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1567",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1436",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1584",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1585",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1586",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1587",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1588",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1589",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1590",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1591",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1568",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1569",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1570",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1571",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1572",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1573",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1574",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1437",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "200",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1644",
+            "localId" : "1443",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1645",
+              "localId" : "1445",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1646",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1446",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1612",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1613",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1614",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1615",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1616",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1617",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1618",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1619",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1596",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1597",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1598",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1599",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1600",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1601",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1602",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1441",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1636",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1444",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1637",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1638",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1639",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1640",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1641",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1642",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1643",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1620",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1621",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1622",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1623",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1624",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1625",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1626",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1442",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1654",
+        "localId" : "1454",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlNotMeetsNegInfBeg",
+        "name" : "UnknownEndMeetsAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1654",
+            "r" : "1454",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlNotMeetsNegInfBeg", ": " ]
+              "value" : [ "", "define ", "UnknownEndMeetsAfterIntIvl", ": " ]
             }, {
-              "r" : "1735",
+              "r" : "1466",
               "s" : [ {
-                "r" : "1703",
+                "r" : "1457",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1671",
-                  "s" : [ {
-                    "r" : "1655",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1695",
-                  "s" : [ {
-                    "r" : "1679",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1455",
+                  "value" : [ "Interval[", "100", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1735",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1466",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1731",
+                "r" : "1463",
                 "s" : [ {
-                  "r" : "1706",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1723",
-                  "s" : [ {
-                    "r" : "1707",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1461",
+                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1735",
+          "type" : "MeetsBefore",
+          "localId" : "1466",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1736",
+            "localId" : "1467",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1737",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1468",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1738",
+            "localId" : "1469",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1739",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1470",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1703",
+            "localId" : "1457",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1704",
+              "localId" : "1459",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1705",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1460",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1671",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1455",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1458",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1672",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1673",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1674",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1675",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1676",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1677",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1456",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1463",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1464",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1678",
+                "localId" : "1465",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1655",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1656",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1657",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1658",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1659",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1660",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1661",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1461",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1695",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1696",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1697",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1698",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1699",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1700",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "1462",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "99",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1473",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayMeetBeforeIntIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1473",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMayMeetBeforeIntIvl", ": " ]
+            }, {
+              "r" : "1485",
+              "s" : [ {
+                "r" : "1476",
+                "s" : [ {
+                  "r" : "1474",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1701",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1485",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1702",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1679",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1680",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1681",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1682",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1683",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1684",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1685",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "r" : "1482",
+                "s" : [ {
+                  "r" : "1480",
+                  "value" : [ "Interval[", "50", ", ", "100", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1485",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1486",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1487",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1488",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1489",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1731",
+            "localId" : "1476",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1733",
+              "localId" : "1478",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1734",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1479",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "Literal",
+              "localId" : "1474",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "1732",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1477",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1706",
+                "localId" : "1475",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1723",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1482",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1483",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1724",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1725",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1726",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1727",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1728",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1729",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1730",
+                "localId" : "1484",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1707",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1708",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1709",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1710",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1711",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1712",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1713",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1480",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "50",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1481",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1742",
+        "localId" : "1492",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMeetsBeforeDateIvl",
+        "name" : "UnknownEndNotMeetsIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1742",
+            "r" : "1492",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMeetsBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotMeetsIntIvl", ": " ]
             }, {
-              "r" : "1823",
+              "r" : "1504",
               "s" : [ {
-                "r" : "1768",
+                "r" : "1495",
                 "s" : [ {
-                  "r" : "1743",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "1760",
-                  "s" : [ {
-                    "r" : "1744",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1493",
+                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "1823",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1504",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1820",
+                "r" : "1501",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1788",
-                  "s" : [ {
-                    "r" : "1772",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1812",
-                  "s" : [ {
-                    "r" : "1796",
-                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1499",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1823",
+          "type" : "MeetsBefore",
+          "localId" : "1504",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1824",
+            "localId" : "1505",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1825",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1506",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1826",
+            "localId" : "1507",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1827",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1508",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1768",
-            "lowClosed" : false,
+            "localId" : "1495",
+            "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1770",
+              "localId" : "1497",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1771",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1498",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "Literal",
+              "localId" : "1493",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "1769",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1496",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1743",
+                "localId" : "1494",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1760",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1501",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1502",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1761",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1762",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1763",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1764",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1765",
+                "localId" : "1503",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1499",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1500",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1511",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntIvlMayMeetAfterUnknownEnd",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1511",
+            "s" : [ {
+              "value" : [ "", "define ", "IntIvlMayMeetAfterUnknownEnd", ": " ]
+            }, {
+              "r" : "1525",
+              "s" : [ {
+                "r" : "1514",
+                "s" : [ {
+                  "r" : "1512",
+                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1766",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1525",
+                "value" : [ " ", "meets before", " " ]
               }, {
+                "r" : "1521",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1517",
+                  "s" : [ {
+                    "r" : "1518",
+                    "value" : [ "-", "100" ]
+                  } ]
+                }, {
+                  "r" : "1520",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1525",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1526",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1527",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1528",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1529",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1514",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1515",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1767",
+                "localId" : "1516",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1744",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1745",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1746",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1747",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1748",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1749",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1750",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1512",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1513",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "100",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1820",
+            "localId" : "1521",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1821",
+              "localId" : "1523",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1822",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1524",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1788",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Negate",
+              "localId" : "1517",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1789",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1790",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1791",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1792",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1793",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1794",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1795",
+                "localId" : "1519",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1772",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1773",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1774",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1775",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1776",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1777",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "1778",
+                "localId" : "1518",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "100",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1812",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1522",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1813",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1814",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1815",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1816",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1817",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1520",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1532",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NegInfBegMeetsBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1532",
+            "s" : [ {
+              "value" : [ "", "define ", "NegInfBegMeetsBeforeLongIvl", ": " ]
+            }, {
+              "r" : "1544",
+              "s" : [ {
+                "r" : "1535",
+                "s" : [ {
+                  "r" : "1533",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1818",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1544",
+                "value" : [ " ", "meets before", " " ]
               }, {
+                "r" : "1541",
+                "s" : [ {
+                  "r" : "1539",
+                  "value" : [ "Interval[", "101L", ", ", "200L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1544",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1545",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1546",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1547",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1548",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1535",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1537",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1819",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1796",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2030",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1797",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1798",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1799",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1800",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1538",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1801",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1536",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1533",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1802",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1534",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1541",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1542",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1543",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1539",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1540",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1830",
+        "localId" : "1551",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayMeetAfterDateIvl",
+        "name" : "NegInfBegNotMeetsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1830",
+            "r" : "1551",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayMeetAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotMeetsLongIvl", ": " ]
             }, {
-              "r" : "1911",
+              "r" : "1563",
               "s" : [ {
-                "r" : "1856",
+                "r" : "1554",
                 "s" : [ {
-                  "r" : "1831",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "1848",
-                  "s" : [ {
-                    "r" : "1832",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1552",
+                  "value" : [ "Interval[", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1911",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1563",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1908",
+                "r" : "1560",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1876",
-                  "s" : [ {
-                    "r" : "1860",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1900",
-                  "s" : [ {
-                    "r" : "1884",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1558",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1911",
+          "type" : "MeetsBefore",
+          "localId" : "1563",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1912",
+            "localId" : "1564",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1913",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1565",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1914",
+            "localId" : "1566",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1915",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1567",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1856",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "1554",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1858",
+              "localId" : "1556",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1859",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1557",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1857",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1555",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1831",
+                "localId" : "1552",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1848",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1553",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1560",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1561",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1849",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1850",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1851",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1852",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1853",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1562",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1558",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1559",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1570",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIvlNotMeetsNegInfBeg",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1570",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIvlNotMeetsNegInfBeg", ": " ]
+            }, {
+              "r" : "1582",
+              "s" : [ {
+                "r" : "1573",
+                "s" : [ {
+                  "r" : "1571",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1854",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1582",
+                "value" : [ " ", "meets before", " " ]
               }, {
+                "r" : "1578",
+                "s" : [ {
+                  "r" : "1576",
+                  "value" : [ "Interval[", "null", ", ", "400L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1582",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1583",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1584",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1585",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1586",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1573",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1574",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1855",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1832",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1833",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1834",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1835",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1836",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1837",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1838",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1575",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1571",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1572",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1908",
+            "localId" : "1578",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1909",
+              "localId" : "1580",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1910",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1581",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1876",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1579",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1877",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1878",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1879",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1880",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1881",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1576",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1577",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "400",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1589",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegMeetsBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1589",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegMeetsBeforeLongIvl", ": " ]
+            }, {
+              "r" : "1601",
+              "s" : [ {
+                "r" : "1592",
+                "s" : [ {
+                  "r" : "1590",
+                  "value" : [ "Interval(", "null", ", ", "100L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1882",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1601",
+                "value" : [ " ", "meets before", " " ]
               }, {
+                "r" : "1598",
+                "s" : [ {
+                  "r" : "1596",
+                  "value" : [ "Interval[", "101L", ", ", "200L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1601",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1602",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1603",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1604",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1605",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1592",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1594",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1883",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1860",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1861",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1862",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1863",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1864",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1865",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1595",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1866",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1593",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1590",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1900",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1591",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1598",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1599",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1901",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1902",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1903",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1904",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1905",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1906",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1907",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1884",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1885",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1886",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1887",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1888",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1889",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1890",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1600",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1596",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "101",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1597",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1918",
+        "localId" : "1608",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotMeetsDateIvl",
+        "name" : "UnknownBegMayMeetAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1918",
+            "r" : "1608",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayMeetAfterLongIvl", ": " ]
             }, {
-              "r" : "1999",
+              "r" : "1620",
               "s" : [ {
-                "r" : "1944",
+                "r" : "1611",
                 "s" : [ {
-                  "r" : "1919",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "1936",
-                  "s" : [ {
-                    "r" : "1920",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1609",
+                  "value" : [ "Interval(", "null", ", ", "100L", "]" ]
                 } ]
               }, {
-                "r" : "1999",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1620",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "1996",
+                "r" : "1617",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1964",
-                  "s" : [ {
-                    "r" : "1948",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1988",
-                  "s" : [ {
-                    "r" : "1972",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1615",
+                  "value" : [ "Interval[", "0L", ", ", "50L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "1999",
+          "type" : "MeetsBefore",
+          "localId" : "1620",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2000",
+            "localId" : "1621",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2001",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1622",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2002",
+            "localId" : "1623",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2003",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1624",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1944",
+            "localId" : "1611",
             "lowClosed" : false,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1946",
+              "localId" : "1613",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1947",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1614",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1945",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1612",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1919",
+                "localId" : "1609",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1936",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1610",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1617",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1618",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1937",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1938",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1939",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1940",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1941",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1619",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1615",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1616",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "50",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1627",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownBegNotMeetsLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1627",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownBegNotMeetsLongIvl", ": " ]
+            }, {
+              "r" : "1639",
+              "s" : [ {
+                "r" : "1630",
+                "s" : [ {
+                  "r" : "1628",
+                  "value" : [ "Interval(", "null", ", ", "5L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1942",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1639",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1943",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1920",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1921",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1922",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1923",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1924",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1925",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1926",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "r" : "1636",
+                "s" : [ {
+                  "r" : "1634",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1639",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1640",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1641",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1642",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1643",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1996",
-            "lowClosed" : true,
+            "localId" : "1630",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1997",
+              "localId" : "1632",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1998",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1633",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1964",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "1631",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1965",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1966",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1967",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1968",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1969",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1970",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1971",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1948",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1949",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1950",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1951",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1952",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1953",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1954",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1628",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1988",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1629",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1636",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1637",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1989",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1990",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1991",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1992",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1993",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1638",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1634",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1635",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1646",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIvlMayMeetBeforeUnknownBeg",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1646",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIvlMayMeetBeforeUnknownBeg", ": " ]
+            }, {
+              "r" : "1658",
+              "s" : [ {
+                "r" : "1649",
+                "s" : [ {
+                  "r" : "1647",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1994",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1658",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1995",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1972",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1973",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1974",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1975",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1976",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "r" : "1654",
+                "s" : [ {
+                  "r" : "1652",
+                  "value" : [ "Interval(", "null", ", ", "400L", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1658",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1659",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1660",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1661",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1662",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1649",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1650",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1651",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1977",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1647",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1648",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1654",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1656",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1657",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1978",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1655",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1652",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1653",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "400",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2006",
+        "localId" : "1665",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlMayMeetBeforeUnknownBeg",
+        "name" : "PosInfEndMeetsAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2006",
+            "r" : "1665",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlMayMeetBeforeUnknownBeg", ": " ]
+              "value" : [ "", "define ", "PosInfEndMeetsAfterLongIvl", ": " ]
             }, {
-              "r" : "2087",
+              "r" : "1677",
               "s" : [ {
-                "r" : "2055",
+                "r" : "1668",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2023",
-                  "s" : [ {
-                    "r" : "2007",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2047",
-                  "s" : [ {
-                    "r" : "2031",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1666",
+                  "value" : [ "Interval[", "100L", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "2087",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1677",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "2083",
+                "r" : "1674",
                 "s" : [ {
-                  "r" : "2058",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "2075",
-                  "s" : [ {
-                    "r" : "2059",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1672",
+                  "value" : [ "Interval[", "0L", ", ", "99L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "2087",
+          "type" : "MeetsBefore",
+          "localId" : "1677",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2088",
+            "localId" : "1678",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2089",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1679",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2090",
+            "localId" : "1680",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2091",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1681",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2055",
+            "localId" : "1668",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2056",
+              "localId" : "1670",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2057",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1671",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2023",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1666",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1669",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2024",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2025",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2026",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2027",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2028",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2029",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1667",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1674",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1675",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2030",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2007",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2008",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2009",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2010",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2011",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2012",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2013",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1676",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1672",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2047",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2048",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2049",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2050",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2051",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2052",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "1673",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "99",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1684",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "PosInfEndNotMeetsLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1684",
+            "s" : [ {
+              "value" : [ "", "define ", "PosInfEndNotMeetsLongIvl", ": " ]
+            }, {
+              "r" : "1696",
+              "s" : [ {
+                "r" : "1687",
+                "s" : [ {
+                  "r" : "1685",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2053",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1696",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2054",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2031",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2032",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2033",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2034",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2035",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2036",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2037",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "r" : "1693",
+                "s" : [ {
+                  "r" : "1691",
+                  "value" : [ "Interval[", "1000L", ", ", "2000L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1696",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1697",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1698",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1699",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1700",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "2083",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "1687",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2085",
+              "localId" : "1689",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2086",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1690",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "Literal",
+              "localId" : "1685",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "2084",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1688",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2058",
+                "localId" : "1686",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2075",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1693",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1694",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2076",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2077",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2078",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2079",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2080",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2081",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2082",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2059",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2060",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2061",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2062",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2063",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2064",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2065",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1695",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1691",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1000",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1692",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2000",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2094",
+        "localId" : "1703",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndMeetsAfterDateIvl",
+        "name" : "LongIvlNotMeetsPosInfEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2094",
+            "r" : "1703",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndMeetsAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "LongIvlNotMeetsPosInfEnd", ": " ]
             }, {
-              "r" : "2175",
+              "r" : "1715",
               "s" : [ {
-                "r" : "2120",
+                "r" : "1706",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2111",
-                  "s" : [ {
-                    "r" : "2095",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2119",
-                  "value" : [ ", ", "null", "]" ]
+                  "r" : "1704",
+                  "value" : [ "Interval[", "100L", ", ", "200L", "]" ]
                 } ]
               }, {
-                "r" : "2175",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1715",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "2172",
+                "r" : "1711",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2140",
-                  "s" : [ {
-                    "r" : "2124",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2164",
-                  "s" : [ {
-                    "r" : "2148",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1709",
+                  "value" : [ "Interval[", "0L", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "2175",
+          "type" : "MeetsBefore",
+          "localId" : "1715",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2176",
+            "localId" : "1716",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2177",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1717",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2178",
+            "localId" : "1718",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2179",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1719",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2120",
+            "localId" : "1706",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2122",
+              "localId" : "1707",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2123",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1708",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2111",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1704",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1705",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "200",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1711",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1713",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2112",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2113",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2114",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2115",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2116",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2117",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2118",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2095",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2096",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2097",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2098",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2099",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2100",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2101",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1714",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1709",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
               "type" : "As",
-              "localId" : "2121",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1712",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2119",
+                "localId" : "1710",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
+          } ]
+        }
+      }, {
+        "localId" : "1722",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMeetsAfterLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1722",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMeetsAfterLongIvl", ": " ]
+            }, {
+              "r" : "1734",
+              "s" : [ {
+                "r" : "1725",
+                "s" : [ {
+                  "r" : "1723",
+                  "value" : [ "Interval[", "100L", ", ", "null", ")" ]
+                } ]
+              }, {
+                "r" : "1734",
+                "value" : [ " ", "meets before", " " ]
+              }, {
+                "r" : "1731",
+                "s" : [ {
+                  "r" : "1729",
+                  "value" : [ "Interval[", "0L", ", ", "99L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1734",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1735",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1736",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1737",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1738",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "2172",
+            "localId" : "1725",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2173",
+              "localId" : "1727",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2174",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1728",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2140",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1723",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1726",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2141",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2142",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2143",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2144",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2145",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2146",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1724",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1731",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1732",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2147",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2124",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2125",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2126",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2127",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2128",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2129",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2130",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1733",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1729",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2164",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2165",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2166",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2167",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2168",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2169",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "1730",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "99",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1741",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownEndMayMeetBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1741",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownEndMayMeetBeforeLongIvl", ": " ]
+            }, {
+              "r" : "1753",
+              "s" : [ {
+                "r" : "1744",
+                "s" : [ {
+                  "r" : "1742",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2170",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1753",
+                "value" : [ " ", "meets before", " " ]
               }, {
+                "r" : "1750",
+                "s" : [ {
+                  "r" : "1748",
+                  "value" : [ "Interval[", "50L", ", ", "100L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1753",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1754",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1755",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1756",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1757",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1744",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1746",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2171",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2148",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2149",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2150",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2151",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2152",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2153",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1747",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2154",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1742",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1745",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1743",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1750",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1751",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1752",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1748",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "50",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1749",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2182",
+        "localId" : "1760",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotMeetsDateIvl",
+        "name" : "UnknownEndNotMeetsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2182",
+            "r" : "1760",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotMeetsLongIvl", ": " ]
             }, {
-              "r" : "2263",
+              "r" : "1772",
               "s" : [ {
-                "r" : "2208",
+                "r" : "1763",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2199",
-                  "s" : [ {
-                    "r" : "2183",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2207",
-                  "value" : [ ", ", "null", "]" ]
+                  "r" : "1761",
+                  "value" : [ "Interval[", "0L", ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "2263",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1772",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "2260",
+                "r" : "1769",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2228",
-                  "s" : [ {
-                    "r" : "2212",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2252",
-                  "s" : [ {
-                    "r" : "2236",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1767",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "2263",
+          "type" : "MeetsBefore",
+          "localId" : "1772",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2264",
+            "localId" : "1773",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2265",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1774",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2266",
+            "localId" : "1775",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2267",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1776",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2208",
+            "localId" : "1763",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2210",
+              "localId" : "1765",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2211",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1766",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2199",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2200",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2201",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2202",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2203",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2204",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2205",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2206",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2183",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2184",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2185",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2186",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2187",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2188",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2189",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1761",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "2209",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "1764",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2207",
+                "localId" : "1762",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2260",
+            "localId" : "1769",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2261",
+              "localId" : "1770",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2262",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "1771",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2228",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2229",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2230",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2231",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2232",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2233",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "1767",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1768",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1779",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIvlMayMeetAfterUnknownEnd",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1779",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIvlMayMeetAfterUnknownEnd", ": " ]
+            }, {
+              "r" : "1793",
+              "s" : [ {
+                "r" : "1782",
+                "s" : [ {
+                  "r" : "1780",
+                  "value" : [ "Interval[", "0L", ", ", "100L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2234",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1793",
+                "value" : [ " ", "meets before", " " ]
               }, {
+                "r" : "1789",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1785",
+                  "s" : [ {
+                    "r" : "1786",
+                    "value" : [ "-", "100L" ]
+                  } ]
+                }, {
+                  "r" : "1788",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "MeetsBefore",
+          "localId" : "1793",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1794",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1795",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1796",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1797",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1782",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1783",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2235",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2212",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2213",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2214",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2215",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2216",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2217",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2218",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1784",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1780",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "1781",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "100",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1789",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1791",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2253",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2254",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2255",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2256",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2257",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2258",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1792",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "1785",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2259",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1787",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2236",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2237",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2238",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2239",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2240",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "2241",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "1786",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "100",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2242",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "1790",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1788",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2270",
+        "localId" : "1800",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlNotMeetsPosInfEnd",
+        "name" : "NegInfBegMeetsBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2270",
+            "r" : "1800",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlNotMeetsPosInfEnd", ": " ]
+              "value" : [ "", "define ", "NegInfBegMeetsBeforeDateIvl", ": " ]
             }, {
-              "r" : "2351",
+              "r" : "1881",
               "s" : [ {
-                "r" : "2319",
+                "r" : "1826",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2287",
-                  "s" : [ {
-                    "r" : "2271",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "r" : "1801",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "2311",
+                  "r" : "1818",
                   "s" : [ {
-                    "r" : "2295",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1802",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "2351",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1881",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "2347",
+                "r" : "1878",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2338",
+                  "r" : "1846",
                   "s" : [ {
-                    "r" : "2322",
+                    "r" : "1830",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2346",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1870",
+                  "s" : [ {
+                    "r" : "1854",
+                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "2351",
+          "type" : "MeetsBefore",
+          "localId" : "1881",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2352",
+            "localId" : "1882",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2353",
+              "localId" : "1883",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2354",
+            "localId" : "1884",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2355",
+              "localId" : "1885",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2319",
+            "localId" : "1826",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2320",
+              "localId" : "1828",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2321",
+                "localId" : "1829",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "1827",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1801",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "2287",
+              "localId" : "1818",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2288",
+                "localId" : "1819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2289",
+                "localId" : "1820",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2290",
+                "localId" : "1821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2291",
+                "localId" : "1822",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2292",
+                "localId" : "1823",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2293",
+                "localId" : "1824",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2294",
+                "localId" : "1825",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2271",
+                "localId" : "1802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2272",
+                "localId" : "1803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -124581,7 +151875,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2273",
+                "localId" : "1804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -124589,7 +151883,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2274",
+                "localId" : "1805",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -124597,7 +151891,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2275",
+                "localId" : "1806",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -124605,7 +151899,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2276",
+                "localId" : "1807",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -124613,65 +151907,82 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2277",
+                "localId" : "1808",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1878",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1879",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1880",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "high" : {
+            "low" : {
               "type" : "DateTime",
-              "localId" : "2311",
+              "localId" : "1846",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2312",
+                "localId" : "1847",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2313",
+                "localId" : "1848",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2314",
+                "localId" : "1849",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2315",
+                "localId" : "1850",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2316",
+                "localId" : "1851",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2317",
+                "localId" : "1852",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2318",
+                "localId" : "1853",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2295",
+                "localId" : "1830",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2296",
+                "localId" : "1831",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -124679,7 +151990,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2297",
+                "localId" : "1832",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -124687,7 +151998,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2298",
+                "localId" : "1833",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -124695,7 +152006,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2299",
+                "localId" : "1834",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -124703,7 +152014,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2300",
+                "localId" : "1835",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -124711,82 +152022,65 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2301",
+                "localId" : "1836",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2347",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2349",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2350",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
+            "high" : {
               "type" : "DateTime",
-              "localId" : "2338",
+              "localId" : "1870",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2339",
+                "localId" : "1871",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2340",
+                "localId" : "1872",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2341",
+                "localId" : "1873",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2342",
+                "localId" : "1874",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2343",
+                "localId" : "1875",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2344",
+                "localId" : "1876",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2345",
+                "localId" : "1877",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2322",
+                "localId" : "1854",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2030",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2323",
+                "localId" : "1855",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -124794,7 +152088,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2324",
+                "localId" : "1856",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -124802,7 +152096,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2325",
+                "localId" : "1857",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -124810,7 +152104,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2326",
+                "localId" : "1858",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -124818,7 +152112,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2327",
+                "localId" : "1859",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -124826,172 +152120,172 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2328",
+                "localId" : "1860",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2348",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2346",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           } ]
         }
       }, {
-        "localId" : "2358",
+        "localId" : "1888",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMeetsAfterDateIvl",
+        "name" : "NegInfBegNotMeetsDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2358",
+            "r" : "1888",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMeetsAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "NegInfBegNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "2439",
+              "r" : "1969",
               "s" : [ {
-                "r" : "2384",
+                "r" : "1914",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "r" : "1889",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "2375",
+                  "r" : "1906",
                   "s" : [ {
-                    "r" : "2359",
+                    "r" : "1890",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2383",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "2439",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "1969",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "2436",
+                "r" : "1966",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2404",
+                  "r" : "1934",
                   "s" : [ {
-                    "r" : "2388",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1918",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2428",
+                  "r" : "1958",
                   "s" : [ {
-                    "r" : "2412",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1942",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "2439",
+          "type" : "MeetsBefore",
+          "localId" : "1969",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2440",
+            "localId" : "1970",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2441",
+              "localId" : "1971",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2442",
+            "localId" : "1972",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2443",
+              "localId" : "1973",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2384",
+            "localId" : "1914",
             "lowClosed" : true,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2386",
+              "localId" : "1916",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2387",
+                "localId" : "1917",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "1915",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1889",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "2375",
+              "localId" : "1906",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2376",
+                "localId" : "1907",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2377",
+                "localId" : "1908",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2378",
+                "localId" : "1909",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2379",
+                "localId" : "1910",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2380",
+                "localId" : "1911",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2381",
+                "localId" : "1912",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2382",
+                "localId" : "1913",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2359",
+                "localId" : "1890",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -124999,7 +152293,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2360",
+                "localId" : "1891",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125007,7 +152301,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2361",
+                "localId" : "1892",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125015,7 +152309,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2362",
+                "localId" : "1893",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125023,7 +152317,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2363",
+                "localId" : "1894",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125031,7 +152325,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2364",
+                "localId" : "1895",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125039,95 +152333,82 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2365",
+                "localId" : "1896",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2385",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2383",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2436",
+            "localId" : "1966",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2437",
+              "localId" : "1967",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2438",
+                "localId" : "1968",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2404",
+              "localId" : "1934",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2405",
+                "localId" : "1935",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2406",
+                "localId" : "1936",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2407",
+                "localId" : "1937",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2408",
+                "localId" : "1938",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2409",
+                "localId" : "1939",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2410",
+                "localId" : "1940",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2411",
+                "localId" : "1941",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2388",
+                "localId" : "1918",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2389",
+                "localId" : "1919",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125135,7 +152416,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2390",
+                "localId" : "1920",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125143,7 +152424,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2391",
+                "localId" : "1921",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125151,7 +152432,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2392",
+                "localId" : "1922",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125159,7 +152440,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2393",
+                "localId" : "1923",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125167,7 +152448,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2394",
+                "localId" : "1924",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125176,56 +152457,56 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2428",
+              "localId" : "1958",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2429",
+                "localId" : "1959",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2430",
+                "localId" : "1960",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2431",
+                "localId" : "1961",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2432",
+                "localId" : "1962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2433",
+                "localId" : "1963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2434",
+                "localId" : "1964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2435",
+                "localId" : "1965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2412",
+                "localId" : "1942",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2413",
+                "localId" : "1943",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125233,7 +152514,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2414",
+                "localId" : "1944",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125241,7 +152522,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2415",
+                "localId" : "1945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125249,7 +152530,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2416",
+                "localId" : "1946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125257,7 +152538,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2417",
+                "localId" : "1947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125265,7 +152546,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2418",
+                "localId" : "1948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125275,157 +152556,157 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "2446",
+        "localId" : "1976",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayMeetBeforeDateIvl",
+        "name" : "DateIvlNotMeetsNegInfBeg",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2446",
+            "r" : "1976",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayMeetBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "DateIvlNotMeetsNegInfBeg", ": " ]
             }, {
-              "r" : "2527",
+              "r" : "2057",
               "s" : [ {
-                "r" : "2472",
+                "r" : "2025",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2463",
+                  "r" : "1993",
                   "s" : [ {
-                    "r" : "2447",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1977",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2471",
-                  "value" : [ ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "2527",
-                "value" : [ " ", "meets after", " " ]
-              }, {
-                "r" : "2524",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "2492",
+                  "r" : "2017",
                   "s" : [ {
-                    "r" : "2476",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2001",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ", " ]
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "2057",
+                "value" : [ " ", "meets before", " " ]
+              }, {
+                "r" : "2053",
+                "s" : [ {
+                  "r" : "2028",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "2516",
+                  "r" : "2045",
                   "s" : [ {
-                    "r" : "2500",
-                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2029",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "2527",
+          "type" : "MeetsBefore",
+          "localId" : "2057",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2528",
+            "localId" : "2058",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2529",
+              "localId" : "2059",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2530",
+            "localId" : "2060",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2531",
+              "localId" : "2061",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2472",
+            "localId" : "2025",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2474",
+              "localId" : "2026",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2475",
+                "localId" : "2027",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2463",
+              "localId" : "1993",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2464",
+                "localId" : "1994",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2465",
+                "localId" : "1995",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2466",
+                "localId" : "1996",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2467",
+                "localId" : "1997",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2468",
+                "localId" : "1998",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2469",
+                "localId" : "1999",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2470",
+                "localId" : "2000",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2447",
+                "localId" : "1977",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2448",
+                "localId" : "1978",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125433,7 +152714,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2449",
+                "localId" : "1979",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125441,7 +152722,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2450",
+                "localId" : "1980",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125449,7 +152730,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2451",
+                "localId" : "1981",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125457,7 +152738,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2452",
+                "localId" : "1982",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125465,7 +152746,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2453",
+                "localId" : "1983",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125473,87 +152754,57 @@ module.exports['MeetsAfter'] = {
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "2473",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2471",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2524",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2525",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2526",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
               "type" : "DateTime",
-              "localId" : "2492",
+              "localId" : "2017",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2493",
+                "localId" : "2018",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2494",
+                "localId" : "2019",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2495",
+                "localId" : "2020",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2496",
+                "localId" : "2021",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2497",
+                "localId" : "2022",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2498",
+                "localId" : "2023",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2499",
+                "localId" : "2024",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2476",
+                "localId" : "2001",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2477",
+                "localId" : "2002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125561,7 +152812,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2478",
+                "localId" : "2003",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125569,7 +152820,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2479",
+                "localId" : "2004",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125577,7 +152828,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2480",
+                "localId" : "2005",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125585,7 +152836,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2481",
+                "localId" : "2006",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125593,65 +152844,95 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2482",
+                "localId" : "2007",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2053",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2055",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2056",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "2054",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2028",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2516",
+              "localId" : "2045",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2517",
+                "localId" : "2046",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2518",
+                "localId" : "2047",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2519",
+                "localId" : "2048",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2520",
+                "localId" : "2049",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2521",
+                "localId" : "2050",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2522",
+                "localId" : "2051",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2523",
+                "localId" : "2052",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2500",
+                "localId" : "2029",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2040",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2501",
+                "localId" : "2030",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125659,7 +152940,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2502",
+                "localId" : "2031",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125667,7 +152948,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2503",
+                "localId" : "2032",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125675,7 +152956,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2504",
+                "localId" : "2033",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125683,7 +152964,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2505",
+                "localId" : "2034",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125691,7 +152972,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2506",
+                "localId" : "2035",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125701,54 +152982,54 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "2534",
+        "localId" : "2064",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotMeetsDateIvl",
+        "name" : "UnknownBegMeetsBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2534",
+            "r" : "2064",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegMeetsBeforeDateIvl", ": " ]
             }, {
-              "r" : "2615",
+              "r" : "2145",
               "s" : [ {
-                "r" : "2560",
+                "r" : "2090",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "r" : "2065",
+                  "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "2551",
+                  "r" : "2082",
                   "s" : [ {
-                    "r" : "2535",
+                    "r" : "2066",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2559",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "2615",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "2145",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "2612",
+                "r" : "2142",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2580",
+                  "r" : "2110",
                   "s" : [ {
-                    "r" : "2564",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2094",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2604",
+                  "r" : "2134",
                   "s" : [ {
-                    "r" : "2588",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2118",
+                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -125758,92 +153039,105 @@ module.exports['MeetsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "2615",
+          "type" : "MeetsBefore",
+          "localId" : "2145",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2616",
+            "localId" : "2146",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2617",
+              "localId" : "2147",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2618",
+            "localId" : "2148",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2619",
+              "localId" : "2149",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2560",
-            "lowClosed" : true,
+            "localId" : "2090",
+            "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2562",
+              "localId" : "2092",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2563",
+                "localId" : "2093",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2091",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2065",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "2551",
+              "localId" : "2082",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2552",
+                "localId" : "2083",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2553",
+                "localId" : "2084",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2554",
+                "localId" : "2085",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2555",
+                "localId" : "2086",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2556",
+                "localId" : "2087",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2557",
+                "localId" : "2088",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2558",
+                "localId" : "2089",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2535",
+                "localId" : "2066",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -125851,7 +153145,7 @@ module.exports['MeetsAfter'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2536",
+                "localId" : "2067",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125859,7 +153153,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2537",
+                "localId" : "2068",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125867,7 +153161,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2538",
+                "localId" : "2069",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125875,7 +153169,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2539",
+                "localId" : "2070",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125883,7 +153177,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2540",
+                "localId" : "2071",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -125891,95 +153185,82 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2541",
+                "localId" : "2072",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2561",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2559",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2612",
+            "localId" : "2142",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2613",
+              "localId" : "2143",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2614",
+                "localId" : "2144",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2580",
+              "localId" : "2110",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2581",
+                "localId" : "2111",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2582",
+                "localId" : "2112",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2583",
+                "localId" : "2113",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2584",
+                "localId" : "2114",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2585",
+                "localId" : "2115",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2586",
+                "localId" : "2116",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2587",
+                "localId" : "2117",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2564",
+                "localId" : "2094",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2565",
+                "localId" : "2095",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125987,7 +153268,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2566",
+                "localId" : "2096",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -125995,7 +153276,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2567",
+                "localId" : "2097",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126003,7 +153284,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2568",
+                "localId" : "2098",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126011,7 +153292,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2569",
+                "localId" : "2099",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126019,7 +153300,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2570",
+                "localId" : "2100",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126028,56 +153309,56 @@ module.exports['MeetsAfter'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2604",
+              "localId" : "2134",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2605",
+                "localId" : "2135",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2606",
+                "localId" : "2136",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2607",
+                "localId" : "2137",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2608",
+                "localId" : "2138",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2609",
+                "localId" : "2139",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2610",
+                "localId" : "2140",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2611",
+                "localId" : "2141",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2588",
+                "localId" : "2118",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2030",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2589",
+                "localId" : "2119",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -126085,7 +153366,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2590",
+                "localId" : "2120",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -126093,7 +153374,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2591",
+                "localId" : "2121",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126101,7 +153382,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2592",
+                "localId" : "2122",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126109,7 +153390,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2593",
+                "localId" : "2123",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126117,7 +153398,7 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2594",
+                "localId" : "2124",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126127,157 +153408,170 @@ module.exports['MeetsAfter'] = {
           } ]
         }
       }, {
-        "localId" : "2622",
+        "localId" : "2152",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlMayMeetAfterUnknownEnd",
+        "name" : "UnknownBegMayMeetAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2622",
+            "r" : "2152",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlMayMeetAfterUnknownEnd", ": " ]
+              "value" : [ "", "define ", "UnknownBegMayMeetAfterDateIvl", ": " ]
             }, {
-              "r" : "2703",
+              "r" : "2233",
               "s" : [ {
-                "r" : "2671",
+                "r" : "2178",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2639",
-                  "s" : [ {
-                    "r" : "2623",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "r" : "2153",
+                  "value" : [ "Interval(", "null", ", " ]
                 }, {
-                  "r" : "2663",
+                  "r" : "2170",
                   "s" : [ {
-                    "r" : "2647",
-                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2154",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "2703",
-                "value" : [ " ", "meets after", " " ]
+                "r" : "2233",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "2699",
+                "r" : "2230",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2690",
+                  "r" : "2198",
                   "s" : [ {
-                    "r" : "2674",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2182",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "r" : "2698",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2222",
+                  "s" : [ {
+                    "r" : "2206",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsAfter",
-          "localId" : "2703",
+          "type" : "MeetsBefore",
+          "localId" : "2233",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2704",
+            "localId" : "2234",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2705",
+              "localId" : "2235",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2706",
+            "localId" : "2236",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2707",
+              "localId" : "2237",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2671",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2178",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2672",
+              "localId" : "2180",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2673",
+                "localId" : "2181",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2179",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2153",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "2639",
+              "localId" : "2170",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2640",
+                "localId" : "2171",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2641",
+                "localId" : "2172",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2642",
+                "localId" : "2173",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2643",
+                "localId" : "2174",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2644",
+                "localId" : "2175",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2645",
+                "localId" : "2176",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2646",
+                "localId" : "2177",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2623",
+                "localId" : "2154",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2624",
+                "localId" : "2155",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -126285,7 +153579,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2625",
+                "localId" : "2156",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -126293,7 +153587,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2626",
+                "localId" : "2157",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126301,7 +153595,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2627",
+                "localId" : "2158",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126309,7 +153603,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2628",
+                "localId" : "2159",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126317,65 +153611,82 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2629",
+                "localId" : "2160",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2230",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2231",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2232",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "high" : {
+            "low" : {
               "type" : "DateTime",
-              "localId" : "2663",
+              "localId" : "2198",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2664",
+                "localId" : "2199",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2665",
+                "localId" : "2200",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2666",
+                "localId" : "2201",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2667",
+                "localId" : "2202",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2668",
+                "localId" : "2203",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2669",
+                "localId" : "2204",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2670",
+                "localId" : "2205",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2647",
+                "localId" : "2182",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2040",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2648",
+                "localId" : "2183",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -126383,7 +153694,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2649",
+                "localId" : "2184",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -126391,7 +153702,7 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2650",
+                "localId" : "2185",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126399,7 +153710,7 @@ module.exports['MeetsAfter'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2651",
+                "localId" : "2186",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126407,7 +153718,7 @@ module.exports['MeetsAfter'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2652",
+                "localId" : "2187",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -126415,82 +153726,65 @@ module.exports['MeetsAfter'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2653",
+                "localId" : "2188",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2699",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2701",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2702",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
+            "high" : {
               "type" : "DateTime",
-              "localId" : "2690",
+              "localId" : "2222",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2691",
+                "localId" : "2223",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2692",
+                "localId" : "2224",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2693",
+                "localId" : "2225",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2694",
+                "localId" : "2226",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2695",
+                "localId" : "2227",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2696",
+                "localId" : "2228",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2697",
+                "localId" : "2229",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2674",
+                "localId" : "2206",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2675",
+                "localId" : "2207",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -126498,7 +153792,7 @@ module.exports['MeetsAfter'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2676",
+                "localId" : "2208",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -126506,740 +153800,91 @@ module.exports['MeetsAfter'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2677",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2678",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2679",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2680",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2700",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2698",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      } ]
-    }
-  }
-}
-
-/* MeetsBefore
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define MeetsAfterIntIvl: Interval[11, 15] meets before Interval[5, 10]
-define MeetsBeforeIntIvl: Interval[1, 4] meets before Interval[5, 10]
-define NotMeetsIntIvl: Interval[1, 2] meets before Interval[5, 10]
-define MeetsAfterRealIvl: Interval[1.50000001, 2.5] meets before Interval[0.5, 1.5]
-define MeetsBeforeRealIvl: Interval[0.5, 1.5] meets before Interval[1.50000001, 2.5]
-define NotMeetsRealIvl: Interval[0.0, 1.0] meets before Interval[1.1, 2.0]
-define DateIvl: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define MeetsAfterDateIvl: Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)) meets before DateIvl
-define MeetsBeforeDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)) meets before DateIvl
-define NotMeetsDateIvl: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 0, 0, 0, 0)) meets before DateIvl
-define MayMeetAfterImpreciseDateIvl: DateIvl meets before Interval[DateTime(2012, 1), DateTime(2012, 2)]
-define MayMeetBeforeImpreciseDateIvl: DateIvl meets before Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define NotMeetsImpreciseDateIvl: DateIvl meets before Interval[DateTime(2012, 1), DateTime(2012, 12)]
-define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define MeetsAfterDayOfIvl: PrecisionDateIvl meets before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define MeetsBeforeDayOfIvl: PrecisionDateIvl meets before day of Interval[DateTime(2012, 9, 3, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
-define NotMeetsDayOfIvl: PrecisionDateIvl meets before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define NotMeetsDayOfImpreciseIVL: PrecisionDateIvl meets before day of Interval[DateTime(2012, 1), DateTime(2012, 2)]
-define MayMeetAfterDayOfImpreciseIvl: PrecisionDateIvl meets before day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
-define MayMeetBeforeDayOfImpreciseIvl: PrecisionDateIvl meets before day of Interval[DateTime(2012, 9), DateTime(2012, 12)]
-define ImpDateIvl: Interval[DateTime(2012, 3), DateTime(2012, 8)]
-define ImpreciseMayMeetAfterDateIvl: ImpDateIvl meets before Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 2, 29, 23, 59, 59, 999)]
-define ImpreciseMayMeetBeforeDateIvl: ImpDateIvl meets before Interval[DateTime(2012, 9, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999)]
-define ImpreciseNotMeetsDateIvl: ImpDateIvl meets before Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 31, 23, 59, 59, 999))
-define NegInfBegMeetsBeforeIntIvl: Interval[null, 100] meets before Interval[101, 200]
-define NegInfBegNotMeetsIntIvl: Interval[null, 100] meets before Interval[100, 200]
-define IntIvlNotMeetsNegInfBeg: Interval[100, 200] meets before Interval[null, 400]
-define UnknownBegMeetsBeforeIntIvl: Interval(null, 100] meets before Interval[101, 200]
-define UnknownBegMayMeetAfterIntIvl: Interval(null, 100] meets before Interval[0, 50]
-define UnknownBegNotMeetsIntIvl: Interval(null, 5] meets before Interval[0, 100]
-define IntIvlMayMeetBeforeUnknownBeg: Interval[0, 100] meets before Interval(null, 400)
-define PosInfEndMeetsAfterIntIvl: Interval[100, null] meets before Interval[0, 99]
-define PosInfEndNotMeetsIntIvl: Interval[0, null] meets before Interval[1000, 2000]
-define IntIvlNotMeetsPosInfEnd: Interval[100, 200] meets before Interval[0, null]
-define UnknownEndMeetsAfterIntIvl: Interval[100, null) meets before Interval[0, 99]
-define UnknownEndMayMeetBeforeIntIvl: Interval[0, null) meets before Interval[50, 100]
-define UnknownEndNotMeetsIntIvl: Interval[0, null) meets before Interval[0, 100]
-define IntIvlMayMeetAfterUnknownEnd: Interval[0, 100] meets before Interval[-100, null)
-define NegInfBegMeetsBeforeDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
-define NegInfBegNotMeetsDateIvl: Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define DateIvlNotMeetsNegInfBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets before Interval[null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownBegMeetsBeforeDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2030, 1, 1, 0, 0, 0, 0)]
-define UnknownBegMayMeetAfterDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)]
-define UnknownBegNotMeetsDateIvl: Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0)) meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define DateIvlMayMeetBeforeUnknownBeg: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2010, 1, 1, 0, 0, 0, 0)] meets before Interval(null, DateTime(2013, 1, 1, 0, 0, 0, 0))
-define PosInfEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
-define PosInfEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null] meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)]
-define DateIvlNotMeetsPosInfEnd: Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2020, 1, 1, 0, 0, 0, 0)] meets before Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null]
-define UnknownEndMeetsAfterDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets before Interval[DateTime(2010, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
-define UnknownEndMayMeetBeforeDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets before Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)]
-define UnknownEndNotMeetsDateIvl: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null) meets before Interval[DateTime(2000, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateIvlMayMeetAfterUnknownEnd: Interval[DateTime(2020, 1, 1, 0, 0, 0, 0), DateTime(2040, 1, 1, 0, 0, 0, 0)] meets before Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), null)
-*/
-
-module.exports['MeetsBefore'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "2622",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
-      }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "214",
-            "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterIntIvl", ": " ]
-            }, {
-              "r" : "225",
-              "s" : [ {
-                "r" : "217",
-                "s" : [ {
-                  "r" : "215",
-                  "value" : [ "Interval[", "11", ", ", "15", "]" ]
-                } ]
-              }, {
-                "r" : "225",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "222",
-                "s" : [ {
-                  "r" : "220",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "225",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "226",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "227",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "228",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "217",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "218",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "219",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "11",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "15",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "222",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "223",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "224",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "232",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "232",
-            "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeIntIvl", ": " ]
-            }, {
-              "r" : "243",
-              "s" : [ {
-                "r" : "235",
-                "s" : [ {
-                  "r" : "233",
-                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
-                } ]
-              }, {
-                "r" : "243",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "240",
-                "s" : [ {
-                  "r" : "238",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "243",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "244",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "245",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "246",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "247",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "235",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "236",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "237",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "233",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "234",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "240",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "241",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "242",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "238",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "250",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "250",
-            "s" : [ {
-              "value" : [ "", "define ", "NotMeetsIntIvl", ": " ]
-            }, {
-              "r" : "261",
-              "s" : [ {
-                "r" : "253",
-                "s" : [ {
-                  "r" : "251",
-                  "value" : [ "Interval[", "1", ", ", "2", "]" ]
-                } ]
-              }, {
-                "r" : "261",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "258",
-                "s" : [ {
-                  "r" : "256",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "261",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "262",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "263",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "265",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "253",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "254",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "255",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "258",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "259",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "260",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "256",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "257",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "268",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterRealIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "268",
-            "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterRealIvl", ": " ]
-            }, {
-              "r" : "279",
-              "s" : [ {
-                "r" : "271",
-                "s" : [ {
-                  "r" : "269",
-                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
-                } ]
-              }, {
-                "r" : "279",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "276",
-                "s" : [ {
-                  "r" : "274",
-                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "279",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "280",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "281",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "282",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "283",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "271",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "272",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "273",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.50000001",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "276",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "277",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "278",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "2209",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2210",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2211",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2212",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.5",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "286",
+        "localId" : "2240",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeRealIvl",
+        "name" : "UnknownBegNotMeetsDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "286",
+            "r" : "2240",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeRealIvl", ": " ]
+              "value" : [ "", "define ", "UnknownBegNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "297",
+              "r" : "2321",
               "s" : [ {
-                "r" : "289",
+                "r" : "2266",
                 "s" : [ {
-                  "r" : "287",
-                  "value" : [ "Interval[", "0.5", ", ", "1.5", "]" ]
+                  "r" : "2241",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2258",
+                  "s" : [ {
+                    "r" : "2242",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "297",
+                "r" : "2321",
                 "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "294",
+                "r" : "2318",
                 "s" : [ {
-                  "r" : "292",
-                  "value" : [ "Interval[", "1.50000001", ", ", "2.5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2286",
+                  "s" : [ {
+                    "r" : "2270",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2310",
+                  "s" : [ {
+                    "r" : "2294",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -127247,127 +153892,425 @@ module.exports['MeetsBefore'] = {
         } ],
         "expression" : {
           "type" : "MeetsBefore",
-          "localId" : "297",
+          "localId" : "2321",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "298",
+            "localId" : "2322",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "299",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "2323",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "300",
+            "localId" : "2324",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "301",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "2325",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "289",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2266",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "290",
+              "localId" : "2268",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "291",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "2269",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "287",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.5",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "2267",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2241",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "288",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2258",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2259",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2260",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2261",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2262",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2263",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2264",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2265",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2242",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2243",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2244",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2245",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2246",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2247",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2248",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "294",
+            "localId" : "2318",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "295",
+              "localId" : "2319",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "296",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "2320",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.50000001",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2286",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2287",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2288",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2289",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2290",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2291",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2292",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2293",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2270",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2271",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2272",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2273",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2274",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2275",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2276",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2310",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2311",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2312",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2313",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2314",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2315",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2316",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2317",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2294",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2020",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2295",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2296",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2297",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2298",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2299",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2300",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "304",
+        "localId" : "2328",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsRealIvl",
+        "name" : "DateIvlMayMeetBeforeUnknownBeg",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "304",
+            "r" : "2328",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsRealIvl", ": " ]
+              "value" : [ "", "define ", "DateIvlMayMeetBeforeUnknownBeg", ": " ]
             }, {
-              "r" : "315",
+              "r" : "2409",
               "s" : [ {
-                "r" : "307",
+                "r" : "2377",
                 "s" : [ {
-                  "r" : "305",
-                  "value" : [ "Interval[", "0.0", ", ", "1.0", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2345",
+                  "s" : [ {
+                    "r" : "2329",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2369",
+                  "s" : [ {
+                    "r" : "2353",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "315",
+                "r" : "2409",
                 "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "312",
+                "r" : "2405",
                 "s" : [ {
-                  "r" : "310",
-                  "value" : [ "Interval[", "1.1", ", ", "2.0", "]" ]
+                  "r" : "2380",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "2397",
+                  "s" : [ {
+                    "r" : "2381",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -127375,510 +154318,533 @@ module.exports['MeetsBefore'] = {
         } ],
         "expression" : {
           "type" : "MeetsBefore",
-          "localId" : "315",
+          "localId" : "2409",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "316",
+            "localId" : "2410",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "317",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "2411",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "318",
+            "localId" : "2412",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "319",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "2413",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "307",
+            "localId" : "2377",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "308",
+              "localId" : "2378",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "309",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "2379",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "305",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.0",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2346",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2347",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2348",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2349",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2350",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2351",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2352",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2329",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2000",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2330",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2331",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2332",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2333",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2334",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2335",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "306",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2369",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2370",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2371",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2372",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2373",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2374",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2375",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2376",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2353",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2010",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2354",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2355",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2356",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2357",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2358",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2359",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "312",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2405",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "313",
+              "localId" : "2407",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "314",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "2408",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "310",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.1",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "2406",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2380",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "311",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.0",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "322",
-        "name" : "DateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "322",
-            "s" : [ {
-              "value" : [ "", "define ", "DateIvl", ": " ]
-            }, {
-              "r" : "371",
-              "s" : [ {
-                "value" : [ "Interval[" ]
+              "type" : "DateTime",
+              "localId" : "2397",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2398",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "339",
-                "s" : [ {
-                  "r" : "323",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2399",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "value" : [ ", " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2400",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "363",
-                "s" : [ {
-                  "r" : "347",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2401",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "374",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "375",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "371",
-          "lowClosed" : true,
-          "highClosed" : false,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "372",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "373",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "339",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "340",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "341",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "342",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "343",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "344",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "345",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "346",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "323",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "324",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "325",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "326",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "327",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "328",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "329",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "363",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "364",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "365",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "366",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "367",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "368",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "369",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "370",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "347",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "348",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "349",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "350",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "351",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "352",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "353",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2402",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2403",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2404",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2381",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2382",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2383",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2384",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2385",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2386",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2387",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "378",
+        "localId" : "2416",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterDateIvl",
+        "name" : "PosInfEndMeetsAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "378",
+            "r" : "2416",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndMeetsAfterDateIvl", ": " ]
             }, {
-              "r" : "433",
+              "r" : "2497",
               "s" : [ {
-                "r" : "427",
+                "r" : "2442",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "395",
+                  "r" : "2433",
                   "s" : [ {
-                    "r" : "379",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2417",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2441",
+                  "value" : [ ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "2497",
+                "value" : [ " ", "meets before", " " ]
+              }, {
+                "r" : "2494",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2462",
+                  "s" : [ {
+                    "r" : "2446",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "419",
+                  "r" : "2486",
                   "s" : [ {
-                    "r" : "403",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2470",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ")" ]
                 } ]
-              }, {
-                "r" : "433",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "430",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "MeetsBefore",
-          "localId" : "433",
+          "localId" : "2497",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "434",
+            "localId" : "2498",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "435",
+              "localId" : "2499",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "436",
+            "localId" : "2500",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "437",
+              "localId" : "2501",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "427",
+            "localId" : "2442",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "428",
+              "localId" : "2444",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "429",
+                "localId" : "2445",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "395",
+              "localId" : "2433",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "396",
+                "localId" : "2434",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "397",
+                "localId" : "2435",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "398",
+                "localId" : "2436",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "399",
+                "localId" : "2437",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "400",
+                "localId" : "2438",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "401",
+                "localId" : "2439",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "402",
+                "localId" : "2440",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "379",
+                "localId" : "2417",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "380",
+                "localId" : "2418",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "381",
+                "localId" : "2419",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -127886,7 +154852,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "382",
+                "localId" : "2420",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -127894,7 +154860,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "383",
+                "localId" : "2421",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -127902,7 +154868,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "384",
+                "localId" : "2422",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -127910,7 +154876,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "385",
+                "localId" : "2423",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -127918,65 +154884,95 @@ module.exports['MeetsBefore'] = {
               }
             },
             "high" : {
+              "type" : "As",
+              "localId" : "2443",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2441",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2494",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2495",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2496",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "DateTime",
-              "localId" : "419",
+              "localId" : "2462",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "420",
+                "localId" : "2463",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "421",
+                "localId" : "2464",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "422",
+                "localId" : "2465",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "423",
+                "localId" : "2466",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "424",
+                "localId" : "2467",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "425",
+                "localId" : "2468",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "426",
+                "localId" : "2469",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "403",
+                "localId" : "2446",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "404",
+                "localId" : "2447",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "405",
+                "localId" : "2448",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -127984,7 +154980,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "406",
+                "localId" : "2449",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -127992,7 +154988,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "407",
+                "localId" : "2450",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128000,7 +154996,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "408",
+                "localId" : "2451",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128008,74 +155004,165 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "409",
+                "localId" : "2452",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "430",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "431",
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2486",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "432",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2487",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2488",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2489",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2490",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2491",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2492",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2493",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2470",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2471",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2472",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2473",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2474",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2475",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2476",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "440",
+        "localId" : "2504",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeDateIvl",
+        "name" : "PosInfEndNotMeetsDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "440",
+            "r" : "2504",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "PosInfEndNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "495",
+              "r" : "2585",
               "s" : [ {
-                "r" : "489",
+                "r" : "2530",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "457",
-                  "s" : [ {
-                    "r" : "441",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "481",
+                  "r" : "2521",
                   "s" : [ {
-                    "r" : "465",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2505",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "r" : "2529",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "495",
+                "r" : "2585",
                 "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "492",
+                "r" : "2582",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2550",
+                  "s" : [ {
+                    "r" : "2534",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2574",
+                  "s" : [ {
+                    "r" : "2558",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -128083,99 +155170,99 @@ module.exports['MeetsBefore'] = {
         } ],
         "expression" : {
           "type" : "MeetsBefore",
-          "localId" : "495",
+          "localId" : "2585",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "496",
+            "localId" : "2586",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "497",
+              "localId" : "2587",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "498",
+            "localId" : "2588",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "499",
+              "localId" : "2589",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "489",
+            "localId" : "2530",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "490",
+              "localId" : "2532",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "491",
+                "localId" : "2533",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "457",
+              "localId" : "2521",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "458",
+                "localId" : "2522",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "459",
+                "localId" : "2523",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "460",
+                "localId" : "2524",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "461",
+                "localId" : "2525",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "462",
+                "localId" : "2526",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "463",
+                "localId" : "2527",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "464",
+                "localId" : "2528",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "441",
+                "localId" : "2505",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "442",
+                "localId" : "2506",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -128183,7 +155270,7 @@ module.exports['MeetsBefore'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "443",
+                "localId" : "2507",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -128191,7 +155278,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "444",
+                "localId" : "2508",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128199,7 +155286,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "445",
+                "localId" : "2509",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128207,7 +155294,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "446",
+                "localId" : "2510",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128215,7 +155302,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "447",
+                "localId" : "2511",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128223,65 +155310,95 @@ module.exports['MeetsBefore'] = {
               }
             },
             "high" : {
+              "type" : "As",
+              "localId" : "2531",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2529",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2582",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2583",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2584",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "DateTime",
-              "localId" : "481",
+              "localId" : "2550",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "482",
+                "localId" : "2551",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "483",
+                "localId" : "2552",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "484",
+                "localId" : "2553",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "485",
+                "localId" : "2554",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "486",
+                "localId" : "2555",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "487",
+                "localId" : "2556",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "488",
+                "localId" : "2557",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "465",
+                "localId" : "2534",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "466",
+                "localId" : "2535",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "467",
+                "localId" : "2536",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -128289,7 +155406,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "468",
+                "localId" : "2537",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128297,7 +155414,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "469",
+                "localId" : "2538",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128305,7 +155422,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "470",
+                "localId" : "2539",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128313,74 +155430,165 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "471",
+                "localId" : "2540",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "492",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "493",
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2574",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "494",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2575",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2576",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2577",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2578",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2579",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2580",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2581",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2558",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2020",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2559",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2560",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2561",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2562",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2563",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2564",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "502",
+        "localId" : "2592",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsDateIvl",
+        "name" : "DateIvlNotMeetsPosInfEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "502",
+            "r" : "2592",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "DateIvlNotMeetsPosInfEnd", ": " ]
             }, {
-              "r" : "557",
+              "r" : "2673",
               "s" : [ {
-                "r" : "551",
+                "r" : "2641",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "519",
+                  "r" : "2609",
                   "s" : [ {
-                    "r" : "503",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2593",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "543",
+                  "r" : "2633",
                   "s" : [ {
-                    "r" : "527",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2617",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "557",
+                "r" : "2673",
                 "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "554",
+                "r" : "2669",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2660",
+                  "s" : [ {
+                    "r" : "2644",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2668",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
             } ]
@@ -128388,99 +155596,99 @@ module.exports['MeetsBefore'] = {
         } ],
         "expression" : {
           "type" : "MeetsBefore",
-          "localId" : "557",
+          "localId" : "2673",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "558",
+            "localId" : "2674",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "559",
+              "localId" : "2675",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "560",
+            "localId" : "2676",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "561",
+              "localId" : "2677",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "551",
+            "localId" : "2641",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "552",
+              "localId" : "2642",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "553",
+                "localId" : "2643",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "519",
+              "localId" : "2609",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "520",
+                "localId" : "2610",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "521",
+                "localId" : "2611",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "522",
+                "localId" : "2612",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "523",
+                "localId" : "2613",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "524",
+                "localId" : "2614",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "525",
+                "localId" : "2615",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "526",
+                "localId" : "2616",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "503",
+                "localId" : "2593",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "504",
+                "localId" : "2594",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -128488,7 +155696,7 @@ module.exports['MeetsBefore'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "505",
+                "localId" : "2595",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -128496,7 +155704,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "506",
+                "localId" : "2596",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128504,7 +155712,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "507",
+                "localId" : "2597",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128512,7 +155720,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "508",
+                "localId" : "2598",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128520,7 +155728,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "509",
+                "localId" : "2599",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128529,72 +155737,72 @@ module.exports['MeetsBefore'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "543",
+              "localId" : "2633",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "544",
+                "localId" : "2634",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "545",
+                "localId" : "2635",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "546",
+                "localId" : "2636",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "547",
+                "localId" : "2637",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "548",
+                "localId" : "2638",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "549",
+                "localId" : "2639",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "550",
+                "localId" : "2640",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "527",
+                "localId" : "2617",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "528",
+                "localId" : "2618",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "529",
+                "localId" : "2619",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "29",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "530",
+                "localId" : "2620",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128602,7 +155810,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "531",
+                "localId" : "2621",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128610,7 +155818,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "532",
+                "localId" : "2622",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128618,7 +155826,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "533",
+                "localId" : "2623",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -128626,66 +155834,187 @@ module.exports['MeetsBefore'] = {
               }
             }
           }, {
-            "type" : "ExpressionRef",
-            "localId" : "554",
-            "name" : "DateIvl",
+            "type" : "Interval",
+            "localId" : "2669",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "555",
+              "localId" : "2671",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "556",
+                "localId" : "2672",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2660",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2661",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2662",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2663",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2664",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2665",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2666",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2667",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2644",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2645",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2646",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2647",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2648",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2649",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2650",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2670",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2668",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "564",
+        "localId" : "2680",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetAfterImpreciseDateIvl",
+        "name" : "UnknownEndMeetsAfterDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "564",
+            "r" : "2680",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetAfterImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMeetsAfterDateIvl", ": " ]
             }, {
-              "r" : "589",
+              "r" : "2761",
               "s" : [ {
-                "r" : "565",
+                "r" : "2706",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2697",
+                  "s" : [ {
+                    "r" : "2681",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2705",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "589",
+                "r" : "2761",
                 "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "586",
+                "r" : "2758",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "574",
+                  "r" : "2726",
                   "s" : [ {
-                    "r" : "568",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "2710",
+                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "583",
+                  "r" : "2750",
                   "s" : [ {
-                    "r" : "577",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
+                    "r" : "2734",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -128693,346 +156022,422 @@ module.exports['MeetsBefore'] = {
         } ],
         "expression" : {
           "type" : "MeetsBefore",
-          "localId" : "589",
+          "localId" : "2761",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "590",
+            "localId" : "2762",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "591",
+              "localId" : "2763",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "592",
+            "localId" : "2764",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "593",
+              "localId" : "2765",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "565",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "566",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "567",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "586",
+            "localId" : "2706",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "587",
+              "localId" : "2708",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "588",
+                "localId" : "2709",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "574",
+              "localId" : "2697",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "575",
+                "localId" : "2698",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "576",
+                "localId" : "2699",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2700",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2701",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2702",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2703",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2704",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "568",
+                "localId" : "2681",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "569",
+                "localId" : "2682",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "583",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "584",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2683",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "585",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2684",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "577",
+                "localId" : "2685",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "month" : {
+              "second" : {
                 "type" : "Literal",
-                "localId" : "578",
+                "localId" : "2686",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2687",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "596",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetBeforeImpreciseDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "596",
-            "s" : [ {
-              "value" : [ "", "define ", "MayMeetBeforeImpreciseDateIvl", ": " ]
-            }, {
-              "r" : "621",
-              "s" : [ {
-                "r" : "597",
-                "s" : [ {
-                  "value" : [ "DateIvl" ]
-                } ]
-              }, {
-                "r" : "621",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "618",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "606",
-                  "s" : [ {
-                    "r" : "600",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "615",
-                  "s" : [ {
-                    "r" : "609",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "621",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "622",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "623",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "624",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "625",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "597",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "598",
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2707",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "599",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2705",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "618",
+            "localId" : "2758",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "619",
+              "localId" : "2759",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "620",
+                "localId" : "2760",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "606",
+              "localId" : "2726",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "607",
+                "localId" : "2727",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2728",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2729",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2730",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2731",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2732",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "608",
+                "localId" : "2733",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "600",
+                "localId" : "2710",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2010",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "601",
+                "localId" : "2711",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2712",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2713",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2714",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2715",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2716",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "615",
+              "localId" : "2750",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "616",
+                "localId" : "2751",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "617",
+                "localId" : "2752",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2753",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2754",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2755",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2756",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2757",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "609",
+                "localId" : "2734",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "610",
+                "localId" : "2735",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2736",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2737",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2738",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2739",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2740",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "628",
+        "localId" : "2768",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsImpreciseDateIvl",
+        "name" : "UnknownEndMayMeetBeforeDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "628",
+            "r" : "2768",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsImpreciseDateIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndMayMeetBeforeDateIvl", ": " ]
             }, {
-              "r" : "653",
+              "r" : "2849",
               "s" : [ {
-                "r" : "629",
+                "r" : "2794",
                 "s" : [ {
-                  "value" : [ "DateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2785",
+                  "s" : [ {
+                    "r" : "2769",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2793",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "653",
+                "r" : "2849",
                 "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "650",
+                "r" : "2846",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "638",
+                  "r" : "2814",
                   "s" : [ {
-                    "r" : "632",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "2798",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "647",
+                  "r" : "2838",
                   "s" : [ {
-                    "r" : "641",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
+                    "r" : "2822",
+                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -129043,552 +156448,227 @@ module.exports['MeetsBefore'] = {
         } ],
         "expression" : {
           "type" : "MeetsBefore",
-          "localId" : "653",
+          "localId" : "2849",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "654",
+            "localId" : "2850",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "655",
+              "localId" : "2851",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "656",
+            "localId" : "2852",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "657",
+              "localId" : "2853",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "629",
-            "name" : "DateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "630",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "631",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "650",
+            "localId" : "2794",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "651",
+              "localId" : "2796",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "652",
+                "localId" : "2797",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "638",
+              "localId" : "2785",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "639",
+                "localId" : "2786",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "640",
+                "localId" : "2787",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2788",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2789",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2790",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2791",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2792",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "632",
+                "localId" : "2769",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "633",
+                "localId" : "2770",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "647",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "648",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2771",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "649",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2772",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "641",
+                "localId" : "2773",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "month" : {
+              "second" : {
                 "type" : "Literal",
-                "localId" : "642",
+                "localId" : "2774",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2775",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "660",
-        "name" : "PrecisionDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "660",
-            "s" : [ {
-              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
-            }, {
-              "r" : "709",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "677",
-                "s" : [ {
-                  "r" : "661",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "701",
-                "s" : [ {
-                  "r" : "685",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "712",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "713",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "709",
-          "lowClosed" : true,
-          "highClosed" : false,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "710",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "711",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "677",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "678",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "679",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "680",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "681",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "682",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "683",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "684",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "661",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "662",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "663",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "664",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "665",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "34",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "666",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "56",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "667",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "789",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "701",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "702",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "703",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "704",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "705",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "706",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "707",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "708",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "685",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "686",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "687",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "688",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "689",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "690",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "45",
-              "annotation" : [ ]
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "691",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "678",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "716",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsAfterDayOfIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "716",
-            "s" : [ {
-              "value" : [ "", "define ", "MeetsAfterDayOfIvl", ": " ]
-            }, {
-              "r" : "771",
-              "s" : [ {
-                "r" : "717",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "771",
-                "value" : [ " ", "meets before day of", " " ]
-              }, {
-                "r" : "768",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "736",
-                  "s" : [ {
-                    "r" : "720",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "760",
-                  "s" : [ {
-                    "r" : "744",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "771",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "772",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "773",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "774",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "775",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "717",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "718",
+            "high" : {
+              "type" : "As",
+              "localId" : "2795",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "719",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2793",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "768",
+            "localId" : "2846",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "769",
+              "localId" : "2847",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "770",
+                "localId" : "2848",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "736",
+              "localId" : "2814",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "737",
+                "localId" : "2815",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "738",
+                "localId" : "2816",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "739",
+                "localId" : "2817",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "740",
+                "localId" : "2818",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "741",
+                "localId" : "2819",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "742",
+                "localId" : "2820",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "743",
+                "localId" : "2821",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "720",
+                "localId" : "2798",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "721",
+                "localId" : "2799",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -129596,15 +156676,15 @@ module.exports['MeetsBefore'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "722",
+                "localId" : "2800",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "723",
+                "localId" : "2801",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129612,7 +156692,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "724",
+                "localId" : "2802",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129620,7 +156700,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "725",
+                "localId" : "2803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129628,7 +156708,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "726",
+                "localId" : "2804",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129637,64 +156717,64 @@ module.exports['MeetsBefore'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "760",
+              "localId" : "2838",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "761",
+                "localId" : "2839",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "762",
+                "localId" : "2840",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "763",
+                "localId" : "2841",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "764",
+                "localId" : "2842",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "765",
+                "localId" : "2843",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
+                "localId" : "2844",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "767",
+                "localId" : "2845",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "744",
+                "localId" : "2822",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2040",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "745",
+                "localId" : "2823",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "746",
+                "localId" : "2824",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -129702,7 +156782,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "747",
+                "localId" : "2825",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129710,7 +156790,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "748",
+                "localId" : "2826",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129718,7 +156798,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "749",
+                "localId" : "2827",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129726,7 +156806,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "750",
+                "localId" : "2828",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129736,45 +156816,54 @@ module.exports['MeetsBefore'] = {
           } ]
         }
       }, {
-        "localId" : "778",
+        "localId" : "2856",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MeetsBeforeDayOfIvl",
+        "name" : "UnknownEndNotMeetsDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "778",
+            "r" : "2856",
             "s" : [ {
-              "value" : [ "", "define ", "MeetsBeforeDayOfIvl", ": " ]
+              "value" : [ "", "define ", "UnknownEndNotMeetsDateIvl", ": " ]
             }, {
-              "r" : "833",
+              "r" : "2937",
               "s" : [ {
-                "r" : "779",
+                "r" : "2882",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2873",
+                  "s" : [ {
+                    "r" : "2857",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "2881",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               }, {
-                "r" : "833",
-                "value" : [ " ", "meets before day of", " " ]
+                "r" : "2937",
+                "value" : [ " ", "meets before", " " ]
               }, {
-                "r" : "830",
+                "r" : "2934",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "798",
+                  "r" : "2902",
                   "s" : [ {
-                    "r" : "782",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2886",
+                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "822",
+                  "r" : "2926",
                   "s" : [ {
-                    "r" : "806",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2910",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -129785,132 +156874,243 @@ module.exports['MeetsBefore'] = {
         } ],
         "expression" : {
           "type" : "MeetsBefore",
-          "localId" : "833",
+          "localId" : "2937",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "834",
+            "localId" : "2938",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "835",
+              "localId" : "2939",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "836",
+            "localId" : "2940",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "837",
+              "localId" : "2941",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "779",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "2882",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "780",
+              "localId" : "2884",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "781",
+                "localId" : "2885",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2873",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2874",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2875",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2876",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2877",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2878",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2879",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2880",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2857",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2858",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2859",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2860",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2861",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2862",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2863",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2883",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2881",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "830",
+            "localId" : "2934",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "831",
+              "localId" : "2935",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "832",
+                "localId" : "2936",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "798",
+              "localId" : "2902",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "799",
+                "localId" : "2903",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "800",
+                "localId" : "2904",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "801",
+                "localId" : "2905",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "802",
+                "localId" : "2906",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "803",
+                "localId" : "2907",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "804",
+                "localId" : "2908",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "805",
+                "localId" : "2909",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "782",
+                "localId" : "2886",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2000",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "783",
+                "localId" : "2887",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "784",
+                "localId" : "2888",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "785",
+                "localId" : "2889",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129918,7 +157118,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "786",
+                "localId" : "2890",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129926,7 +157126,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "787",
+                "localId" : "2891",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129934,7 +157134,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "788",
+                "localId" : "2892",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -129943,64 +157143,64 @@ module.exports['MeetsBefore'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "822",
+              "localId" : "2926",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "823",
+                "localId" : "2927",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "824",
+                "localId" : "2928",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "825",
+                "localId" : "2929",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "826",
+                "localId" : "2930",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "827",
+                "localId" : "2931",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "828",
+                "localId" : "2932",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "829",
+                "localId" : "2933",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "806",
+                "localId" : "2910",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "807",
+                "localId" : "2911",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "808",
+                "localId" : "2912",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -130008,7 +157208,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "809",
+                "localId" : "2913",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130016,7 +157216,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "810",
+                "localId" : "2914",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130024,7 +157224,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "811",
+                "localId" : "2915",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130032,7 +157232,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "812",
+                "localId" : "2916",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130042,165 +157242,157 @@ module.exports['MeetsBefore'] = {
           } ]
         }
       }, {
-        "localId" : "840",
+        "localId" : "2944",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsDayOfIvl",
+        "name" : "DateIvlMayMeetAfterUnknownEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "840",
+            "r" : "2944",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsDayOfIvl", ": " ]
+              "value" : [ "", "define ", "DateIvlMayMeetAfterUnknownEnd", ": " ]
             }, {
-              "r" : "895",
+              "r" : "3025",
               "s" : [ {
-                "r" : "841",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "895",
-                "value" : [ " ", "meets before day of", " " ]
-              }, {
-                "r" : "892",
+                "r" : "2993",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "860",
+                  "r" : "2961",
                   "s" : [ {
-                    "r" : "844",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2945",
+                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "884",
+                  "r" : "2985",
                   "s" : [ {
-                    "r" : "868",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2969",
+                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "r" : "3025",
+                "value" : [ " ", "meets before", " " ]
+              }, {
+                "r" : "3021",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "3012",
+                  "s" : [ {
+                    "r" : "2996",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "r" : "3020",
+                  "value" : [ ", ", "null", ")" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "MeetsBefore",
-          "localId" : "895",
+          "localId" : "3025",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "896",
+            "localId" : "3026",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "897",
+              "localId" : "3027",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "898",
+            "localId" : "3028",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "899",
+              "localId" : "3029",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "841",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "842",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "843",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "892",
+            "localId" : "2993",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "893",
+              "localId" : "2994",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "894",
+                "localId" : "2995",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "860",
+              "localId" : "2961",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "861",
+                "localId" : "2962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "862",
+                "localId" : "2963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "863",
+                "localId" : "2964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "864",
+                "localId" : "2965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "865",
+                "localId" : "2966",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "866",
+                "localId" : "2967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "867",
+                "localId" : "2968",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "844",
+                "localId" : "2945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2020",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "845",
+                "localId" : "2946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -130208,15 +157400,15 @@ module.exports['MeetsBefore'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "846",
+                "localId" : "2947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "847",
+                "localId" : "2948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130224,7 +157416,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "848",
+                "localId" : "2949",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130232,7 +157424,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "849",
+                "localId" : "2950",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130240,7 +157432,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "850",
+                "localId" : "2951",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130249,72 +157441,187 @@ module.exports['MeetsBefore'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "884",
+              "localId" : "2985",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "885",
+                "localId" : "2986",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "886",
+                "localId" : "2987",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "887",
+                "localId" : "2988",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "888",
+                "localId" : "2989",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "889",
+                "localId" : "2990",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "890",
+                "localId" : "2991",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "891",
+                "localId" : "2992",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2969",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2040",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2970",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2971",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2972",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2973",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2974",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2975",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "3021",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "3023",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3024",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "3012",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3013",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3014",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3015",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3016",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3017",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3018",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "3019",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "868",
+                "localId" : "2996",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "869",
+                "localId" : "2997",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "870",
+                "localId" : "2998",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "871",
+                "localId" : "2999",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130322,7 +157629,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "872",
+                "localId" : "3000",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130330,7 +157637,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "873",
+                "localId" : "3001",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -130338,6928 +157645,5582 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "874",
+                "localId" : "3002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "3022",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "3020",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* Overlaps
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define OverlapsBeforeIntIvl: Interval[1, 5] overlaps Interval[2, 7]
+define OverlapsAfterIntIvl: Interval[3, 8] overlaps Interval[1, 6]
+define OverlapsBoundaryIntIvl: Interval[1, 5] overlaps Interval[5, 10]
+define NoOverlapsIntIvl: Interval[1,5) overlaps Interval[5, 10]
+define OverlapsBeforeLongIvl: Interval[1L, 5L] overlaps Interval[2L, 7L]
+define OverlapsAfterLongIvl: Interval[3L, 8L] overlaps Interval[1L, 6L]
+define OverlapsBoundaryLongIvl: Interval[1L, 5L] overlaps Interval[5L, 10L]
+define NoOverlapsLongIvl: Interval[1L,5L) overlaps Interval[5L, 10L]
+define OverlapsBeforeRealIvl: Interval[1.234, 1.567] overlaps Interval[1.345, 1.678]
+define OverlapsAfterRealIvl: Interval[1.345, 1.678] overlaps Interval[1.234, 1.567]
+define OverlapsBoundaryRealIvl: Interval[1.0, 1.234] overlaps Interval[1.234, 2.0]
+define NoOverlapsRealIvl: Interval[1.0, 1.23456789) overlaps Interval[1.23456789, 2.0]
+define OverlapsClosedNullIntervalLHS: Interval[null, null] overlaps Interval[6, 10]
+define OverlapsClosedNullIntervalRHS: Interval[6, 10] overlaps Interval[null, null]
+define OverlapsIsNull: Interval[6, 10] overlaps (null as Interval<Integer>)
+*/
+
+module.exports['Overlaps'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "480",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "902",
+        "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotMeetsDayOfImpreciseIVL",
+        "name" : "OverlapsBeforeIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "902",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "NotMeetsDayOfImpreciseIVL", ": " ]
+              "value" : [ "", "define ", "OverlapsBeforeIntIvl", ": " ]
             }, {
-              "r" : "927",
+              "r" : "225",
               "s" : [ {
-                "r" : "903",
+                "r" : "217",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "215",
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "927",
-                "value" : [ " ", "meets before day of", " " ]
+                "r" : "225",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "924",
+                "r" : "222",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "912",
-                  "s" : [ {
-                    "r" : "906",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "921",
-                  "s" : [ {
-                    "r" : "915",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "220",
+                  "value" : [ "Interval[", "2", ", ", "7", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "927",
+          "type" : "Overlaps",
+          "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "928",
+            "localId" : "226",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "929",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "227",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "930",
+            "localId" : "228",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "931",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "903",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "217",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "904",
+              "localId" : "218",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "905",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "219",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "924",
+            "localId" : "222",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "925",
+              "localId" : "223",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "926",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "912",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "913",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "914",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "906",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "907",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "921",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "922",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "923",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "915",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "916",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "7",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "934",
+        "localId" : "232",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetAfterDayOfImpreciseIvl",
+        "name" : "OverlapsAfterIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "934",
+            "r" : "232",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetAfterDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsAfterIntIvl", ": " ]
             }, {
-              "r" : "959",
+              "r" : "243",
               "s" : [ {
-                "r" : "935",
+                "r" : "235",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "233",
+                  "value" : [ "Interval[", "3", ", ", "8", "]" ]
                 } ]
               }, {
-                "r" : "959",
-                "value" : [ " ", "meets before day of", " " ]
+                "r" : "243",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "956",
+                "r" : "240",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "944",
-                  "s" : [ {
-                    "r" : "938",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "953",
-                  "s" : [ {
-                    "r" : "947",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "238",
+                  "value" : [ "Interval[", "1", ", ", "6", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "959",
+          "type" : "Overlaps",
+          "localId" : "243",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "960",
+            "localId" : "244",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "961",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "245",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "962",
+            "localId" : "246",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "963",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "247",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "935",
-            "name" : "PrecisionDateIvl",
+            "type" : "Interval",
+            "localId" : "235",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "936",
+              "localId" : "236",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "937",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "237",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "233",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "8",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "956",
+            "localId" : "240",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "957",
+              "localId" : "241",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "958",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "242",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "944",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "945",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "946",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "938",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "939",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "238",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "953",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "954",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "955",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "947",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "948",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "966",
+        "localId" : "250",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayMeetBeforeDayOfImpreciseIvl",
+        "name" : "OverlapsBoundaryIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "966",
+            "r" : "250",
             "s" : [ {
-              "value" : [ "", "define ", "MayMeetBeforeDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsBoundaryIntIvl", ": " ]
             }, {
-              "r" : "991",
+              "r" : "261",
               "s" : [ {
-                "r" : "967",
+                "r" : "253",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "251",
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               }, {
-                "r" : "991",
-                "value" : [ " ", "meets before day of", " " ]
+                "r" : "261",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "988",
+                "r" : "258",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "976",
-                  "s" : [ {
-                    "r" : "970",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "985",
-                  "s" : [ {
-                    "r" : "979",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "256",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "991",
+          "type" : "Overlaps",
+          "localId" : "261",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "992",
+            "localId" : "262",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "993",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "263",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "994",
+            "localId" : "264",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "995",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "265",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "967",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "968",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "969",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "988",
+            "localId" : "253",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "989",
+              "localId" : "254",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "990",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "976",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "977",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "978",
+                "localId" : "255",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "970",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "971",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
               }
             },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "985",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "986",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "987",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "979",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "980",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "998",
-        "name" : "ImpDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "998",
-            "s" : [ {
-              "value" : [ "", "define ", "ImpDateIvl", ": " ]
-            }, {
-              "r" : "1017",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "1005",
-                "s" : [ {
-                  "r" : "999",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "1014",
-                "s" : [ {
-                  "r" : "1008",
-                  "value" : [ "DateTime", "(", "2012", ", ", "8", ")" ]
-                } ]
-              }, {
-                "value" : [ "]" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1020",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1021",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "1017",
-          "lowClosed" : true,
-          "highClosed" : true,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1018",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1019",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "1005",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1006",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1007",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "999",
+              "localId" : "251",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "1",
               "annotation" : [ ]
             },
-            "month" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1000",
+              "localId" : "252",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "5",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "1014",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "Interval",
+            "localId" : "258",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1015",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1016",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "259",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "260",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "1008",
+              "localId" : "256",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "5",
               "annotation" : [ ]
             },
-            "month" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "1009",
+              "localId" : "257",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
+              "value" : "10",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "1024",
+        "localId" : "268",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayMeetAfterDateIvl",
+        "name" : "NoOverlapsIntIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1024",
+            "r" : "268",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayMeetAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "NoOverlapsIntIvl", ": " ]
             }, {
-              "r" : "1079",
+              "r" : "279",
               "s" : [ {
-                "r" : "1025",
+                "r" : "271",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "r" : "269",
+                  "value" : [ "Interval[", "1", ",", "5", ")" ]
                 } ]
               }, {
-                "r" : "1079",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "279",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1076",
+                "r" : "276",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1044",
-                  "s" : [ {
-                    "r" : "1028",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1068",
-                  "s" : [ {
-                    "r" : "1052",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "29", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "274",
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1079",
+          "type" : "Overlaps",
+          "localId" : "279",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1080",
+            "localId" : "280",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1081",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "281",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1082",
+            "localId" : "282",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1083",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "283",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1025",
-            "name" : "ImpDateIvl",
+            "type" : "Interval",
+            "localId" : "271",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1026",
+              "localId" : "272",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1027",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "273",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1076",
+            "localId" : "276",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1077",
+              "localId" : "277",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1078",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "278",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1044",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1045",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1046",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1047",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1048",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1049",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1050",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1051",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1028",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1029",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1030",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1031",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1032",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1033",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1034",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1068",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1069",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1070",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1071",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1072",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1073",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "286",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OverlapsBeforeLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "286",
+            "s" : [ {
+              "value" : [ "", "define ", "OverlapsBeforeLongIvl", ": " ]
+            }, {
+              "r" : "297",
+              "s" : [ {
+                "r" : "289",
+                "s" : [ {
+                  "r" : "287",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1074",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "297",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1075",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1052",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1053",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1054",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "29",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1055",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1056",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1057",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
+                "r" : "294",
+                "s" : [ {
+                  "r" : "292",
+                  "value" : [ "Interval[", "2L", ", ", "7L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Overlaps",
+          "localId" : "297",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "298",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "299",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "300",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "301",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "289",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "290",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1058",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "294",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "295",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "296",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "293",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1086",
+        "localId" : "304",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseMayMeetBeforeDateIvl",
+        "name" : "OverlapsAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1086",
+            "r" : "304",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseMayMeetBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsAfterLongIvl", ": " ]
             }, {
-              "r" : "1141",
+              "r" : "315",
               "s" : [ {
-                "r" : "1087",
+                "r" : "307",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "r" : "305",
+                  "value" : [ "Interval[", "3L", ", ", "8L", "]" ]
                 } ]
               }, {
-                "r" : "1141",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "315",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1138",
+                "r" : "312",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1106",
-                  "s" : [ {
-                    "r" : "1090",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1130",
-                  "s" : [ {
-                    "r" : "1114",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "310",
+                  "value" : [ "Interval[", "1L", ", ", "6L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1141",
+          "type" : "Overlaps",
+          "localId" : "315",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1142",
+            "localId" : "316",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1143",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1144",
+            "localId" : "318",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1145",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "319",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1087",
-            "name" : "ImpDateIvl",
+            "type" : "Interval",
+            "localId" : "307",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1088",
+              "localId" : "308",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1089",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "309",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "8",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1138",
+            "localId" : "312",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1139",
+              "localId" : "313",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1140",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1106",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1107",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1108",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1109",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1110",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1111",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1112",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1113",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1090",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1091",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1092",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1093",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1094",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1095",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1096",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "310",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1130",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1131",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1132",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1133",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1134",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1135",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1136",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1137",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1114",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1115",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1116",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1117",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1118",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1119",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1120",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1148",
+        "localId" : "322",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseNotMeetsDateIvl",
+        "name" : "OverlapsBoundaryLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1148",
+            "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseNotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsBoundaryLongIvl", ": " ]
             }, {
-              "r" : "1203",
+              "r" : "333",
               "s" : [ {
-                "r" : "1149",
+                "r" : "325",
                 "s" : [ {
-                  "value" : [ "ImpDateIvl" ]
+                  "r" : "323",
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
-                "r" : "1203",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "333",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1200",
+                "r" : "330",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1168",
-                  "s" : [ {
-                    "r" : "1152",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1192",
-                  "s" : [ {
-                    "r" : "1176",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "31", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "328",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1203",
+          "type" : "Overlaps",
+          "localId" : "333",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1204",
+            "localId" : "334",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1205",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "335",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1206",
+            "localId" : "336",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1207",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "337",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1149",
-            "name" : "ImpDateIvl",
+            "type" : "Interval",
+            "localId" : "325",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1150",
+              "localId" : "326",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1151",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "327",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "324",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1200",
+            "localId" : "330",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1201",
+              "localId" : "331",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1202",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "332",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1168",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1169",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1170",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1171",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1172",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1173",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "340",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NoOverlapsLongIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "340",
+            "s" : [ {
+              "value" : [ "", "define ", "NoOverlapsLongIvl", ": " ]
+            }, {
+              "r" : "351",
+              "s" : [ {
+                "r" : "343",
+                "s" : [ {
+                  "r" : "341",
+                  "value" : [ "Interval[", "1L", ",", "5L", ")" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1174",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "351",
+                "value" : [ " ", "overlaps", " " ]
               }, {
+                "r" : "348",
+                "s" : [ {
+                  "r" : "346",
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Overlaps",
+          "localId" : "351",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "352",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "353",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "354",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "355",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "343",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "344",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1175",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1152",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1153",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1154",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1155",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1156",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1157",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1158",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "345",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1192",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "348",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "349",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1193",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1194",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1195",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1196",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1197",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1198",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1199",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1176",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1177",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1178",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "31",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1179",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1180",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1181",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1182",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
+                "localId" : "350",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1210",
+        "localId" : "358",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegMeetsBeforeIntIvl",
+        "name" : "OverlapsBeforeRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1210",
+            "r" : "358",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegMeetsBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsBeforeRealIvl", ": " ]
             }, {
-              "r" : "1222",
+              "r" : "369",
               "s" : [ {
-                "r" : "1213",
+                "r" : "361",
                 "s" : [ {
-                  "r" : "1211",
-                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                  "r" : "359",
+                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
                 } ]
               }, {
-                "r" : "1222",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "369",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1219",
+                "r" : "366",
                 "s" : [ {
-                  "r" : "1217",
-                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
+                  "r" : "364",
+                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1222",
+          "type" : "Overlaps",
+          "localId" : "369",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1223",
+            "localId" : "370",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1224",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1225",
+            "localId" : "372",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1226",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1213",
+            "localId" : "361",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1215",
+              "localId" : "362",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1216",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "363",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1214",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1211",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "359",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1212",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "localId" : "360",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.567",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1219",
+            "localId" : "366",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1220",
+              "localId" : "367",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1221",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "101",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.345",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.678",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1229",
+        "localId" : "376",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotMeetsIntIvl",
+        "name" : "OverlapsAfterRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1229",
+            "r" : "376",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotMeetsIntIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsAfterRealIvl", ": " ]
             }, {
-              "r" : "1241",
+              "r" : "387",
               "s" : [ {
-                "r" : "1232",
+                "r" : "379",
                 "s" : [ {
-                  "r" : "1230",
-                  "value" : [ "Interval[", "null", ", ", "100", "]" ]
+                  "r" : "377",
+                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
                 } ]
               }, {
-                "r" : "1241",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "387",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1238",
+                "r" : "384",
                 "s" : [ {
-                  "r" : "1236",
-                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                  "r" : "382",
+                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1241",
+          "type" : "Overlaps",
+          "localId" : "387",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1242",
+            "localId" : "388",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1243",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "389",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1244",
+            "localId" : "390",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1245",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "391",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1232",
+            "localId" : "379",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1234",
+              "localId" : "380",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1235",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "381",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1233",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1230",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "377",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.345",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1231",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "localId" : "378",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.678",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1238",
+            "localId" : "384",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1239",
+              "localId" : "385",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1240",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "386",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1236",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1237",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.567",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1248",
+        "localId" : "394",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlNotMeetsNegInfBeg",
+        "name" : "OverlapsBoundaryRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1248",
+            "r" : "394",
             "s" : [ {
-              "value" : [ "", "define ", "IntIvlNotMeetsNegInfBeg", ": " ]
+              "value" : [ "", "define ", "OverlapsBoundaryRealIvl", ": " ]
             }, {
-              "r" : "1260",
+              "r" : "405",
               "s" : [ {
-                "r" : "1251",
+                "r" : "397",
                 "s" : [ {
-                  "r" : "1249",
-                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                  "r" : "395",
+                  "value" : [ "Interval[", "1.0", ", ", "1.234", "]" ]
                 } ]
               }, {
-                "r" : "1260",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "405",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1256",
+                "r" : "402",
                 "s" : [ {
-                  "r" : "1254",
-                  "value" : [ "Interval[", "null", ", ", "400", "]" ]
+                  "r" : "400",
+                  "value" : [ "Interval[", "1.234", ", ", "2.0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1260",
+          "type" : "Overlaps",
+          "localId" : "405",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1261",
+            "localId" : "406",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1262",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "407",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1263",
+            "localId" : "408",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1264",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "409",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1251",
+            "localId" : "397",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1252",
+              "localId" : "398",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1253",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "399",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1249",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "localId" : "395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1250",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1256",
+            "localId" : "402",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1258",
+              "localId" : "403",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1259",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "404",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1257",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1254",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "400",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1255",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "400",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1267",
+        "localId" : "412",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMeetsBeforeIntIvl",
+        "name" : "NoOverlapsRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1267",
+            "r" : "412",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMeetsBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "NoOverlapsRealIvl", ": " ]
             }, {
-              "r" : "1279",
+              "r" : "423",
               "s" : [ {
-                "r" : "1270",
+                "r" : "415",
                 "s" : [ {
-                  "r" : "1268",
-                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
+                  "r" : "413",
+                  "value" : [ "Interval[", "1.0", ", ", "1.23456789", ")" ]
                 } ]
               }, {
-                "r" : "1279",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "423",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1276",
+                "r" : "420",
                 "s" : [ {
-                  "r" : "1274",
-                  "value" : [ "Interval[", "101", ", ", "200", "]" ]
+                  "r" : "418",
+                  "value" : [ "Interval[", "1.23456789", ", ", "2.0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1279",
+          "type" : "Overlaps",
+          "localId" : "423",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1280",
+            "localId" : "424",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1281",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "425",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1282",
+            "localId" : "426",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1283",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "427",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1270",
-            "lowClosed" : false,
-            "highClosed" : true,
+            "localId" : "415",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1272",
+              "localId" : "416",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1273",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "417",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1271",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1268",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "413",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "localId" : "414",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23456789",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1276",
+            "localId" : "420",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1277",
+              "localId" : "421",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1278",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "422",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "101",
+              "localId" : "418",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23456789",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
+              "localId" : "419",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1286",
+        "localId" : "430",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayMeetAfterIntIvl",
+        "name" : "OverlapsClosedNullIntervalLHS",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1286",
+            "r" : "430",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayMeetAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsClosedNullIntervalLHS", ": " ]
             }, {
-              "r" : "1298",
+              "r" : "441",
               "s" : [ {
-                "r" : "1289",
+                "r" : "433",
                 "s" : [ {
-                  "r" : "1287",
-                  "value" : [ "Interval(", "null", ", ", "100", "]" ]
+                  "r" : "431",
+                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
                 } ]
               }, {
-                "r" : "1298",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "441",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1295",
+                "r" : "438",
                 "s" : [ {
-                  "r" : "1293",
-                  "value" : [ "Interval[", "0", ", ", "50", "]" ]
+                  "r" : "436",
+                  "value" : [ "Interval[", "6", ", ", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1298",
+          "type" : "Overlaps",
+          "localId" : "441",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1299",
+            "localId" : "449",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1300",
+              "localId" : "450",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1301",
+            "localId" : "451",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1302",
+              "localId" : "452",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1289",
-            "lowClosed" : false,
-            "highClosed" : true,
+            "localId" : "442",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1291",
+            "low" : {
+              "type" : "As",
+              "localId" : "444",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1292",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "443",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "433",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "434",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "435",
+                      "name" : "{urn:hl7-org:elm-types:r1}Any",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Null",
+                    "localId" : "431",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  },
+                  "high" : {
+                    "type" : "Null",
+                    "localId" : "432",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }
               }
             },
-            "low" : {
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "445",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "433",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "434",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "435",
+                    "name" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Null",
+                  "localId" : "431",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                },
+                "high" : {
+                  "type" : "Null",
+                  "localId" : "432",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "1290",
+              "localId" : "447",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
-                "type" : "Null",
-                "localId" : "1287",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+                "type" : "Property",
+                "localId" : "446",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "433",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "434",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "435",
+                      "name" : "{urn:hl7-org:elm-types:r1}Any",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Null",
+                    "localId" : "431",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  },
+                  "high" : {
+                    "type" : "Null",
+                    "localId" : "432",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }
               }
             },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1288",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "448",
+              "path" : "highClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "433",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "434",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "435",
+                    "name" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Null",
+                  "localId" : "431",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                },
+                "high" : {
+                  "type" : "Null",
+                  "localId" : "432",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1295",
+            "localId" : "438",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1296",
+              "localId" : "439",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1297",
+                "localId" : "440",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1293",
+              "localId" : "436",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "6",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1294",
+              "localId" : "437",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "50",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1305",
+        "localId" : "455",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotMeetsIntIvl",
+        "name" : "OverlapsClosedNullIntervalRHS",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1305",
+            "r" : "455",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotMeetsIntIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsClosedNullIntervalRHS", ": " ]
             }, {
-              "r" : "1317",
+              "r" : "466",
               "s" : [ {
-                "r" : "1308",
+                "r" : "458",
                 "s" : [ {
-                  "r" : "1306",
-                  "value" : [ "Interval(", "null", ", ", "5", "]" ]
+                  "r" : "456",
+                  "value" : [ "Interval[", "6", ", ", "10", "]" ]
                 } ]
               }, {
-                "r" : "1317",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "466",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1314",
+                "r" : "463",
                 "s" : [ {
-                  "r" : "1312",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                  "r" : "461",
+                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1317",
+          "type" : "Overlaps",
+          "localId" : "466",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1318",
+            "localId" : "474",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1319",
+              "localId" : "475",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1320",
+            "localId" : "476",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1321",
+              "localId" : "477",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1308",
-            "lowClosed" : false,
+            "localId" : "458",
+            "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1310",
+              "localId" : "459",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1311",
+                "localId" : "460",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "1309",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1306",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "456",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1307",
+              "localId" : "457",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1314",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "467",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1315",
+            "low" : {
+              "type" : "As",
+              "localId" : "469",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1316",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "468",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "463",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "464",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "465",
+                      "name" : "{urn:hl7-org:elm-types:r1}Any",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Null",
+                    "localId" : "461",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  },
+                  "high" : {
+                    "type" : "Null",
+                    "localId" : "462",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1312",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "470",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "463",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "464",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "465",
+                    "name" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Null",
+                  "localId" : "461",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                },
+                "high" : {
+                  "type" : "Null",
+                  "localId" : "462",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1313",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "472",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "471",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "463",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "464",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "465",
+                      "name" : "{urn:hl7-org:elm-types:r1}Any",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Null",
+                    "localId" : "461",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  },
+                  "high" : {
+                    "type" : "Null",
+                    "localId" : "462",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "473",
+              "path" : "highClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "463",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "464",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "465",
+                    "name" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Null",
+                  "localId" : "461",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                },
+                "high" : {
+                  "type" : "Null",
+                  "localId" : "462",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              }
             }
           } ]
         }
       }, {
-        "localId" : "1324",
+        "localId" : "480",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlMayMeetBeforeUnknownBeg",
+        "name" : "OverlapsIsNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1324",
+            "r" : "480",
             "s" : [ {
-              "value" : [ "", "define ", "IntIvlMayMeetBeforeUnknownBeg", ": " ]
+              "value" : [ "", "define ", "OverlapsIsNull", ": " ]
             }, {
-              "r" : "1336",
+              "r" : "496",
               "s" : [ {
-                "r" : "1327",
+                "r" : "483",
                 "s" : [ {
-                  "r" : "1325",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                  "r" : "481",
+                  "value" : [ "Interval[", "6", ", ", "10", "]" ]
                 } ]
               }, {
-                "r" : "1336",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "496",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1332",
+                "r" : "486",
                 "s" : [ {
-                  "r" : "1330",
-                  "value" : [ "Interval(", "null", ", ", "400", ")" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "486",
+                  "s" : [ {
+                    "r" : "487",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "488",
+                    "s" : [ {
+                      "value" : [ "Interval<" ]
+                    }, {
+                      "r" : "489",
+                      "s" : [ {
+                        "value" : [ "Integer" ]
+                      } ]
+                    }, {
+                      "value" : [ ">" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1336",
+          "type" : "Overlaps",
+          "localId" : "496",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1337",
+            "localId" : "497",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1338",
+              "localId" : "498",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1339",
+            "localId" : "499",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1340",
+              "localId" : "500",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1327",
+            "localId" : "483",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1328",
+              "localId" : "484",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1329",
+                "localId" : "485",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "1325",
+              "localId" : "481",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "6",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "1326",
+              "localId" : "482",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1332",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "type" : "As",
+            "localId" : "486",
+            "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1334",
+              "localId" : "494",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1335",
+                "localId" : "495",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "As",
-              "localId" : "1333",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "487",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "488",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1330",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "490",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "491",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              },
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "489",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            }
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* OverlapsDateTime
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define ivlA: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
+define ivlB: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
+define ivlC: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
+define ivlD: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2014, 1, 1, 0, 0, 0, 0))
+define ivlE: Interval[DateTime(2013), DateTime(2015)]
+define ivlF: Interval[DateTime(2014), DateTime(2016)]
+define ivlG: Interval[DateTime(2016), DateTime(2017)]
+define ivlH: Interval[DateTime(2012, 2, 3), DateTime(2013, 3)]
+define OverlapsBefore: ivlA overlaps ivlB
+define OverlapsAfter: ivlB overlaps ivlA
+define OverlapsContained: ivlB overlaps ivlC
+define OverlapsContains: ivlC overlaps ivlB
+define ImpreciseOverlap: ivlD overlaps ivlH
+define NoOverlap: ivlC overlaps ivlD
+define NoImpreciseOverlap: ivlE overlaps ivlG
+define UnknownOverlap: ivlE overlaps ivlH
+define MatchingPrecisionOverlap: ivlF overlaps ivlG
+define OverlapsClosedNullIntervalLHS: Interval[null, null] overlaps ivlA
+define OverlapsClosedNullIntervalRHS: ivlA overlaps Interval[null, null]
+define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
+// NOTE: There appears to be a bug in cql-to-elm that translates these 'overlaps' to 'OverlapsAfter'!
+define OverlapsBeforeDayOfIvlEdge: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 9, 2, 23, 59, 59, 999), DateTime(2012, 10, 1, 0, 0, 0, 0)]
+define OverlapsAfterDayOfIvlEdge: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define OverlapsContainsDayOfIvl: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 5, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)]
+define OverlapsContainedByDayOfIvl: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
+define NotOverlapsDayOfIvl: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define OverlapsAfterDayOfImpreciseInterval: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 1), DateTime(2012, 4)]
+define MayOverlapBeforeDayOfImpreciseIvl: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 9), DateTime(2012, 10)]
+define MayOverlapAfterDayOfImpreciseIvl: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+*/
+
+module.exports['OverlapsDateTime'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "1129",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "name" : "ivlA",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "ivlA", ": " ]
+            }, {
+              "r" : "263",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "231",
+                "s" : [ {
+                  "r" : "215",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "255",
+                "s" : [ {
+                  "r" : "239",
+                  "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "266",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "267",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "263",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "264",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "265",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "231",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "232",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "233",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "234",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "235",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "236",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "237",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "238",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "high" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "1331",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "219",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "256",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "257",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "258",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "259",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "260",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "262",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "243",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "244",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "245",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "400",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1343",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndMeetsAfterIntIvl",
+        "localId" : "270",
+        "name" : "ivlB",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1343",
+            "r" : "270",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndMeetsAfterIntIvl", ": " ]
+              "value" : [ "", "define ", "ivlB", ": " ]
             }, {
-              "r" : "1355",
+              "r" : "319",
               "s" : [ {
-                "r" : "1346",
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "287",
                 "s" : [ {
-                  "r" : "1344",
-                  "value" : [ "Interval[", "100", ", ", "null", "]" ]
+                  "r" : "271",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "r" : "1355",
-                "value" : [ " ", "meets before", " " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "1352",
+                "r" : "311",
                 "s" : [ {
-                  "r" : "1350",
-                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
+                  "r" : "295",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "322",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "323",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1355",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Interval",
+          "localId" : "319",
+          "lowClosed" : true,
+          "highClosed" : false,
           "annotation" : [ ],
-          "signature" : [ {
+          "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1356",
+            "localId" : "320",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1357",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "321",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1358",
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "287",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1359",
+              "localId" : "288",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1346",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1348",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1349",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "289",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "290",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "291",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "292",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "293",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "294",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "271",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "1344",
+              "localId" : "272",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "value" : "3",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "1347",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1345",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1352",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1353",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1354",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "day" : {
+              "type" : "Literal",
+              "localId" : "273",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             },
-            "low" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "1350",
+              "localId" : "274",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "1351",
+              "localId" : "275",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "99",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "276",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "277",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
-        }
-      }, {
-        "localId" : "1362",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotMeetsIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1362",
-            "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotMeetsIntIvl", ": " ]
-            }, {
-              "r" : "1374",
-              "s" : [ {
-                "r" : "1365",
-                "s" : [ {
-                  "r" : "1363",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
-                } ]
-              }, {
-                "r" : "1374",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "1371",
-                "s" : [ {
-                  "r" : "1369",
-                  "value" : [ "Interval[", "1000", ", ", "2000", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1374",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1375",
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "311",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1376",
+              "localId" : "312",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1377",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1378",
+              "localId" : "313",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1365",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1367",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1368",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "314",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "315",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "316",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "318",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "295",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "1363",
+              "localId" : "296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "297",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "298",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "1366",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1364",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1371",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1372",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1373",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "299",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
-            "low" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "1369",
+              "localId" : "300",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1000",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "millisecond" : {
               "type" : "Literal",
-              "localId" : "1370",
+              "localId" : "301",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2000",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1381",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlNotMeetsPosInfEnd",
+        "localId" : "326",
+        "name" : "ivlC",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1381",
+            "r" : "326",
             "s" : [ {
-              "value" : [ "", "define ", "IntIvlNotMeetsPosInfEnd", ": " ]
+              "value" : [ "", "define ", "ivlC", ": " ]
             }, {
-              "r" : "1393",
+              "r" : "375",
               "s" : [ {
-                "r" : "1384",
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "343",
                 "s" : [ {
-                  "r" : "1382",
-                  "value" : [ "Interval[", "100", ", ", "200", "]" ]
+                  "r" : "327",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "r" : "1393",
-                "value" : [ " ", "meets before", " " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "1389",
+                "r" : "367",
                 "s" : [ {
-                  "r" : "1387",
-                  "value" : [ "Interval[", "0", ", ", "null", "]" ]
+                  "r" : "351",
+                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "378",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "379",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1393",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Interval",
+          "localId" : "375",
+          "lowClosed" : true,
+          "highClosed" : false,
           "annotation" : [ ],
-          "signature" : [ {
+          "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1394",
+            "localId" : "376",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1395",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "377",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1396",
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "343",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1397",
+              "localId" : "344",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1384",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1385",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1386",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "345",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "346",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "347",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "348",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "349",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "350",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "327",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "1382",
+              "localId" : "328",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "value" : "1",
               "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "1383",
+              "localId" : "329",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "200",
+              "value" : "1",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1389",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1391",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1392",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "1387",
+              "localId" : "330",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "1390",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1388",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "331",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "332",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "333",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
-          } ]
-        }
-      }, {
-        "localId" : "1400",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMeetsAfterIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1400",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMeetsAfterIntIvl", ": " ]
-            }, {
-              "r" : "1412",
-              "s" : [ {
-                "r" : "1403",
-                "s" : [ {
-                  "r" : "1401",
-                  "value" : [ "Interval[", "100", ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "1412",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "1409",
-                "s" : [ {
-                  "r" : "1407",
-                  "value" : [ "Interval[", "0", ", ", "99", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1412",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1413",
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "367",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1414",
+              "localId" : "368",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1415",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1416",
+              "localId" : "369",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1403",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1405",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1406",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "370",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "372",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "374",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "351",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2013",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "1401",
+              "localId" : "352",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "value" : "1",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "1404",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1402",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1409",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1410",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1411",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "day" : {
+              "type" : "Literal",
+              "localId" : "353",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             },
-            "low" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "1407",
+              "localId" : "354",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "1408",
+              "localId" : "355",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "99",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "356",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "357",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1419",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayMeetBeforeIntIvl",
+        "localId" : "382",
+        "name" : "ivlD",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1419",
+            "r" : "382",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayMeetBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "ivlD", ": " ]
             }, {
-              "r" : "1431",
+              "r" : "431",
               "s" : [ {
-                "r" : "1422",
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "399",
                 "s" : [ {
-                  "r" : "1420",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
+                  "r" : "383",
+                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "r" : "1431",
-                "value" : [ " ", "meets before", " " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "1428",
+                "r" : "423",
                 "s" : [ {
-                  "r" : "1426",
-                  "value" : [ "Interval[", "50", ", ", "100", "]" ]
+                  "r" : "407",
+                  "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "434",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "435",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1431",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Interval",
+          "localId" : "431",
+          "lowClosed" : true,
+          "highClosed" : false,
           "annotation" : [ ],
-          "signature" : [ {
+          "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1432",
+            "localId" : "432",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1433",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "433",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1434",
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "399",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1435",
+              "localId" : "400",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1422",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1424",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1425",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "401",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "402",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "403",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "404",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "405",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "406",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2013",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "1420",
+              "localId" : "384",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "385",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "386",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "1423",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1421",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1428",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1429",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1430",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "387",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
-            "low" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "1426",
+              "localId" : "388",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "50",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "millisecond" : {
               "type" : "Literal",
-              "localId" : "1427",
+              "localId" : "389",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
-        }
-      }, {
-        "localId" : "1438",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotMeetsIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1438",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotMeetsIntIvl", ": " ]
-            }, {
-              "r" : "1450",
-              "s" : [ {
-                "r" : "1441",
-                "s" : [ {
-                  "r" : "1439",
-                  "value" : [ "Interval[", "0", ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "1450",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "1447",
-                "s" : [ {
-                  "r" : "1445",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1450",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1451",
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "423",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1452",
+              "localId" : "424",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1453",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1454",
+              "localId" : "425",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "426",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "427",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "428",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "429",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "430",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1441",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1443",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1444",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "407",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2014",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "408",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "409",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             },
-            "low" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "1439",
+              "localId" : "410",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "1442",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1440",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1447",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1448",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1449",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "411",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
-            "low" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "1445",
+              "localId" : "412",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "millisecond" : {
               "type" : "Literal",
-              "localId" : "1446",
+              "localId" : "413",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1457",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntIvlMayMeetAfterUnknownEnd",
+        "localId" : "438",
+        "name" : "ivlE",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1457",
+            "r" : "438",
             "s" : [ {
-              "value" : [ "", "define ", "IntIvlMayMeetAfterUnknownEnd", ": " ]
+              "value" : [ "", "define ", "ivlE", ": " ]
             }, {
-              "r" : "1471",
+              "r" : "451",
               "s" : [ {
-                "r" : "1460",
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "443",
                 "s" : [ {
-                  "r" : "1458",
-                  "value" : [ "Interval[", "0", ", ", "100", "]" ]
+                  "r" : "439",
+                  "value" : [ "DateTime", "(", "2013", ")" ]
                 } ]
               }, {
-                "r" : "1471",
-                "value" : [ " ", "meets before", " " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "1467",
+                "r" : "449",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1463",
-                  "s" : [ {
-                    "r" : "1464",
-                    "value" : [ "-", "100" ]
-                  } ]
-                }, {
-                  "r" : "1466",
-                  "value" : [ ", ", "null", ")" ]
+                  "r" : "445",
+                  "value" : [ "DateTime", "(", "2015", ")" ]
                 } ]
+              }, {
+                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "454",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "455",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1471",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Interval",
+          "localId" : "451",
+          "lowClosed" : true,
+          "highClosed" : true,
           "annotation" : [ ],
-          "signature" : [ {
+          "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1472",
+            "localId" : "452",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1473",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "453",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1474",
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "443",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1475",
+              "localId" : "444",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1460",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1461",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1462",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
+            } ],
+            "year" : {
               "type" : "Literal",
-              "localId" : "1458",
+              "localId" : "439",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "2013",
               "annotation" : [ ]
-            },
-            "high" : {
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "449",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "450",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
               "type" : "Literal",
-              "localId" : "1459",
+              "localId" : "445",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "100",
+              "value" : "2015",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "Interval",
-            "localId" : "1467",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1469",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1470",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "1463",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1465",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1464",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "100",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1468",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1466",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          } ]
+          }
         }
       }, {
-        "localId" : "1478",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegMeetsBeforeDateIvl",
+        "localId" : "458",
+        "name" : "ivlF",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1478",
+            "r" : "458",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegMeetsBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "ivlF", ": " ]
             }, {
-              "r" : "1559",
+              "r" : "471",
               "s" : [ {
-                "r" : "1504",
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "463",
                 "s" : [ {
-                  "r" : "1479",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1496",
-                  "s" : [ {
-                    "r" : "1480",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "459",
+                  "value" : [ "DateTime", "(", "2014", ")" ]
                 } ]
               }, {
-                "r" : "1559",
-                "value" : [ " ", "meets before", " " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "1556",
+                "r" : "469",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1524",
-                  "s" : [ {
-                    "r" : "1508",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1548",
-                  "s" : [ {
-                    "r" : "1532",
-                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "465",
+                  "value" : [ "DateTime", "(", "2016", ")" ]
                 } ]
+              }, {
+                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "474",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "475",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1559",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Interval",
+          "localId" : "471",
+          "lowClosed" : true,
+          "highClosed" : true,
           "annotation" : [ ],
-          "signature" : [ {
+          "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1560",
+            "localId" : "472",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1561",
+              "localId" : "473",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1562",
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "463",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1563",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "464",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "459",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2014",
               "annotation" : [ ]
             }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1504",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1506",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1507",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1505",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1479",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1496",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1497",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1498",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1499",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1500",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1501",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1502",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1503",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1480",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1481",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1482",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1483",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1484",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1485",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1486",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1556",
-            "lowClosed" : true,
-            "highClosed" : true,
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "469",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1557",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1558",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1524",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1525",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1526",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1527",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1528",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1529",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1530",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1531",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1508",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1509",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1510",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1511",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1512",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1513",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1514",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1548",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1549",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1550",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1551",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1552",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1553",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1554",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1555",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1532",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2030",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1533",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1534",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1535",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1536",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1537",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1538",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "470",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "465",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2016",
+              "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1566",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NegInfBegNotMeetsDateIvl",
+        "localId" : "478",
+        "name" : "ivlG",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1566",
+            "r" : "478",
             "s" : [ {
-              "value" : [ "", "define ", "NegInfBegNotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "ivlG", ": " ]
             }, {
-              "r" : "1647",
+              "r" : "491",
               "s" : [ {
-                "r" : "1592",
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "483",
                 "s" : [ {
-                  "r" : "1567",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1584",
-                  "s" : [ {
-                    "r" : "1568",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "479",
+                  "value" : [ "DateTime", "(", "2016", ")" ]
                 } ]
               }, {
-                "r" : "1647",
-                "value" : [ " ", "meets before", " " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "1644",
+                "r" : "489",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1612",
-                  "s" : [ {
-                    "r" : "1596",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1636",
-                  "s" : [ {
-                    "r" : "1620",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "485",
+                  "value" : [ "DateTime", "(", "2017", ")" ]
                 } ]
+              }, {
+                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "494",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "495",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1647",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Interval",
+          "localId" : "491",
+          "lowClosed" : true,
+          "highClosed" : true,
           "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1648",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1649",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
+          "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1650",
+            "localId" : "492",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1651",
+              "localId" : "493",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1592",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1594",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1595",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1593",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1567",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1584",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1585",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1586",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1587",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1588",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1589",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1590",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1591",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1568",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1569",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1570",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1571",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1572",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1573",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1574",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1644",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1645",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1646",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1612",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1613",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1614",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1615",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1616",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1617",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1618",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1619",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1596",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1597",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1598",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1599",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1600",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1601",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1602",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1636",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1637",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1638",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1639",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "483",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "484",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "479",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2016",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "489",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "490",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "485",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2017",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "498",
+        "name" : "ivlH",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "498",
+            "s" : [ {
+              "value" : [ "", "define ", "ivlH", ": " ]
+            }, {
+              "r" : "520",
+              "s" : [ {
+                "value" : [ "Interval[" ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1640",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "507",
+                "s" : [ {
+                  "r" : "499",
+                  "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "3", ")" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1641",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ ", " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1642",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "517",
+                "s" : [ {
+                  "r" : "511",
+                  "value" : [ "DateTime", "(", "2013", ", ", "3", ")" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1643",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1620",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1621",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1622",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1623",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1624",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1625",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1626",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "523",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "524",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "520",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "521",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "522",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
             }
-          } ]
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "507",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "508",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "509",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "510",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "499",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "500",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "501",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "517",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "518",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "519",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "511",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2013",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "512",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          }
         }
       }, {
-        "localId" : "1654",
+        "localId" : "527",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlNotMeetsNegInfBeg",
+        "name" : "OverlapsBefore",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1654",
+            "r" : "527",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlNotMeetsNegInfBeg", ": " ]
+              "value" : [ "", "define ", "OverlapsBefore", ": " ]
             }, {
-              "r" : "1735",
+              "r" : "534",
               "s" : [ {
-                "r" : "1703",
+                "r" : "528",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1671",
-                  "s" : [ {
-                    "r" : "1655",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1695",
-                  "s" : [ {
-                    "r" : "1679",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "ivlA" ]
                 } ]
               }, {
-                "r" : "1735",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "534",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1731",
+                "r" : "531",
                 "s" : [ {
-                  "r" : "1706",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "1723",
-                  "s" : [ {
-                    "r" : "1707",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "ivlB" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1735",
+          "type" : "Overlaps",
+          "localId" : "534",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1736",
+            "localId" : "535",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1737",
+              "localId" : "536",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1738",
+            "localId" : "537",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1739",
+              "localId" : "538",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1703",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "528",
+            "name" : "ivlA",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1704",
+              "localId" : "529",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1705",
+                "localId" : "530",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1671",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1672",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1673",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1674",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1675",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1676",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1677",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1678",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1655",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1656",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1657",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1658",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1659",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1660",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1661",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1695",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1696",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1697",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1698",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1699",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1700",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1701",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1702",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1679",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1680",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1681",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1682",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1683",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1684",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1685",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1731",
-            "lowClosed" : true,
-            "highClosed" : false,
+            "type" : "ExpressionRef",
+            "localId" : "531",
+            "name" : "ivlB",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1733",
+              "localId" : "532",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1734",
+                "localId" : "533",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1732",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1706",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1723",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1724",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1725",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1726",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1727",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1728",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1729",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1730",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1707",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1708",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1709",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1710",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1711",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1712",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1713",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           } ]
         }
       }, {
-        "localId" : "1742",
+        "localId" : "541",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMeetsBeforeDateIvl",
+        "name" : "OverlapsAfter",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1742",
+            "r" : "541",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMeetsBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsAfter", ": " ]
             }, {
-              "r" : "1823",
+              "r" : "548",
               "s" : [ {
-                "r" : "1768",
+                "r" : "542",
                 "s" : [ {
-                  "r" : "1743",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "1760",
-                  "s" : [ {
-                    "r" : "1744",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "ivlB" ]
                 } ]
               }, {
-                "r" : "1823",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "548",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1820",
+                "r" : "545",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1788",
-                  "s" : [ {
-                    "r" : "1772",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1812",
-                  "s" : [ {
-                    "r" : "1796",
-                    "value" : [ "DateTime", "(", "2030", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "ivlA" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1823",
+          "type" : "Overlaps",
+          "localId" : "548",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1824",
+            "localId" : "549",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1825",
+              "localId" : "550",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1826",
+            "localId" : "551",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1827",
+              "localId" : "552",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1768",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "type" : "ExpressionRef",
+            "localId" : "542",
+            "name" : "ivlB",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1770",
+              "localId" : "543",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1771",
+                "localId" : "544",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1769",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1743",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1760",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1761",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1762",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1763",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1764",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1765",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1766",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1767",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1744",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1745",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1746",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1747",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1748",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1749",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1750",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1820",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "545",
+            "name" : "ivlA",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1821",
+              "localId" : "546",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1822",
+                "localId" : "547",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1788",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1789",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1790",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1791",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1792",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1793",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1794",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1795",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1772",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1773",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1774",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1775",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1776",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1777",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1778",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1812",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1813",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1814",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1815",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1816",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1817",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "555",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OverlapsContained",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "555",
+            "s" : [ {
+              "value" : [ "", "define ", "OverlapsContained", ": " ]
+            }, {
+              "r" : "562",
+              "s" : [ {
+                "r" : "556",
+                "s" : [ {
+                  "value" : [ "ivlB" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1818",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "562",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1819",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1796",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2030",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1797",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1798",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1799",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1800",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1801",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "r" : "559",
+                "s" : [ {
+                  "value" : [ "ivlC" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Overlaps",
+          "localId" : "562",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "563",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "564",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "565",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "566",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "556",
+            "name" : "ivlB",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "557",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "558",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1802",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "559",
+            "name" : "ivlC",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "560",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "561",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1830",
+        "localId" : "569",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegMayMeetAfterDateIvl",
+        "name" : "OverlapsContains",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1830",
+            "r" : "569",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegMayMeetAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsContains", ": " ]
             }, {
-              "r" : "1911",
+              "r" : "576",
               "s" : [ {
-                "r" : "1856",
+                "r" : "570",
                 "s" : [ {
-                  "r" : "1831",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "1848",
-                  "s" : [ {
-                    "r" : "1832",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "ivlC" ]
                 } ]
               }, {
-                "r" : "1911",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "576",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1908",
+                "r" : "573",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1876",
-                  "s" : [ {
-                    "r" : "1860",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1900",
-                  "s" : [ {
-                    "r" : "1884",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "ivlB" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1911",
+          "type" : "Overlaps",
+          "localId" : "576",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1912",
+            "localId" : "577",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1913",
+              "localId" : "578",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1914",
+            "localId" : "579",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1915",
+              "localId" : "580",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1856",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "type" : "ExpressionRef",
+            "localId" : "570",
+            "name" : "ivlC",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1858",
+              "localId" : "571",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1859",
+                "localId" : "572",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1857",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1831",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1848",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1849",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1850",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1851",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1852",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1853",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1854",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1855",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1832",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1833",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1834",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1835",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1836",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1837",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1838",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1908",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "573",
+            "name" : "ivlB",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1909",
+              "localId" : "574",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1910",
+                "localId" : "575",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1876",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1877",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1878",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1879",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1880",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1881",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "583",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ImpreciseOverlap",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "583",
+            "s" : [ {
+              "value" : [ "", "define ", "ImpreciseOverlap", ": " ]
+            }, {
+              "r" : "590",
+              "s" : [ {
+                "r" : "584",
+                "s" : [ {
+                  "value" : [ "ivlD" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1882",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "590",
+                "value" : [ " ", "overlaps", " " ]
               }, {
+                "r" : "587",
+                "s" : [ {
+                  "value" : [ "ivlH" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Overlaps",
+          "localId" : "590",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "591",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "592",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "593",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "594",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "584",
+            "name" : "ivlD",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "585",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1883",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1860",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1861",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1862",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1863",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1864",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1865",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1866",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "586",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1900",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "587",
+            "name" : "ivlH",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "588",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1901",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1902",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1903",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1904",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1905",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1906",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1907",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1884",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1885",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1886",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1887",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1888",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1889",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1890",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "589",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1918",
+        "localId" : "597",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownBegNotMeetsDateIvl",
+        "name" : "NoOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1918",
+            "r" : "597",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownBegNotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "NoOverlap", ": " ]
             }, {
-              "r" : "1999",
+              "r" : "604",
               "s" : [ {
-                "r" : "1944",
+                "r" : "598",
                 "s" : [ {
-                  "r" : "1919",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "1936",
-                  "s" : [ {
-                    "r" : "1920",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "ivlC" ]
                 } ]
               }, {
-                "r" : "1999",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "604",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "1996",
+                "r" : "601",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1964",
-                  "s" : [ {
-                    "r" : "1948",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1988",
-                  "s" : [ {
-                    "r" : "1972",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "ivlD" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "1999",
+          "type" : "Overlaps",
+          "localId" : "604",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2000",
+            "localId" : "605",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2001",
+              "localId" : "606",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2002",
+            "localId" : "607",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2003",
+              "localId" : "608",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1944",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "type" : "ExpressionRef",
+            "localId" : "598",
+            "name" : "ivlC",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1946",
+              "localId" : "599",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1947",
+                "localId" : "600",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "1945",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1919",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1936",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "601",
+            "name" : "ivlD",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "602",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1937",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1938",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1939",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1940",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1941",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "603",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "611",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NoImpreciseOverlap",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "611",
+            "s" : [ {
+              "value" : [ "", "define ", "NoImpreciseOverlap", ": " ]
+            }, {
+              "r" : "618",
+              "s" : [ {
+                "r" : "612",
+                "s" : [ {
+                  "value" : [ "ivlE" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1942",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "618",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1943",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1920",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1921",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1922",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1923",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1924",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1925",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1926",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "r" : "615",
+                "s" : [ {
+                  "value" : [ "ivlG" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Overlaps",
+          "localId" : "618",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "619",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "620",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1996",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "621",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "622",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "612",
+            "name" : "ivlE",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1997",
+              "localId" : "613",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1998",
+                "localId" : "614",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1964",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "615",
+            "name" : "ivlG",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "616",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1965",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1966",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1967",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1968",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1969",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1970",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1971",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1948",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1949",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1950",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1951",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1952",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1953",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1954",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "617",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1988",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1989",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1990",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1991",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1992",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1993",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "625",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownOverlap",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "625",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownOverlap", ": " ]
+            }, {
+              "r" : "632",
+              "s" : [ {
+                "r" : "626",
+                "s" : [ {
+                  "value" : [ "ivlE" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1994",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "632",
+                "value" : [ " ", "overlaps", " " ]
               }, {
+                "r" : "629",
+                "s" : [ {
+                  "value" : [ "ivlH" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Overlaps",
+          "localId" : "632",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "633",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "634",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "635",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "636",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "626",
+            "name" : "ivlE",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "627",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1995",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1972",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1973",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1974",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1975",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1976",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1977",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "628",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1978",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "629",
+            "name" : "ivlH",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "630",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "631",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2006",
+        "localId" : "639",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlMayMeetBeforeUnknownBeg",
+        "name" : "MatchingPrecisionOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2006",
+            "r" : "639",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlMayMeetBeforeUnknownBeg", ": " ]
+              "value" : [ "", "define ", "MatchingPrecisionOverlap", ": " ]
             }, {
-              "r" : "2087",
+              "r" : "646",
               "s" : [ {
-                "r" : "2055",
+                "r" : "640",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2023",
-                  "s" : [ {
-                    "r" : "2007",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2047",
-                  "s" : [ {
-                    "r" : "2031",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "ivlF" ]
                 } ]
               }, {
-                "r" : "2087",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "646",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "2083",
+                "r" : "643",
                 "s" : [ {
-                  "r" : "2058",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "2075",
-                  "s" : [ {
-                    "r" : "2059",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "value" : [ "ivlG" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "2087",
+          "type" : "Overlaps",
+          "localId" : "646",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2088",
+            "localId" : "647",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2089",
+              "localId" : "648",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2090",
+            "localId" : "649",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2091",
+              "localId" : "650",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "2055",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "640",
+            "name" : "ivlF",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2056",
+              "localId" : "641",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2057",
+                "localId" : "642",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "2023",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2024",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2025",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2026",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2027",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2028",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2029",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2030",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2007",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2008",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2009",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2010",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2011",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2012",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2013",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2047",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2048",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2049",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2050",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2051",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2052",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2053",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2054",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2031",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2032",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2033",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2034",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2035",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2036",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2037",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "2083",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "type" : "ExpressionRef",
+            "localId" : "643",
+            "name" : "ivlG",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2085",
+              "localId" : "644",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2086",
+                "localId" : "645",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
+            }
+          } ]
+        }
+      }, {
+        "localId" : "653",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OverlapsClosedNullIntervalLHS",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "653",
+            "s" : [ {
+              "value" : [ "", "define ", "OverlapsClosedNullIntervalLHS", ": " ]
+            }, {
+              "r" : "662",
+              "s" : [ {
+                "r" : "656",
+                "s" : [ {
+                  "r" : "654",
+                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
+                } ]
+              }, {
+                "r" : "662",
+                "value" : [ " ", "overlaps", " " ]
+              }, {
+                "r" : "659",
+                "s" : [ {
+                  "value" : [ "ivlA" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Overlaps",
+          "localId" : "662",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "670",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "671",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "672",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "673",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "663",
+            "annotation" : [ ],
             "low" : {
               "type" : "As",
-              "localId" : "2084",
+              "localId" : "665",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
-                "type" : "Null",
-                "localId" : "2058",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+                "type" : "Property",
+                "localId" : "664",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "656",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "657",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "658",
+                      "name" : "{urn:hl7-org:elm-types:r1}Any",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Null",
+                    "localId" : "654",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  },
+                  "high" : {
+                    "type" : "Null",
+                    "localId" : "655",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "666",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "656",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "657",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "658",
+                    "name" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Null",
+                  "localId" : "654",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                },
+                "high" : {
+                  "type" : "Null",
+                  "localId" : "655",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2075",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "668",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2076",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2077",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2078",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2079",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2080",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2081",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "667",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "656",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "657",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "658",
+                      "name" : "{urn:hl7-org:elm-types:r1}Any",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Null",
+                    "localId" : "654",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  },
+                  "high" : {
+                    "type" : "Null",
+                    "localId" : "655",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "669",
+              "path" : "highClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "656",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "657",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "658",
+                    "name" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Null",
+                  "localId" : "654",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                },
+                "high" : {
+                  "type" : "Null",
+                  "localId" : "655",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "659",
+            "name" : "ivlA",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "660",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2082",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2059",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2060",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2061",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2062",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2063",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2064",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2065",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "661",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2094",
+        "localId" : "676",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndMeetsAfterDateIvl",
+        "name" : "OverlapsClosedNullIntervalRHS",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2094",
+            "r" : "676",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndMeetsAfterDateIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsClosedNullIntervalRHS", ": " ]
             }, {
-              "r" : "2175",
+              "r" : "685",
               "s" : [ {
-                "r" : "2120",
+                "r" : "677",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2111",
-                  "s" : [ {
-                    "r" : "2095",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2119",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ "ivlA" ]
                 } ]
               }, {
-                "r" : "2175",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "685",
+                "value" : [ " ", "overlaps", " " ]
               }, {
-                "r" : "2172",
+                "r" : "682",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2140",
-                  "s" : [ {
-                    "r" : "2124",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2164",
-                  "s" : [ {
-                    "r" : "2148",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "680",
+                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "2175",
+          "type" : "Overlaps",
+          "localId" : "685",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2176",
+            "localId" : "693",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2177",
+              "localId" : "694",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2178",
+            "localId" : "695",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2179",
+              "localId" : "696",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "2120",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "677",
+            "name" : "ivlA",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2122",
+              "localId" : "678",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2123",
+                "localId" : "679",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "686",
+            "annotation" : [ ],
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2111",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "688",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2112",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2113",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2114",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2115",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2116",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2117",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2118",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2095",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2096",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2097",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2098",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2099",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2100",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2101",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "687",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "682",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "683",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "684",
+                      "name" : "{urn:hl7-org:elm-types:r1}Any",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Null",
+                    "localId" : "680",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  },
+                  "high" : {
+                    "type" : "Null",
+                    "localId" : "681",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "689",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "682",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "683",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "684",
+                    "name" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Null",
+                  "localId" : "680",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                },
+                "high" : {
+                  "type" : "Null",
+                  "localId" : "681",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
               }
             },
             "high" : {
               "type" : "As",
-              "localId" : "2121",
+              "localId" : "691",
               "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
-                "type" : "Null",
-                "localId" : "2119",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2172",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2173",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2174",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
+                "type" : "Property",
+                "localId" : "690",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "682",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "683",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "684",
+                      "name" : "{urn:hl7-org:elm-types:r1}Any",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Null",
+                    "localId" : "680",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  },
+                  "high" : {
+                    "type" : "Null",
+                    "localId" : "681",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }
               }
             },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "2140",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "692",
+              "path" : "highClosed",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2141",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2142",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2143",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2144",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2145",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2146",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2147",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2124",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2125",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2126",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2127",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2128",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2129",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2130",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
+              "source" : {
+                "type" : "Interval",
+                "localId" : "682",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "683",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "684",
+                    "name" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Null",
+                  "localId" : "680",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                },
+                "high" : {
+                  "type" : "Null",
+                  "localId" : "681",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2164",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2165",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2166",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2167",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "699",
+        "name" : "PrecisionDateIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "699",
+            "s" : [ {
+              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
+            }, {
+              "r" : "748",
+              "s" : [ {
+                "value" : [ "Interval[" ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2168",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "716",
+                "s" : [ {
+                  "r" : "700",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2169",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ ", " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2170",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "740",
+                "s" : [ {
+                  "r" : "724",
+                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2171",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2148",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2149",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2150",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2151",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2152",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2153",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2154",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "751",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "752",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "748",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "749",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "750",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
             }
-          } ]
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "716",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "717",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "718",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "719",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "720",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "721",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "722",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "723",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "700",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "701",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "702",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "703",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "704",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "34",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "705",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "56",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "706",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "789",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "740",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "741",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "742",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "743",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "744",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "745",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "746",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "747",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "724",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "725",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "726",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "727",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "728",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "23",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "729",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "45",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "730",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "678",
+              "annotation" : [ ]
+            }
+          }
         }
       }, {
-        "localId" : "2182",
+        "localId" : "755",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "PosInfEndNotMeetsDateIvl",
+        "name" : "OverlapsBeforeDayOfIvlEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2182",
+            "r" : "755",
             "s" : [ {
-              "value" : [ "", "define ", "PosInfEndNotMeetsDateIvl", ": " ]
+              "value" : [ "// NOTE: There appears to be a bug in cql-to-elm that translates these 'overlaps' to 'OverlapsAfter'!\n", "define ", "OverlapsBeforeDayOfIvlEdge", ": " ]
             }, {
-              "r" : "2263",
+              "r" : "810",
               "s" : [ {
-                "r" : "2208",
+                "r" : "756",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2199",
-                  "s" : [ {
-                    "r" : "2183",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2207",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "2263",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "810",
+                "value" : [ " ", "overlaps day of", " " ]
               }, {
-                "r" : "2260",
+                "r" : "807",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2228",
+                  "r" : "775",
                   "s" : [ {
-                    "r" : "2212",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "759",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2252",
+                  "r" : "799",
                   "s" : [ {
-                    "r" : "2236",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "783",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -137269,334 +163230,223 @@ module.exports['MeetsBefore'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "2263",
+          "type" : "Overlaps",
+          "localId" : "810",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2264",
+            "localId" : "811",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2265",
+              "localId" : "812",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2266",
+            "localId" : "813",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2267",
+              "localId" : "814",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "2208",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "756",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2210",
+              "localId" : "757",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2211",
+                "localId" : "758",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "2199",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2200",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2201",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2202",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2203",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2204",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2205",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2206",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2183",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2184",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2185",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2186",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2187",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2188",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2189",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2209",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2207",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2260",
+            "localId" : "807",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2261",
+              "localId" : "808",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2262",
+                "localId" : "809",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2228",
+              "localId" : "775",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2229",
+                "localId" : "776",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2230",
+                "localId" : "777",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2231",
+                "localId" : "778",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2232",
+                "localId" : "779",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2233",
+                "localId" : "780",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2234",
+                "localId" : "781",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2235",
+                "localId" : "782",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2212",
+                "localId" : "759",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2213",
+                "localId" : "760",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "9",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2214",
+                "localId" : "761",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2215",
+                "localId" : "762",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "23",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2216",
+                "localId" : "763",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2217",
+                "localId" : "764",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "59",
                 "annotation" : [ ]
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2218",
+                "localId" : "765",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "999",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2252",
+              "localId" : "799",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2253",
+                "localId" : "800",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2254",
+                "localId" : "801",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2255",
+                "localId" : "802",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2256",
+                "localId" : "803",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2257",
+                "localId" : "804",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2258",
+                "localId" : "805",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2259",
+                "localId" : "806",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2236",
+                "localId" : "783",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2237",
+                "localId" : "784",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "10",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2238",
+                "localId" : "785",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -137604,7 +163454,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2239",
+                "localId" : "786",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -137612,7 +163462,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2240",
+                "localId" : "787",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -137620,7 +163470,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2241",
+                "localId" : "788",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -137628,7 +163478,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2242",
+                "localId" : "789",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -137638,370 +163488,165 @@ module.exports['MeetsBefore'] = {
           } ]
         }
       }, {
-        "localId" : "2270",
+        "localId" : "817",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlNotMeetsPosInfEnd",
+        "name" : "OverlapsAfterDayOfIvlEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2270",
+            "r" : "817",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlNotMeetsPosInfEnd", ": " ]
+              "value" : [ "", "define ", "OverlapsAfterDayOfIvlEdge", ": " ]
             }, {
-              "r" : "2351",
+              "r" : "872",
               "s" : [ {
-                "r" : "2319",
+                "r" : "818",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "872",
+                "value" : [ " ", "overlaps day of", " " ]
+              }, {
+                "r" : "869",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2287",
+                  "r" : "837",
                   "s" : [ {
-                    "r" : "2271",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "821",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2311",
+                  "r" : "861",
                   "s" : [ {
-                    "r" : "2295",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "845",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
-              }, {
-                "r" : "2351",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "2347",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2338",
-                  "s" : [ {
-                    "r" : "2322",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2346",
-                  "value" : [ ", ", "null", "]" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "2351",
+          "type" : "Overlaps",
+          "localId" : "872",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2352",
+            "localId" : "873",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2353",
+              "localId" : "874",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2354",
+            "localId" : "875",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2355",
+              "localId" : "876",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "2319",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "818",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2320",
+              "localId" : "819",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2321",
+                "localId" : "820",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "2287",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2288",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2289",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2290",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2291",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2292",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2293",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2294",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2271",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2272",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2273",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2274",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2275",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2276",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2277",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2311",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2312",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2313",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2314",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2315",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2316",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2317",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2318",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2295",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2296",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2297",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2298",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2299",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2300",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2301",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2347",
+            "localId" : "869",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2349",
+              "localId" : "870",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2350",
+                "localId" : "871",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2338",
+              "localId" : "837",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2339",
+                "localId" : "838",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2340",
+                "localId" : "839",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2341",
+                "localId" : "840",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2342",
+                "localId" : "841",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2343",
+                "localId" : "842",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2344",
+                "localId" : "843",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2345",
+                "localId" : "844",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2322",
+                "localId" : "821",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2323",
+                "localId" : "822",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -138009,15 +163654,15 @@ module.exports['MeetsBefore'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2324",
+                "localId" : "823",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2325",
+                "localId" : "824",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138025,7 +163670,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2326",
+                "localId" : "825",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138033,7 +163678,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2327",
+                "localId" : "826",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138041,7 +163686,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2328",
+                "localId" : "827",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138049,188 +163694,73 @@ module.exports['MeetsBefore'] = {
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "2348",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2346",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "2358",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMeetsAfterDateIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "2358",
-            "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMeetsAfterDateIvl", ": " ]
-            }, {
-              "r" : "2439",
-              "s" : [ {
-                "r" : "2384",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2375",
-                  "s" : [ {
-                    "r" : "2359",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2383",
-                  "value" : [ ", ", "null", ")" ]
-                } ]
-              }, {
-                "r" : "2439",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "2436",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2404",
-                  "s" : [ {
-                    "r" : "2388",
-                    "value" : [ "DateTime", "(", "2010", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2428",
-                  "s" : [ {
-                    "r" : "2412",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "2439",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "2440",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2441",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "2442",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2443",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "2384",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2386",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2387",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
               "type" : "DateTime",
-              "localId" : "2375",
+              "localId" : "861",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2376",
+                "localId" : "862",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2377",
+                "localId" : "863",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2378",
+                "localId" : "864",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2379",
+                "localId" : "865",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2380",
+                "localId" : "866",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2381",
+                "localId" : "867",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2382",
+                "localId" : "868",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2359",
+                "localId" : "845",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2360",
+                "localId" : "846",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2361",
+                "localId" : "847",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2362",
+                "localId" : "848",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138238,7 +163768,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2363",
+                "localId" : "849",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138246,7 +163776,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2364",
+                "localId" : "850",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138254,103 +163784,183 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2365",
+                "localId" : "851",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2385",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          } ]
+        }
+      }, {
+        "localId" : "879",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OverlapsContainsDayOfIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "879",
+            "s" : [ {
+              "value" : [ "", "define ", "OverlapsContainsDayOfIvl", ": " ]
+            }, {
+              "r" : "934",
+              "s" : [ {
+                "r" : "880",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "934",
+                "value" : [ " ", "overlaps day of", " " ]
+              }, {
+                "r" : "931",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "899",
+                  "s" : [ {
+                    "r" : "883",
+                    "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "923",
+                  "s" : [ {
+                    "r" : "907",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Overlaps",
+          "localId" : "934",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "935",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "936",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "937",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "938",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "880",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "881",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2383",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "882",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2436",
+            "localId" : "931",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2437",
+              "localId" : "932",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2438",
+                "localId" : "933",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2404",
+              "localId" : "899",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2405",
+                "localId" : "900",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2406",
+                "localId" : "901",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2407",
+                "localId" : "902",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2408",
+                "localId" : "903",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2409",
+                "localId" : "904",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2410",
+                "localId" : "905",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2411",
+                "localId" : "906",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2388",
+                "localId" : "883",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2010",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2389",
+                "localId" : "884",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "5",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2390",
+                "localId" : "885",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -138358,7 +163968,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2391",
+                "localId" : "886",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138366,7 +163976,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2392",
+                "localId" : "887",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138374,7 +163984,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2393",
+                "localId" : "888",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138382,7 +163992,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2394",
+                "localId" : "889",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138391,64 +164001,64 @@ module.exports['MeetsBefore'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2428",
+              "localId" : "923",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2429",
+                "localId" : "924",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2430",
+                "localId" : "925",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2431",
+                "localId" : "926",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2432",
+                "localId" : "927",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2433",
+                "localId" : "928",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2434",
+                "localId" : "929",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2435",
+                "localId" : "930",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2412",
+                "localId" : "907",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2413",
+                "localId" : "908",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2414",
+                "localId" : "909",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -138456,7 +164066,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2415",
+                "localId" : "910",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138464,7 +164074,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2416",
+                "localId" : "911",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138472,7 +164082,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2417",
+                "localId" : "912",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138480,7 +164090,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2418",
+                "localId" : "913",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138490,54 +164100,45 @@ module.exports['MeetsBefore'] = {
           } ]
         }
       }, {
-        "localId" : "2446",
+        "localId" : "941",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndMayMeetBeforeDateIvl",
+        "name" : "OverlapsContainedByDayOfIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2446",
+            "r" : "941",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndMayMeetBeforeDateIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsContainedByDayOfIvl", ": " ]
             }, {
-              "r" : "2527",
+              "r" : "996",
               "s" : [ {
-                "r" : "2472",
+                "r" : "942",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2463",
-                  "s" : [ {
-                    "r" : "2447",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2471",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "2527",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "996",
+                "value" : [ " ", "overlaps day of", " " ]
               }, {
-                "r" : "2524",
+                "r" : "993",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2492",
+                  "r" : "961",
                   "s" : [ {
-                    "r" : "2476",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "945",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2516",
+                  "r" : "985",
                   "s" : [ {
-                    "r" : "2500",
-                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "969",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -138547,228 +164148,117 @@ module.exports['MeetsBefore'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "2527",
+          "type" : "Overlaps",
+          "localId" : "996",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2528",
+            "localId" : "997",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2529",
+              "localId" : "998",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2530",
+            "localId" : "999",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2531",
+              "localId" : "1000",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "2472",
-            "lowClosed" : true,
-            "highClosed" : false,
+            "type" : "ExpressionRef",
+            "localId" : "942",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2474",
+              "localId" : "943",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2475",
+                "localId" : "944",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "2463",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2464",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2465",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2466",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2467",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2468",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2469",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2470",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2447",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2448",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2449",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2450",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2451",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2452",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2453",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2473",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2471",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2524",
+            "localId" : "993",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2525",
+              "localId" : "994",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2526",
+                "localId" : "995",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2492",
+              "localId" : "961",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2493",
+                "localId" : "962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2494",
+                "localId" : "963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2495",
+                "localId" : "964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2496",
+                "localId" : "965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2497",
+                "localId" : "966",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2498",
+                "localId" : "967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2499",
+                "localId" : "968",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2476",
+                "localId" : "945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2477",
+                "localId" : "946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -138776,7 +164266,7 @@ module.exports['MeetsBefore'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2478",
+                "localId" : "947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -138784,7 +164274,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2479",
+                "localId" : "948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138792,7 +164282,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2480",
+                "localId" : "949",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138800,7 +164290,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2481",
+                "localId" : "950",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138808,7 +164298,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2482",
+                "localId" : "951",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138817,64 +164307,64 @@ module.exports['MeetsBefore'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2516",
+              "localId" : "985",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2517",
+                "localId" : "986",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2518",
+                "localId" : "987",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2519",
+                "localId" : "988",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2520",
+                "localId" : "989",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2521",
+                "localId" : "990",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2522",
+                "localId" : "991",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2523",
+                "localId" : "992",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2500",
+                "localId" : "969",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2040",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2501",
+                "localId" : "970",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "12",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2502",
+                "localId" : "971",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -138882,7 +164372,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2503",
+                "localId" : "972",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138890,7 +164380,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2504",
+                "localId" : "973",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138898,7 +164388,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2505",
+                "localId" : "974",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138906,7 +164396,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2506",
+                "localId" : "975",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -138916,54 +164406,45 @@ module.exports['MeetsBefore'] = {
           } ]
         }
       }, {
-        "localId" : "2534",
+        "localId" : "1003",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownEndNotMeetsDateIvl",
+        "name" : "NotOverlapsDayOfIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2534",
+            "r" : "1003",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownEndNotMeetsDateIvl", ": " ]
+              "value" : [ "", "define ", "NotOverlapsDayOfIvl", ": " ]
             }, {
-              "r" : "2615",
+              "r" : "1058",
               "s" : [ {
-                "r" : "2560",
+                "r" : "1004",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2551",
-                  "s" : [ {
-                    "r" : "2535",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2559",
-                  "value" : [ ", ", "null", ")" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "2615",
-                "value" : [ " ", "meets before", " " ]
+                "r" : "1058",
+                "value" : [ " ", "overlaps day of", " " ]
               }, {
-                "r" : "2612",
+                "r" : "1055",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2580",
+                  "r" : "1023",
                   "s" : [ {
-                    "r" : "2564",
-                    "value" : [ "DateTime", "(", "2000", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1007",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2604",
+                  "r" : "1047",
                   "s" : [ {
-                    "r" : "2588",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1031",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -138973,100 +164454,117 @@ module.exports['MeetsBefore'] = {
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "2615",
+          "type" : "Overlaps",
+          "localId" : "1058",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2616",
+            "localId" : "1059",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2617",
+              "localId" : "1060",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2618",
+            "localId" : "1061",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2619",
+              "localId" : "1062",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1004",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1005",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1006",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "2560",
+            "localId" : "1055",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2562",
+              "localId" : "1056",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2563",
+                "localId" : "1057",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2551",
+              "localId" : "1023",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2552",
+                "localId" : "1024",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2553",
+                "localId" : "1025",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2554",
+                "localId" : "1026",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2555",
+                "localId" : "1027",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2556",
+                "localId" : "1028",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2557",
+                "localId" : "1029",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2558",
+                "localId" : "1030",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2535",
+                "localId" : "1007",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2536",
+                "localId" : "1008",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -139074,15 +164572,15 @@ module.exports['MeetsBefore'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2537",
+                "localId" : "1009",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2538",
+                "localId" : "1010",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -139090,7 +164588,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2539",
+                "localId" : "1011",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -139098,7 +164596,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2540",
+                "localId" : "1012",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -139106,7 +164604,7 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2541",
+                "localId" : "1013",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -139114,95 +164612,65 @@ module.exports['MeetsBefore'] = {
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "2561",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2559",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2612",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2613",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2614",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
               "type" : "DateTime",
-              "localId" : "2580",
+              "localId" : "1047",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2581",
+                "localId" : "1048",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2582",
+                "localId" : "1049",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2583",
+                "localId" : "1050",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2584",
+                "localId" : "1051",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2585",
+                "localId" : "1052",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2586",
+                "localId" : "1053",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2587",
+                "localId" : "1054",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2564",
+                "localId" : "1031",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2000",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2565",
+                "localId" : "1032",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2566",
+                "localId" : "1033",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -139210,7 +164678,7 @@ module.exports['MeetsBefore'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2567",
+                "localId" : "1034",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -139218,7 +164686,7 @@ module.exports['MeetsBefore'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2568",
+                "localId" : "1035",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -139226,7 +164694,7 @@ module.exports['MeetsBefore'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2569",
+                "localId" : "1036",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -139234,534 +164702,538 @@ module.exports['MeetsBefore'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2570",
+                "localId" : "1037",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2604",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2605",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2606",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1065",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OverlapsAfterDayOfImpreciseInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1065",
+            "s" : [ {
+              "value" : [ "", "define ", "OverlapsAfterDayOfImpreciseInterval", ": " ]
+            }, {
+              "r" : "1090",
+              "s" : [ {
+                "r" : "1066",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2607",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "1090",
+                "value" : [ " ", "overlaps day of", " " ]
               }, {
+                "r" : "1087",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1075",
+                  "s" : [ {
+                    "r" : "1069",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1084",
+                  "s" : [ {
+                    "r" : "1078",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Overlaps",
+          "localId" : "1090",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1091",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1092",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1093",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1094",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1066",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1067",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2608",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1068",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1087",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1088",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2609",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1089",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1075",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2610",
+                "localId" : "1076",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2611",
+                "localId" : "1077",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2588",
+                "localId" : "1069",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2589",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2590",
+                "localId" : "1070",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2591",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1084",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1085",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2592",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1086",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "second" : {
+              } ],
+              "year" : {
                 "type" : "Literal",
-                "localId" : "2593",
+                "localId" : "1078",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "2012",
                 "annotation" : [ ]
               },
-              "millisecond" : {
+              "month" : {
                 "type" : "Literal",
-                "localId" : "2594",
+                "localId" : "1079",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "4",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2622",
+        "localId" : "1097",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateIvlMayMeetAfterUnknownEnd",
+        "name" : "MayOverlapBeforeDayOfImpreciseIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2622",
+            "r" : "1097",
             "s" : [ {
-              "value" : [ "", "define ", "DateIvlMayMeetAfterUnknownEnd", ": " ]
+              "value" : [ "", "define ", "MayOverlapBeforeDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "2703",
+              "r" : "1122",
               "s" : [ {
-                "r" : "2671",
+                "r" : "1098",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "1122",
+                "value" : [ " ", "overlaps day of", " " ]
+              }, {
+                "r" : "1119",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2639",
+                  "r" : "1107",
                   "s" : [ {
-                    "r" : "2623",
-                    "value" : [ "DateTime", "(", "2020", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1101",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2663",
+                  "r" : "1116",
                   "s" : [ {
-                    "r" : "2647",
-                    "value" : [ "DateTime", "(", "2040", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1110",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
-              }, {
-                "r" : "2703",
-                "value" : [ " ", "meets before", " " ]
-              }, {
-                "r" : "2699",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2690",
-                  "s" : [ {
-                    "r" : "2674",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "r" : "2698",
-                  "value" : [ ", ", "null", ")" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "MeetsBefore",
-          "localId" : "2703",
+          "type" : "Overlaps",
+          "localId" : "1122",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2704",
+            "localId" : "1123",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2705",
+              "localId" : "1124",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2706",
+            "localId" : "1125",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2707",
+              "localId" : "1126",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1098",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1099",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1100",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "2671",
+            "localId" : "1119",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2672",
+              "localId" : "1120",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2673",
+                "localId" : "1121",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2639",
+              "localId" : "1107",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2640",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2641",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2642",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2643",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2644",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2645",
+                "localId" : "1108",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2646",
+                "localId" : "1109",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2623",
+                "localId" : "1101",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2020",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2624",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2625",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2626",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2627",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2628",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2629",
+                "localId" : "1102",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "9",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2663",
+              "localId" : "1116",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2664",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2665",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2666",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2667",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2668",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2669",
+                "localId" : "1117",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2670",
+                "localId" : "1118",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2647",
+                "localId" : "1110",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2040",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2648",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2649",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2650",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2651",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2652",
+                "localId" : "1111",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "10",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2653",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1129",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "MayOverlapAfterDayOfImpreciseIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1129",
+            "s" : [ {
+              "value" : [ "", "define ", "MayOverlapAfterDayOfImpreciseIvl", ": " ]
+            }, {
+              "r" : "1154",
+              "s" : [ {
+                "r" : "1130",
+                "s" : [ {
+                  "value" : [ "PrecisionDateIvl" ]
+                } ]
+              }, {
+                "r" : "1154",
+                "value" : [ " ", "overlaps day of", " " ]
+              }, {
+                "r" : "1151",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1139",
+                  "s" : [ {
+                    "r" : "1133",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1148",
+                  "s" : [ {
+                    "r" : "1142",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Overlaps",
+          "localId" : "1154",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1155",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1156",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1157",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1158",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1130",
+            "name" : "PrecisionDateIvl",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1131",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1132",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2699",
+            "localId" : "1151",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2701",
+              "localId" : "1152",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2702",
+                "localId" : "1153",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2690",
+              "localId" : "1139",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2691",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2692",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2693",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2694",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2695",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2696",
+                "localId" : "1140",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2697",
+                "localId" : "1141",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2674",
+                "localId" : "1133",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2675",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2676",
+                "localId" : "1134",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2677",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1148",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1149",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2678",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1150",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "second" : {
+              } ],
+              "year" : {
                 "type" : "Literal",
-                "localId" : "2679",
+                "localId" : "1142",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "2012",
                 "annotation" : [ ]
               },
-              "millisecond" : {
+              "month" : {
                 "type" : "Literal",
-                "localId" : "2680",
+                "localId" : "1143",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2700",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2698",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "value" : "3",
                 "annotation" : [ ]
               }
             }
@@ -139772,24 +165244,25 @@ module.exports['MeetsBefore'] = {
   }
 }
 
-/* Overlaps
+/* OverlapsAfter
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define OverlapsBeforeIntIvl: Interval[1, 5] overlaps Interval[2, 7]
-define OverlapsAfterIntIvl: Interval[3, 8] overlaps Interval[1, 6]
-define OverlapsBoundaryIntIvl: Interval[1, 5] overlaps Interval[5, 10]
-define NoOverlapsIntIvl: Interval[1,5) overlaps Interval[5, 10]
-define OverlapsBeforeRealIvl: Interval[1.234, 1.567] overlaps Interval[1.345, 1.678]
-define OverlapsAfterRealIvl: Interval[1.345, 1.678] overlaps Interval[1.234, 1.567]
-define OverlapsBoundaryRealIvl: Interval[1.0, 1.234] overlaps Interval[1.234, 2.0]
-define NoOverlapsRealIvl: Interval[1.0, 1.23456789) overlaps Interval[1.23456789, 2.0]
-define OverlapsClosedNullIntervalLHS: Interval[null, null] overlaps Interval[6, 10]
-define OverlapsClosedNullIntervalRHS: Interval[6, 10] overlaps Interval[null, null]
-define OverlapsIsNull: Interval[6, 10] overlaps (null as Interval<Integer>)
+define OverlapsBeforeIntIvl: Interval[1, 5] overlaps after Interval[2, 7]
+define OverlapsAfterIntIvl: Interval[3, 8] overlaps after Interval[1, 6]
+define OverlapsBoundaryIntIvl: Interval[5, 10] overlaps after Interval[1, 5]
+define NoOverlapsIntIvl: Interval[1,5) overlaps after Interval[5, 10]
+define OverlapsBeforeLongIvl: Interval[1L, 5L] overlaps after Interval[2L, 7L]
+define OverlapsAfterLongIvl: Interval[3L, 8L] overlaps after Interval[1L, 6L]
+define OverlapsBoundaryLongIvl: Interval[5L, 10L] overlaps after Interval[1L, 5L]
+define NoOverlapsLongIvl: Interval[1L,5L) overlaps after Interval[5L, 10L]
+define OverlapsBeforeRealIvl: Interval[1.234, 1.567] overlaps after Interval[1.345, 1.678]
+define OverlapsAfterRealIvl: Interval[1.345, 1.678] overlaps after Interval[1.234, 1.567]
+define OverlapsBoundaryRealIvl: Interval[1.234, 2.0] overlaps after Interval[1.0, 1.234]
+define NoOverlapsRealIvl: Interval[1.0, 1.23456789) overlaps after Interval[1.23456789, 2.0]
 */
 
-module.exports['Overlaps'] = {
+module.exports['OverlapsAfter'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -139801,7 +165274,7 @@ module.exports['Overlaps'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "408",
+        "r" : "412",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -139896,7 +165369,7 @@ module.exports['Overlaps'] = {
                 } ]
               }, {
                 "r" : "225",
-                "value" : [ " ", "overlaps", " " ]
+                "value" : [ " ", "overlaps after", " " ]
               }, {
                 "r" : "222",
                 "s" : [ {
@@ -139908,7 +165381,7 @@ module.exports['Overlaps'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
+          "type" : "OverlapsAfter",
           "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -140024,7 +165497,7 @@ module.exports['Overlaps'] = {
                 } ]
               }, {
                 "r" : "243",
-                "value" : [ " ", "overlaps", " " ]
+                "value" : [ " ", "overlaps after", " " ]
               }, {
                 "r" : "240",
                 "s" : [ {
@@ -140036,7 +165509,7 @@ module.exports['Overlaps'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
+          "type" : "OverlapsAfter",
           "localId" : "243",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -140148,23 +165621,23 @@ module.exports['Overlaps'] = {
                 "r" : "253",
                 "s" : [ {
                   "r" : "251",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
               }, {
                 "r" : "261",
-                "value" : [ " ", "overlaps", " " ]
+                "value" : [ " ", "overlaps after", " " ]
               }, {
                 "r" : "258",
                 "s" : [ {
                   "r" : "256",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
+          "type" : "OverlapsAfter",
           "localId" : "261",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -140211,7 +165684,7 @@ module.exports['Overlaps'] = {
               "localId" : "251",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
@@ -140219,7 +165692,7 @@ module.exports['Overlaps'] = {
               "localId" : "252",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
@@ -140244,7 +165717,7 @@ module.exports['Overlaps'] = {
               "localId" : "256",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
@@ -140252,7 +165725,7 @@ module.exports['Overlaps'] = {
               "localId" : "257",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
@@ -140280,7 +165753,7 @@ module.exports['Overlaps'] = {
                 } ]
               }, {
                 "r" : "279",
-                "value" : [ " ", "overlaps", " " ]
+                "value" : [ " ", "overlaps after", " " ]
               }, {
                 "r" : "276",
                 "s" : [ {
@@ -140292,7 +165765,7 @@ module.exports['Overlaps'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
+          "type" : "OverlapsAfter",
           "localId" : "279",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -140388,7 +165861,7 @@ module.exports['Overlaps'] = {
       }, {
         "localId" : "286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsBeforeRealIvl",
+        "name" : "OverlapsBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -140397,30 +165870,30 @@ module.exports['Overlaps'] = {
           "s" : {
             "r" : "286",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsBeforeRealIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsBeforeLongIvl", ": " ]
             }, {
               "r" : "297",
               "s" : [ {
                 "r" : "289",
                 "s" : [ {
                   "r" : "287",
-                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
                 "r" : "297",
-                "value" : [ " ", "overlaps", " " ]
+                "value" : [ " ", "overlaps after", " " ]
               }, {
                 "r" : "294",
                 "s" : [ {
                   "r" : "292",
-                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
+                  "value" : [ "Interval[", "2L", ", ", "7L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
+          "type" : "OverlapsAfter",
           "localId" : "297",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -140431,7 +165904,7 @@ module.exports['Overlaps'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "299",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -140441,7 +165914,7 @@ module.exports['Overlaps'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "301",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -140458,24 +165931,24 @@ module.exports['Overlaps'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "291",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "287",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "288",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.567",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -140491,24 +165964,24 @@ module.exports['Overlaps'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "296",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.678",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
               "annotation" : [ ]
             }
           } ]
@@ -140516,7 +165989,7 @@ module.exports['Overlaps'] = {
       }, {
         "localId" : "304",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsAfterRealIvl",
+        "name" : "OverlapsAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -140525,30 +165998,30 @@ module.exports['Overlaps'] = {
           "s" : {
             "r" : "304",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsAfterRealIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsAfterLongIvl", ": " ]
             }, {
               "r" : "315",
               "s" : [ {
                 "r" : "307",
                 "s" : [ {
                   "r" : "305",
-                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
+                  "value" : [ "Interval[", "3L", ", ", "8L", "]" ]
                 } ]
               }, {
                 "r" : "315",
-                "value" : [ " ", "overlaps", " " ]
+                "value" : [ " ", "overlaps after", " " ]
               }, {
                 "r" : "312",
                 "s" : [ {
                   "r" : "310",
-                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "6L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
+          "type" : "OverlapsAfter",
           "localId" : "315",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -140559,7 +166032,7 @@ module.exports['Overlaps'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "317",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -140569,7 +166042,7 @@ module.exports['Overlaps'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "319",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -140586,24 +166059,24 @@ module.exports['Overlaps'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "309",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "305",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "306",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.678",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "8",
               "annotation" : [ ]
             }
           }, {
@@ -140619,24 +166092,24 @@ module.exports['Overlaps'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "314",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "310",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "311",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.567",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
               "annotation" : [ ]
             }
           } ]
@@ -140644,7 +166117,7 @@ module.exports['Overlaps'] = {
       }, {
         "localId" : "322",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsBoundaryRealIvl",
+        "name" : "OverlapsBoundaryLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -140653,30 +166126,30 @@ module.exports['Overlaps'] = {
           "s" : {
             "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsBoundaryRealIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsBoundaryLongIvl", ": " ]
             }, {
               "r" : "333",
               "s" : [ {
                 "r" : "325",
                 "s" : [ {
                   "r" : "323",
-                  "value" : [ "Interval[", "1.0", ", ", "1.234", "]" ]
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               }, {
                 "r" : "333",
-                "value" : [ " ", "overlaps", " " ]
+                "value" : [ " ", "overlaps after", " " ]
               }, {
                 "r" : "330",
                 "s" : [ {
                   "r" : "328",
-                  "value" : [ "Interval[", "1.234", ", ", "2.0", "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
+          "type" : "OverlapsAfter",
           "localId" : "333",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -140687,7 +166160,7 @@ module.exports['Overlaps'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "335",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -140697,7 +166170,7 @@ module.exports['Overlaps'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "337",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -140714,24 +166187,24 @@ module.exports['Overlaps'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "327",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "323",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "324",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
@@ -140747,24 +166220,24 @@ module.exports['Overlaps'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "332",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "328",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "329",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.0",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
@@ -140772,7 +166245,7 @@ module.exports['Overlaps'] = {
       }, {
         "localId" : "340",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NoOverlapsRealIvl",
+        "name" : "NoOverlapsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -140781,30 +166254,30 @@ module.exports['Overlaps'] = {
           "s" : {
             "r" : "340",
             "s" : [ {
-              "value" : [ "", "define ", "NoOverlapsRealIvl", ": " ]
+              "value" : [ "", "define ", "NoOverlapsLongIvl", ": " ]
             }, {
               "r" : "351",
               "s" : [ {
                 "r" : "343",
                 "s" : [ {
                   "r" : "341",
-                  "value" : [ "Interval[", "1.0", ", ", "1.23456789", ")" ]
+                  "value" : [ "Interval[", "1L", ",", "5L", ")" ]
                 } ]
               }, {
                 "r" : "351",
-                "value" : [ " ", "overlaps", " " ]
+                "value" : [ " ", "overlaps after", " " ]
               }, {
                 "r" : "348",
                 "s" : [ {
                   "r" : "346",
-                  "value" : [ "Interval[", "1.23456789", ", ", "2.0", "]" ]
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
+          "type" : "OverlapsAfter",
           "localId" : "351",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -140815,7 +166288,7 @@ module.exports['Overlaps'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "353",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -140825,7 +166298,7 @@ module.exports['Overlaps'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "355",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -140842,24 +166315,24 @@ module.exports['Overlaps'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "345",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "341",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "342",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23456789",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -140875,24 +166348,24 @@ module.exports['Overlaps'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "350",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "346",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23456789",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "347",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.0",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
@@ -140900,7 +166373,7 @@ module.exports['Overlaps'] = {
       }, {
         "localId" : "358",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsClosedNullIntervalLHS",
+        "name" : "OverlapsBeforeRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -140909,215 +166382,86 @@ module.exports['Overlaps'] = {
           "s" : {
             "r" : "358",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsClosedNullIntervalLHS", ": " ]
+              "value" : [ "", "define ", "OverlapsBeforeRealIvl", ": " ]
             }, {
               "r" : "369",
               "s" : [ {
                 "r" : "361",
                 "s" : [ {
                   "r" : "359",
-                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
+                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
                 } ]
               }, {
                 "r" : "369",
-                "value" : [ " ", "overlaps", " " ]
+                "value" : [ " ", "overlaps after", " " ]
               }, {
                 "r" : "366",
                 "s" : [ {
                   "r" : "364",
-                  "value" : [ "Interval[", "6", ", ", "10", "]" ]
+                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
+          "type" : "OverlapsAfter",
           "localId" : "369",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "377",
+            "localId" : "370",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "378",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "379",
+            "localId" : "372",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "380",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "370",
+            "localId" : "361",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "low" : {
-              "type" : "As",
-              "localId" : "372",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "362",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "371",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "361",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "362",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "363",
-                      "name" : "{urn:hl7-org:elm-types:r1}Any",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Null",
-                    "localId" : "359",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  },
-                  "high" : {
-                    "type" : "Null",
-                    "localId" : "360",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "363",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
               }
             },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "373",
-              "path" : "lowClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "361",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "362",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "363",
-                    "name" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Null",
-                  "localId" : "359",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                },
-                "high" : {
-                  "type" : "Null",
-                  "localId" : "360",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                }
-              }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "359",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "375",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "374",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "361",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "362",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "363",
-                      "name" : "{urn:hl7-org:elm-types:r1}Any",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Null",
-                    "localId" : "359",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  },
-                  "high" : {
-                    "type" : "Null",
-                    "localId" : "360",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }
-              }
-            },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "376",
-              "path" : "highClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "361",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "362",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "363",
-                    "name" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Null",
-                  "localId" : "359",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                },
-                "high" : {
-                  "type" : "Null",
-                  "localId" : "360",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                }
-              }
+              "type" : "Literal",
+              "localId" : "360",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.567",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
@@ -141132,442 +166476,409 @@ module.exports['Overlaps'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "368",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "364",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.345",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "365",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.678",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "383",
+        "localId" : "376",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsClosedNullIntervalRHS",
+        "name" : "OverlapsAfterRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "383",
+            "r" : "376",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsClosedNullIntervalRHS", ": " ]
+              "value" : [ "", "define ", "OverlapsAfterRealIvl", ": " ]
             }, {
-              "r" : "394",
+              "r" : "387",
               "s" : [ {
-                "r" : "386",
+                "r" : "379",
                 "s" : [ {
-                  "r" : "384",
-                  "value" : [ "Interval[", "6", ", ", "10", "]" ]
+                  "r" : "377",
+                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
                 } ]
               }, {
-                "r" : "394",
-                "value" : [ " ", "overlaps", " " ]
+                "r" : "387",
+                "value" : [ " ", "overlaps after", " " ]
               }, {
-                "r" : "391",
+                "r" : "384",
                 "s" : [ {
-                  "r" : "389",
-                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
+                  "r" : "382",
+                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "394",
+          "type" : "OverlapsAfter",
+          "localId" : "387",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "402",
+            "localId" : "388",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "403",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "389",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "404",
+            "localId" : "390",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "405",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "391",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "386",
+            "localId" : "379",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "387",
+              "localId" : "380",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "388",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "381",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "384",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
+              "localId" : "377",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.345",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "385",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "localId" : "378",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.678",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "395",
+            "localId" : "384",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "low" : {
-              "type" : "As",
-              "localId" : "397",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "385",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "396",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "391",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "392",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "393",
-                      "name" : "{urn:hl7-org:elm-types:r1}Any",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Null",
-                    "localId" : "389",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  },
-                  "high" : {
-                    "type" : "Null",
-                    "localId" : "390",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "386",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
               }
             },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "398",
-              "path" : "lowClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "391",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "392",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "393",
-                    "name" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Null",
-                  "localId" : "389",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                },
-                "high" : {
-                  "type" : "Null",
-                  "localId" : "390",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                }
-              }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "400",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "399",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "391",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "392",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "393",
-                      "name" : "{urn:hl7-org:elm-types:r1}Any",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Null",
-                    "localId" : "389",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  },
-                  "high" : {
-                    "type" : "Null",
-                    "localId" : "390",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }
-              }
-            },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "401",
-              "path" : "highClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "391",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "392",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "393",
-                    "name" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Null",
-                  "localId" : "389",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                },
-                "high" : {
-                  "type" : "Null",
-                  "localId" : "390",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                }
-              }
+              "type" : "Literal",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.567",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "408",
+        "localId" : "394",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsIsNull",
+        "name" : "OverlapsBoundaryRealIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "408",
+            "r" : "394",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsIsNull", ": " ]
+              "value" : [ "", "define ", "OverlapsBoundaryRealIvl", ": " ]
             }, {
-              "r" : "424",
+              "r" : "405",
               "s" : [ {
-                "r" : "411",
+                "r" : "397",
                 "s" : [ {
-                  "r" : "409",
-                  "value" : [ "Interval[", "6", ", ", "10", "]" ]
+                  "r" : "395",
+                  "value" : [ "Interval[", "1.234", ", ", "2.0", "]" ]
                 } ]
               }, {
-                "r" : "424",
-                "value" : [ " ", "overlaps", " " ]
+                "r" : "405",
+                "value" : [ " ", "overlaps after", " " ]
               }, {
-                "r" : "414",
+                "r" : "402",
                 "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "414",
-                  "s" : [ {
-                    "r" : "415",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "416",
-                    "s" : [ {
-                      "value" : [ "Interval<" ]
-                    }, {
-                      "r" : "417",
-                      "s" : [ {
-                        "value" : [ "Integer" ]
-                      } ]
-                    }, {
-                      "value" : [ ">" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "400",
+                  "value" : [ "Interval[", "1.0", ", ", "1.234", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "424",
+          "type" : "OverlapsAfter",
+          "localId" : "405",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "425",
+            "localId" : "406",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "426",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "407",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "427",
+            "localId" : "408",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "428",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "409",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "411",
+            "localId" : "397",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "412",
+              "localId" : "398",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "413",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "399",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "409",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
+              "localId" : "395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "410",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
               "annotation" : [ ]
             }
           }, {
-            "type" : "As",
-            "localId" : "414",
-            "strict" : false,
+            "type" : "Interval",
+            "localId" : "402",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "422",
+              "localId" : "403",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "423",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "404",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "415",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+            "low" : {
+              "type" : "Literal",
+              "localId" : "400",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
               "annotation" : [ ]
             },
-            "asTypeSpecifier" : {
+            "high" : {
+              "type" : "Literal",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "412",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NoOverlapsRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "412",
+            "s" : [ {
+              "value" : [ "", "define ", "NoOverlapsRealIvl", ": " ]
+            }, {
+              "r" : "423",
+              "s" : [ {
+                "r" : "415",
+                "s" : [ {
+                  "r" : "413",
+                  "value" : [ "Interval[", "1.0", ", ", "1.23456789", ")" ]
+                } ]
+              }, {
+                "r" : "423",
+                "value" : [ " ", "overlaps after", " " ]
+              }, {
+                "r" : "420",
+                "s" : [ {
+                  "r" : "418",
+                  "value" : [ "Interval[", "1.23456789", ", ", "2.0", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "OverlapsAfter",
+          "localId" : "423",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "424",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "425",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "426",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "427",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "415",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
               "localId" : "416",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "418",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "419",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              },
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "417",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "413",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "414",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23456789",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "420",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "421",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "422",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "418",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23456789",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "419",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
+              "annotation" : [ ]
             }
           } ]
         }
@@ -141576,7 +166887,7 @@ module.exports['Overlaps'] = {
   }
 }
 
-/* OverlapsDateTime
+/* OverlapsAfterDateTime
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
@@ -141587,31 +166898,29 @@ define ivlD: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2014, 1, 1, 0,
 define ivlE: Interval[DateTime(2013), DateTime(2015)]
 define ivlF: Interval[DateTime(2014), DateTime(2016)]
 define ivlG: Interval[DateTime(2016), DateTime(2017)]
-define ivlH: Interval[DateTime(2012, 2, 3), DateTime(2013, 3)]
-define OverlapsBefore: ivlA overlaps ivlB
-define OverlapsAfter: ivlB overlaps ivlA
-define OverlapsContained: ivlB overlaps ivlC
-define OverlapsContains: ivlC overlaps ivlB
-define ImpreciseOverlap: ivlD overlaps ivlH
-define NoOverlap: ivlC overlaps ivlD
-define NoImpreciseOverlap: ivlE overlaps ivlG
-define UnknownOverlap: ivlE overlaps ivlH
-define MatchingPrecisionOverlap: ivlF overlaps ivlG
-define OverlapsClosedNullIntervalLHS: Interval[null, null] overlaps ivlA
-define OverlapsClosedNullIntervalRHS: ivlA overlaps Interval[null, null]
+define ivlH: Interval[DateTime(2013,1), DateTime(2015,1)]
+define OverlapsBefore: ivlA overlaps after ivlB
+define OverlapsAfter: ivlB overlaps after ivlA
+define OverlapsContained: ivlB overlaps after ivlC
+define OverlapsContains: ivlC overlaps after ivlB
+define ImpreciseOverlapBefore: ivlE overlaps after ivlF
+define ImpreciseOverlapAfter: ivlF overlaps after ivlE
+define NoOverlap: ivlC overlaps after ivlD
+define NoImpreciseOverlap: ivlE overlaps after ivlG
+define MatchingPrecisionOverlap: ivlG overlaps after ivlF
+define UnknownOverlap: ivlH overlaps after ivlE
 define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-// NOTE: There appears to be a bug in cql-to-elm that translates these 'overlaps' to 'OverlapsAfter'!
-define OverlapsBeforeDayOfIvlEdge: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 9, 2, 23, 59, 59, 999), DateTime(2012, 10, 1, 0, 0, 0, 0)]
-define OverlapsAfterDayOfIvlEdge: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define OverlapsContainsDayOfIvl: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 5, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)]
-define OverlapsContainedByDayOfIvl: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
-define NotOverlapsDayOfIvl: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define OverlapsAfterDayOfImpreciseInterval: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 1), DateTime(2012, 4)]
-define MayOverlapBeforeDayOfImpreciseIvl: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 9), DateTime(2012, 10)]
-define MayOverlapAfterDayOfImpreciseIvl: PrecisionDateIvl overlaps day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define OverlapsBeforeDayOfIvlEdge: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 9, 2, 23, 59, 59, 999), DateTime(2012, 10, 1, 0, 0, 0, 0)]
+define OverlapsAfterDayOfIvlEdge: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define OverlapsContainsDayOfIvl: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 5, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)]
+define OverlapsContainedByDayOfIvl: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
+define NotOverlapsDayOfIvl: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define OverlapsAfterDayOfImpreciseInterval: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 1), DateTime(2012, 4)]
+define MayOverlapBeforeDayOfImpreciseIvl: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 9), DateTime(2012, 10)]
+define MayOverlapAfterDayOfImpreciseIvl: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
 */
 
-module.exports['OverlapsDateTime'] = {
+module.exports['OverlapsAfterDateTime'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -141623,7 +166932,7 @@ module.exports['OverlapsDateTime'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "1129",
+        "r" : "1094",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -143067,22 +168376,22 @@ module.exports['OverlapsDateTime'] = {
             "s" : [ {
               "value" : [ "", "define ", "ivlH", ": " ]
             }, {
-              "r" : "520",
+              "r" : "517",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "507",
+                "r" : "505",
                 "s" : [ {
                   "r" : "499",
-                  "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "3", ")" ]
+                  "value" : [ "DateTime", "(", "2013", ",", "1", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "517",
+                "r" : "514",
                 "s" : [ {
-                  "r" : "511",
-                  "value" : [ "DateTime", "(", "2013", ", ", "3", ")" ]
+                  "r" : "508",
+                  "value" : [ "DateTime", "(", "2015", ",", "1", ")" ]
                 } ]
               }, {
                 "value" : [ "]" ]
@@ -143092,50 +168401,45 @@ module.exports['OverlapsDateTime'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "523",
+          "localId" : "520",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "524",
+            "localId" : "521",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "520",
+          "localId" : "517",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "521",
+            "localId" : "518",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "522",
+              "localId" : "519",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "507",
+            "localId" : "505",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "508",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "509",
+              "localId" : "506",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "510",
+              "localId" : "507",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
@@ -143144,7 +168448,7 @@ module.exports['OverlapsDateTime'] = {
               "localId" : "499",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "2013",
               "annotation" : [ ]
             },
             "month" : {
@@ -143152,54 +168456,46 @@ module.exports['OverlapsDateTime'] = {
               "localId" : "500",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "501",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "1",
               "annotation" : [ ]
             }
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "517",
+            "localId" : "514",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "518",
+              "localId" : "515",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "519",
+              "localId" : "516",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "511",
+              "localId" : "508",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
+              "value" : "2015",
               "annotation" : [ ]
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "512",
+              "localId" : "509",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "1",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "527",
+        "localId" : "524",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "OverlapsBefore",
         "context" : "Patient",
@@ -143208,21 +168504,21 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "527",
+            "r" : "524",
             "s" : [ {
               "value" : [ "", "define ", "OverlapsBefore", ": " ]
             }, {
-              "r" : "534",
+              "r" : "531",
               "s" : [ {
-                "r" : "528",
+                "r" : "525",
                 "s" : [ {
                   "value" : [ "ivlA" ]
                 } ]
-              }, {
-                "r" : "534",
-                "value" : [ " ", "overlaps", " " ]
               }, {
                 "r" : "531",
+                "value" : [ " ", "overlaps after", " " ]
+              }, {
+                "r" : "528",
                 "s" : [ {
                   "value" : [ "ivlB" ]
                 } ]
@@ -143231,59 +168527,59 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "534",
+          "type" : "OverlapsAfter",
+          "localId" : "531",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "535",
+            "localId" : "532",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "536",
+              "localId" : "533",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "537",
+            "localId" : "534",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "538",
+              "localId" : "535",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "528",
+            "localId" : "525",
             "name" : "ivlA",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "529",
+              "localId" : "526",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "530",
+                "localId" : "527",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "531",
+            "localId" : "528",
             "name" : "ivlB",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "532",
+              "localId" : "529",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "533",
+                "localId" : "530",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -143291,7 +168587,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "541",
+        "localId" : "538",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "OverlapsAfter",
         "context" : "Patient",
@@ -143300,21 +168596,21 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "541",
+            "r" : "538",
             "s" : [ {
               "value" : [ "", "define ", "OverlapsAfter", ": " ]
             }, {
-              "r" : "548",
+              "r" : "545",
               "s" : [ {
-                "r" : "542",
+                "r" : "539",
                 "s" : [ {
                   "value" : [ "ivlB" ]
                 } ]
-              }, {
-                "r" : "548",
-                "value" : [ " ", "overlaps", " " ]
               }, {
                 "r" : "545",
+                "value" : [ " ", "overlaps after", " " ]
+              }, {
+                "r" : "542",
                 "s" : [ {
                   "value" : [ "ivlA" ]
                 } ]
@@ -143323,59 +168619,59 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "548",
+          "type" : "OverlapsAfter",
+          "localId" : "545",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "549",
+            "localId" : "546",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "550",
+              "localId" : "547",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "551",
+            "localId" : "548",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "552",
+              "localId" : "549",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "542",
+            "localId" : "539",
             "name" : "ivlB",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "543",
+              "localId" : "540",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "544",
+                "localId" : "541",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "545",
+            "localId" : "542",
             "name" : "ivlA",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "546",
+              "localId" : "543",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "547",
+                "localId" : "544",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -143383,7 +168679,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "555",
+        "localId" : "552",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "OverlapsContained",
         "context" : "Patient",
@@ -143392,21 +168688,21 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "555",
+            "r" : "552",
             "s" : [ {
               "value" : [ "", "define ", "OverlapsContained", ": " ]
             }, {
-              "r" : "562",
+              "r" : "559",
               "s" : [ {
-                "r" : "556",
+                "r" : "553",
                 "s" : [ {
                   "value" : [ "ivlB" ]
                 } ]
-              }, {
-                "r" : "562",
-                "value" : [ " ", "overlaps", " " ]
               }, {
                 "r" : "559",
+                "value" : [ " ", "overlaps after", " " ]
+              }, {
+                "r" : "556",
                 "s" : [ {
                   "value" : [ "ivlC" ]
                 } ]
@@ -143415,59 +168711,59 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "562",
+          "type" : "OverlapsAfter",
+          "localId" : "559",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "563",
+            "localId" : "560",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "564",
+              "localId" : "561",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "565",
+            "localId" : "562",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "566",
+              "localId" : "563",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "556",
+            "localId" : "553",
             "name" : "ivlB",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "557",
+              "localId" : "554",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "558",
+                "localId" : "555",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "559",
+            "localId" : "556",
             "name" : "ivlC",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "560",
+              "localId" : "557",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "561",
+                "localId" : "558",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -143475,7 +168771,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "569",
+        "localId" : "566",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "OverlapsContains",
         "context" : "Patient",
@@ -143484,21 +168780,21 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "569",
+            "r" : "566",
             "s" : [ {
               "value" : [ "", "define ", "OverlapsContains", ": " ]
             }, {
-              "r" : "576",
+              "r" : "573",
               "s" : [ {
-                "r" : "570",
+                "r" : "567",
                 "s" : [ {
                   "value" : [ "ivlC" ]
                 } ]
-              }, {
-                "r" : "576",
-                "value" : [ " ", "overlaps", " " ]
               }, {
                 "r" : "573",
+                "value" : [ " ", "overlaps after", " " ]
+              }, {
+                "r" : "570",
                 "s" : [ {
                   "value" : [ "ivlB" ]
                 } ]
@@ -143507,59 +168803,59 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "576",
+          "type" : "OverlapsAfter",
+          "localId" : "573",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "577",
+            "localId" : "574",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "578",
+              "localId" : "575",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "579",
+            "localId" : "576",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "580",
+              "localId" : "577",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "570",
+            "localId" : "567",
             "name" : "ivlC",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "571",
+              "localId" : "568",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "572",
+                "localId" : "569",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "573",
+            "localId" : "570",
             "name" : "ivlB",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "574",
+              "localId" : "571",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "575",
+                "localId" : "572",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -143567,91 +168863,91 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "583",
+        "localId" : "580",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseOverlap",
+        "name" : "ImpreciseOverlapBefore",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "583",
+            "r" : "580",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseOverlap", ": " ]
+              "value" : [ "", "define ", "ImpreciseOverlapBefore", ": " ]
             }, {
-              "r" : "590",
+              "r" : "587",
               "s" : [ {
-                "r" : "584",
+                "r" : "581",
                 "s" : [ {
-                  "value" : [ "ivlD" ]
+                  "value" : [ "ivlE" ]
                 } ]
-              }, {
-                "r" : "590",
-                "value" : [ " ", "overlaps", " " ]
               }, {
                 "r" : "587",
+                "value" : [ " ", "overlaps after", " " ]
+              }, {
+                "r" : "584",
                 "s" : [ {
-                  "value" : [ "ivlH" ]
+                  "value" : [ "ivlF" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "590",
+          "type" : "OverlapsAfter",
+          "localId" : "587",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "591",
+            "localId" : "588",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "592",
+              "localId" : "589",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "593",
+            "localId" : "590",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "594",
+              "localId" : "591",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "584",
-            "name" : "ivlD",
+            "localId" : "581",
+            "name" : "ivlE",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "585",
+              "localId" : "582",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "586",
+                "localId" : "583",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "587",
-            "name" : "ivlH",
+            "localId" : "584",
+            "name" : "ivlF",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "588",
+              "localId" : "585",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "589",
+                "localId" : "586",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -143659,91 +168955,91 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "597",
+        "localId" : "594",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NoOverlap",
+        "name" : "ImpreciseOverlapAfter",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "597",
+            "r" : "594",
             "s" : [ {
-              "value" : [ "", "define ", "NoOverlap", ": " ]
+              "value" : [ "", "define ", "ImpreciseOverlapAfter", ": " ]
             }, {
-              "r" : "604",
+              "r" : "601",
               "s" : [ {
-                "r" : "598",
+                "r" : "595",
                 "s" : [ {
-                  "value" : [ "ivlC" ]
+                  "value" : [ "ivlF" ]
                 } ]
-              }, {
-                "r" : "604",
-                "value" : [ " ", "overlaps", " " ]
               }, {
                 "r" : "601",
+                "value" : [ " ", "overlaps after", " " ]
+              }, {
+                "r" : "598",
                 "s" : [ {
-                  "value" : [ "ivlD" ]
+                  "value" : [ "ivlE" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "604",
+          "type" : "OverlapsAfter",
+          "localId" : "601",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "605",
+            "localId" : "602",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "606",
+              "localId" : "603",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "607",
+            "localId" : "604",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "608",
+              "localId" : "605",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "598",
-            "name" : "ivlC",
+            "localId" : "595",
+            "name" : "ivlF",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "599",
+              "localId" : "596",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "600",
+                "localId" : "597",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "601",
-            "name" : "ivlD",
+            "localId" : "598",
+            "name" : "ivlE",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "602",
+              "localId" : "599",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "603",
+                "localId" : "600",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -143751,91 +169047,91 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "611",
+        "localId" : "608",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NoImpreciseOverlap",
+        "name" : "NoOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "611",
+            "r" : "608",
             "s" : [ {
-              "value" : [ "", "define ", "NoImpreciseOverlap", ": " ]
+              "value" : [ "", "define ", "NoOverlap", ": " ]
             }, {
-              "r" : "618",
+              "r" : "615",
               "s" : [ {
-                "r" : "612",
+                "r" : "609",
                 "s" : [ {
-                  "value" : [ "ivlE" ]
+                  "value" : [ "ivlC" ]
                 } ]
-              }, {
-                "r" : "618",
-                "value" : [ " ", "overlaps", " " ]
               }, {
                 "r" : "615",
+                "value" : [ " ", "overlaps after", " " ]
+              }, {
+                "r" : "612",
                 "s" : [ {
-                  "value" : [ "ivlG" ]
+                  "value" : [ "ivlD" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "618",
+          "type" : "OverlapsAfter",
+          "localId" : "615",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "619",
+            "localId" : "616",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "620",
+              "localId" : "617",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "621",
+            "localId" : "618",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "622",
+              "localId" : "619",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "612",
-            "name" : "ivlE",
+            "localId" : "609",
+            "name" : "ivlC",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "613",
+              "localId" : "610",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "614",
+                "localId" : "611",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "615",
-            "name" : "ivlG",
+            "localId" : "612",
+            "name" : "ivlD",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "616",
+              "localId" : "613",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "617",
+                "localId" : "614",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -143843,91 +169139,91 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "625",
+        "localId" : "622",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownOverlap",
+        "name" : "NoImpreciseOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "625",
+            "r" : "622",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownOverlap", ": " ]
+              "value" : [ "", "define ", "NoImpreciseOverlap", ": " ]
             }, {
-              "r" : "632",
+              "r" : "629",
               "s" : [ {
-                "r" : "626",
+                "r" : "623",
                 "s" : [ {
                   "value" : [ "ivlE" ]
                 } ]
-              }, {
-                "r" : "632",
-                "value" : [ " ", "overlaps", " " ]
               }, {
                 "r" : "629",
+                "value" : [ " ", "overlaps after", " " ]
+              }, {
+                "r" : "626",
                 "s" : [ {
-                  "value" : [ "ivlH" ]
+                  "value" : [ "ivlG" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "632",
+          "type" : "OverlapsAfter",
+          "localId" : "629",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "633",
+            "localId" : "630",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "634",
+              "localId" : "631",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "635",
+            "localId" : "632",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "636",
+              "localId" : "633",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "626",
+            "localId" : "623",
             "name" : "ivlE",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "627",
+              "localId" : "624",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "628",
+                "localId" : "625",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ExpressionRef",
-            "localId" : "629",
-            "name" : "ivlH",
+            "localId" : "626",
+            "name" : "ivlG",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "630",
+              "localId" : "627",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "631",
+                "localId" : "628",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -143935,7 +169231,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "639",
+        "localId" : "636",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MatchingPrecisionOverlap",
         "context" : "Patient",
@@ -143944,568 +169240,182 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "639",
+            "r" : "636",
             "s" : [ {
               "value" : [ "", "define ", "MatchingPrecisionOverlap", ": " ]
             }, {
-              "r" : "646",
+              "r" : "643",
               "s" : [ {
-                "r" : "640",
-                "s" : [ {
-                  "value" : [ "ivlF" ]
-                } ]
-              }, {
-                "r" : "646",
-                "value" : [ " ", "overlaps", " " ]
-              }, {
-                "r" : "643",
+                "r" : "637",
                 "s" : [ {
                   "value" : [ "ivlG" ]
                 } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Overlaps",
-          "localId" : "646",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "647",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "648",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "649",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "650",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "640",
-            "name" : "ivlF",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "641",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "642",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "643",
-            "name" : "ivlG",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "644",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "645",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "653",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsClosedNullIntervalLHS",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "653",
-            "s" : [ {
-              "value" : [ "", "define ", "OverlapsClosedNullIntervalLHS", ": " ]
-            }, {
-              "r" : "662",
-              "s" : [ {
-                "r" : "656",
-                "s" : [ {
-                  "r" : "654",
-                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
-                } ]
               }, {
-                "r" : "662",
-                "value" : [ " ", "overlaps", " " ]
+                "r" : "643",
+                "value" : [ " ", "overlaps after", " " ]
               }, {
-                "r" : "659",
+                "r" : "640",
                 "s" : [ {
-                  "value" : [ "ivlA" ]
+                  "value" : [ "ivlF" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "662",
+          "type" : "OverlapsAfter",
+          "localId" : "643",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "670",
+            "localId" : "644",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "671",
+              "localId" : "645",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "672",
+            "localId" : "646",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "673",
+              "localId" : "647",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "663",
-            "annotation" : [ ],
-            "low" : {
-              "type" : "As",
-              "localId" : "665",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "664",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "656",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "657",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "658",
-                      "name" : "{urn:hl7-org:elm-types:r1}Any",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Null",
-                    "localId" : "654",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  },
-                  "high" : {
-                    "type" : "Null",
-                    "localId" : "655",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }
-              }
-            },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "666",
-              "path" : "lowClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "656",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "657",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "658",
-                    "name" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Null",
-                  "localId" : "654",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                },
-                "high" : {
-                  "type" : "Null",
-                  "localId" : "655",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "668",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "667",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "656",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "657",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "658",
-                      "name" : "{urn:hl7-org:elm-types:r1}Any",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Null",
-                    "localId" : "654",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  },
-                  "high" : {
-                    "type" : "Null",
-                    "localId" : "655",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }
-              }
-            },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "669",
-              "path" : "highClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "656",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "657",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "658",
-                    "name" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Null",
-                  "localId" : "654",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                },
-                "high" : {
-                  "type" : "Null",
-                  "localId" : "655",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                }
-              }
-            }
-          }, {
             "type" : "ExpressionRef",
-            "localId" : "659",
-            "name" : "ivlA",
+            "localId" : "637",
+            "name" : "ivlG",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "660",
+              "localId" : "638",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "661",
+                "localId" : "639",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
-          } ]
-        }
-      }, {
-        "localId" : "676",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsClosedNullIntervalRHS",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "676",
-            "s" : [ {
-              "value" : [ "", "define ", "OverlapsClosedNullIntervalRHS", ": " ]
-            }, {
-              "r" : "685",
-              "s" : [ {
-                "r" : "677",
-                "s" : [ {
-                  "value" : [ "ivlA" ]
-                } ]
-              }, {
-                "r" : "685",
-                "value" : [ " ", "overlaps", " " ]
-              }, {
-                "r" : "682",
-                "s" : [ {
-                  "r" : "680",
-                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Overlaps",
-          "localId" : "685",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "693",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "694",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "695",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "696",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "677",
-            "name" : "ivlA",
+            "localId" : "640",
+            "name" : "ivlF",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "678",
+              "localId" : "641",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "679",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "686",
-            "annotation" : [ ],
-            "low" : {
-              "type" : "As",
-              "localId" : "688",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "687",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "682",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "683",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "684",
-                      "name" : "{urn:hl7-org:elm-types:r1}Any",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Null",
-                    "localId" : "680",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  },
-                  "high" : {
-                    "type" : "Null",
-                    "localId" : "681",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }
-              }
-            },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "689",
-              "path" : "lowClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "682",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "683",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "684",
-                    "name" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Null",
-                  "localId" : "680",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                },
-                "high" : {
-                  "type" : "Null",
-                  "localId" : "681",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "691",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "642",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "650",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnknownOverlap",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "650",
+            "s" : [ {
+              "value" : [ "", "define ", "UnknownOverlap", ": " ]
+            }, {
+              "r" : "657",
+              "s" : [ {
+                "r" : "651",
+                "s" : [ {
+                  "value" : [ "ivlH" ]
+                } ]
+              }, {
+                "r" : "657",
+                "value" : [ " ", "overlaps after", " " ]
+              }, {
+                "r" : "654",
+                "s" : [ {
+                  "value" : [ "ivlE" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "OverlapsAfter",
+          "localId" : "657",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "658",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "659",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "660",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "661",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "651",
+            "name" : "ivlH",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "652",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "690",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "682",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "683",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "684",
-                      "name" : "{urn:hl7-org:elm-types:r1}Any",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Null",
-                    "localId" : "680",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  },
-                  "high" : {
-                    "type" : "Null",
-                    "localId" : "681",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "653",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
               }
-            },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "692",
-              "path" : "highClosed",
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "654",
+            "name" : "ivlE",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "655",
               "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "682",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "683",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "684",
-                    "name" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Null",
-                  "localId" : "680",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                },
-                "high" : {
-                  "type" : "Null",
-                  "localId" : "681",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "656",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "699",
+        "localId" : "664",
         "name" : "PrecisionDateIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -144513,25 +169423,25 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "699",
+            "r" : "664",
             "s" : [ {
               "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
             }, {
-              "r" : "748",
+              "r" : "713",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "716",
+                "r" : "681",
                 "s" : [ {
-                  "r" : "700",
+                  "r" : "665",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "740",
+                "r" : "705",
                 "s" : [ {
-                  "r" : "724",
+                  "r" : "689",
                   "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
                 } ]
               }, {
@@ -144542,76 +169452,76 @@ module.exports['OverlapsDateTime'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "751",
+          "localId" : "716",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "752",
+            "localId" : "717",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "748",
+          "localId" : "713",
           "lowClosed" : true,
           "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "749",
+            "localId" : "714",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "750",
+              "localId" : "715",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "DateTime",
-            "localId" : "716",
+            "localId" : "681",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "717",
+              "localId" : "682",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "718",
+              "localId" : "683",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "719",
+              "localId" : "684",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "720",
+              "localId" : "685",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "721",
+              "localId" : "686",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "722",
+              "localId" : "687",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "723",
+              "localId" : "688",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "700",
+              "localId" : "665",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -144619,7 +169529,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "701",
+              "localId" : "666",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -144627,7 +169537,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "702",
+              "localId" : "667",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -144635,7 +169545,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "703",
+              "localId" : "668",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -144643,7 +169553,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "704",
+              "localId" : "669",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "34",
@@ -144651,7 +169561,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "705",
+              "localId" : "670",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "56",
@@ -144659,7 +169569,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "706",
+              "localId" : "671",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "789",
@@ -144668,48 +169578,48 @@ module.exports['OverlapsDateTime'] = {
           },
           "high" : {
             "type" : "DateTime",
-            "localId" : "740",
+            "localId" : "705",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "741",
+              "localId" : "706",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "742",
+              "localId" : "707",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "743",
+              "localId" : "708",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "744",
+              "localId" : "709",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "745",
+              "localId" : "710",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "746",
+              "localId" : "711",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "747",
+              "localId" : "712",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "724",
+              "localId" : "689",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -144717,7 +169627,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "725",
+              "localId" : "690",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -144725,7 +169635,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "726",
+              "localId" : "691",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -144733,7 +169643,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "hour" : {
               "type" : "Literal",
-              "localId" : "727",
+              "localId" : "692",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -144741,7 +169651,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "minute" : {
               "type" : "Literal",
-              "localId" : "728",
+              "localId" : "693",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "23",
@@ -144749,7 +169659,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "second" : {
               "type" : "Literal",
-              "localId" : "729",
+              "localId" : "694",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "45",
@@ -144757,7 +169667,7 @@ module.exports['OverlapsDateTime'] = {
             },
             "millisecond" : {
               "type" : "Literal",
-              "localId" : "730",
+              "localId" : "695",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "678",
@@ -144766,7 +169676,7 @@ module.exports['OverlapsDateTime'] = {
           }
         }
       }, {
-        "localId" : "755",
+        "localId" : "720",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "OverlapsBeforeDayOfIvlEdge",
         "context" : "Patient",
@@ -144775,35 +169685,35 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "755",
+            "r" : "720",
             "s" : [ {
-              "value" : [ "// NOTE: There appears to be a bug in cql-to-elm that translates these 'overlaps' to 'OverlapsAfter'!\n", "define ", "OverlapsBeforeDayOfIvlEdge", ": " ]
+              "value" : [ "", "define ", "OverlapsBeforeDayOfIvlEdge", ": " ]
             }, {
-              "r" : "810",
+              "r" : "775",
               "s" : [ {
-                "r" : "756",
+                "r" : "721",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "810",
-                "value" : [ " ", "overlaps day of", " " ]
+                "r" : "775",
+                "value" : [ " ", "overlaps after day of", " " ]
               }, {
-                "r" : "807",
+                "r" : "772",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "775",
+                  "r" : "740",
                   "s" : [ {
-                    "r" : "759",
+                    "r" : "724",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "799",
+                  "r" : "764",
                   "s" : [ {
-                    "r" : "783",
+                    "r" : "748",
                     "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -144814,109 +169724,109 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "810",
+          "type" : "OverlapsAfter",
+          "localId" : "775",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "811",
+            "localId" : "776",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "812",
+              "localId" : "777",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "813",
+            "localId" : "778",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "814",
+              "localId" : "779",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "756",
+            "localId" : "721",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "757",
+              "localId" : "722",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "758",
+                "localId" : "723",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "807",
+            "localId" : "772",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "808",
+              "localId" : "773",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "809",
+                "localId" : "774",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "775",
+              "localId" : "740",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "776",
+                "localId" : "741",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "777",
+                "localId" : "742",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "778",
+                "localId" : "743",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "779",
+                "localId" : "744",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "780",
+                "localId" : "745",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "781",
+                "localId" : "746",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "782",
+                "localId" : "747",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "759",
+                "localId" : "724",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -144924,7 +169834,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "760",
+                "localId" : "725",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -144932,7 +169842,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "761",
+                "localId" : "726",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -144940,7 +169850,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "762",
+                "localId" : "727",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "23",
@@ -144948,7 +169858,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "763",
+                "localId" : "728",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "59",
@@ -144956,7 +169866,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "764",
+                "localId" : "729",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "59",
@@ -144964,7 +169874,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "765",
+                "localId" : "730",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "999",
@@ -144973,48 +169883,48 @@ module.exports['OverlapsDateTime'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "799",
+              "localId" : "764",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "800",
+                "localId" : "765",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "801",
+                "localId" : "766",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "802",
+                "localId" : "767",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "803",
+                "localId" : "768",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "804",
+                "localId" : "769",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "805",
+                "localId" : "770",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "806",
+                "localId" : "771",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "783",
+                "localId" : "748",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -145022,7 +169932,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "784",
+                "localId" : "749",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "10",
@@ -145030,7 +169940,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "785",
+                "localId" : "750",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -145038,7 +169948,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "786",
+                "localId" : "751",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145046,7 +169956,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "787",
+                "localId" : "752",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145054,7 +169964,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "788",
+                "localId" : "753",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145062,7 +169972,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "789",
+                "localId" : "754",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145072,7 +169982,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "817",
+        "localId" : "782",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "OverlapsAfterDayOfIvlEdge",
         "context" : "Patient",
@@ -145081,35 +169991,35 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "817",
+            "r" : "782",
             "s" : [ {
               "value" : [ "", "define ", "OverlapsAfterDayOfIvlEdge", ": " ]
             }, {
-              "r" : "872",
+              "r" : "837",
               "s" : [ {
-                "r" : "818",
+                "r" : "783",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "872",
-                "value" : [ " ", "overlaps day of", " " ]
+                "r" : "837",
+                "value" : [ " ", "overlaps after day of", " " ]
               }, {
-                "r" : "869",
+                "r" : "834",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "837",
+                  "r" : "802",
                   "s" : [ {
-                    "r" : "821",
+                    "r" : "786",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "861",
+                  "r" : "826",
                   "s" : [ {
-                    "r" : "845",
+                    "r" : "810",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -145120,109 +170030,109 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "872",
+          "type" : "OverlapsAfter",
+          "localId" : "837",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "873",
+            "localId" : "838",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "874",
+              "localId" : "839",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "875",
+            "localId" : "840",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "876",
+              "localId" : "841",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "818",
+            "localId" : "783",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "819",
+              "localId" : "784",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "820",
+                "localId" : "785",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "869",
+            "localId" : "834",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "870",
+              "localId" : "835",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "871",
+                "localId" : "836",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "837",
+              "localId" : "802",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "838",
+                "localId" : "803",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "839",
+                "localId" : "804",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "840",
+                "localId" : "805",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "841",
+                "localId" : "806",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "842",
+                "localId" : "807",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "843",
+                "localId" : "808",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "844",
+                "localId" : "809",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "821",
+                "localId" : "786",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -145230,7 +170140,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "822",
+                "localId" : "787",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -145238,7 +170148,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "823",
+                "localId" : "788",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -145246,7 +170156,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "824",
+                "localId" : "789",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145254,7 +170164,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "825",
+                "localId" : "790",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145262,7 +170172,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "826",
+                "localId" : "791",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145270,7 +170180,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "827",
+                "localId" : "792",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145279,48 +170189,48 @@ module.exports['OverlapsDateTime'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "861",
+              "localId" : "826",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "862",
+                "localId" : "827",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "863",
+                "localId" : "828",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "864",
+                "localId" : "829",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "865",
+                "localId" : "830",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "866",
+                "localId" : "831",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "867",
+                "localId" : "832",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "868",
+                "localId" : "833",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "845",
+                "localId" : "810",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -145328,7 +170238,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "846",
+                "localId" : "811",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -145336,7 +170246,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "847",
+                "localId" : "812",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -145344,7 +170254,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "848",
+                "localId" : "813",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145352,7 +170262,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "849",
+                "localId" : "814",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145360,7 +170270,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "850",
+                "localId" : "815",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145368,7 +170278,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "851",
+                "localId" : "816",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145378,7 +170288,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "879",
+        "localId" : "844",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "OverlapsContainsDayOfIvl",
         "context" : "Patient",
@@ -145387,35 +170297,35 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "879",
+            "r" : "844",
             "s" : [ {
               "value" : [ "", "define ", "OverlapsContainsDayOfIvl", ": " ]
             }, {
-              "r" : "934",
+              "r" : "899",
               "s" : [ {
-                "r" : "880",
+                "r" : "845",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "934",
-                "value" : [ " ", "overlaps day of", " " ]
+                "r" : "899",
+                "value" : [ " ", "overlaps after day of", " " ]
               }, {
-                "r" : "931",
+                "r" : "896",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "899",
+                  "r" : "864",
                   "s" : [ {
-                    "r" : "883",
+                    "r" : "848",
                     "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "923",
+                  "r" : "888",
                   "s" : [ {
-                    "r" : "907",
+                    "r" : "872",
                     "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -145426,109 +170336,109 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "934",
+          "type" : "OverlapsAfter",
+          "localId" : "899",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "935",
+            "localId" : "900",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "936",
+              "localId" : "901",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "937",
+            "localId" : "902",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "938",
+              "localId" : "903",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "880",
+            "localId" : "845",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "881",
+              "localId" : "846",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "882",
+                "localId" : "847",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "931",
+            "localId" : "896",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "932",
+              "localId" : "897",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "933",
+                "localId" : "898",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "899",
+              "localId" : "864",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "900",
+                "localId" : "865",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "901",
+                "localId" : "866",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "902",
+                "localId" : "867",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "903",
+                "localId" : "868",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "904",
+                "localId" : "869",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "905",
+                "localId" : "870",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "906",
+                "localId" : "871",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "883",
+                "localId" : "848",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -145536,7 +170446,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "884",
+                "localId" : "849",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "5",
@@ -145544,7 +170454,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "885",
+                "localId" : "850",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -145552,7 +170462,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "886",
+                "localId" : "851",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145560,7 +170470,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "887",
+                "localId" : "852",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145568,7 +170478,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "888",
+                "localId" : "853",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145576,7 +170486,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "889",
+                "localId" : "854",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145585,48 +170495,48 @@ module.exports['OverlapsDateTime'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "923",
+              "localId" : "888",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "924",
+                "localId" : "889",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "925",
+                "localId" : "890",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "926",
+                "localId" : "891",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "927",
+                "localId" : "892",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "928",
+                "localId" : "893",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "929",
+                "localId" : "894",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "930",
+                "localId" : "895",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "907",
+                "localId" : "872",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -145634,7 +170544,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "908",
+                "localId" : "873",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -145642,7 +170552,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "909",
+                "localId" : "874",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -145650,7 +170560,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "910",
+                "localId" : "875",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145658,7 +170568,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "911",
+                "localId" : "876",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145666,7 +170576,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "912",
+                "localId" : "877",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145674,7 +170584,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "913",
+                "localId" : "878",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145684,7 +170594,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "941",
+        "localId" : "906",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "OverlapsContainedByDayOfIvl",
         "context" : "Patient",
@@ -145693,35 +170603,35 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "941",
+            "r" : "906",
             "s" : [ {
               "value" : [ "", "define ", "OverlapsContainedByDayOfIvl", ": " ]
             }, {
-              "r" : "996",
+              "r" : "961",
               "s" : [ {
-                "r" : "942",
+                "r" : "907",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "996",
-                "value" : [ " ", "overlaps day of", " " ]
+                "r" : "961",
+                "value" : [ " ", "overlaps after day of", " " ]
               }, {
-                "r" : "993",
+                "r" : "958",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "961",
+                  "r" : "926",
                   "s" : [ {
-                    "r" : "945",
+                    "r" : "910",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "985",
+                  "r" : "950",
                   "s" : [ {
-                    "r" : "969",
+                    "r" : "934",
                     "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -145732,109 +170642,109 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "996",
+          "type" : "OverlapsAfter",
+          "localId" : "961",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "997",
+            "localId" : "962",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "998",
+              "localId" : "963",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "999",
+            "localId" : "964",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1000",
+              "localId" : "965",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "942",
+            "localId" : "907",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "943",
+              "localId" : "908",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "944",
+                "localId" : "909",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "993",
+            "localId" : "958",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "994",
+              "localId" : "959",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "995",
+                "localId" : "960",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "961",
+              "localId" : "926",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "962",
+                "localId" : "927",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "963",
+                "localId" : "928",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "964",
+                "localId" : "929",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "965",
+                "localId" : "930",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "966",
+                "localId" : "931",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "967",
+                "localId" : "932",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "968",
+                "localId" : "933",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "945",
+                "localId" : "910",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -145842,7 +170752,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "946",
+                "localId" : "911",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -145850,7 +170760,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "947",
+                "localId" : "912",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -145858,7 +170768,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "948",
+                "localId" : "913",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145866,7 +170776,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "949",
+                "localId" : "914",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145874,7 +170784,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "950",
+                "localId" : "915",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145882,7 +170792,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "951",
+                "localId" : "916",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145891,48 +170801,48 @@ module.exports['OverlapsDateTime'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "985",
+              "localId" : "950",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "986",
+                "localId" : "951",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "987",
+                "localId" : "952",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "988",
+                "localId" : "953",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "989",
+                "localId" : "954",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "990",
+                "localId" : "955",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "991",
+                "localId" : "956",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "992",
+                "localId" : "957",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "969",
+                "localId" : "934",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -145940,7 +170850,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "970",
+                "localId" : "935",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -145948,7 +170858,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "971",
+                "localId" : "936",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -145956,7 +170866,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "972",
+                "localId" : "937",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145964,7 +170874,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "973",
+                "localId" : "938",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145972,7 +170882,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "974",
+                "localId" : "939",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145980,7 +170890,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "975",
+                "localId" : "940",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -145990,7 +170900,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "1003",
+        "localId" : "968",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NotOverlapsDayOfIvl",
         "context" : "Patient",
@@ -145999,35 +170909,35 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1003",
+            "r" : "968",
             "s" : [ {
               "value" : [ "", "define ", "NotOverlapsDayOfIvl", ": " ]
             }, {
-              "r" : "1058",
+              "r" : "1023",
               "s" : [ {
-                "r" : "1004",
+                "r" : "969",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1058",
-                "value" : [ " ", "overlaps day of", " " ]
+                "r" : "1023",
+                "value" : [ " ", "overlaps after day of", " " ]
               }, {
-                "r" : "1055",
+                "r" : "1020",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1023",
+                  "r" : "988",
                   "s" : [ {
-                    "r" : "1007",
+                    "r" : "972",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1047",
+                  "r" : "1012",
                   "s" : [ {
-                    "r" : "1031",
+                    "r" : "996",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -146038,109 +170948,109 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "1058",
+          "type" : "OverlapsAfter",
+          "localId" : "1023",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1059",
+            "localId" : "1024",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1060",
+              "localId" : "1025",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1061",
+            "localId" : "1026",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1062",
+              "localId" : "1027",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1004",
+            "localId" : "969",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1005",
+              "localId" : "970",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1006",
+                "localId" : "971",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1055",
+            "localId" : "1020",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1056",
+              "localId" : "1021",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1057",
+                "localId" : "1022",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1023",
+              "localId" : "988",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1024",
+                "localId" : "989",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1025",
+                "localId" : "990",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1026",
+                "localId" : "991",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1027",
+                "localId" : "992",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1028",
+                "localId" : "993",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1029",
+                "localId" : "994",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1030",
+                "localId" : "995",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1007",
+                "localId" : "972",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -146148,7 +171058,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1008",
+                "localId" : "973",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -146156,7 +171066,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1009",
+                "localId" : "974",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -146164,7 +171074,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1010",
+                "localId" : "975",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -146172,7 +171082,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1011",
+                "localId" : "976",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -146180,7 +171090,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1012",
+                "localId" : "977",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -146188,7 +171098,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1013",
+                "localId" : "978",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -146197,48 +171107,48 @@ module.exports['OverlapsDateTime'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1047",
+              "localId" : "1012",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1048",
+                "localId" : "1013",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1049",
+                "localId" : "1014",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1050",
+                "localId" : "1015",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1051",
+                "localId" : "1016",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1052",
+                "localId" : "1017",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1053",
+                "localId" : "1018",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1054",
+                "localId" : "1019",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1031",
+                "localId" : "996",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -146246,7 +171156,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1032",
+                "localId" : "997",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -146254,7 +171164,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "1033",
+                "localId" : "998",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -146262,7 +171172,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "1034",
+                "localId" : "999",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -146270,7 +171180,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "1035",
+                "localId" : "1000",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -146278,7 +171188,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "1036",
+                "localId" : "1001",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -146286,7 +171196,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "1037",
+                "localId" : "1002",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -146296,7 +171206,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "1065",
+        "localId" : "1030",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "OverlapsAfterDayOfImpreciseInterval",
         "context" : "Patient",
@@ -146305,35 +171215,35 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1065",
+            "r" : "1030",
             "s" : [ {
               "value" : [ "", "define ", "OverlapsAfterDayOfImpreciseInterval", ": " ]
             }, {
-              "r" : "1090",
+              "r" : "1055",
               "s" : [ {
-                "r" : "1066",
+                "r" : "1031",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1090",
-                "value" : [ " ", "overlaps day of", " " ]
+                "r" : "1055",
+                "value" : [ " ", "overlaps after day of", " " ]
               }, {
-                "r" : "1087",
+                "r" : "1052",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1075",
+                  "r" : "1040",
                   "s" : [ {
-                    "r" : "1069",
+                    "r" : "1034",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1084",
+                  "r" : "1049",
                   "s" : [ {
-                    "r" : "1078",
+                    "r" : "1043",
                     "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
                   } ]
                 }, {
@@ -146344,84 +171254,84 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "1090",
+          "type" : "OverlapsAfter",
+          "localId" : "1055",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1091",
+            "localId" : "1056",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1092",
+              "localId" : "1057",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1093",
+            "localId" : "1058",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1094",
+              "localId" : "1059",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1066",
+            "localId" : "1031",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1067",
+              "localId" : "1032",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1068",
+                "localId" : "1033",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1087",
+            "localId" : "1052",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1088",
+              "localId" : "1053",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1089",
+                "localId" : "1054",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1075",
+              "localId" : "1040",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1076",
+                "localId" : "1041",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1077",
+                "localId" : "1042",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1069",
+                "localId" : "1034",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -146429,7 +171339,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1070",
+                "localId" : "1035",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -146438,23 +171348,23 @@ module.exports['OverlapsDateTime'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1084",
+              "localId" : "1049",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1085",
+                "localId" : "1050",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1086",
+                "localId" : "1051",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1078",
+                "localId" : "1043",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -146462,7 +171372,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1079",
+                "localId" : "1044",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -146472,7 +171382,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "1097",
+        "localId" : "1062",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayOverlapBeforeDayOfImpreciseIvl",
         "context" : "Patient",
@@ -146481,35 +171391,35 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1097",
+            "r" : "1062",
             "s" : [ {
               "value" : [ "", "define ", "MayOverlapBeforeDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "1122",
+              "r" : "1087",
               "s" : [ {
-                "r" : "1098",
+                "r" : "1063",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1122",
-                "value" : [ " ", "overlaps day of", " " ]
+                "r" : "1087",
+                "value" : [ " ", "overlaps after day of", " " ]
               }, {
-                "r" : "1119",
+                "r" : "1084",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1107",
+                  "r" : "1072",
                   "s" : [ {
-                    "r" : "1101",
+                    "r" : "1066",
                     "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1116",
+                  "r" : "1081",
                   "s" : [ {
-                    "r" : "1110",
+                    "r" : "1075",
                     "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
                   } ]
                 }, {
@@ -146520,84 +171430,84 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "1122",
+          "type" : "OverlapsAfter",
+          "localId" : "1087",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1123",
+            "localId" : "1088",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1124",
+              "localId" : "1089",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1125",
+            "localId" : "1090",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1126",
+              "localId" : "1091",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1098",
+            "localId" : "1063",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1099",
+              "localId" : "1064",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1100",
+                "localId" : "1065",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1119",
+            "localId" : "1084",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1120",
+              "localId" : "1085",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1121",
+                "localId" : "1086",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1107",
+              "localId" : "1072",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1108",
+                "localId" : "1073",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1109",
+                "localId" : "1074",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1101",
+                "localId" : "1066",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -146605,7 +171515,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1102",
+                "localId" : "1067",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -146614,23 +171524,23 @@ module.exports['OverlapsDateTime'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1116",
+              "localId" : "1081",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1117",
+                "localId" : "1082",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1118",
+                "localId" : "1083",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1110",
+                "localId" : "1075",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -146638,7 +171548,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1111",
+                "localId" : "1076",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "10",
@@ -146648,7 +171558,7 @@ module.exports['OverlapsDateTime'] = {
           } ]
         }
       }, {
-        "localId" : "1129",
+        "localId" : "1094",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "MayOverlapAfterDayOfImpreciseIvl",
         "context" : "Patient",
@@ -146657,35 +171567,35 @@ module.exports['OverlapsDateTime'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1129",
+            "r" : "1094",
             "s" : [ {
               "value" : [ "", "define ", "MayOverlapAfterDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "1154",
+              "r" : "1119",
               "s" : [ {
-                "r" : "1130",
+                "r" : "1095",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1154",
-                "value" : [ " ", "overlaps day of", " " ]
+                "r" : "1119",
+                "value" : [ " ", "overlaps after day of", " " ]
               }, {
-                "r" : "1151",
+                "r" : "1116",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1139",
+                  "r" : "1104",
                   "s" : [ {
-                    "r" : "1133",
+                    "r" : "1098",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1148",
+                  "r" : "1113",
                   "s" : [ {
-                    "r" : "1142",
+                    "r" : "1107",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
                   } ]
                 }, {
@@ -146696,84 +171606,84 @@ module.exports['OverlapsDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "Overlaps",
-          "localId" : "1154",
+          "type" : "OverlapsAfter",
+          "localId" : "1119",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1155",
+            "localId" : "1120",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1156",
+              "localId" : "1121",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1157",
+            "localId" : "1122",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1158",
+              "localId" : "1123",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1130",
+            "localId" : "1095",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1131",
+              "localId" : "1096",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1132",
+                "localId" : "1097",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1151",
+            "localId" : "1116",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1152",
+              "localId" : "1117",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1153",
+                "localId" : "1118",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1139",
+              "localId" : "1104",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1140",
+                "localId" : "1105",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1141",
+                "localId" : "1106",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1133",
+                "localId" : "1098",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -146781,7 +171691,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1134",
+                "localId" : "1099",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -146790,23 +171700,23 @@ module.exports['OverlapsDateTime'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1148",
+              "localId" : "1113",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1149",
+                "localId" : "1114",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1150",
+                "localId" : "1115",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1142",
+                "localId" : "1107",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -146814,7 +171724,7 @@ module.exports['OverlapsDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1143",
+                "localId" : "1108",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -146828,21 +171738,25 @@ module.exports['OverlapsDateTime'] = {
   }
 }
 
-/* OverlapsAfter
+/* OverlapsBefore
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define OverlapsBeforeIntIvl: Interval[1, 5] overlaps after Interval[2, 7]
-define OverlapsAfterIntIvl: Interval[3, 8] overlaps after Interval[1, 6]
-define OverlapsBoundaryIntIvl: Interval[5, 10] overlaps after Interval[1, 5]
-define NoOverlapsIntIvl: Interval[1,5) overlaps after Interval[5, 10]
-define OverlapsBeforeRealIvl: Interval[1.234, 1.567] overlaps after Interval[1.345, 1.678]
-define OverlapsAfterRealIvl: Interval[1.345, 1.678] overlaps after Interval[1.234, 1.567]
-define OverlapsBoundaryRealIvl: Interval[1.234, 2.0] overlaps after Interval[1.0, 1.234]
-define NoOverlapsRealIvl: Interval[1.0, 1.23456789) overlaps after Interval[1.23456789, 2.0]
+define OverlapsBeforeIntIvl: Interval[1, 5] overlaps before Interval[2, 7]
+define OverlapsAfterIntIvl: Interval[3, 8] overlaps before Interval[1, 6]
+define OverlapsBoundaryIntIvl: Interval[1, 5] overlaps before Interval[5, 10]
+define NoOverlapsIntIvl: Interval[1,5) overlaps before Interval[5, 10]
+define OverlapsBeforeLongIvl: Interval[1L, 5L] overlaps before Interval[2L, 7L]
+define OverlapsAfterLongIvl: Interval[3L, 8L] overlaps before Interval[1L, 6L]
+define OverlapsBoundaryLongIvl: Interval[1L, 5L] overlaps before Interval[5L, 10L]
+define NoOverlapsLongIvl: Interval[1L,5L) overlaps before Interval[5L, 10L]
+define OverlapsBeforeRealIvl: Interval[1.234, 1.567] overlaps before Interval[1.345, 1.678]
+define OverlapsAfterRealIvl: Interval[1.345, 1.678] overlaps before Interval[1.234, 1.567]
+define OverlapsBoundaryRealIvl: Interval[1.0, 1.234] overlaps before Interval[1.234, 2.0]
+define NoOverlapsRealIvl: Interval[1.0, 1.23456789) overlaps before Interval[1.23456789, 2.0]
 */
 
-module.exports['OverlapsAfter'] = {
+module.exports['OverlapsBefore'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -146854,7 +171768,7 @@ module.exports['OverlapsAfter'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "340",
+        "r" : "412",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -146949,7 +171863,7 @@ module.exports['OverlapsAfter'] = {
                 } ]
               }, {
                 "r" : "225",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "222",
                 "s" : [ {
@@ -146961,7 +171875,7 @@ module.exports['OverlapsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -147077,7 +171991,7 @@ module.exports['OverlapsAfter'] = {
                 } ]
               }, {
                 "r" : "243",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "240",
                 "s" : [ {
@@ -147089,7 +172003,7 @@ module.exports['OverlapsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "243",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -147201,23 +172115,23 @@ module.exports['OverlapsAfter'] = {
                 "r" : "253",
                 "s" : [ {
                   "r" : "251",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
                 } ]
               }, {
                 "r" : "261",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "258",
                 "s" : [ {
                   "r" : "256",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "261",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -147264,7 +172178,7 @@ module.exports['OverlapsAfter'] = {
               "localId" : "251",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
@@ -147272,7 +172186,7 @@ module.exports['OverlapsAfter'] = {
               "localId" : "252",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -147297,7 +172211,7 @@ module.exports['OverlapsAfter'] = {
               "localId" : "256",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
@@ -147305,7 +172219,7 @@ module.exports['OverlapsAfter'] = {
               "localId" : "257",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
@@ -147333,7 +172247,7 @@ module.exports['OverlapsAfter'] = {
                 } ]
               }, {
                 "r" : "279",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "276",
                 "s" : [ {
@@ -147345,7 +172259,7 @@ module.exports['OverlapsAfter'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "279",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -147441,7 +172355,7 @@ module.exports['OverlapsAfter'] = {
       }, {
         "localId" : "286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsBeforeRealIvl",
+        "name" : "OverlapsBeforeLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -147450,30 +172364,30 @@ module.exports['OverlapsAfter'] = {
           "s" : {
             "r" : "286",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsBeforeRealIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsBeforeLongIvl", ": " ]
             }, {
               "r" : "297",
               "s" : [ {
                 "r" : "289",
                 "s" : [ {
                   "r" : "287",
-                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
                 "r" : "297",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "294",
                 "s" : [ {
                   "r" : "292",
-                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
+                  "value" : [ "Interval[", "2L", ", ", "7L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "297",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -147484,7 +172398,7 @@ module.exports['OverlapsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "299",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -147494,7 +172408,7 @@ module.exports['OverlapsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "301",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -147511,24 +172425,24 @@ module.exports['OverlapsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "291",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "287",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "288",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.567",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -147544,24 +172458,24 @@ module.exports['OverlapsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "296",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.678",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
               "annotation" : [ ]
             }
           } ]
@@ -147569,7 +172483,7 @@ module.exports['OverlapsAfter'] = {
       }, {
         "localId" : "304",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsAfterRealIvl",
+        "name" : "OverlapsAfterLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -147578,30 +172492,30 @@ module.exports['OverlapsAfter'] = {
           "s" : {
             "r" : "304",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsAfterRealIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsAfterLongIvl", ": " ]
             }, {
               "r" : "315",
               "s" : [ {
                 "r" : "307",
                 "s" : [ {
                   "r" : "305",
-                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
+                  "value" : [ "Interval[", "3L", ", ", "8L", "]" ]
                 } ]
               }, {
                 "r" : "315",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "312",
                 "s" : [ {
                   "r" : "310",
-                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "6L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "315",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -147612,7 +172526,7 @@ module.exports['OverlapsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "317",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -147622,7 +172536,7 @@ module.exports['OverlapsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "319",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -147639,24 +172553,24 @@ module.exports['OverlapsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "309",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "305",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "306",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.678",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "8",
               "annotation" : [ ]
             }
           }, {
@@ -147672,24 +172586,24 @@ module.exports['OverlapsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "314",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "310",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "311",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.567",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
               "annotation" : [ ]
             }
           } ]
@@ -147697,7 +172611,7 @@ module.exports['OverlapsAfter'] = {
       }, {
         "localId" : "322",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsBoundaryRealIvl",
+        "name" : "OverlapsBoundaryLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -147706,30 +172620,30 @@ module.exports['OverlapsAfter'] = {
           "s" : {
             "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsBoundaryRealIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsBoundaryLongIvl", ": " ]
             }, {
               "r" : "333",
               "s" : [ {
                 "r" : "325",
                 "s" : [ {
                   "r" : "323",
-                  "value" : [ "Interval[", "1.234", ", ", "2.0", "]" ]
+                  "value" : [ "Interval[", "1L", ", ", "5L", "]" ]
                 } ]
               }, {
                 "r" : "333",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "330",
                 "s" : [ {
                   "r" : "328",
-                  "value" : [ "Interval[", "1.0", ", ", "1.234", "]" ]
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "333",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -147740,7 +172654,7 @@ module.exports['OverlapsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "335",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -147750,7 +172664,7 @@ module.exports['OverlapsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "337",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -147767,24 +172681,24 @@ module.exports['OverlapsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "327",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "323",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "324",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.0",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
@@ -147800,24 +172714,24 @@ module.exports['OverlapsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "332",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "328",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "329",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
@@ -147825,7 +172739,7 @@ module.exports['OverlapsAfter'] = {
       }, {
         "localId" : "340",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NoOverlapsRealIvl",
+        "name" : "NoOverlapsLongIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -147834,30 +172748,30 @@ module.exports['OverlapsAfter'] = {
           "s" : {
             "r" : "340",
             "s" : [ {
-              "value" : [ "", "define ", "NoOverlapsRealIvl", ": " ]
+              "value" : [ "", "define ", "NoOverlapsLongIvl", ": " ]
             }, {
               "r" : "351",
               "s" : [ {
                 "r" : "343",
                 "s" : [ {
                   "r" : "341",
-                  "value" : [ "Interval[", "1.0", ", ", "1.23456789", ")" ]
+                  "value" : [ "Interval[", "1L", ",", "5L", ")" ]
                 } ]
               }, {
                 "r" : "351",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "348",
                 "s" : [ {
                   "r" : "346",
-                  "value" : [ "Interval[", "1.23456789", ", ", "2.0", "]" ]
+                  "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "351",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -147868,7 +172782,7 @@ module.exports['OverlapsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "353",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -147878,7 +172792,7 @@ module.exports['OverlapsAfter'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "355",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -147895,13 +172809,397 @@ module.exports['OverlapsAfter'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "345",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "348",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "349",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "350",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "358",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OverlapsBeforeRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "358",
+            "s" : [ {
+              "value" : [ "", "define ", "OverlapsBeforeRealIvl", ": " ]
+            }, {
+              "r" : "369",
+              "s" : [ {
+                "r" : "361",
+                "s" : [ {
+                  "r" : "359",
+                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
+                } ]
+              }, {
+                "r" : "369",
+                "value" : [ " ", "overlaps before", " " ]
+              }, {
+                "r" : "366",
+                "s" : [ {
+                  "r" : "364",
+                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "OverlapsBefore",
+          "localId" : "369",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "370",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "372",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "361",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "362",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "363",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "359",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "360",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.567",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "366",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "367",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.345",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.678",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "376",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OverlapsAfterRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "376",
+            "s" : [ {
+              "value" : [ "", "define ", "OverlapsAfterRealIvl", ": " ]
+            }, {
+              "r" : "387",
+              "s" : [ {
+                "r" : "379",
+                "s" : [ {
+                  "r" : "377",
+                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
+                } ]
+              }, {
+                "r" : "387",
+                "value" : [ " ", "overlaps before", " " ]
+              }, {
+                "r" : "384",
+                "s" : [ {
+                  "r" : "382",
+                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "OverlapsBefore",
+          "localId" : "387",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "388",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "389",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "390",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "391",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "379",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "380",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "381",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "377",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.345",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "378",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.678",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "384",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "385",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "386",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.567",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "394",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OverlapsBoundaryRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "394",
+            "s" : [ {
+              "value" : [ "", "define ", "OverlapsBoundaryRealIvl", ": " ]
+            }, {
+              "r" : "405",
+              "s" : [ {
+                "r" : "397",
+                "s" : [ {
+                  "r" : "395",
+                  "value" : [ "Interval[", "1.0", ", ", "1.234", "]" ]
+                } ]
+              }, {
+                "r" : "405",
+                "value" : [ " ", "overlaps before", " " ]
+              }, {
+                "r" : "402",
+                "s" : [ {
+                  "r" : "400",
+                  "value" : [ "Interval[", "1.234", ", ", "2.0", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "OverlapsBefore",
+          "localId" : "405",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "406",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "407",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "408",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "409",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "397",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "398",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "399",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "395",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.0",
@@ -147909,7 +173207,135 @@ module.exports['OverlapsAfter'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "342",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "402",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "403",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "404",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "400",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.234",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "2.0",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "412",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NoOverlapsRealIvl",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "412",
+            "s" : [ {
+              "value" : [ "", "define ", "NoOverlapsRealIvl", ": " ]
+            }, {
+              "r" : "423",
+              "s" : [ {
+                "r" : "415",
+                "s" : [ {
+                  "r" : "413",
+                  "value" : [ "Interval[", "1.0", ", ", "1.23456789", ")" ]
+                } ]
+              }, {
+                "r" : "423",
+                "value" : [ " ", "overlaps before", " " ]
+              }, {
+                "r" : "420",
+                "s" : [ {
+                  "r" : "418",
+                  "value" : [ "Interval[", "1.23456789", ", ", "2.0", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "OverlapsBefore",
+          "localId" : "423",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "424",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "425",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "426",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "427",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "415",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "416",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "417",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "413",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "414",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.23456789",
@@ -147917,24 +173343,24 @@ module.exports['OverlapsAfter'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "348",
+            "localId" : "420",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "349",
+              "localId" : "421",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "350",
+                "localId" : "422",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "346",
+              "localId" : "418",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "1.23456789",
@@ -147942,7 +173368,7 @@ module.exports['OverlapsAfter'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "347",
+              "localId" : "419",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "2.0",
@@ -147955,7 +173381,7 @@ module.exports['OverlapsAfter'] = {
   }
 }
 
-/* OverlapsAfterDateTime
+/* OverlapsBeforeDateTime
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
@@ -147966,29 +173392,29 @@ define ivlD: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2014, 1, 1, 0,
 define ivlE: Interval[DateTime(2013), DateTime(2015)]
 define ivlF: Interval[DateTime(2014), DateTime(2016)]
 define ivlG: Interval[DateTime(2016), DateTime(2017)]
-define ivlH: Interval[DateTime(2013,1), DateTime(2015,1)]
-define OverlapsBefore: ivlA overlaps after ivlB
-define OverlapsAfter: ivlB overlaps after ivlA
-define OverlapsContained: ivlB overlaps after ivlC
-define OverlapsContains: ivlC overlaps after ivlB
-define ImpreciseOverlapBefore: ivlE overlaps after ivlF
-define ImpreciseOverlapAfter: ivlF overlaps after ivlE
-define NoOverlap: ivlC overlaps after ivlD
-define NoImpreciseOverlap: ivlE overlaps after ivlG
-define MatchingPrecisionOverlap: ivlG overlaps after ivlF
-define UnknownOverlap: ivlH overlaps after ivlE
+define ivlH: Interval[DateTime(2011, 3), DateTime(2013, 3)]
+define OverlapsBefore: ivlA overlaps before ivlB
+define OverlapsAfter: ivlB overlaps before ivlA
+define OverlapsContained: ivlB overlaps before ivlC
+define OverlapsContains: ivlC overlaps before ivlB
+define ImpreciseOverlapBefore: ivlE overlaps before ivlF
+define ImpreciseOverlapAfter: ivlF overlaps before ivlE
+define NoOverlap: ivlC overlaps before ivlD
+define NoImpreciseOverlap: ivlE overlaps before ivlG
+define MatchingPrecisionOverlap: ivlF overlaps before ivlG
+define UnknownOverlap: ivlH overlaps before ivlE
 define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define OverlapsBeforeDayOfIvlEdge: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 9, 2, 23, 59, 59, 999), DateTime(2012, 10, 1, 0, 0, 0, 0)]
-define OverlapsAfterDayOfIvlEdge: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define OverlapsContainsDayOfIvl: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 5, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)]
-define OverlapsContainedByDayOfIvl: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
-define NotOverlapsDayOfIvl: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define OverlapsAfterDayOfImpreciseInterval: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 1), DateTime(2012, 4)]
-define MayOverlapBeforeDayOfImpreciseIvl: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 9), DateTime(2012, 10)]
-define MayOverlapAfterDayOfImpreciseIvl: PrecisionDateIvl overlaps after day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define OverlapsBeforeDayOfIvlEdge: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 9, 2, 23, 59, 59, 999), DateTime(2012, 10, 1, 0, 0, 0, 0)]
+define OverlapsAfterDayOfIvlEdge: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
+define OverlapsContainsDayOfIvl: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 5, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)]
+define OverlapsContainedByDayOfIvl: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
+define NotOverlapsDayOfIvl: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
+define OverlapsAfterDayOfImpreciseInterval: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 1), DateTime(2012, 4)]
+define MayOverlapBeforeDayOfImpreciseIvl: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 9), DateTime(2012, 10)]
+define MayOverlapAfterDayOfImpreciseIvl: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
 */
 
-module.exports['OverlapsAfterDateTime'] = {
+module.exports['OverlapsBeforeDateTime'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -149451,7 +174877,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 "r" : "505",
                 "s" : [ {
                   "r" : "499",
-                  "value" : [ "DateTime", "(", "2013", ",", "1", ")" ]
+                  "value" : [ "DateTime", "(", "2011", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
@@ -149459,7 +174885,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 "r" : "514",
                 "s" : [ {
                   "r" : "508",
-                  "value" : [ "DateTime", "(", "2015", ",", "1", ")" ]
+                  "value" : [ "DateTime", "(", "2013", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ "]" ]
@@ -149516,7 +174942,7 @@ module.exports['OverlapsAfterDateTime'] = {
               "localId" : "499",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
+              "value" : "2011",
               "annotation" : [ ]
             },
             "month" : {
@@ -149524,7 +174950,7 @@ module.exports['OverlapsAfterDateTime'] = {
               "localId" : "500",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "3",
               "annotation" : [ ]
             }
           },
@@ -149549,7 +174975,7 @@ module.exports['OverlapsAfterDateTime'] = {
               "localId" : "508",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
+              "value" : "2013",
               "annotation" : [ ]
             },
             "month" : {
@@ -149557,7 +174983,7 @@ module.exports['OverlapsAfterDateTime'] = {
               "localId" : "509",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "3",
               "annotation" : [ ]
             }
           }
@@ -149584,7 +175010,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "531",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "528",
                 "s" : [ {
@@ -149595,7 +175021,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "531",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -149676,7 +175102,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "545",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "542",
                 "s" : [ {
@@ -149687,7 +175113,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "545",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -149768,7 +175194,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "559",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "556",
                 "s" : [ {
@@ -149779,7 +175205,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "559",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -149860,7 +175286,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "573",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "570",
                 "s" : [ {
@@ -149871,7 +175297,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "573",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -149952,7 +175378,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "587",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "584",
                 "s" : [ {
@@ -149963,7 +175389,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "587",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -150044,7 +175470,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "601",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "598",
                 "s" : [ {
@@ -150055,7 +175481,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "601",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -150136,7 +175562,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "615",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "612",
                 "s" : [ {
@@ -150147,7 +175573,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "615",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -150228,7 +175654,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "629",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "626",
                 "s" : [ {
@@ -150239,7 +175665,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "629",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -150316,22 +175742,22 @@ module.exports['OverlapsAfterDateTime'] = {
               "s" : [ {
                 "r" : "637",
                 "s" : [ {
-                  "value" : [ "ivlG" ]
+                  "value" : [ "ivlF" ]
                 } ]
               }, {
                 "r" : "643",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "640",
                 "s" : [ {
-                  "value" : [ "ivlF" ]
+                  "value" : [ "ivlG" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "643",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -150359,7 +175785,7 @@ module.exports['OverlapsAfterDateTime'] = {
           "operand" : [ {
             "type" : "ExpressionRef",
             "localId" : "637",
-            "name" : "ivlG",
+            "name" : "ivlF",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
@@ -150375,7 +175801,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }, {
             "type" : "ExpressionRef",
             "localId" : "640",
-            "name" : "ivlF",
+            "name" : "ivlG",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
@@ -150412,7 +175838,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "657",
-                "value" : [ " ", "overlaps after", " " ]
+                "value" : [ " ", "overlaps before", " " ]
               }, {
                 "r" : "654",
                 "s" : [ {
@@ -150423,7 +175849,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "657",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
@@ -150765,7 +176191,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "775",
-                "value" : [ " ", "overlaps after day of", " " ]
+                "value" : [ " ", "overlaps before day of", " " ]
               }, {
                 "r" : "772",
                 "s" : [ {
@@ -150792,7 +176218,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "775",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
@@ -151071,7 +176497,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "837",
-                "value" : [ " ", "overlaps after day of", " " ]
+                "value" : [ " ", "overlaps before day of", " " ]
               }, {
                 "r" : "834",
                 "s" : [ {
@@ -151098,7 +176524,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "837",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
@@ -151377,7 +176803,7 @@ module.exports['OverlapsAfterDateTime'] = {
                 } ]
               }, {
                 "r" : "899",
-                "value" : [ " ", "overlaps after day of", " " ]
+                "value" : [ " ", "overlaps before day of", " " ]
               }, {
                 "r" : "896",
                 "s" : [ {
@@ -151404,7 +176830,7 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
+          "type" : "OverlapsBefore",
           "localId" : "899",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
@@ -151675,996 +177101,32 @@ module.exports['OverlapsAfterDateTime'] = {
             "s" : [ {
               "value" : [ "", "define ", "OverlapsContainedByDayOfIvl", ": " ]
             }, {
-              "r" : "961",
-              "s" : [ {
-                "r" : "907",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "961",
-                "value" : [ " ", "overlaps after day of", " " ]
-              }, {
-                "r" : "958",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "926",
-                  "s" : [ {
-                    "r" : "910",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "950",
-                  "s" : [ {
-                    "r" : "934",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "OverlapsAfter",
-          "localId" : "961",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "962",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "963",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "964",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "965",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "907",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "908",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "909",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "958",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "959",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "960",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "926",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "927",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "928",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "929",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "930",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "931",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "932",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "933",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "910",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "911",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "912",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "913",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "914",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "915",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "916",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "950",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "951",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "952",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "953",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "954",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "955",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "956",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "957",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "934",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "935",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "936",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "937",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "938",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "939",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "940",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "968",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotOverlapsDayOfIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "968",
-            "s" : [ {
-              "value" : [ "", "define ", "NotOverlapsDayOfIvl", ": " ]
-            }, {
-              "r" : "1023",
-              "s" : [ {
-                "r" : "969",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "1023",
-                "value" : [ " ", "overlaps after day of", " " ]
-              }, {
-                "r" : "1020",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "988",
-                  "s" : [ {
-                    "r" : "972",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1012",
-                  "s" : [ {
-                    "r" : "996",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "OverlapsAfter",
-          "localId" : "1023",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1024",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1025",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1026",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1027",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "969",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "970",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "971",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1020",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1021",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1022",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "988",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "989",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "990",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "991",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "992",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "993",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "994",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "995",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "972",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "973",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "974",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "975",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "976",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "977",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "978",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1012",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1013",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1014",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1015",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1016",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1017",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1018",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1019",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "996",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "997",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "998",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "999",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1000",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1001",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1002",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1030",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsAfterDayOfImpreciseInterval",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1030",
-            "s" : [ {
-              "value" : [ "", "define ", "OverlapsAfterDayOfImpreciseInterval", ": " ]
-            }, {
-              "r" : "1055",
-              "s" : [ {
-                "r" : "1031",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "1055",
-                "value" : [ " ", "overlaps after day of", " " ]
-              }, {
-                "r" : "1052",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1040",
-                  "s" : [ {
-                    "r" : "1034",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1049",
-                  "s" : [ {
-                    "r" : "1043",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "OverlapsAfter",
-          "localId" : "1055",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1056",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1057",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1058",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1059",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1031",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1032",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1033",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1052",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1053",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1054",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1040",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1041",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1042",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1034",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1035",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1049",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1050",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1051",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1043",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1044",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1062",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayOverlapBeforeDayOfImpreciseIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1062",
-            "s" : [ {
-              "value" : [ "", "define ", "MayOverlapBeforeDayOfImpreciseIvl", ": " ]
-            }, {
-              "r" : "1087",
-              "s" : [ {
-                "r" : "1063",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "1087",
-                "value" : [ " ", "overlaps after day of", " " ]
-              }, {
-                "r" : "1084",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1072",
-                  "s" : [ {
-                    "r" : "1066",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1081",
-                  "s" : [ {
-                    "r" : "1075",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "OverlapsAfter",
-          "localId" : "1087",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1088",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1089",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1090",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1091",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1063",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1064",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1065",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1084",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1085",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1086",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1072",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1073",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1074",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1066",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1067",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1081",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1082",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1083",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1075",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1076",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "1094",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayOverlapAfterDayOfImpreciseIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1094",
-            "s" : [ {
-              "value" : [ "", "define ", "MayOverlapAfterDayOfImpreciseIvl", ": " ]
-            }, {
-              "r" : "1119",
+              "r" : "961",
               "s" : [ {
-                "r" : "1095",
+                "r" : "907",
                 "s" : [ {
                   "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "1119",
-                "value" : [ " ", "overlaps after day of", " " ]
+                "r" : "961",
+                "value" : [ " ", "overlaps before day of", " " ]
               }, {
-                "r" : "1116",
+                "r" : "958",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1104",
+                  "r" : "926",
                   "s" : [ {
-                    "r" : "1098",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                    "r" : "910",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1113",
+                  "r" : "950",
                   "s" : [ {
-                    "r" : "1107",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                    "r" : "934",
+                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -152674,84 +177136,109 @@ module.exports['OverlapsAfterDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsAfter",
-          "localId" : "1119",
+          "type" : "OverlapsBefore",
+          "localId" : "961",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1120",
+            "localId" : "962",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1121",
+              "localId" : "963",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1122",
+            "localId" : "964",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1123",
+              "localId" : "965",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1095",
+            "localId" : "907",
             "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1096",
+              "localId" : "908",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1097",
+                "localId" : "909",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1116",
+            "localId" : "958",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1117",
+              "localId" : "959",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1118",
+                "localId" : "960",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1104",
+              "localId" : "926",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1105",
+                "localId" : "927",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1106",
+                "localId" : "928",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "929",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "930",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "931",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "932",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "933",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1098",
+                "localId" : "910",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -152759,32 +177246,97 @@ module.exports['OverlapsAfterDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1099",
+                "localId" : "911",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "912",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "913",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "914",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "915",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "916",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1113",
+              "localId" : "950",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1114",
+                "localId" : "951",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1115",
+                "localId" : "952",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "953",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "954",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "955",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "956",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "957",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1107",
+                "localId" : "934",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -152792,147 +177344,98 @@ module.exports['OverlapsAfterDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1108",
+                "localId" : "935",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "936",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "937",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "938",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "939",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "940",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* OverlapsBefore
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define OverlapsBeforeIntIvl: Interval[1, 5] overlaps before Interval[2, 7]
-define OverlapsAfterIntIvl: Interval[3, 8] overlaps before Interval[1, 6]
-define OverlapsBoundaryIntIvl: Interval[1, 5] overlaps before Interval[5, 10]
-define NoOverlapsIntIvl: Interval[1,5) overlaps before Interval[5, 10]
-define OverlapsBeforeRealIvl: Interval[1.234, 1.567] overlaps before Interval[1.345, 1.678]
-define OverlapsAfterRealIvl: Interval[1.345, 1.678] overlaps before Interval[1.234, 1.567]
-define OverlapsBoundaryRealIvl: Interval[1.0, 1.234] overlaps before Interval[1.234, 2.0]
-define NoOverlapsRealIvl: Interval[1.0, 1.23456789) overlaps before Interval[1.23456789, 2.0]
-*/
-
-module.exports['OverlapsBefore'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "340",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
       }, {
-        "localId" : "214",
+        "localId" : "968",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsBeforeIntIvl",
+        "name" : "NotOverlapsDayOfIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "968",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsBeforeIntIvl", ": " ]
+              "value" : [ "", "define ", "NotOverlapsDayOfIvl", ": " ]
             }, {
-              "r" : "225",
+              "r" : "1023",
               "s" : [ {
-                "r" : "217",
+                "r" : "969",
                 "s" : [ {
-                  "r" : "215",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "225",
-                "value" : [ " ", "overlaps before", " " ]
+                "r" : "1023",
+                "value" : [ " ", "overlaps before day of", " " ]
               }, {
-                "r" : "222",
+                "r" : "1020",
                 "s" : [ {
-                  "r" : "220",
-                  "value" : [ "Interval[", "2", ", ", "7", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "988",
+                  "s" : [ {
+                    "r" : "972",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1012",
+                  "s" : [ {
+                    "r" : "996",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -152940,639 +177443,305 @@ module.exports['OverlapsBefore'] = {
         } ],
         "expression" : {
           "type" : "OverlapsBefore",
-          "localId" : "225",
+          "localId" : "1023",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "226",
+            "localId" : "1024",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "227",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1025",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "228",
+            "localId" : "1026",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "1027",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "217",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "969",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "218",
+              "localId" : "970",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "219",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "971",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "222",
+            "localId" : "1020",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "223",
+              "localId" : "1021",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "224",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1022",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "232",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsAfterIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "232",
-            "s" : [ {
-              "value" : [ "", "define ", "OverlapsAfterIntIvl", ": " ]
-            }, {
-              "r" : "243",
-              "s" : [ {
-                "r" : "235",
-                "s" : [ {
-                  "r" : "233",
-                  "value" : [ "Interval[", "3", ", ", "8", "]" ]
-                } ]
+              "type" : "DateTime",
+              "localId" : "988",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "989",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "243",
-                "value" : [ " ", "overlaps before", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "990",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "240",
-                "s" : [ {
-                  "r" : "238",
-                  "value" : [ "Interval[", "1", ", ", "6", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "243",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "244",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "245",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "246",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "247",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "235",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "236",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "237",
+                "localId" : "991",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "233",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "234",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "240",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "241",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "242",
+                "localId" : "992",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "238",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "250",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsBoundaryIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "250",
-            "s" : [ {
-              "value" : [ "", "define ", "OverlapsBoundaryIntIvl", ": " ]
-            }, {
-              "r" : "261",
-              "s" : [ {
-                "r" : "253",
-                "s" : [ {
-                  "r" : "251",
-                  "value" : [ "Interval[", "1", ", ", "5", "]" ]
-                } ]
               }, {
-                "r" : "261",
-                "value" : [ " ", "overlaps before", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "993",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "258",
-                "s" : [ {
-                  "r" : "256",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "261",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "262",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "263",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "265",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "253",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "254",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "255",
+                "localId" : "994",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "995",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "972",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "973",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "974",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "975",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "976",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "977",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "978",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
             "high" : {
-              "type" : "Literal",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "258",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "259",
+              "type" : "DateTime",
+              "localId" : "1012",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "260",
+                "localId" : "1013",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "256",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "257",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "268",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NoOverlapsIntIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "268",
-            "s" : [ {
-              "value" : [ "", "define ", "NoOverlapsIntIvl", ": " ]
-            }, {
-              "r" : "279",
-              "s" : [ {
-                "r" : "271",
-                "s" : [ {
-                  "r" : "269",
-                  "value" : [ "Interval[", "1", ",", "5", ")" ]
-                } ]
               }, {
-                "r" : "279",
-                "value" : [ " ", "overlaps before", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1014",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "276",
-                "s" : [ {
-                  "r" : "274",
-                  "value" : [ "Interval[", "5", ", ", "10", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "279",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "280",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "281",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "282",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "283",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "271",
-            "lowClosed" : true,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "272",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "273",
+                "localId" : "1015",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "276",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "277",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "278",
+                "localId" : "1016",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "286",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsBeforeRealIvl",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "286",
-            "s" : [ {
-              "value" : [ "", "define ", "OverlapsBeforeRealIvl", ": " ]
-            }, {
-              "r" : "297",
-              "s" : [ {
-                "r" : "289",
-                "s" : [ {
-                  "r" : "287",
-                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
-                } ]
               }, {
-                "r" : "297",
-                "value" : [ " ", "overlaps before", " " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1017",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "294",
-                "s" : [ {
-                  "r" : "292",
-                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "297",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "298",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "299",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "300",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "301",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "289",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "290",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "291",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1018",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "287",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "288",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.567",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "294",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "295",
-              "annotation" : [ ],
-              "pointType" : {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "296",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1019",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "996",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "997",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "998",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "999",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1000",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1001",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1002",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.345",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "293",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.678",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "304",
+        "localId" : "1030",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsAfterRealIvl",
+        "name" : "OverlapsAfterDayOfImpreciseInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "304",
+            "r" : "1030",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsAfterRealIvl", ": " ]
+              "value" : [ "", "define ", "OverlapsAfterDayOfImpreciseInterval", ": " ]
             }, {
-              "r" : "315",
+              "r" : "1055",
               "s" : [ {
-                "r" : "307",
+                "r" : "1031",
                 "s" : [ {
-                  "r" : "305",
-                  "value" : [ "Interval[", "1.345", ", ", "1.678", "]" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "315",
-                "value" : [ " ", "overlaps before", " " ]
+                "r" : "1055",
+                "value" : [ " ", "overlaps before day of", " " ]
               }, {
-                "r" : "312",
+                "r" : "1052",
                 "s" : [ {
-                  "r" : "310",
-                  "value" : [ "Interval[", "1.234", ", ", "1.567", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1040",
+                  "s" : [ {
+                    "r" : "1034",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1049",
+                  "s" : [ {
+                    "r" : "1043",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -153580,127 +177749,175 @@ module.exports['OverlapsBefore'] = {
         } ],
         "expression" : {
           "type" : "OverlapsBefore",
-          "localId" : "315",
+          "localId" : "1055",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "316",
+            "localId" : "1056",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "317",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "1057",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "318",
+            "localId" : "1058",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "319",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "1059",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "307",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "1031",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "308",
+              "localId" : "1032",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "309",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1033",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "305",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.345",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "306",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.678",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "312",
+            "localId" : "1052",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "313",
+              "localId" : "1053",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "314",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1054",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "310",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1040",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1041",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1042",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1034",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1035",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "311",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.567",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1049",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1050",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1051",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1043",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1044",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "322",
+        "localId" : "1062",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsBoundaryRealIvl",
+        "name" : "MayOverlapBeforeDayOfImpreciseIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "322",
+            "r" : "1062",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsBoundaryRealIvl", ": " ]
+              "value" : [ "", "define ", "MayOverlapBeforeDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "333",
+              "r" : "1087",
               "s" : [ {
-                "r" : "325",
+                "r" : "1063",
                 "s" : [ {
-                  "r" : "323",
-                  "value" : [ "Interval[", "1.0", ", ", "1.234", "]" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "333",
-                "value" : [ " ", "overlaps before", " " ]
+                "r" : "1087",
+                "value" : [ " ", "overlaps before day of", " " ]
               }, {
-                "r" : "330",
+                "r" : "1084",
                 "s" : [ {
-                  "r" : "328",
-                  "value" : [ "Interval[", "1.234", ", ", "2.0", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1072",
+                  "s" : [ {
+                    "r" : "1066",
+                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1081",
+                  "s" : [ {
+                    "r" : "1075",
+                    "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -153708,127 +177925,175 @@ module.exports['OverlapsBefore'] = {
         } ],
         "expression" : {
           "type" : "OverlapsBefore",
-          "localId" : "333",
+          "localId" : "1087",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "334",
+            "localId" : "1088",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "335",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "1089",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "336",
+            "localId" : "1090",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "337",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "1091",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "325",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "1063",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "326",
+              "localId" : "1064",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "327",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1065",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "323",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "324",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "330",
+            "localId" : "1084",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "331",
+              "localId" : "1085",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "332",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1086",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "328",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.234",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1072",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1073",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1074",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1066",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1067",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "9",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "329",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.0",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1081",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1082",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1083",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1075",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1076",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "340",
+        "localId" : "1094",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NoOverlapsRealIvl",
+        "name" : "MayOverlapAfterDayOfImpreciseIvl",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "340",
+            "r" : "1094",
             "s" : [ {
-              "value" : [ "", "define ", "NoOverlapsRealIvl", ": " ]
+              "value" : [ "", "define ", "MayOverlapAfterDayOfImpreciseIvl", ": " ]
             }, {
-              "r" : "351",
+              "r" : "1119",
               "s" : [ {
-                "r" : "343",
+                "r" : "1095",
                 "s" : [ {
-                  "r" : "341",
-                  "value" : [ "Interval[", "1.0", ", ", "1.23456789", ")" ]
+                  "value" : [ "PrecisionDateIvl" ]
                 } ]
               }, {
-                "r" : "351",
-                "value" : [ " ", "overlaps before", " " ]
+                "r" : "1119",
+                "value" : [ " ", "overlaps before day of", " " ]
               }, {
-                "r" : "348",
+                "r" : "1116",
                 "s" : [ {
-                  "r" : "346",
-                  "value" : [ "Interval[", "1.23456789", ", ", "2.0", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1104",
+                  "s" : [ {
+                    "r" : "1098",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1113",
+                  "s" : [ {
+                    "r" : "1107",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -153836,95 +178101,129 @@ module.exports['OverlapsBefore'] = {
         } ],
         "expression" : {
           "type" : "OverlapsBefore",
-          "localId" : "351",
+          "localId" : "1119",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "352",
+            "localId" : "1120",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "353",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "1121",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "354",
+            "localId" : "1122",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "355",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "1123",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "343",
-            "lowClosed" : true,
-            "highClosed" : false,
+            "type" : "ExpressionRef",
+            "localId" : "1095",
+            "name" : "PrecisionDateIvl",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "344",
+              "localId" : "1096",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "345",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1097",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "341",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "342",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23456789",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "348",
+            "localId" : "1116",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "349",
+              "localId" : "1117",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "350",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "1118",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "346",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23456789",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1104",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1105",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1106",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1098",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1099",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "347",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "2.0",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "1113",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1114",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1115",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1107",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1108",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
@@ -153933,40 +178232,27 @@ module.exports['OverlapsBefore'] = {
   }
 }
 
-/* OverlapsBeforeDateTime
+/* Width
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define ivlA: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
-define ivlB: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 9, 1, 0, 0, 0, 0))
-define ivlC: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
-define ivlD: Interval[DateTime(2013, 1, 1, 0, 0, 0, 0), DateTime(2014, 1, 1, 0, 0, 0, 0))
-define ivlE: Interval[DateTime(2013), DateTime(2015)]
-define ivlF: Interval[DateTime(2014), DateTime(2016)]
-define ivlG: Interval[DateTime(2016), DateTime(2017)]
-define ivlH: Interval[DateTime(2011, 3), DateTime(2013, 3)]
-define OverlapsBefore: ivlA overlaps before ivlB
-define OverlapsAfter: ivlB overlaps before ivlA
-define OverlapsContained: ivlB overlaps before ivlC
-define OverlapsContains: ivlC overlaps before ivlB
-define ImpreciseOverlapBefore: ivlE overlaps before ivlF
-define ImpreciseOverlapAfter: ivlF overlaps before ivlE
-define NoOverlap: ivlC overlaps before ivlD
-define NoImpreciseOverlap: ivlE overlaps before ivlG
-define MatchingPrecisionOverlap: ivlF overlaps before ivlG
-define UnknownOverlap: ivlH overlaps before ivlE
-define PrecisionDateIvl: Interval[DateTime(2012, 3, 2, 12, 34, 56, 789), DateTime(2012, 9, 2, 1, 23, 45, 678))
-define OverlapsBeforeDayOfIvlEdge: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 9, 2, 23, 59, 59, 999), DateTime(2012, 10, 1, 0, 0, 0, 0)]
-define OverlapsAfterDayOfIvlEdge: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 2, 0, 0, 0, 0)]
-define OverlapsContainsDayOfIvl: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 5, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)]
-define OverlapsContainedByDayOfIvl: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 12, 1, 0, 0, 0, 0)]
-define NotOverlapsDayOfIvl: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 1, 2, 0, 0, 0, 0), DateTime(2012, 3, 1, 0, 0, 0, 0)]
-define OverlapsAfterDayOfImpreciseInterval: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 1), DateTime(2012, 4)]
-define MayOverlapBeforeDayOfImpreciseIvl: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 9), DateTime(2012, 10)]
-define MayOverlapAfterDayOfImpreciseIvl: PrecisionDateIvl overlaps before day of Interval[DateTime(2012, 1), DateTime(2012, 3)]
+define IntWidth: width of Interval[-2, 5]
+define IntOpenWidth: width of Interval(-2, 5)
+define LongWidth: width of Interval[-2L, 5L]
+define LongOpenWidth: width of Interval(-2L, 5L)
+define IntWidthThreeToMax: width of Interval[3, null]
+define IntWidthMinToThree: width of Interval[null, 3]
+define IntWidthThreeToUnknown: width of Interval[3, null)
+define IntWidthUnknownToThree: width of Interval(null, 3]
+define RealWidth: width of Interval[1.23, 4.56]
+define RealOpenWidth: width of Interval(1.23, 4.56)
+define WidthOfQuantityInterval: width of Interval[Quantity{value: 1, unit: 'mm'}, Quantity{value: 10, unit: 'mm'}]
+define WidthOfDateTimeInterval: width of Interval[DateTime(2012,01,01), DateTime(2012,01,03)]
+define WidthOfDateInterval: width of Interval[Date(2012,01,01), Date(2012,01,03)]
+define WidthOfTimeInterval: width of Interval[Time(12,00,00), Time(12,30,02)]
 */
 
-module.exports['OverlapsBeforeDateTime'] = {
+module.exports['Width'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -153978,7 +178264,7 @@ module.exports['OverlapsBeforeDateTime'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "1094",
+        "r" : "427",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -154052,7 +178338,8 @@ module.exports['OverlapsBeforeDateTime'] = {
         }
       }, {
         "localId" : "214",
-        "name" : "ivlA",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntWidth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -154061,2434 +178348,2442 @@ module.exports['OverlapsBeforeDateTime'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "ivlA", ": " ]
+              "value" : [ "", "define ", "IntWidth", ": " ]
             }, {
-              "r" : "263",
+              "r" : "215",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "231",
-                "s" : [ {
-                  "r" : "215",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "width of " ]
               }, {
-                "r" : "255",
+                "r" : "220",
                 "s" : [ {
-                  "r" : "239",
-                  "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "216",
+                  "s" : [ {
+                    "r" : "217",
+                    "value" : [ "-", "2" ]
+                  } ]
+                }, {
+                  "r" : "219",
+                  "value" : [ ", ", "5", "]" ]
                 } ]
-              }, {
-                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "266",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "267",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "263",
-          "lowClosed" : true,
-          "highClosed" : false,
+          "type" : "Width",
+          "localId" : "215",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
+            "localId" : "223",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "265",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "224",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "231",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "220",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "232",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "233",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "234",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "235",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "236",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "237",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "238",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "221",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "222",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "month" : {
-              "type" : "Literal",
+            "low" : {
+              "type" : "Negate",
               "localId" : "216",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "218",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "217",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
+            "high" : {
               "type" : "Literal",
               "localId" : "219",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "5",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "255",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "256",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "257",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "258",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "259",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "260",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "261",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "227",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntOpenWidth",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "227",
+            "s" : [ {
+              "value" : [ "", "define ", "IntOpenWidth", ": " ]
             }, {
+              "r" : "228",
+              "s" : [ {
+                "value" : [ "width of " ]
+              }, {
+                "r" : "233",
+                "s" : [ {
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "229",
+                  "s" : [ {
+                    "r" : "230",
+                    "value" : [ "-", "2" ]
+                  } ]
+                }, {
+                  "r" : "232",
+                  "value" : [ ", ", "5", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Width",
+          "localId" : "228",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "236",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "262",
+              "localId" : "237",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "233",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "234",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "235",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "240",
+            "low" : {
+              "type" : "Negate",
+              "localId" : "229",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
-              "annotation" : [ ]
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "231",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "230",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             },
-            "day" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "241",
+              "localId" : "232",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "240",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongWidth",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "240",
+            "s" : [ {
+              "value" : [ "", "define ", "LongWidth", ": " ]
+            }, {
+              "r" : "241",
+              "s" : [ {
+                "value" : [ "width of " ]
+              }, {
+                "r" : "246",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "242",
+                  "s" : [ {
+                    "r" : "243",
+                    "value" : [ "-", "2L" ]
+                  } ]
+                }, {
+                  "r" : "245",
+                  "value" : [ ", ", "5L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Width",
+          "localId" : "241",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "249",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "250",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "246",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "247",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "248",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
-              "type" : "Literal",
+            "low" : {
+              "type" : "Negate",
               "localId" : "242",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "244",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "243",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "243",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "253",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongOpenWidth",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "253",
+            "s" : [ {
+              "value" : [ "", "define ", "LongOpenWidth", ": " ]
+            }, {
+              "r" : "254",
+              "s" : [ {
+                "value" : [ "width of " ]
+              }, {
+                "r" : "259",
+                "s" : [ {
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "255",
+                  "s" : [ {
+                    "r" : "256",
+                    "value" : [ "-", "2L" ]
+                  } ]
+                }, {
+                  "r" : "258",
+                  "value" : [ ", ", "5L", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Width",
+          "localId" : "254",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "262",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "263",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "259",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "260",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "261",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "244",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "Negate",
+              "localId" : "255",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "257",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "256",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "245",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "258",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "270",
-        "name" : "ivlB",
+        "localId" : "266",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntWidthThreeToMax",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "270",
+            "r" : "266",
             "s" : [ {
-              "value" : [ "", "define ", "ivlB", ": " ]
+              "value" : [ "", "define ", "IntWidthThreeToMax", ": " ]
             }, {
-              "r" : "319",
+              "r" : "267",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "287",
-                "s" : [ {
-                  "r" : "271",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "width of " ]
               }, {
-                "r" : "311",
+                "r" : "270",
                 "s" : [ {
-                  "r" : "295",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "268",
+                  "value" : [ "Interval[", "3", ", ", "null", "]" ]
                 } ]
-              }, {
-                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "322",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "323",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "319",
-          "lowClosed" : true,
-          "highClosed" : false,
+          "type" : "Width",
+          "localId" : "267",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "320",
+            "localId" : "274",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "321",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "275",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "287",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "270",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "288",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "289",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "290",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "291",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "292",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "293",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "294",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "271",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
               "localId" : "272",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "273",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "273",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "276",
+              "localId" : "268",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "3",
               "annotation" : [ ]
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "277",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "As",
+              "localId" : "271",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "269",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "311",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "312",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "313",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "314",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "315",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "316",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "317",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "278",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntWidthMinToThree",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "278",
+            "s" : [ {
+              "value" : [ "", "define ", "IntWidthMinToThree", ": " ]
             }, {
+              "r" : "279",
+              "s" : [ {
+                "value" : [ "width of " ]
+              }, {
+                "r" : "282",
+                "s" : [ {
+                  "r" : "280",
+                  "value" : [ "Interval[", "null", ", ", "3", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Width",
+          "localId" : "279",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "286",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "318",
+              "localId" : "287",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "295",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "298",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "299",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "282",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "284",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "285",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "300",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "As",
+              "localId" : "283",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "280",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "301",
+              "localId" : "281",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "3",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "326",
-        "name" : "ivlC",
+        "localId" : "290",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntWidthThreeToUnknown",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "326",
+            "r" : "290",
             "s" : [ {
-              "value" : [ "", "define ", "ivlC", ": " ]
+              "value" : [ "", "define ", "IntWidthThreeToUnknown", ": " ]
             }, {
-              "r" : "375",
+              "r" : "291",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "343",
-                "s" : [ {
-                  "r" : "327",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "width of " ]
               }, {
-                "r" : "367",
+                "r" : "294",
                 "s" : [ {
-                  "r" : "351",
-                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "292",
+                  "value" : [ "Interval[", "3", ", ", "null", ")" ]
                 } ]
-              }, {
-                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "378",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "379",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "375",
-          "lowClosed" : true,
-          "highClosed" : false,
+          "type" : "Width",
+          "localId" : "291",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "376",
+            "localId" : "298",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "377",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "343",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "344",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "345",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "346",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "347",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "348",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "349",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "350",
+              "localId" : "299",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "327",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "328",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "329",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "330",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "331",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "332",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "333",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "367",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "294",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "368",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "369",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "370",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "371",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "372",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "373",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "374",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "351",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "352",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "353",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "354",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "355",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "296",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "297",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "356",
+              "localId" : "292",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "3",
               "annotation" : [ ]
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "357",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "As",
+              "localId" : "295",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "293",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }
         }
       }, {
-        "localId" : "382",
-        "name" : "ivlD",
+        "localId" : "302",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntWidthUnknownToThree",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "382",
+            "r" : "302",
             "s" : [ {
-              "value" : [ "", "define ", "ivlD", ": " ]
+              "value" : [ "", "define ", "IntWidthUnknownToThree", ": " ]
             }, {
-              "r" : "431",
+              "r" : "303",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "399",
-                "s" : [ {
-                  "r" : "383",
-                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "width of " ]
               }, {
-                "r" : "423",
+                "r" : "306",
                 "s" : [ {
-                  "r" : "407",
-                  "value" : [ "DateTime", "(", "2014", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "304",
+                  "value" : [ "Interval(", "null", ", ", "3", "]" ]
                 } ]
-              }, {
-                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "434",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "435",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "431",
-          "lowClosed" : true,
-          "highClosed" : false,
+          "type" : "Width",
+          "localId" : "303",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "432",
+            "localId" : "310",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "433",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "399",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "400",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "401",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "402",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "403",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "404",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "405",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "406",
+              "localId" : "311",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "383",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "384",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "385",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "386",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "387",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "388",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "389",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "423",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "306",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "424",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "425",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "426",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "427",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "428",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "429",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "430",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "407",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2014",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "408",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "409",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "410",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "411",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "308",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "309",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "412",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "As",
+              "localId" : "307",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "304",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "413",
+              "localId" : "305",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "3",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "438",
-        "name" : "ivlE",
+        "localId" : "314",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "RealWidth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "438",
+            "r" : "314",
             "s" : [ {
-              "value" : [ "", "define ", "ivlE", ": " ]
+              "value" : [ "", "define ", "RealWidth", ": " ]
             }, {
-              "r" : "451",
+              "r" : "315",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "443",
-                "s" : [ {
-                  "r" : "439",
-                  "value" : [ "DateTime", "(", "2013", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "width of " ]
               }, {
-                "r" : "449",
+                "r" : "318",
                 "s" : [ {
-                  "r" : "445",
-                  "value" : [ "DateTime", "(", "2015", ")" ]
+                  "r" : "316",
+                  "value" : [ "Interval[", "1.23", ", ", "4.56", "]" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "454",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "455",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "451",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Width",
+          "localId" : "315",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "452",
+            "localId" : "321",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "453",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "322",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "443",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "318",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "444",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "319",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "320",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "439",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "449",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "450",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "316",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23",
               "annotation" : [ ]
-            } ],
-            "year" : {
+            },
+            "high" : {
               "type" : "Literal",
-              "localId" : "445",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2015",
+              "localId" : "317",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.56",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "458",
-        "name" : "ivlF",
+        "localId" : "325",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "RealOpenWidth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "458",
+            "r" : "325",
             "s" : [ {
-              "value" : [ "", "define ", "ivlF", ": " ]
+              "value" : [ "", "define ", "RealOpenWidth", ": " ]
             }, {
-              "r" : "471",
+              "r" : "326",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "463",
-                "s" : [ {
-                  "r" : "459",
-                  "value" : [ "DateTime", "(", "2014", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "width of " ]
               }, {
-                "r" : "469",
+                "r" : "329",
                 "s" : [ {
-                  "r" : "465",
-                  "value" : [ "DateTime", "(", "2016", ")" ]
+                  "r" : "327",
+                  "value" : [ "Interval(", "1.23", ", ", "4.56", ")" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "474",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "475",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "471",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Width",
+          "localId" : "326",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "472",
+            "localId" : "332",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "473",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "333",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "463",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "329",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "464",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "330",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "331",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "459",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2014",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "469",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "470",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "327",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23",
               "annotation" : [ ]
-            } ],
-            "year" : {
+            },
+            "high" : {
               "type" : "Literal",
-              "localId" : "465",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2016",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.56",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "478",
-        "name" : "ivlG",
+        "localId" : "336",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "WidthOfQuantityInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "478",
+            "r" : "336",
             "s" : [ {
-              "value" : [ "", "define ", "ivlG", ": " ]
+              "value" : [ "", "define ", "WidthOfQuantityInterval", ": " ]
             }, {
-              "r" : "491",
+              "r" : "337",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "483",
-                "s" : [ {
-                  "r" : "479",
-                  "value" : [ "DateTime", "(", "2016", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "width of " ]
               }, {
-                "r" : "489",
+                "r" : "354",
                 "s" : [ {
-                  "r" : "485",
-                  "value" : [ "DateTime", "(", "2017", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "338",
+                  "s" : [ {
+                    "value" : [ "Quantity", "{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "340",
+                      "value" : [ "value", ": ", "1" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "unit", ": " ]
+                    }, {
+                      "r" : "344",
+                      "s" : [ {
+                        "value" : [ "'mm'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "346",
+                  "s" : [ {
+                    "value" : [ "Quantity", "{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "348",
+                      "value" : [ "value", ": ", "10" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "unit", ": " ]
+                    }, {
+                      "r" : "352",
+                      "s" : [ {
+                        "value" : [ "'mm'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "494",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "495",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "491",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Width",
+          "localId" : "337",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "492",
+            "localId" : "357",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "493",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "483",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "484",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "479",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2016",
+              "localId" : "358",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "489",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "354",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "490",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "485",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2017",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "355",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "356",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Instance",
+              "localId" : "338",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "element" : [ {
+                "name" : "value",
+                "value" : {
+                  "type" : "ToDecimal",
+                  "localId" : "342",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "343",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "operand" : {
+                    "type" : "Literal",
+                    "localId" : "340",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  }
+                }
+              }, {
+                "name" : "unit",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "344",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "mm",
+                  "annotation" : [ ]
+                }
+              } ]
+            },
+            "high" : {
+              "type" : "Instance",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "element" : [ {
+                "name" : "value",
+                "value" : {
+                  "type" : "ToDecimal",
+                  "localId" : "350",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "351",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "operand" : {
+                    "type" : "Literal",
+                    "localId" : "348",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "10",
+                    "annotation" : [ ]
+                  }
+                }
+              }, {
+                "name" : "unit",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "352",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "mm",
+                  "annotation" : [ ]
+                }
+              } ]
             }
           }
         }
       }, {
-        "localId" : "498",
-        "name" : "ivlH",
+        "localId" : "361",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "WidthOfDateTimeInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "498",
+            "r" : "361",
             "s" : [ {
-              "value" : [ "", "define ", "ivlH", ": " ]
+              "value" : [ "", "define ", "WidthOfDateTimeInterval", ": " ]
             }, {
-              "r" : "517",
+              "r" : "362",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "505",
-                "s" : [ {
-                  "r" : "499",
-                  "value" : [ "DateTime", "(", "2011", ", ", "3", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "width of " ]
               }, {
-                "r" : "514",
+                "r" : "387",
                 "s" : [ {
-                  "r" : "508",
-                  "value" : [ "DateTime", "(", "2013", ", ", "3", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "371",
+                  "s" : [ {
+                    "r" : "363",
+                    "value" : [ "DateTime", "(", "2012", ",", "01", ",", "01", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "383",
+                  "s" : [ {
+                    "r" : "375",
+                    "value" : [ "DateTime", "(", "2012", ",", "01", ",", "03", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "520",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "521",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "517",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Width",
+          "localId" : "362",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "518",
+            "localId" : "390",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "519",
+              "localId" : "391",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "505",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "387",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "506",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "507",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "499",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2011",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "388",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "389",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "500",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "514",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "515",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "516",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "508",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "372",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "373",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "374",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "363",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "364",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "365",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              }
             },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "509",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "384",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "385",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "386",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "375",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "376",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "377",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "03",
+                "annotation" : [ ]
+              }
             }
           }
         }
       }, {
-        "localId" : "524",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsBefore",
+        "localId" : "394",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "WidthOfDateInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "524",
+            "r" : "394",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsBefore", ": " ]
+              "value" : [ "", "define ", "WidthOfDateInterval", ": " ]
             }, {
-              "r" : "531",
+              "r" : "395",
               "s" : [ {
-                "r" : "525",
-                "s" : [ {
-                  "value" : [ "ivlA" ]
-                } ]
-              }, {
-                "r" : "531",
-                "value" : [ " ", "overlaps before", " " ]
+                "value" : [ "width of " ]
               }, {
-                "r" : "528",
+                "r" : "420",
                 "s" : [ {
-                  "value" : [ "ivlB" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "404",
+                  "s" : [ {
+                    "r" : "396",
+                    "value" : [ "Date", "(", "2012", ",", "01", ",", "01", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "416",
+                  "s" : [ {
+                    "r" : "408",
+                    "value" : [ "Date", "(", "2012", ",", "01", ",", "03", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "531",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Width",
+          "localId" : "395",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "532",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "533",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "534",
+            "localId" : "423",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "535",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "424",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "525",
-            "name" : "ivlA",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "420",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "526",
+              "localId" : "421",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "527",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "422",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "528",
-            "name" : "ivlB",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "529",
+            },
+            "low" : {
+              "type" : "Date",
+              "localId" : "404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "530",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "405",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "406",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "407",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "396",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "397",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "398",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Date",
+              "localId" : "416",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "417",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "418",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "419",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "408",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "409",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "410",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "03",
                 "annotation" : [ ]
               }
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "538",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsAfter",
+        "localId" : "427",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "WidthOfTimeInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "538",
+            "r" : "427",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsAfter", ": " ]
+              "value" : [ "", "define ", "WidthOfTimeInterval", ": " ]
             }, {
-              "r" : "545",
+              "r" : "428",
               "s" : [ {
-                "r" : "539",
-                "s" : [ {
-                  "value" : [ "ivlB" ]
-                } ]
-              }, {
-                "r" : "545",
-                "value" : [ " ", "overlaps before", " " ]
+                "value" : [ "width of " ]
               }, {
-                "r" : "542",
+                "r" : "453",
                 "s" : [ {
-                  "value" : [ "ivlA" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "437",
+                  "s" : [ {
+                    "r" : "429",
+                    "value" : [ "Time", "(", "12", ",", "00", ",", "00", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "449",
+                  "s" : [ {
+                    "r" : "441",
+                    "value" : [ "Time", "(", "12", ",", "30", ",", "02", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "545",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Width",
+          "localId" : "428",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "546",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "547",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "548",
+            "localId" : "456",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "549",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "457",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "539",
-            "name" : "ivlB",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "453",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "540",
+              "localId" : "454",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "541",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "455",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "542",
-            "name" : "ivlA",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "543",
+            },
+            "low" : {
+              "type" : "Time",
+              "localId" : "437",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "544",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "438",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "439",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "440",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "429",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "430",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "00",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "431",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "00",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Time",
+              "localId" : "449",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "450",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "451",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "452",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "441",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "12",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "442",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "30",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "443",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "02",
                 "annotation" : [ ]
               }
             }
-          } ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Size
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define IntSize: Size(Interval[-2, 5])
+define IntOpenSize: Size(Interval(-2, 5))
+define LongSize: Size(Interval[-2L, 5L])
+define LongOpenSize: Size(Interval(-2L, 5L))
+define IntSizeThreeToMax: Size(Interval[3, null])
+define IntSizeMinToThree: Size(Interval[null, 3])
+define IntSizeThreeToUnknown: Size(Interval[3, null))
+define IntSizeUnknownToThree: Size(Interval(null, 3])
+define RealSize: Size(Interval[1.23, 4.56])
+define RealOpenSize: Size(Interval(1.23, 4.56))
+define SizeIsNull: Size(null as Interval<Integer>)
+define SizeOfQuantityInterval: Size(Interval[Quantity{value: 1, unit: 'mm'}, Quantity{value: 10, unit: 'mm'}])
+define SizeOfDateTimeInterval: Size(Interval[DateTime(2012,01,01), DateTime(2012,01,03)])
+define SizeOfDateInterval: Size(Interval[Date(2012,01,01), Date(2012,01,03)])
+define SizeOfTimeInterval: Size(Interval[Time(12,00,00), Time(12,30,02)])
+*/
+
+module.exports['Size'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "497",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
         }
       }, {
-        "localId" : "552",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsContained",
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntSize",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "552",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsContained", ": " ]
+              "value" : [ "", "define ", "IntSize", ": " ]
             }, {
-              "r" : "559",
+              "r" : "226",
               "s" : [ {
-                "r" : "553",
-                "s" : [ {
-                  "value" : [ "ivlB" ]
-                } ]
-              }, {
-                "r" : "559",
-                "value" : [ " ", "overlaps before", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "556",
+                "r" : "219",
                 "s" : [ {
-                  "value" : [ "ivlC" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "215",
+                  "s" : [ {
+                    "r" : "216",
+                    "value" : [ "-", "2" ]
+                  } ]
+                }, {
+                  "r" : "218",
+                  "value" : [ ", ", "5", "]" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "559",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Size",
+          "localId" : "226",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "560",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "561",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "562",
+            "localId" : "227",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "563",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "228",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "553",
-            "name" : "ivlB",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "219",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "554",
+              "localId" : "220",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "555",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "221",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "556",
-            "name" : "ivlC",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "557",
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "558",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "217",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "216",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "566",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsContains",
+        "localId" : "231",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntOpenSize",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "566",
+            "r" : "231",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsContains", ": " ]
+              "value" : [ "", "define ", "IntOpenSize", ": " ]
             }, {
-              "r" : "573",
+              "r" : "243",
               "s" : [ {
-                "r" : "567",
-                "s" : [ {
-                  "value" : [ "ivlC" ]
-                } ]
-              }, {
-                "r" : "573",
-                "value" : [ " ", "overlaps before", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "570",
+                "r" : "236",
                 "s" : [ {
-                  "value" : [ "ivlB" ]
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "232",
+                  "s" : [ {
+                    "r" : "233",
+                    "value" : [ "-", "2" ]
+                  } ]
+                }, {
+                  "r" : "235",
+                  "value" : [ ", ", "5", ")" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "573",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Size",
+          "localId" : "243",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "574",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "575",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "576",
+            "localId" : "244",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "577",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "245",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "567",
-            "name" : "ivlC",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "236",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "568",
+              "localId" : "237",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "569",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "238",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "570",
-            "name" : "ivlB",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "571",
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "232",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "572",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "234",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "233",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "235",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "580",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseOverlapBefore",
+        "localId" : "248",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongSize",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "580",
+            "r" : "248",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseOverlapBefore", ": " ]
+              "value" : [ "", "define ", "LongSize", ": " ]
             }, {
-              "r" : "587",
+              "r" : "260",
               "s" : [ {
-                "r" : "581",
-                "s" : [ {
-                  "value" : [ "ivlE" ]
-                } ]
-              }, {
-                "r" : "587",
-                "value" : [ " ", "overlaps before", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "584",
+                "r" : "253",
                 "s" : [ {
-                  "value" : [ "ivlF" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "249",
+                  "s" : [ {
+                    "r" : "250",
+                    "value" : [ "-", "2L" ]
+                  } ]
+                }, {
+                  "r" : "252",
+                  "value" : [ ", ", "5L", "]" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "587",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Size",
+          "localId" : "260",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "588",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "589",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "590",
+            "localId" : "261",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "591",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "262",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "581",
-            "name" : "ivlE",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "253",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "582",
+              "localId" : "254",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "583",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "255",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "584",
-            "name" : "ivlF",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "585",
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "249",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "586",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "251",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "250",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "594",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "ImpreciseOverlapAfter",
+        "localId" : "265",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongOpenSize",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "594",
+            "r" : "265",
             "s" : [ {
-              "value" : [ "", "define ", "ImpreciseOverlapAfter", ": " ]
+              "value" : [ "", "define ", "LongOpenSize", ": " ]
             }, {
-              "r" : "601",
+              "r" : "277",
               "s" : [ {
-                "r" : "595",
-                "s" : [ {
-                  "value" : [ "ivlF" ]
-                } ]
-              }, {
-                "r" : "601",
-                "value" : [ " ", "overlaps before", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "598",
+                "r" : "270",
                 "s" : [ {
-                  "value" : [ "ivlE" ]
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "266",
+                  "s" : [ {
+                    "r" : "267",
+                    "value" : [ "-", "2L" ]
+                  } ]
+                }, {
+                  "r" : "269",
+                  "value" : [ ", ", "5L", ")" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "601",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Size",
+          "localId" : "277",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "602",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "603",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "604",
+            "localId" : "278",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "605",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "279",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "595",
-            "name" : "ivlF",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "270",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "596",
+              "localId" : "271",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "597",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "272",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "598",
-            "name" : "ivlE",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "599",
+            },
+            "low" : {
+              "type" : "Negate",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "600",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "268",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "267",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "608",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NoOverlap",
+        "localId" : "282",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntSizeThreeToMax",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "608",
+            "r" : "282",
             "s" : [ {
-              "value" : [ "", "define ", "NoOverlap", ": " ]
+              "value" : [ "", "define ", "IntSizeThreeToMax", ": " ]
             }, {
-              "r" : "615",
+              "r" : "293",
               "s" : [ {
-                "r" : "609",
-                "s" : [ {
-                  "value" : [ "ivlC" ]
-                } ]
-              }, {
-                "r" : "615",
-                "value" : [ " ", "overlaps before", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "612",
+                "r" : "285",
                 "s" : [ {
-                  "value" : [ "ivlD" ]
+                  "r" : "283",
+                  "value" : [ "Interval[", "3", ", ", "null", "]" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "615",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Size",
+          "localId" : "293",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "616",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "617",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "618",
+            "localId" : "294",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "619",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "295",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "609",
-            "name" : "ivlC",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "285",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "610",
+              "localId" : "287",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "611",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "288",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "612",
-            "name" : "ivlD",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "613",
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "283",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "286",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "614",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "284",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "622",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NoImpreciseOverlap",
+        "localId" : "298",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntSizeMinToThree",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "622",
+            "r" : "298",
             "s" : [ {
-              "value" : [ "", "define ", "NoImpreciseOverlap", ": " ]
+              "value" : [ "", "define ", "IntSizeMinToThree", ": " ]
             }, {
-              "r" : "629",
+              "r" : "309",
               "s" : [ {
-                "r" : "623",
-                "s" : [ {
-                  "value" : [ "ivlE" ]
-                } ]
-              }, {
-                "r" : "629",
-                "value" : [ " ", "overlaps before", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "626",
+                "r" : "301",
                 "s" : [ {
-                  "value" : [ "ivlG" ]
+                  "r" : "299",
+                  "value" : [ "Interval[", "null", ", ", "3", "]" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "629",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Size",
+          "localId" : "309",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "630",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "631",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "632",
+            "localId" : "310",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "633",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "311",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "623",
-            "name" : "ivlE",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "301",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "624",
+              "localId" : "303",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "625",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "304",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "626",
-            "name" : "ivlG",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "627",
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "302",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "628",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "299",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "300",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "636",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MatchingPrecisionOverlap",
+        "localId" : "314",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntSizeThreeToUnknown",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "636",
+            "r" : "314",
             "s" : [ {
-              "value" : [ "", "define ", "MatchingPrecisionOverlap", ": " ]
+              "value" : [ "", "define ", "IntSizeThreeToUnknown", ": " ]
             }, {
-              "r" : "643",
+              "r" : "325",
               "s" : [ {
-                "r" : "637",
-                "s" : [ {
-                  "value" : [ "ivlF" ]
-                } ]
-              }, {
-                "r" : "643",
-                "value" : [ " ", "overlaps before", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "640",
+                "r" : "317",
                 "s" : [ {
-                  "value" : [ "ivlG" ]
+                  "r" : "315",
+                  "value" : [ "Interval[", "3", ", ", "null", ")" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "643",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Size",
+          "localId" : "325",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "644",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "645",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "646",
+            "localId" : "326",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "647",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "327",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "637",
-            "name" : "ivlF",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "317",
+            "lowClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "638",
+              "localId" : "319",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "639",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "320",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "640",
-            "name" : "ivlG",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "641",
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "315",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "318",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "642",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "316",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "650",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnknownOverlap",
+        "localId" : "330",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IntSizeUnknownToThree",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "650",
+            "r" : "330",
             "s" : [ {
-              "value" : [ "", "define ", "UnknownOverlap", ": " ]
+              "value" : [ "", "define ", "IntSizeUnknownToThree", ": " ]
             }, {
-              "r" : "657",
+              "r" : "341",
               "s" : [ {
-                "r" : "651",
-                "s" : [ {
-                  "value" : [ "ivlH" ]
-                } ]
-              }, {
-                "r" : "657",
-                "value" : [ " ", "overlaps before", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "654",
+                "r" : "333",
                 "s" : [ {
-                  "value" : [ "ivlE" ]
+                  "r" : "331",
+                  "value" : [ "Interval(", "null", ", ", "3", "]" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "657",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Size",
+          "localId" : "341",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "658",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "659",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "660",
+            "localId" : "342",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "661",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "343",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "651",
-            "name" : "ivlH",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "333",
+            "lowClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "652",
+              "localId" : "335",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "653",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "336",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "654",
-            "name" : "ivlE",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "655",
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "334",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "656",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "331",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "332",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "664",
-        "name" : "PrecisionDateIvl",
+        "localId" : "346",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "RealSize",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "664",
+            "r" : "346",
             "s" : [ {
-              "value" : [ "", "define ", "PrecisionDateIvl", ": " ]
+              "value" : [ "", "define ", "RealSize", ": " ]
             }, {
-              "r" : "713",
+              "r" : "356",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "681",
-                "s" : [ {
-                  "r" : "665",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "12", ", ", "34", ", ", "56", ", ", "789", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "705",
+                "r" : "349",
                 "s" : [ {
-                  "r" : "689",
-                  "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "1", ", ", "23", ", ", "45", ", ", "678", ")" ]
+                  "r" : "347",
+                  "value" : [ "Interval[", "1.23", ", ", "4.56", "]" ]
                 } ]
               }, {
                 "value" : [ ")" ]
@@ -156496,689 +180791,534 @@ module.exports['OverlapsBeforeDateTime'] = {
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "716",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "717",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "713",
-          "lowClosed" : true,
-          "highClosed" : false,
+          "type" : "Size",
+          "localId" : "356",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "714",
+            "localId" : "357",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "715",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "681",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "682",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "683",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "684",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "685",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "686",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "687",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "688",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "665",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "666",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "667",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "668",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "669",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "34",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "670",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "56",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "671",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "789",
+              "localId" : "358",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "705",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "349",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "706",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "707",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "708",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "709",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "710",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "711",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "712",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "689",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "690",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "691",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "350",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "351",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "692",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23",
               "annotation" : [ ]
             },
-            "minute" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "693",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "23",
+              "localId" : "348",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.56",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "361",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "RealOpenSize",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "361",
+            "s" : [ {
+              "value" : [ "", "define ", "RealOpenSize", ": " ]
+            }, {
+              "r" : "371",
+              "s" : [ {
+                "value" : [ "Size", "(" ]
+              }, {
+                "r" : "364",
+                "s" : [ {
+                  "r" : "362",
+                  "value" : [ "Interval(", "1.23", ", ", "4.56", ")" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Size",
+          "localId" : "371",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "372",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "364",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "365",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "366",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
+            "low" : {
               "type" : "Literal",
-              "localId" : "694",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "45",
+              "localId" : "362",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "1.23",
               "annotation" : [ ]
             },
-            "millisecond" : {
+            "high" : {
               "type" : "Literal",
-              "localId" : "695",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "678",
+              "localId" : "363",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.56",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "720",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsBeforeDayOfIvlEdge",
+        "localId" : "376",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "SizeIsNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "720",
+            "r" : "376",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsBeforeDayOfIvlEdge", ": " ]
+              "value" : [ "", "define ", "SizeIsNull", ": " ]
             }, {
-              "r" : "775",
+              "r" : "389",
               "s" : [ {
-                "r" : "721",
+                "value" : [ "Size", "(" ]
+              }, {
+                "r" : "377",
                 "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
+                  "r" : "378",
+                  "value" : [ "null", " as " ]
+                }, {
+                  "r" : "379",
+                  "s" : [ {
+                    "value" : [ "Interval<" ]
+                  }, {
+                    "r" : "380",
+                    "s" : [ {
+                      "value" : [ "Integer" ]
+                    } ]
+                  }, {
+                    "value" : [ ">" ]
+                  } ]
                 } ]
               }, {
-                "r" : "775",
-                "value" : [ " ", "overlaps before day of", " " ]
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Size",
+          "localId" : "389",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "390",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "391",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "As",
+            "localId" : "377",
+            "strict" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "383",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "384",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "378",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "379",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "381",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "382",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              },
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "380",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          }
+        }
+      }, {
+        "localId" : "394",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+        "name" : "SizeOfQuantityInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "394",
+            "s" : [ {
+              "value" : [ "", "define ", "SizeOfQuantityInterval", ": " ]
+            }, {
+              "r" : "418",
+              "s" : [ {
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "772",
+                "r" : "411",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "740",
+                  "r" : "395",
                   "s" : [ {
-                    "r" : "724",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ", ", "2", ", ", "23", ", ", "59", ", ", "59", ", ", "999", ")" ]
+                    "value" : [ "Quantity", "{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "397",
+                      "value" : [ "value", ": ", "1" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "unit", ": " ]
+                    }, {
+                      "r" : "401",
+                      "s" : [ {
+                        "value" : [ "'mm'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "764",
+                  "r" : "403",
                   "s" : [ {
-                    "r" : "748",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "Quantity", "{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "405",
+                      "value" : [ "value", ": ", "10" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "unit", ": " ]
+                    }, {
+                      "r" : "409",
+                      "s" : [ {
+                        "value" : [ "'mm'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "775",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Size",
+          "localId" : "418",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "776",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "777",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "778",
+            "localId" : "419",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "779",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "420",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "721",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "722",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "723",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
+          "operand" : {
             "type" : "Interval",
-            "localId" : "772",
+            "localId" : "411",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "773",
+              "localId" : "412",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "774",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "413",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "740",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Instance",
+              "localId" : "395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "741",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "742",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "743",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "744",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "745",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "746",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "element" : [ {
+                "name" : "value",
+                "value" : {
+                  "type" : "ToDecimal",
+                  "localId" : "399",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "400",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "operand" : {
+                    "type" : "Literal",
+                    "localId" : "397",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "1",
+                    "annotation" : [ ]
+                  }
+                }
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "747",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "724",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "725",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "726",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "727",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "23",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "728",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "729",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "59",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "730",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "999",
-                "annotation" : [ ]
-              }
+                "name" : "unit",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "401",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "mm",
+                  "annotation" : [ ]
+                }
+              } ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "764",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Instance",
+              "localId" : "403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "765",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "766",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "767",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "768",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "769",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "770",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "element" : [ {
+                "name" : "value",
+                "value" : {
+                  "type" : "ToDecimal",
+                  "localId" : "407",
+                  "annotation" : [ ],
+                  "signature" : [ {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "408",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  } ],
+                  "operand" : {
+                    "type" : "Literal",
+                    "localId" : "405",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "value" : "10",
+                    "annotation" : [ ]
+                  }
+                }
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "771",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "748",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "749",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "750",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "751",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "752",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "753",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "754",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "name" : "unit",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "409",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "mm",
+                  "annotation" : [ ]
+                }
+              } ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "782",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsAfterDayOfIvlEdge",
+        "localId" : "423",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "SizeOfDateTimeInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "782",
+            "r" : "423",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsAfterDayOfIvlEdge", ": " ]
+              "value" : [ "", "define ", "SizeOfDateTimeInterval", ": " ]
             }, {
-              "r" : "837",
+              "r" : "455",
               "s" : [ {
-                "r" : "783",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "837",
-                "value" : [ " ", "overlaps before day of", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "834",
+                "r" : "448",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "802",
+                  "r" : "432",
                   "s" : [ {
-                    "r" : "786",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "424",
+                    "value" : [ "DateTime", "(", "2012", ",", "01", ",", "01", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "826",
+                  "r" : "444",
                   "s" : [ {
-                    "r" : "810",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "436",
+                    "value" : [ "DateTime", "(", "2012", ",", "01", ",", "03", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "837",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Size",
+          "localId" : "455",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "838",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "839",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "840",
+            "localId" : "456",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "841",
+              "localId" : "457",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "783",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "784",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "785",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
+          "operand" : {
             "type" : "Interval",
-            "localId" : "834",
+            "localId" : "448",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "835",
+              "localId" : "449",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "836",
+                "localId" : "450",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "802",
+              "localId" : "432",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "803",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "804",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "805",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "806",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "807",
+                "localId" : "433",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "808",
+                "localId" : "434",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "809",
+                "localId" : "435",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "786",
+                "localId" : "424",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -157186,97 +181326,45 @@ module.exports['OverlapsBeforeDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "787",
+                "localId" : "425",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "01",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "788",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "789",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "790",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "791",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "792",
+                "localId" : "426",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "01",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "826",
+              "localId" : "444",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "827",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "828",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "829",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "830",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "831",
+                "localId" : "445",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "832",
+                "localId" : "446",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "833",
+                "localId" : "447",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "810",
+                "localId" : "436",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -157284,207 +181372,124 @@ module.exports['OverlapsBeforeDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "811",
+                "localId" : "437",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "01",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "812",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "813",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "814",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "815",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "816",
+                "localId" : "438",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "03",
                 "annotation" : [ ]
               }
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "844",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsContainsDayOfIvl",
+        "localId" : "460",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+        "name" : "SizeOfDateInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "844",
+            "r" : "460",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsContainsDayOfIvl", ": " ]
+              "value" : [ "", "define ", "SizeOfDateInterval", ": " ]
             }, {
-              "r" : "899",
+              "r" : "492",
               "s" : [ {
-                "r" : "845",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "899",
-                "value" : [ " ", "overlaps before day of", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "896",
+                "r" : "485",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "864",
+                  "r" : "469",
                   "s" : [ {
-                    "r" : "848",
-                    "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "461",
+                    "value" : [ "Date", "(", "2012", ",", "01", ",", "01", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "888",
+                  "r" : "481",
                   "s" : [ {
-                    "r" : "872",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "473",
+                    "value" : [ "Date", "(", "2012", ",", "01", ",", "03", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "899",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Size",
+          "localId" : "492",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "900",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "901",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "902",
+            "localId" : "493",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "903",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "494",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "845",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "846",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "847",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
+          "operand" : {
             "type" : "Interval",
-            "localId" : "896",
+            "localId" : "485",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "897",
+              "localId" : "486",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "898",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "487",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "864",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Date",
+              "localId" : "469",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "865",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "866",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "867",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "868",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "869",
+                "localId" : "470",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "870",
+                "localId" : "471",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "871",
+                "localId" : "472",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "848",
+                "localId" : "461",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -157492,97 +181497,45 @@ module.exports['OverlapsBeforeDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "849",
+                "localId" : "462",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
+                "value" : "01",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "850",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "851",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "852",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "853",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "854",
+                "localId" : "463",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "01",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "888",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Date",
+              "localId" : "481",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "889",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "890",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "891",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "892",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "893",
+                "localId" : "482",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "894",
+                "localId" : "483",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "895",
+                "localId" : "484",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "872",
+                "localId" : "473",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -157590,401 +181543,332 @@ module.exports['OverlapsBeforeDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "873",
+                "localId" : "474",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "01",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "874",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "875",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "876",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "877",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "878",
+                "localId" : "475",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "03",
                 "annotation" : [ ]
               }
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "906",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsContainedByDayOfIvl",
+        "localId" : "497",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+        "name" : "SizeOfTimeInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "906",
+            "r" : "497",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsContainedByDayOfIvl", ": " ]
+              "value" : [ "", "define ", "SizeOfTimeInterval", ": " ]
             }, {
-              "r" : "961",
+              "r" : "529",
               "s" : [ {
-                "r" : "907",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "961",
-                "value" : [ " ", "overlaps before day of", " " ]
+                "value" : [ "Size", "(" ]
               }, {
-                "r" : "958",
+                "r" : "522",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "926",
+                  "r" : "506",
                   "s" : [ {
-                    "r" : "910",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "498",
+                    "value" : [ "Time", "(", "12", ",", "00", ",", "00", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "950",
+                  "r" : "518",
                   "s" : [ {
-                    "r" : "934",
-                    "value" : [ "DateTime", "(", "2012", ", ", "12", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "510",
+                    "value" : [ "Time", "(", "12", ",", "30", ",", "02", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "961",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Size",
+          "localId" : "529",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "962",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "963",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "964",
+            "localId" : "530",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "965",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "531",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "907",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "908",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "909",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
+          "operand" : {
             "type" : "Interval",
-            "localId" : "958",
+            "localId" : "522",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "959",
+              "localId" : "523",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "960",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "524",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "926",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Time",
+              "localId" : "506",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "927",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "928",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "929",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "930",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "931",
+                "localId" : "507",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "932",
+                "localId" : "508",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "933",
+                "localId" : "509",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "910",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "911",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "912",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "913",
+                "localId" : "498",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "12",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "914",
+                "localId" : "499",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "00",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "915",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "916",
+                "localId" : "500",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "00",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "950",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Time",
+              "localId" : "518",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "951",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "952",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "953",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "954",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "955",
+                "localId" : "519",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "956",
+                "localId" : "520",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "957",
+                "localId" : "521",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "934",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "935",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "936",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "937",
+                "localId" : "510",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "12",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "938",
+                "localId" : "511",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "30",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "939",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "940",
+                "localId" : "512",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "02",
                 "annotation" : [ ]
               }
             }
-          } ]
+          }
+        }
+      } ]
+    }
+  }
+}
+
+/* Start
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define ClosedNotNull: start of Interval[DateTime(2012, 1, 1), DateTime(2013, 1, 1)]
+define ClosedNullDateTime: start of Interval[null, DateTime(2013, 1, 1)]
+define ClosedNullInteger: start of Interval[null, 3]
+define ClosedNullLong: start of Interval[null, 3L]
+define ClosedNullDecimal: start of Interval[null, 5.1]
+define NullInterval: start of (null as Interval<DateTime>)
+define OpenNotNull: start of Interval(DateTime(2012, 1, 1), DateTime(2013, 1, 1))
+define OpenLongNotNull: start of Interval(1L, 3L)
+define OpenNull: start of Interval(null, DateTime(2013, 1, 1))
+*/
+
+module.exports['Start'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "366",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
         }
       }, {
-        "localId" : "968",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NotOverlapsDayOfIvl",
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ClosedNotNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "968",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "NotOverlapsDayOfIvl", ": " ]
+              "value" : [ "", "define ", "ClosedNotNull", ": " ]
             }, {
-              "r" : "1023",
+              "r" : "215",
               "s" : [ {
-                "r" : "969",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "1023",
-                "value" : [ " ", "overlaps before day of", " " ]
+                "value" : [ "start of " ]
               }, {
-                "r" : "1020",
+                "r" : "240",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "988",
+                  "r" : "224",
                   "s" : [ {
-                    "r" : "972",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "216",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1012",
+                  "r" : "236",
                   "s" : [ {
-                    "r" : "996",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "228",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -157994,109 +181878,62 @@ module.exports['OverlapsBeforeDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "1023",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Start",
+          "localId" : "215",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1024",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1025",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1026",
+            "localId" : "243",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1027",
+              "localId" : "244",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "969",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "970",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "971",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
+          "operand" : {
             "type" : "Interval",
-            "localId" : "1020",
+            "localId" : "240",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1021",
+              "localId" : "241",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1022",
+                "localId" : "242",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "988",
+              "localId" : "224",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "989",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "990",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "991",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "992",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "993",
+                "localId" : "225",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "994",
+                "localId" : "226",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "995",
+                "localId" : "227",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "972",
+                "localId" : "216",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -158104,7 +181941,7 @@ module.exports['OverlapsBeforeDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "973",
+                "localId" : "217",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -158112,185 +181949,88 @@ module.exports['OverlapsBeforeDateTime'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "974",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "975",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "976",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "977",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "978",
+                "localId" : "218",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "1",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1012",
+              "localId" : "236",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1013",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1014",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1015",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1016",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1017",
+                "localId" : "237",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1018",
+                "localId" : "238",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1019",
+                "localId" : "239",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "996",
+                "localId" : "228",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "997",
+                "localId" : "229",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "998",
+                "localId" : "230",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "999",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1000",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1001",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1002",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1030",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OverlapsAfterDayOfImpreciseInterval",
+        "localId" : "247",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ClosedNullDateTime",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1030",
+            "r" : "247",
             "s" : [ {
-              "value" : [ "", "define ", "OverlapsAfterDayOfImpreciseInterval", ": " ]
+              "value" : [ "", "define ", "ClosedNullDateTime", ": " ]
             }, {
-              "r" : "1055",
+              "r" : "248",
               "s" : [ {
-                "r" : "1031",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "1055",
-                "value" : [ " ", "overlaps before day of", " " ]
+                "value" : [ "start of " ]
               }, {
-                "r" : "1052",
+                "r" : "262",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1040",
-                  "s" : [ {
-                    "r" : "1034",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "r" : "249",
+                  "value" : [ "Interval[", "null", ", " ]
                 }, {
-                  "r" : "1049",
+                  "r" : "258",
                   "s" : [ {
-                    "r" : "1043",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ")" ]
+                    "r" : "250",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -158300,260 +182040,557 @@ module.exports['OverlapsBeforeDateTime'] = {
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "1055",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Start",
+          "localId" : "248",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1056",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1057",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1058",
+            "localId" : "266",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1059",
+              "localId" : "267",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1031",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1032",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1033",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
+          "operand" : {
             "type" : "Interval",
-            "localId" : "1052",
+            "localId" : "262",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1053",
+              "localId" : "264",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1054",
+                "localId" : "265",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "263",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "249",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "1040",
+              "localId" : "258",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1041",
+                "localId" : "259",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1042",
+                "localId" : "260",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "261",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1034",
+                "localId" : "250",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1035",
+                "localId" : "251",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "252",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
               }
+            }
+          }
+        }
+      }, {
+        "localId" : "270",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "ClosedNullInteger",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "270",
+            "s" : [ {
+              "value" : [ "", "define ", "ClosedNullInteger", ": " ]
+            }, {
+              "r" : "271",
+              "s" : [ {
+                "value" : [ "start of " ]
+              }, {
+                "r" : "274",
+                "s" : [ {
+                  "r" : "272",
+                  "value" : [ "Interval[", "null", ", ", "3", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Start",
+          "localId" : "271",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "278",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "279",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "274",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "276",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "277",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "275",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "272",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1049",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "273",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "282",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "ClosedNullLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "282",
+            "s" : [ {
+              "value" : [ "", "define ", "ClosedNullLong", ": " ]
+            }, {
+              "r" : "283",
+              "s" : [ {
+                "value" : [ "start of " ]
+              }, {
+                "r" : "286",
+                "s" : [ {
+                  "r" : "284",
+                  "value" : [ "Interval[", "null", ", ", "3L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Start",
+          "localId" : "283",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "290",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "291",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "286",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "288",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1050",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "289",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "287",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "284",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "285",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "294",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "ClosedNullDecimal",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "294",
+            "s" : [ {
+              "value" : [ "", "define ", "ClosedNullDecimal", ": " ]
+            }, {
+              "r" : "295",
+              "s" : [ {
+                "value" : [ "start of " ]
               }, {
+                "r" : "298",
+                "s" : [ {
+                  "r" : "296",
+                  "value" : [ "Interval[", "null", ", ", "5.1", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Start",
+          "localId" : "295",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "302",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "303",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "298",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "300",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1051",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "301",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1043",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+              }
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "299",
+              "asType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "296",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1044",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "297",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "5.1",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "306",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "NullInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "306",
+            "s" : [ {
+              "value" : [ "", "define ", "NullInterval", ": " ]
+            }, {
+              "r" : "307",
+              "s" : [ {
+                "value" : [ "start of " ]
+              }, {
+                "r" : "308",
+                "s" : [ {
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "308",
+                  "s" : [ {
+                    "r" : "309",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "310",
+                    "s" : [ {
+                      "value" : [ "Interval<" ]
+                    }, {
+                      "r" : "311",
+                      "s" : [ {
+                        "value" : [ "DateTime" ]
+                      } ]
+                    }, {
+                      "value" : [ ">" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Start",
+          "localId" : "307",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "318",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "319",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "As",
+            "localId" : "308",
+            "strict" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "316",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "317",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "309",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "310",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "312",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "313",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              },
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "311",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1062",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayOverlapBeforeDayOfImpreciseIvl",
+        "localId" : "322",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "OpenNotNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1062",
+            "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "MayOverlapBeforeDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "OpenNotNull", ": " ]
             }, {
-              "r" : "1087",
+              "r" : "323",
               "s" : [ {
-                "r" : "1063",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "1087",
-                "value" : [ " ", "overlaps before day of", " " ]
+                "value" : [ "start of " ]
               }, {
-                "r" : "1084",
+                "r" : "348",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "Interval(" ]
                 }, {
-                  "r" : "1072",
+                  "r" : "332",
                   "s" : [ {
-                    "r" : "1066",
-                    "value" : [ "DateTime", "(", "2012", ", ", "9", ")" ]
+                    "r" : "324",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1081",
+                  "r" : "344",
                   "s" : [ {
-                    "r" : "1075",
-                    "value" : [ "DateTime", "(", "2012", ", ", "10", ")" ]
+                    "r" : "336",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "1087",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Start",
+          "localId" : "323",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1088",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1089",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1090",
+            "localId" : "351",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1091",
+              "localId" : "352",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1063",
-            "name" : "PrecisionDateIvl",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1064",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1065",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
+          "operand" : {
             "type" : "Interval",
-            "localId" : "1084",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "348",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1085",
+              "localId" : "349",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1086",
+                "localId" : "350",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "1072",
+              "localId" : "332",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1073",
+                "localId" : "333",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1074",
+                "localId" : "334",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "335",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1066",
+                "localId" : "324",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -158561,248 +182598,297 @@ module.exports['OverlapsBeforeDateTime'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1067",
+                "localId" : "325",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "9",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "326",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "1081",
+              "localId" : "344",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1082",
+                "localId" : "345",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1083",
+                "localId" : "346",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "347",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1075",
+                "localId" : "336",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1076",
+                "localId" : "337",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "338",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
               }
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1094",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "MayOverlapAfterDayOfImpreciseIvl",
+        "localId" : "355",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "OpenLongNotNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1094",
+            "r" : "355",
             "s" : [ {
-              "value" : [ "", "define ", "MayOverlapAfterDayOfImpreciseIvl", ": " ]
+              "value" : [ "", "define ", "OpenLongNotNull", ": " ]
             }, {
-              "r" : "1119",
+              "r" : "356",
               "s" : [ {
-                "r" : "1095",
-                "s" : [ {
-                  "value" : [ "PrecisionDateIvl" ]
-                } ]
-              }, {
-                "r" : "1119",
-                "value" : [ " ", "overlaps before day of", " " ]
+                "value" : [ "start of " ]
               }, {
-                "r" : "1116",
+                "r" : "359",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1104",
-                  "s" : [ {
-                    "r" : "1098",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1113",
-                  "s" : [ {
-                    "r" : "1107",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "357",
+                  "value" : [ "Interval(", "1L", ", ", "3L", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "OverlapsBefore",
-          "localId" : "1119",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Start",
+          "localId" : "356",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1120",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1121",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1122",
+            "localId" : "362",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1123",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "363",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1095",
-            "name" : "PrecisionDateIvl",
+          "operand" : {
+            "type" : "Interval",
+            "localId" : "359",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1096",
+              "localId" : "360",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1097",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "361",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "357",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "358",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
             }
-          }, {
+          }
+        }
+      }, {
+        "localId" : "366",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "OpenNull",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "366",
+            "s" : [ {
+              "value" : [ "", "define ", "OpenNull", ": " ]
+            }, {
+              "r" : "367",
+              "s" : [ {
+                "value" : [ "start of " ]
+              }, {
+                "r" : "381",
+                "s" : [ {
+                  "r" : "368",
+                  "value" : [ "Interval(", "null", ", " ]
+                }, {
+                  "r" : "377",
+                  "s" : [ {
+                    "r" : "369",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Start",
+          "localId" : "367",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "385",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "386",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
             "type" : "Interval",
-            "localId" : "1116",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "381",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1117",
+              "localId" : "383",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1118",
+                "localId" : "384",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "382",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "368",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "DateTime",
-              "localId" : "1104",
+              "localId" : "377",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1105",
+                "localId" : "378",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1106",
+                "localId" : "379",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "380",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "1098",
+                "localId" : "369",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "1099",
+                "localId" : "370",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1113",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1114",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1115",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1107",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
               },
-              "month" : {
+              "day" : {
                 "type" : "Literal",
-                "localId" : "1108",
+                "localId" : "371",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
+                "value" : "1",
                 "annotation" : [ ]
               }
             }
-          } ]
+          }
         }
       } ]
     }
   }
 }
 
-/* Width
+/* End
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define IntWidth: width of Interval[-2, 5]
-define IntOpenWidth: width of Interval(-2, 5)
-define IntWidthThreeToMax: width of Interval[3, null]
-define IntWidthMinToThree: width of Interval[null, 3]
-define IntWidthThreeToUnknown: width of Interval[3, null)
-define IntWidthUnknownToThree: width of Interval(null, 3]
-define RealWidth: width of Interval[1.23, 4.56]
-define RealOpenWidth: width of Interval(1.23, 4.56)
-define WidthOfQuantityInterval: width of Interval[Quantity{value: 1, unit: 'mm'}, Quantity{value: 10, unit: 'mm'}]
-define WidthOfDateTimeInterval: width of Interval[DateTime(2012,01,01), DateTime(2012,01,03)]
-define WidthOfDateInterval: width of Interval[Date(2012,01,01), Date(2012,01,03)]
-define WidthOfTimeInterval: width of Interval[Time(12,00,00), Time(12,30,02)]
+define ClosedNotNull: end of Interval[DateTime(2012, 1, 1), DateTime(2013, 1, 1)]
+define ClosedNullDateTime: end of Interval[DateTime(2013, 1, 1), null]
+define ClosedNullInteger: end of Interval[5, null]
+define ClosedNullLong: end of Interval[5L, null]
+define ClosedNullDecimal: end of Interval[7.3, null]
+define NullInterval: end of (null as Interval<DateTime>)
+define OpenNotNull: end of Interval(DateTime(2012, 1, 1), DateTime(2013, 1, 1))
+define OpenLongNotNull: end of Interval(1L, 3L)
+define OpenNull: end of Interval(DateTime(2013, 1, 1), null)
 */
 
-module.exports['Width'] = {
+module.exports['End'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -158814,7 +182900,7 @@ module.exports['Width'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "401",
+        "r" : "366",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -158888,8 +182974,8 @@ module.exports['Width'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntWidth",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ClosedNotNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -158898,433 +182984,369 @@ module.exports['Width'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "IntWidth", ": " ]
+              "value" : [ "", "define ", "ClosedNotNull", ": " ]
             }, {
               "r" : "215",
               "s" : [ {
-                "value" : [ "width of " ]
+                "value" : [ "end of " ]
               }, {
-                "r" : "220",
+                "r" : "240",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "216",
+                  "r" : "224",
                   "s" : [ {
-                    "r" : "217",
-                    "value" : [ "-", "2" ]
+                    "r" : "216",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
-                  "r" : "219",
-                  "value" : [ ", ", "5", "]" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "236",
+                  "s" : [ {
+                    "r" : "228",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Width",
+          "type" : "End",
           "localId" : "215",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "223",
+            "localId" : "243",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "224",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "244",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "Interval",
-            "localId" : "220",
+            "localId" : "240",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "221",
+              "localId" : "241",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "222",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "242",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Negate",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "type" : "DateTime",
+              "localId" : "224",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "218",
+                "localId" : "225",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "226",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "227",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "operand" : {
+              "year" : {
+                "type" : "Literal",
+                "localId" : "216",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
                 "type" : "Literal",
                 "localId" : "217",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "218",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "219",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "227",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntOpenWidth",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "227",
-            "s" : [ {
-              "value" : [ "", "define ", "IntOpenWidth", ": " ]
-            }, {
-              "r" : "228",
-              "s" : [ {
-                "value" : [ "width of " ]
-              }, {
-                "r" : "233",
-                "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
-                  "r" : "229",
-                  "s" : [ {
-                    "r" : "230",
-                    "value" : [ "-", "2" ]
-                  } ]
-                }, {
-                  "r" : "232",
-                  "value" : [ ", ", "5", ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Width",
-          "localId" : "228",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "236",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "237",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "Interval",
-            "localId" : "233",
-            "lowClosed" : false,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "234",
+              "type" : "DateTime",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "235",
+                "localId" : "237",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Negate",
-              "localId" : "229",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ {
+              }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "231",
+                "localId" : "238",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "239",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "operand" : {
+              "year" : {
+                "type" : "Literal",
+                "localId" : "228",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "229",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
                 "type" : "Literal",
                 "localId" : "230",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "value" : "1",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "232",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "240",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntWidthThreeToMax",
+        "localId" : "247",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "ClosedNullDateTime",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "240",
+            "r" : "247",
             "s" : [ {
-              "value" : [ "", "define ", "IntWidthThreeToMax", ": " ]
+              "value" : [ "", "define ", "ClosedNullDateTime", ": " ]
             }, {
-              "r" : "241",
+              "r" : "248",
               "s" : [ {
-                "value" : [ "width of " ]
+                "value" : [ "end of " ]
               }, {
-                "r" : "244",
+                "r" : "262",
                 "s" : [ {
-                  "r" : "242",
-                  "value" : [ "Interval[", "3", ", ", "null", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "257",
+                  "s" : [ {
+                    "r" : "249",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "r" : "261",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Width",
-          "localId" : "241",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "End",
+          "localId" : "248",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "248",
+            "localId" : "266",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "249",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "267",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "Interval",
-            "localId" : "244",
+            "localId" : "262",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "246",
+              "localId" : "264",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "247",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "265",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "242",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "245",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "type" : "DateTime",
+              "localId" : "257",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "243",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "258",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          }
-        }
-      }, {
-        "localId" : "252",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntWidthMinToThree",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "252",
-            "s" : [ {
-              "value" : [ "", "define ", "IntWidthMinToThree", ": " ]
-            }, {
-              "r" : "253",
-              "s" : [ {
-                "value" : [ "width of " ]
               }, {
-                "r" : "256",
-                "s" : [ {
-                  "r" : "254",
-                  "value" : [ "Interval[", "null", ", ", "3", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Width",
-          "localId" : "253",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "260",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "261",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "Interval",
-            "localId" : "256",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "258",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "259",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "260",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "249",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "250",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "251",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
               }
             },
-            "low" : {
+            "high" : {
               "type" : "As",
-              "localId" : "257",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "263",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "254",
+                "localId" : "261",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "255",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "264",
+        "localId" : "270",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntWidthThreeToUnknown",
+        "name" : "ClosedNullInteger",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "270",
             "s" : [ {
-              "value" : [ "", "define ", "IntWidthThreeToUnknown", ": " ]
+              "value" : [ "", "define ", "ClosedNullInteger", ": " ]
             }, {
-              "r" : "265",
+              "r" : "271",
               "s" : [ {
-                "value" : [ "width of " ]
+                "value" : [ "end of " ]
               }, {
-                "r" : "268",
+                "r" : "274",
                 "s" : [ {
-                  "r" : "266",
-                  "value" : [ "Interval[", "3", ", ", "null", ")" ]
+                  "r" : "272",
+                  "value" : [ "Interval[", "5", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Width",
-          "localId" : "265",
+          "type" : "End",
+          "localId" : "271",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "272",
+            "localId" : "278",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "273",
+              "localId" : "279",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "Interval",
-            "localId" : "268",
+            "localId" : "274",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "270",
+              "localId" : "276",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "271",
+                "localId" : "277",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "266",
+              "localId" : "272",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "269",
+              "localId" : "275",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "267",
+                "localId" : "273",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -159332,532 +183354,380 @@ module.exports['Width'] = {
           }
         }
       }, {
-        "localId" : "276",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntWidthUnknownToThree",
+        "localId" : "282",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "ClosedNullLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "276",
+            "r" : "282",
             "s" : [ {
-              "value" : [ "", "define ", "IntWidthUnknownToThree", ": " ]
+              "value" : [ "", "define ", "ClosedNullLong", ": " ]
             }, {
-              "r" : "277",
+              "r" : "283",
               "s" : [ {
-                "value" : [ "width of " ]
+                "value" : [ "end of " ]
               }, {
-                "r" : "280",
+                "r" : "286",
                 "s" : [ {
-                  "r" : "278",
-                  "value" : [ "Interval(", "null", ", ", "3", "]" ]
+                  "r" : "284",
+                  "value" : [ "Interval[", "5L", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Width",
-          "localId" : "277",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "End",
+          "localId" : "283",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "284",
+            "localId" : "290",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "285",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "291",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "Interval",
-            "localId" : "280",
-            "lowClosed" : false,
+            "localId" : "286",
+            "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "282",
+              "localId" : "288",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "283",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "289",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "Literal",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
               "type" : "As",
-              "localId" : "281",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "287",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "278",
+                "localId" : "285",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "279",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "288",
+        "localId" : "294",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "RealWidth",
+        "name" : "ClosedNullDecimal",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "288",
+            "r" : "294",
             "s" : [ {
-              "value" : [ "", "define ", "RealWidth", ": " ]
+              "value" : [ "", "define ", "ClosedNullDecimal", ": " ]
             }, {
-              "r" : "289",
+              "r" : "295",
               "s" : [ {
-                "value" : [ "width of " ]
+                "value" : [ "end of " ]
               }, {
-                "r" : "292",
+                "r" : "298",
                 "s" : [ {
-                  "r" : "290",
-                  "value" : [ "Interval[", "1.23", ", ", "4.56", "]" ]
+                  "r" : "296",
+                  "value" : [ "Interval[", "7.3", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Width",
-          "localId" : "289",
+          "type" : "End",
+          "localId" : "295",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "295",
+            "localId" : "302",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "296",
+              "localId" : "303",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "Interval",
-            "localId" : "292",
+            "localId" : "298",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "293",
+              "localId" : "300",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "294",
+                "localId" : "301",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "290",
+              "localId" : "296",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23",
+              "value" : "7.3",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "291",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.56",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "299",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "RealOpenWidth",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "299",
-            "s" : [ {
-              "value" : [ "", "define ", "RealOpenWidth", ": " ]
-            }, {
-              "r" : "300",
-              "s" : [ {
-                "value" : [ "width of " ]
-              }, {
-                "r" : "303",
-                "s" : [ {
-                  "r" : "301",
-                  "value" : [ "Interval(", "1.23", ", ", "4.56", ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Width",
-          "localId" : "300",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "306",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "307",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "Interval",
-            "localId" : "303",
-            "lowClosed" : false,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "304",
+              "type" : "As",
+              "localId" : "299",
+              "asType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "305",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "297",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "301",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "302",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.56",
-              "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "310",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "WidthOfQuantityInterval",
+        "localId" : "306",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "NullInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "310",
+            "r" : "306",
             "s" : [ {
-              "value" : [ "", "define ", "WidthOfQuantityInterval", ": " ]
+              "value" : [ "", "define ", "NullInterval", ": " ]
             }, {
-              "r" : "311",
+              "r" : "307",
               "s" : [ {
-                "value" : [ "width of " ]
+                "value" : [ "end of " ]
               }, {
-                "r" : "328",
+                "r" : "308",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "(" ]
                 }, {
-                  "r" : "312",
+                  "r" : "308",
                   "s" : [ {
-                    "value" : [ "Quantity", "{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "314",
-                      "value" : [ "value", ": ", "1" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
+                    "r" : "309",
+                    "value" : [ "null", " as " ]
                   }, {
+                    "r" : "310",
                     "s" : [ {
-                      "value" : [ "unit", ": " ]
+                      "value" : [ "Interval<" ]
                     }, {
-                      "r" : "318",
+                      "r" : "311",
                       "s" : [ {
-                        "value" : [ "'mm'" ]
+                        "value" : [ "DateTime" ]
                       } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "320",
-                  "s" : [ {
-                    "value" : [ "Quantity", "{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "322",
-                      "value" : [ "value", ": ", "10" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "unit", ": " ]
                     }, {
-                      "r" : "326",
-                      "s" : [ {
-                        "value" : [ "'mm'" ]
-                      } ]
+                      "value" : [ ">" ]
                     } ]
-                  }, {
-                    "value" : [ "}" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Width",
-          "localId" : "311",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "End",
+          "localId" : "307",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "331",
+            "localId" : "318",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "332",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "319",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
-            "type" : "Interval",
-            "localId" : "328",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "As",
+            "localId" : "308",
+            "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "329",
+              "localId" : "316",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "330",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "317",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Instance",
-              "localId" : "312",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "element" : [ {
-                "name" : "value",
-                "value" : {
-                  "type" : "ToDecimal",
-                  "localId" : "316",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "317",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "operand" : {
-                    "type" : "Literal",
-                    "localId" : "314",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  }
-                }
-              }, {
-                "name" : "unit",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "318",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "mm",
-                  "annotation" : [ ]
-                }
-              } ]
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "309",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
             },
-            "high" : {
-              "type" : "Instance",
-              "localId" : "320",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "310",
               "annotation" : [ ],
-              "element" : [ {
-                "name" : "value",
-                "value" : {
-                  "type" : "ToDecimal",
-                  "localId" : "324",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "325",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "operand" : {
-                    "type" : "Literal",
-                    "localId" : "322",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "10",
-                    "annotation" : [ ]
-                  }
-                }
-              }, {
-                "name" : "unit",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "326",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "mm",
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "312",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "313",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
-              } ]
+              },
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "311",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             }
           }
         }
       }, {
-        "localId" : "335",
+        "localId" : "322",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "WidthOfDateTimeInterval",
+        "name" : "OpenNotNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "335",
+            "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "WidthOfDateTimeInterval", ": " ]
+              "value" : [ "", "define ", "OpenNotNull", ": " ]
             }, {
-              "r" : "336",
+              "r" : "323",
               "s" : [ {
-                "value" : [ "width of " ]
+                "value" : [ "end of " ]
               }, {
-                "r" : "361",
+                "r" : "348",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "Interval(" ]
                 }, {
-                  "r" : "345",
+                  "r" : "332",
                   "s" : [ {
-                    "r" : "337",
-                    "value" : [ "DateTime", "(", "2012", ",", "01", ",", "01", ")" ]
+                    "r" : "324",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "357",
+                  "r" : "344",
                   "s" : [ {
-                    "r" : "349",
-                    "value" : [ "DateTime", "(", "2012", ",", "01", ",", "03", ")" ]
+                    "r" : "336",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Width",
-          "localId" : "336",
+          "type" : "End",
+          "localId" : "323",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "364",
+            "localId" : "351",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "365",
+              "localId" : "352",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "Interval",
-            "localId" : "361",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "348",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "362",
+              "localId" : "349",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "363",
+                "localId" : "350",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "345",
+              "localId" : "332",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "346",
+                "localId" : "333",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "347",
+                "localId" : "334",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "348",
+                "localId" : "335",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "337",
+                "localId" : "324",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -159865,402 +183735,271 @@ module.exports['Width'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "338",
+                "localId" : "325",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "339",
+                "localId" : "326",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
+                "value" : "1",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "357",
+              "localId" : "344",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "358",
+                "localId" : "345",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "359",
+                "localId" : "346",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "360",
+                "localId" : "347",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "349",
+                "localId" : "336",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "350",
+                "localId" : "337",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "351",
+                "localId" : "338",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "03",
+                "value" : "1",
                 "annotation" : [ ]
               }
             }
           }
         }
       }, {
-        "localId" : "368",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "WidthOfDateInterval",
+        "localId" : "355",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "OpenLongNotNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "368",
+            "r" : "355",
             "s" : [ {
-              "value" : [ "", "define ", "WidthOfDateInterval", ": " ]
+              "value" : [ "", "define ", "OpenLongNotNull", ": " ]
             }, {
-              "r" : "369",
+              "r" : "356",
               "s" : [ {
-                "value" : [ "width of " ]
+                "value" : [ "end of " ]
               }, {
-                "r" : "394",
+                "r" : "359",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "378",
-                  "s" : [ {
-                    "r" : "370",
-                    "value" : [ "Date", "(", "2012", ",", "01", ",", "01", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "390",
-                  "s" : [ {
-                    "r" : "382",
-                    "value" : [ "Date", "(", "2012", ",", "01", ",", "03", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "357",
+                  "value" : [ "Interval(", "1L", ", ", "3L", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Width",
-          "localId" : "369",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "End",
+          "localId" : "356",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "397",
+            "localId" : "362",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "398",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "363",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "Interval",
-            "localId" : "394",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "359",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "395",
+              "localId" : "360",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "396",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "361",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Date",
-              "localId" : "378",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "379",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "380",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "381",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "370",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "371",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "372",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "357",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "Date",
-              "localId" : "390",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "391",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "392",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "393",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "382",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "383",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "384",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "03",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "358",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "401",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "WidthOfTimeInterval",
+        "localId" : "366",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+        "name" : "OpenNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "401",
+            "r" : "366",
             "s" : [ {
-              "value" : [ "", "define ", "WidthOfTimeInterval", ": " ]
+              "value" : [ "", "define ", "OpenNull", ": " ]
             }, {
-              "r" : "402",
+              "r" : "367",
               "s" : [ {
-                "value" : [ "width of " ]
+                "value" : [ "end of " ]
               }, {
-                "r" : "427",
+                "r" : "381",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "411",
-                  "s" : [ {
-                    "r" : "403",
-                    "value" : [ "Time", "(", "12", ",", "00", ",", "00", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "value" : [ "Interval(" ]
                 }, {
-                  "r" : "423",
+                  "r" : "376",
                   "s" : [ {
-                    "r" : "415",
-                    "value" : [ "Time", "(", "12", ",", "30", ",", "02", ")" ]
+                    "r" : "368",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "380",
+                  "value" : [ ", ", "null", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Width",
-          "localId" : "402",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "End",
+          "localId" : "367",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "430",
+            "localId" : "385",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "431",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "386",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "Interval",
-            "localId" : "427",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "381",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "428",
+              "localId" : "383",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "429",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "384",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Time",
-              "localId" : "411",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "type" : "DateTime",
+              "localId" : "376",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "412",
+                "localId" : "377",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "413",
+                "localId" : "378",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "414",
+                "localId" : "379",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "hour" : {
+              "year" : {
                 "type" : "Literal",
-                "localId" : "403",
+                "localId" : "368",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "2013",
                 "annotation" : [ ]
               },
-              "minute" : {
+              "month" : {
                 "type" : "Literal",
-                "localId" : "404",
+                "localId" : "369",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "00",
+                "value" : "1",
                 "annotation" : [ ]
               },
-              "second" : {
+              "day" : {
                 "type" : "Literal",
-                "localId" : "405",
+                "localId" : "370",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "00",
+                "value" : "1",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "Time",
-              "localId" : "423",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "type" : "As",
+              "localId" : "382",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "424",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "425",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "426",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "415",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "416",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "30",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "417",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "02",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "380",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
@@ -160271,26 +184010,30 @@ module.exports['Width'] = {
   }
 }
 
-/* Size
+/* Starts
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define IntSize: Size(Interval[-2, 5])
-define IntOpenSize: Size(Interval(-2, 5))
-define IntSizeThreeToMax: Size(Interval[3, null])
-define IntSizeMinToThree: Size(Interval[null, 3])
-define IntSizeThreeToUnknown: Size(Interval[3, null))
-define IntSizeUnknownToThree: Size(Interval(null, 3])
-define RealSize: Size(Interval[1.23, 4.56])
-define RealOpenSize: Size(Interval(1.23, 4.56))
-define SizeIsNull: Size(null as Interval<Integer>)
-define SizeOfQuantityInterval: Size(Interval[Quantity{value: 1, unit: 'mm'}, Quantity{value: 10, unit: 'mm'}])
-define SizeOfDateTimeInterval: Size(Interval[DateTime(2012,01,01), DateTime(2012,01,03)])
-define SizeOfDateInterval: Size(Interval[Date(2012,01,01), Date(2012,01,03)])
-define SizeOfTimeInterval: Size(Interval[Time(12,00,00), Time(12,30,02)])
+define TestStartsNull: Interval[null, null] starts Interval[1, 10]
+define IntegerIntervalStartsTrue: Interval[4,10] starts Interval[4, 15]
+define IntegerIntervalStartsFalse: Interval[1, 10] starts Interval[4, 10]
+define IntegerIntervalStartEndsFalse: Interval[4, 10] starts Interval[4, 9]
+define LongIntervalStartsTrue: Interval[4L,10L] starts Interval[4L, 15L]
+define LongIntervalStartsFalse: Interval[1L, 10L] starts Interval[4L, 10L]
+define LongIntervalStartEndsFalse: Interval[4L, 10L] starts Interval[4L, 9L]
+define DecimalIntervalStartsTrue: Interval[4.0, 10.0] starts Interval[4.0, 15.0]
+define DecimalIntervalStartsFalse: Interval[1.0, 10.0] starts Interval[4.0, 10.0]
+define DecimalIntervalStartsEndsFalse: Interval[4.0, 10.0] starts Interval[4.0, 9.0]
+define QuantityIntervalStartsTrue: Interval[5.0 'g', 10.0 'g'] starts Interval[5.0 'g', 15.0 'g']
+define QuantityIntervalStartsFalse: Interval[1.0 'g', 10.0 'g'] starts Interval[5.0 'g', 10.0 'g']
+define QuantityIntervalStartsEndsFalse: Interval[5.0 'g', 10.0 'g'] starts Interval[5.0 'g', 9.9 'g']
+define DateTimeIntervalStartsTrue: Interval[DateTime(2012, 1, 5, 0, 0, 0, 0), DateTime(2012, 1, 25, 0, 0, 0, 0)] starts Interval[DateTime(2012, 1, 5, 0, 0, 0, 0), DateTime(2012, 1, 27, 0, 0, 0, 0)]
+define DateTimeIntervalStartsFalse: Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] starts day of Interval[DateTime(2012, 1, 6), DateTime(2012, 1, 27)]
+define DateTimeIntervalStartsDayOfTrue: Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] starts day of Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 27)]
+define DateTimeIntervalStartsEndsFalse: Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] starts day of Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 24)]
 */
 
-module.exports['Size'] = {
+module.exports['Starts'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -160302,7 +184045,7 @@ module.exports['Size'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "463",
+        "r" : "682",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -160376,8 +184119,8 @@ module.exports['Size'] = {
         }
       }, {
         "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntSize",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "TestStartsNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -160386,135 +184129,156 @@ module.exports['Size'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "IntSize", ": " ]
+              "value" : [ "", "define ", "TestStartsNull", ": " ]
             }, {
-              "r" : "226",
+              "r" : "225",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "219",
+                "r" : "217",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
                   "r" : "215",
-                  "s" : [ {
-                    "r" : "216",
-                    "value" : [ "-", "2" ]
-                  } ]
-                }, {
-                  "r" : "218",
-                  "value" : [ ", ", "5", "]" ]
+                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "225",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "222",
+                "s" : [ {
+                  "r" : "220",
+                  "value" : [ "Interval[", "1", ", ", "10", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "226",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Starts",
+          "localId" : "225",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "227",
+            "localId" : "226",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "228",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "227",
+              "name" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "228",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "219",
+            "localId" : "217",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "220",
+              "localId" : "218",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "221",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "219",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Negate",
+              "type" : "Null",
               "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Null",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "222",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "223",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "217",
+                "localId" : "224",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "216",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
             "high" : {
               "type" : "Literal",
-              "localId" : "218",
+              "localId" : "221",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "10",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "231",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntOpenSize",
+        "localId" : "232",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntegerIntervalStartsTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "231",
+            "r" : "232",
             "s" : [ {
-              "value" : [ "", "define ", "IntOpenSize", ": " ]
+              "value" : [ "", "define ", "IntegerIntervalStartsTrue", ": " ]
             }, {
               "r" : "243",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "236",
+                "r" : "235",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
-                  "r" : "232",
-                  "s" : [ {
-                    "r" : "233",
-                    "value" : [ "-", "2" ]
-                  } ]
-                }, {
-                  "r" : "235",
-                  "value" : [ ", ", "5", ")" ]
+                  "r" : "233",
+                  "value" : [ "Interval[", "4", ",", "10", "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "243",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "240",
+                "s" : [ {
+                  "r" : "238",
+                  "value" : [ "Interval[", "4", ", ", "15", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
+          "type" : "Starts",
           "localId" : "243",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
@@ -160526,1342 +184290,1847 @@ module.exports['Size'] = {
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "246",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "247",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "236",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "235",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "237",
+              "localId" : "236",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "238",
+                "localId" : "237",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Negate",
-              "localId" : "232",
+              "type" : "Literal",
+              "localId" : "233",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "234",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "240",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "241",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "234",
+                "localId" : "242",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "233",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "238",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            },
             "high" : {
               "type" : "Literal",
-              "localId" : "235",
+              "localId" : "239",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "15",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "248",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntSizeThreeToMax",
+        "localId" : "250",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntegerIntervalStartsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "248",
+            "r" : "250",
             "s" : [ {
-              "value" : [ "", "define ", "IntSizeThreeToMax", ": " ]
+              "value" : [ "", "define ", "IntegerIntervalStartsFalse", ": " ]
             }, {
-              "r" : "259",
+              "r" : "261",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "251",
+                "r" : "253",
                 "s" : [ {
-                  "r" : "249",
-                  "value" : [ "Interval[", "3", ", ", "null", "]" ]
+                  "r" : "251",
+                  "value" : [ "Interval[", "1", ", ", "10", "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "261",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "258",
+                "s" : [ {
+                  "r" : "256",
+                  "value" : [ "Interval[", "4", ", ", "10", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "259",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Starts",
+          "localId" : "261",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "260",
+            "localId" : "262",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "261",
+              "localId" : "263",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "264",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "265",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "251",
+            "localId" : "253",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "253",
+              "localId" : "254",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "254",
+                "localId" : "255",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "249",
+              "localId" : "251",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
+              "type" : "Literal",
               "localId" : "252",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "258",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "259",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "250",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "260",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "257",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "264",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntSizeMinToThree",
+        "localId" : "268",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntegerIntervalStartEndsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "268",
             "s" : [ {
-              "value" : [ "", "define ", "IntSizeMinToThree", ": " ]
+              "value" : [ "", "define ", "IntegerIntervalStartEndsFalse", ": " ]
             }, {
-              "r" : "275",
+              "r" : "279",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "267",
+                "r" : "271",
                 "s" : [ {
-                  "r" : "265",
-                  "value" : [ "Interval[", "null", ", ", "3", "]" ]
+                  "r" : "269",
+                  "value" : [ "Interval[", "4", ", ", "10", "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "279",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "276",
+                "s" : [ {
+                  "r" : "274",
+                  "value" : [ "Interval[", "4", ", ", "9", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "275",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Starts",
+          "localId" : "279",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "276",
+            "localId" : "280",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "277",
+              "localId" : "281",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "282",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "283",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          } ],
-          "operand" : {
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "271",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "272",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "273",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "276",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "277",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "278",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "286",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIntervalStartsTrue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "286",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIntervalStartsTrue", ": " ]
+            }, {
+              "r" : "297",
+              "s" : [ {
+                "r" : "289",
+                "s" : [ {
+                  "r" : "287",
+                  "value" : [ "Interval[", "4L", ",", "10L", "]" ]
+                } ]
+              }, {
+                "r" : "297",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "294",
+                "s" : [ {
+                  "r" : "292",
+                  "value" : [ "Interval[", "4L", ", ", "15L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Starts",
+          "localId" : "297",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "298",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "299",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "300",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "301",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "289",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "290",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "288",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "267",
+            "localId" : "294",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "269",
+              "localId" : "295",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "270",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "296",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "268",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "265",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "266",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "localId" : "293",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "15",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "280",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntSizeThreeToUnknown",
+        "localId" : "304",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIntervalStartsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "280",
+            "r" : "304",
             "s" : [ {
-              "value" : [ "", "define ", "IntSizeThreeToUnknown", ": " ]
+              "value" : [ "", "define ", "LongIntervalStartsFalse", ": " ]
             }, {
-              "r" : "291",
+              "r" : "315",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "283",
+                "r" : "307",
                 "s" : [ {
-                  "r" : "281",
-                  "value" : [ "Interval[", "3", ", ", "null", ")" ]
+                  "r" : "305",
+                  "value" : [ "Interval[", "1L", ", ", "10L", "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "315",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "312",
+                "s" : [ {
+                  "r" : "310",
+                  "value" : [ "Interval[", "4L", ", ", "10L", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "291",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Starts",
+          "localId" : "315",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "292",
+            "localId" : "316",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "293",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "318",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "319",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "283",
+            "localId" : "307",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "285",
+              "localId" : "308",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "286",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "309",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "281",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "localId" : "305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "284",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "312",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "313",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "282",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "310",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "296",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IntSizeUnknownToThree",
+        "localId" : "322",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIntervalStartEndsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "296",
+            "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "IntSizeUnknownToThree", ": " ]
+              "value" : [ "", "define ", "LongIntervalStartEndsFalse", ": " ]
             }, {
-              "r" : "307",
+              "r" : "333",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "299",
+                "r" : "325",
                 "s" : [ {
-                  "r" : "297",
-                  "value" : [ "Interval(", "null", ", ", "3", "]" ]
+                  "r" : "323",
+                  "value" : [ "Interval[", "4L", ", ", "10L", "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "333",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "330",
+                "s" : [ {
+                  "r" : "328",
+                  "value" : [ "Interval[", "4L", ", ", "9L", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "307",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Starts",
+          "localId" : "333",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "308",
+            "localId" : "334",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "309",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "335",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "336",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "337",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "299",
-            "lowClosed" : false,
+            "localId" : "325",
+            "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "301",
+              "localId" : "326",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "302",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "327",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "300",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "type" : "Literal",
+              "localId" : "323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "324",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "330",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "331",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "297",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "332",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            },
             "high" : {
               "type" : "Literal",
-              "localId" : "298",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "9",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "312",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "RealSize",
+        "localId" : "340",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DecimalIntervalStartsTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "312",
+            "r" : "340",
             "s" : [ {
-              "value" : [ "", "define ", "RealSize", ": " ]
+              "value" : [ "", "define ", "DecimalIntervalStartsTrue", ": " ]
             }, {
-              "r" : "322",
+              "r" : "351",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "315",
+                "r" : "343",
                 "s" : [ {
-                  "r" : "313",
-                  "value" : [ "Interval[", "1.23", ", ", "4.56", "]" ]
+                  "r" : "341",
+                  "value" : [ "Interval[", "4.0", ", ", "10.0", "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "351",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "348",
+                "s" : [ {
+                  "r" : "346",
+                  "value" : [ "Interval[", "4.0", ", ", "15.0", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "322",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Starts",
+          "localId" : "351",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "323",
+            "localId" : "352",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "324",
+              "localId" : "353",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "354",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "355",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "315",
+            "localId" : "343",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "316",
+              "localId" : "344",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "317",
+                "localId" : "345",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "313",
+              "localId" : "341",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23",
+              "value" : "4.0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "314",
+              "localId" : "342",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.56",
+              "value" : "10.0",
               "annotation" : [ ]
             }
-          }
+          }, {
+            "type" : "Interval",
+            "localId" : "348",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "349",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "350",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "15.0",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "327",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "RealOpenSize",
+        "localId" : "358",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DecimalIntervalStartsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "327",
+            "r" : "358",
             "s" : [ {
-              "value" : [ "", "define ", "RealOpenSize", ": " ]
+              "value" : [ "", "define ", "DecimalIntervalStartsFalse", ": " ]
             }, {
-              "r" : "337",
+              "r" : "369",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "330",
+                "r" : "361",
                 "s" : [ {
-                  "r" : "328",
-                  "value" : [ "Interval(", "1.23", ", ", "4.56", ")" ]
+                  "r" : "359",
+                  "value" : [ "Interval[", "1.0", ", ", "10.0", "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "369",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "366",
+                "s" : [ {
+                  "r" : "364",
+                  "value" : [ "Interval[", "4.0", ", ", "10.0", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "337",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+          "type" : "Starts",
+          "localId" : "369",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "338",
+            "localId" : "370",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "339",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "372",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "373",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "330",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "361",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "331",
+              "localId" : "362",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "332",
+                "localId" : "363",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "328",
+              "localId" : "359",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.23",
+              "value" : "1.0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "329",
+              "localId" : "360",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.56",
+              "value" : "10.0",
               "annotation" : [ ]
             }
-          }
+          }, {
+            "type" : "Interval",
+            "localId" : "366",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "367",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "10.0",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "342",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "SizeIsNull",
+        "localId" : "376",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DecimalIntervalStartsEndsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "342",
+            "r" : "376",
             "s" : [ {
-              "value" : [ "", "define ", "SizeIsNull", ": " ]
+              "value" : [ "", "define ", "DecimalIntervalStartsEndsFalse", ": " ]
             }, {
-              "r" : "355",
+              "r" : "387",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "343",
+                "r" : "379",
                 "s" : [ {
-                  "r" : "344",
-                  "value" : [ "null", " as " ]
-                }, {
-                  "r" : "345",
-                  "s" : [ {
-                    "value" : [ "Interval<" ]
-                  }, {
-                    "r" : "346",
-                    "s" : [ {
-                      "value" : [ "Integer" ]
-                    } ]
-                  }, {
-                    "value" : [ ">" ]
-                  } ]
+                  "r" : "377",
+                  "value" : [ "Interval[", "4.0", ", ", "10.0", "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "387",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "384",
+                "s" : [ {
+                  "r" : "382",
+                  "value" : [ "Interval[", "4.0", ", ", "9.0", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "355",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "type" : "Starts",
+          "localId" : "387",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "356",
+            "localId" : "388",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "357",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "389",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "390",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "391",
+              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
-            "type" : "As",
-            "localId" : "343",
-            "strict" : false,
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "379",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "349",
+              "localId" : "380",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "350",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "381",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "344",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+            "low" : {
+              "type" : "Literal",
+              "localId" : "377",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.0",
               "annotation" : [ ]
             },
-            "asTypeSpecifier" : {
+            "high" : {
+              "type" : "Literal",
+              "localId" : "378",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "10.0",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "384",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "345",
+              "localId" : "385",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "347",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "348",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              },
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "346",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "386",
+                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "382",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "4.0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "383",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "value" : "9.0",
+              "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "360",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-        "name" : "SizeOfQuantityInterval",
+        "localId" : "394",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "QuantityIntervalStartsTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "360",
+            "r" : "394",
             "s" : [ {
-              "value" : [ "", "define ", "SizeOfQuantityInterval", ": " ]
+              "value" : [ "", "define ", "QuantityIntervalStartsTrue", ": " ]
             }, {
-              "r" : "384",
+              "r" : "405",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "377",
+                "r" : "397",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "361",
+                  "r" : "395",
                   "s" : [ {
-                    "value" : [ "Quantity", "{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "363",
-                      "value" : [ "value", ": ", "1" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "unit", ": " ]
-                    }, {
-                      "r" : "367",
-                      "s" : [ {
-                        "value" : [ "'mm'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
+                    "value" : [ "5.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "369",
+                  "r" : "396",
                   "s" : [ {
-                    "value" : [ "Quantity", "{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "371",
-                      "value" : [ "value", ": ", "10" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "unit", ": " ]
-                    }, {
-                      "r" : "375",
-                      "s" : [ {
-                        "value" : [ "'mm'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
+                    "value" : [ "10.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "405",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "402",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "400",
+                  "s" : [ {
+                    "value" : [ "5.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "401",
+                  "s" : [ {
+                    "value" : [ "15.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "384",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          "type" : "Starts",
+          "localId" : "405",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "385",
+            "localId" : "406",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "386",
+              "localId" : "407",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "408",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "409",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "377",
+            "localId" : "397",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "378",
+              "localId" : "398",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "379",
+                "localId" : "399",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Instance",
-              "localId" : "361",
+              "type" : "Quantity",
+              "localId" : "395",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "element" : [ {
-                "name" : "value",
-                "value" : {
-                  "type" : "ToDecimal",
-                  "localId" : "365",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "366",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "operand" : {
-                    "type" : "Literal",
-                    "localId" : "363",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "1",
-                    "annotation" : [ ]
-                  }
-                }
-              }, {
-                "name" : "unit",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "367",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "mm",
-                  "annotation" : [ ]
-                }
-              } ]
+              "value" : 5.0,
+              "unit" : "g",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "Instance",
-              "localId" : "369",
+              "type" : "Quantity",
+              "localId" : "396",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "classType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 10.0,
+              "unit" : "g",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "402",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "403",
               "annotation" : [ ],
-              "element" : [ {
-                "name" : "value",
-                "value" : {
-                  "type" : "ToDecimal",
-                  "localId" : "373",
-                  "annotation" : [ ],
-                  "signature" : [ {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "374",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  } ],
-                  "operand" : {
-                    "type" : "Literal",
-                    "localId" : "371",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "value" : "10",
-                    "annotation" : [ ]
-                  }
-                }
-              }, {
-                "name" : "unit",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "375",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "mm",
-                  "annotation" : [ ]
-                }
-              } ]
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "404",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "400",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5.0,
+              "unit" : "g",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 15.0,
+              "unit" : "g",
+              "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "389",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "SizeOfDateTimeInterval",
+        "localId" : "412",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "QuantityIntervalStartsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "389",
+            "r" : "412",
             "s" : [ {
-              "value" : [ "", "define ", "SizeOfDateTimeInterval", ": " ]
+              "value" : [ "", "define ", "QuantityIntervalStartsFalse", ": " ]
             }, {
-              "r" : "421",
+              "r" : "423",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "414",
+                "r" : "415",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "398",
+                  "r" : "413",
                   "s" : [ {
-                    "r" : "390",
-                    "value" : [ "DateTime", "(", "2012", ",", "01", ",", "01", ")" ]
+                    "value" : [ "1.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "410",
+                  "r" : "414",
                   "s" : [ {
-                    "r" : "402",
-                    "value" : [ "DateTime", "(", "2012", ",", "01", ",", "03", ")" ]
+                    "value" : [ "10.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "423",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "420",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "418",
+                  "s" : [ {
+                    "value" : [ "5.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "419",
+                  "s" : [ {
+                    "value" : [ "10.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "421",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Starts",
+          "localId" : "423",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "422",
+            "localId" : "424",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "423",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "425",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "426",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "427",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "414",
+            "localId" : "415",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "415",
+              "localId" : "416",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "416",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "417",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "398",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "399",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "400",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "401",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "390",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "391",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "392",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "413",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 1.0,
+              "unit" : "g",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "410",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Quantity",
+              "localId" : "414",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 10.0,
+              "unit" : "g",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "420",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "421",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "411",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "412",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "413",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "402",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "403",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "404",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "03",
+                "localId" : "422",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "418",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5.0,
+              "unit" : "g",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "419",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 10.0,
+              "unit" : "g",
+              "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "426",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-        "name" : "SizeOfDateInterval",
+        "localId" : "430",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "QuantityIntervalStartsEndsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "426",
+            "r" : "430",
             "s" : [ {
-              "value" : [ "", "define ", "SizeOfDateInterval", ": " ]
+              "value" : [ "", "define ", "QuantityIntervalStartsEndsFalse", ": " ]
             }, {
-              "r" : "458",
+              "r" : "441",
               "s" : [ {
-                "value" : [ "Size", "(" ]
+                "r" : "433",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "431",
+                  "s" : [ {
+                    "value" : [ "5.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "432",
+                  "s" : [ {
+                    "value" : [ "10.0 ", "'g'" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "441",
+                "value" : [ " ", "starts", " " ]
               }, {
-                "r" : "451",
+                "r" : "438",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "435",
+                  "r" : "436",
                   "s" : [ {
-                    "r" : "427",
-                    "value" : [ "Date", "(", "2012", ",", "01", ",", "01", ")" ]
+                    "value" : [ "5.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "447",
+                  "r" : "437",
                   "s" : [ {
-                    "r" : "439",
-                    "value" : [ "Date", "(", "2012", ",", "01", ",", "03", ")" ]
+                    "value" : [ "9.9 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
-              }, {
-                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "458",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+          "type" : "Starts",
+          "localId" : "441",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "459",
+            "localId" : "442",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "460",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "443",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "444",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "445",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "451",
+            "localId" : "433",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "452",
+              "localId" : "434",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "453",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "435",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Date",
-              "localId" : "435",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "436",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "437",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "438",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "427",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "428",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "429",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              }
+              "type" : "Quantity",
+              "localId" : "431",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5.0,
+              "unit" : "g",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "Date",
-              "localId" : "447",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "type" : "Quantity",
+              "localId" : "432",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 10.0,
+              "unit" : "g",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "438",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "439",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "448",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "449",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "450",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "439",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
                 "localId" : "440",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "441",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "03",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Quantity",
+              "localId" : "436",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 5.0,
+              "unit" : "g",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Quantity",
+              "localId" : "437",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "value" : 9.9,
+              "unit" : "g",
+              "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "463",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-        "name" : "SizeOfTimeInterval",
+        "localId" : "448",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateTimeIntervalStartsTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "463",
+            "r" : "448",
             "s" : [ {
-              "value" : [ "", "define ", "SizeOfTimeInterval", ": " ]
+              "value" : [ "", "define ", "DateTimeIntervalStartsTrue", ": " ]
             }, {
-              "r" : "495",
+              "r" : "551",
               "s" : [ {
-                "value" : [ "Size", "(" ]
-              }, {
-                "r" : "488",
+                "r" : "497",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "472",
+                  "r" : "465",
                   "s" : [ {
-                    "r" : "464",
-                    "value" : [ "Time", "(", "12", ",", "00", ",", "00", ")" ]
+                    "r" : "449",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "484",
+                  "r" : "489",
                   "s" : [ {
-                    "r" : "476",
-                    "value" : [ "Time", "(", "12", ",", "30", ",", "02", ")" ]
+                    "r" : "473",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "25", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "value" : [ ")" ]
+                "r" : "551",
+                "value" : [ " ", "starts", " " ]
+              }, {
+                "r" : "548",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "516",
+                  "s" : [ {
+                    "r" : "500",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "540",
+                  "s" : [ {
+                    "r" : "524",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "27", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Size",
-          "localId" : "495",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "type" : "Starts",
+          "localId" : "551",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "496",
+            "localId" : "552",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "497",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "553",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "554",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "555",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "488",
+            "localId" : "497",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "489",
+              "localId" : "498",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "490",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "499",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Time",
-              "localId" : "472",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "type" : "DateTime",
+              "localId" : "465",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "473",
+                "localId" : "466",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "474",
+                "localId" : "467",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "475",
+                "localId" : "468",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "469",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "470",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "471",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "472",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "449",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "450",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "451",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
+                "annotation" : [ ]
+              },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "464",
+                "localId" : "452",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "465",
+                "localId" : "453",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "00",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "466",
+                "localId" : "454",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "00",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "455",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "Time",
-              "localId" : "484",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+              "type" : "DateTime",
+              "localId" : "489",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "485",
+                "localId" : "490",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "486",
+                "localId" : "491",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "487",
+                "localId" : "492",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "493",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "494",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "495",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "496",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "473",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "474",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "475",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "25",
+                "annotation" : [ ]
+              },
               "hour" : {
                 "type" : "Literal",
                 "localId" : "476",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "12",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "minute" : {
@@ -161869,7 +186138,7 @@ module.exports['Size'] = {
                 "localId" : "477",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "30",
+                "value" : "0",
                 "annotation" : [ ]
               },
               "second" : {
@@ -161877,213 +186146,79 @@ module.exports['Size'] = {
                 "localId" : "478",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "02",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "479",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }
-        }
-      } ]
-    }
-  }
-}
-
-/* Start
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define ClosedNotNull: start of Interval[DateTime(2012, 1, 1), DateTime(2013, 1, 1)]
-define ClosedNullDateTime: start of Interval[null, DateTime(2013, 1, 1)]
-define ClosedNullInteger: start of Interval[null, 3]
-define ClosedNullDecimal: start of Interval[null, 5.1]
-define NullInterval: start of (null as Interval<DateTime>)
-define OpenNotNull: start of Interval(DateTime(2012, 1, 1), DateTime(2013, 1, 1))
-define OpenNull: start of Interval(null, DateTime(2013, 1, 1))
-*/
-
-module.exports['Start'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "343",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
-      }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ClosedNotNull",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "214",
-            "s" : [ {
-              "value" : [ "", "define ", "ClosedNotNull", ": " ]
-            }, {
-              "r" : "215",
-              "s" : [ {
-                "value" : [ "start of " ]
-              }, {
-                "r" : "240",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "224",
-                  "s" : [ {
-                    "r" : "216",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "236",
-                  "s" : [ {
-                    "r" : "228",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Start",
-          "localId" : "215",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "243",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "244",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
+          }, {
             "type" : "Interval",
-            "localId" : "240",
+            "localId" : "548",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "241",
+              "localId" : "549",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "242",
+                "localId" : "550",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "224",
+              "localId" : "516",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "225",
+                "localId" : "517",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "226",
+                "localId" : "518",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "227",
+                "localId" : "519",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "520",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "521",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "522",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "523",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "216",
+                "localId" : "500",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -162091,7 +186226,7 @@ module.exports['Start'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "217",
+                "localId" : "501",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -162099,174 +186234,97 @@ module.exports['Start'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "218",
+                "localId" : "502",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "236",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "237",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "238",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "239",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
                 "annotation" : [ ]
-              } ],
-              "year" : {
+              },
+              "hour" : {
                 "type" : "Literal",
-                "localId" : "228",
+                "localId" : "503",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "month" : {
+              "minute" : {
                 "type" : "Literal",
-                "localId" : "229",
+                "localId" : "504",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "0",
                 "annotation" : [ ]
               },
-              "day" : {
+              "second" : {
                 "type" : "Literal",
-                "localId" : "230",
+                "localId" : "505",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            }
-          }
-        }
-      }, {
-        "localId" : "247",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ClosedNullDateTime",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "247",
-            "s" : [ {
-              "value" : [ "", "define ", "ClosedNullDateTime", ": " ]
-            }, {
-              "r" : "248",
-              "s" : [ {
-                "value" : [ "start of " ]
-              }, {
-                "r" : "262",
-                "s" : [ {
-                  "r" : "249",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "258",
-                  "s" : [ {
-                    "r" : "250",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Start",
-          "localId" : "248",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "266",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "267",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "Interval",
-            "localId" : "262",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "264",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "265",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "value" : "0",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "263",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "249",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "506",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "258",
+              "localId" : "540",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "259",
+                "localId" : "541",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "260",
+                "localId" : "542",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "261",
+                "localId" : "543",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "544",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "545",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "546",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "547",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "250",
+                "localId" : "524",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "251",
+                "localId" : "525",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -162274,390 +186332,179 @@ module.exports['Start'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "252",
+                "localId" : "526",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            }
-          }
-        }
-      }, {
-        "localId" : "270",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "ClosedNullInteger",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "270",
-            "s" : [ {
-              "value" : [ "", "define ", "ClosedNullInteger", ": " ]
-            }, {
-              "r" : "271",
-              "s" : [ {
-                "value" : [ "start of " ]
-              }, {
-                "r" : "274",
-                "s" : [ {
-                  "r" : "272",
-                  "value" : [ "Interval[", "null", ", ", "3", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Start",
-          "localId" : "271",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "278",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "279",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "Interval",
-            "localId" : "274",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "276",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "277",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "275",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "272",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "value" : "27",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "273",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "282",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "ClosedNullDecimal",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "282",
-            "s" : [ {
-              "value" : [ "", "define ", "ClosedNullDecimal", ": " ]
-            }, {
-              "r" : "283",
-              "s" : [ {
-                "value" : [ "start of " ]
-              }, {
-                "r" : "286",
-                "s" : [ {
-                  "r" : "284",
-                  "value" : [ "Interval[", "null", ", ", "5.1", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Start",
-          "localId" : "283",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "290",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "291",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "Interval",
-            "localId" : "286",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "288",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "289",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "527",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "287",
-              "asType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "284",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "528",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "285",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "5.1",
-              "annotation" : [ ]
-            }
-          }
-        }
-      }, {
-        "localId" : "294",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "NullInterval",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "294",
-            "s" : [ {
-              "value" : [ "", "define ", "NullInterval", ": " ]
-            }, {
-              "r" : "295",
-              "s" : [ {
-                "value" : [ "start of " ]
-              }, {
-                "r" : "296",
-                "s" : [ {
-                  "value" : [ "(" ]
-                }, {
-                  "r" : "296",
-                  "s" : [ {
-                    "r" : "297",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "298",
-                    "s" : [ {
-                      "value" : [ "Interval<" ]
-                    }, {
-                      "r" : "299",
-                      "s" : [ {
-                        "value" : [ "DateTime" ]
-                      } ]
-                    }, {
-                      "value" : [ ">" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Start",
-          "localId" : "295",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "306",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "307",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "As",
-            "localId" : "296",
-            "strict" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "304",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "305",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "529",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
-              }
-            },
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "298",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "300",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "301",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
               },
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "299",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "530",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
                 "annotation" : [ ]
               }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "310",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "OpenNotNull",
+        "localId" : "558",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateTimeIntervalStartsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "310",
+            "r" : "558",
             "s" : [ {
-              "value" : [ "", "define ", "OpenNotNull", ": " ]
+              "value" : [ "", "define ", "DateTimeIntervalStartsFalse", ": " ]
             }, {
-              "r" : "311",
+              "r" : "613",
               "s" : [ {
-                "value" : [ "start of " ]
+                "r" : "583",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "567",
+                  "s" : [ {
+                    "r" : "559",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "579",
+                  "s" : [ {
+                    "r" : "571",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "25", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "613",
+                "value" : [ " ", "starts day of", " " ]
               }, {
-                "r" : "336",
+                "r" : "610",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "320",
+                  "r" : "594",
                   "s" : [ {
-                    "r" : "312",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                    "r" : "586",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "6", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "332",
+                  "r" : "606",
                   "s" : [ {
-                    "r" : "324",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                    "r" : "598",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "27", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Start",
-          "localId" : "311",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Starts",
+          "localId" : "613",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "339",
+            "localId" : "614",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "340",
+              "localId" : "615",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "616",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "617",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "336",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "583",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "337",
+              "localId" : "584",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "338",
+                "localId" : "585",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "320",
+              "localId" : "567",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "321",
+                "localId" : "568",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "322",
+                "localId" : "569",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "323",
+                "localId" : "570",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "312",
+                "localId" : "559",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -162665,7 +186512,7 @@ module.exports['Start'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "313",
+                "localId" : "560",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -162673,45 +186520,45 @@ module.exports['Start'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "314",
+                "localId" : "561",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "5",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "332",
+              "localId" : "579",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "333",
+                "localId" : "580",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "334",
+                "localId" : "581",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "335",
+                "localId" : "582",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "324",
+                "localId" : "571",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "325",
+                "localId" : "572",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -162719,128 +186566,108 @@ module.exports['Start'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "326",
+                "localId" : "573",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "25",
                 "annotation" : [ ]
               }
             }
-          }
-        }
-      }, {
-        "localId" : "343",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "OpenNull",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "343",
-            "s" : [ {
-              "value" : [ "", "define ", "OpenNull", ": " ]
-            }, {
-              "r" : "344",
-              "s" : [ {
-                "value" : [ "start of " ]
-              }, {
-                "r" : "358",
-                "s" : [ {
-                  "r" : "345",
-                  "value" : [ "Interval(", "null", ", " ]
-                }, {
-                  "r" : "354",
-                  "s" : [ {
-                    "r" : "346",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Start",
-          "localId" : "344",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "362",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "363",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
+          }, {
             "type" : "Interval",
-            "localId" : "358",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "610",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "360",
+              "localId" : "611",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "361",
+                "localId" : "612",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "359",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "DateTime",
+              "localId" : "594",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "345",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "595",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "596",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "597",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "586",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "587",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "588",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "354",
+              "localId" : "606",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "355",
+                "localId" : "607",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "356",
+                "localId" : "608",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "357",
+                "localId" : "609",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "346",
+                "localId" : "598",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "347",
+                "localId" : "599",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -162848,151 +186675,71 @@ module.exports['Start'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "348",
+                "localId" : "600",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "27",
                 "annotation" : [ ]
               }
             }
-          }
-        }
-      } ]
-    }
-  }
-}
-
-/* End
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define ClosedNotNull: end of Interval[DateTime(2012, 1, 1), DateTime(2013, 1, 1)]
-define ClosedNullDateTime: end of Interval[DateTime(2013, 1, 1), null]
-define ClosedNullInteger: end of Interval[5, null]
-define ClosedNullDecimal: end of Interval[7.3, null]
-define NullInterval: end of (null as Interval<DateTime>)
-define OpenNotNull: end of Interval(DateTime(2012, 1, 1), DateTime(2013, 1, 1))
-define OpenNull: end of Interval(DateTime(2013, 1, 1), null)
-*/
-
-module.exports['End'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "343",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+          } ]
         }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ClosedNotNull",
+        "localId" : "620",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateTimeIntervalStartsDayOfTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "620",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedNotNull", ": " ]
+              "value" : [ "", "define ", "DateTimeIntervalStartsDayOfTrue", ": " ]
             }, {
-              "r" : "215",
+              "r" : "675",
               "s" : [ {
-                "value" : [ "end of " ]
+                "r" : "645",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "629",
+                  "s" : [ {
+                    "r" : "621",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "641",
+                  "s" : [ {
+                    "r" : "633",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "25", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
               }, {
-                "r" : "240",
+                "r" : "675",
+                "value" : [ " ", "starts day of", " " ]
+              }, {
+                "r" : "672",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "224",
+                  "r" : "656",
                   "s" : [ {
-                    "r" : "216",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                    "r" : "648",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "236",
+                  "r" : "668",
                   "s" : [ {
-                    "r" : "228",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                    "r" : "660",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "27", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -163002,62 +186749,73 @@ module.exports['End'] = {
           }
         } ],
         "expression" : {
-          "type" : "End",
-          "localId" : "215",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Starts",
+          "localId" : "675",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "243",
+            "localId" : "676",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "244",
+              "localId" : "677",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "678",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "679",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "240",
+            "localId" : "645",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "241",
+              "localId" : "646",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "242",
+                "localId" : "647",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "224",
+              "localId" : "629",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "225",
+                "localId" : "630",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "226",
+                "localId" : "631",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "227",
+                "localId" : "632",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "216",
+                "localId" : "621",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -163065,7 +186823,7 @@ module.exports['End'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "217",
+                "localId" : "622",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -163073,45 +186831,45 @@ module.exports['End'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "218",
+                "localId" : "623",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "5",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "236",
+              "localId" : "641",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "237",
+                "localId" : "642",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "238",
+                "localId" : "643",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "239",
+                "localId" : "644",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "228",
+                "localId" : "633",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "229",
+                "localId" : "634",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -163119,115 +186877,62 @@ module.exports['End'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "230",
+                "localId" : "635",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "25",
                 "annotation" : [ ]
               }
             }
-          }
-        }
-      }, {
-        "localId" : "247",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "ClosedNullDateTime",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "247",
-            "s" : [ {
-              "value" : [ "", "define ", "ClosedNullDateTime", ": " ]
-            }, {
-              "r" : "248",
-              "s" : [ {
-                "value" : [ "end of " ]
-              }, {
-                "r" : "262",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "257",
-                  "s" : [ {
-                    "r" : "249",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "r" : "261",
-                  "value" : [ ", ", "null", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "End",
-          "localId" : "248",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "266",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "267",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
+          }, {
             "type" : "Interval",
-            "localId" : "262",
+            "localId" : "672",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "264",
+              "localId" : "673",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "265",
+                "localId" : "674",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "257",
+              "localId" : "656",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "258",
+                "localId" : "657",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "259",
+                "localId" : "658",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "260",
+                "localId" : "659",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "249",
+                "localId" : "648",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "250",
+                "localId" : "649",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -163235,403 +186940,193 @@ module.exports['End'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "251",
+                "localId" : "650",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "5",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "263",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "DateTime",
+              "localId" : "668",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "261",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "669",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          }
-        }
-      }, {
-        "localId" : "270",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "ClosedNullInteger",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "270",
-            "s" : [ {
-              "value" : [ "", "define ", "ClosedNullInteger", ": " ]
-            }, {
-              "r" : "271",
-              "s" : [ {
-                "value" : [ "end of " ]
               }, {
-                "r" : "274",
-                "s" : [ {
-                  "r" : "272",
-                  "value" : [ "Interval[", "5", ", ", "null", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "End",
-          "localId" : "271",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "278",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "279",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "Interval",
-            "localId" : "274",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "276",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "277",
+                "localId" : "670",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "272",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "275",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "273",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            }
-          }
-        }
-      }, {
-        "localId" : "282",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "ClosedNullDecimal",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "282",
-            "s" : [ {
-              "value" : [ "", "define ", "ClosedNullDecimal", ": " ]
-            }, {
-              "r" : "283",
-              "s" : [ {
-                "value" : [ "end of " ]
               }, {
-                "r" : "286",
-                "s" : [ {
-                  "r" : "284",
-                  "value" : [ "Interval[", "7.3", ", ", "null", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "End",
-          "localId" : "283",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "290",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "291",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "Interval",
-            "localId" : "286",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "288",
-              "annotation" : [ ],
-              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "289",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "671",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "284",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "7.3",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "287",
-              "asType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "285",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "660",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "661",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "662",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "27",
                 "annotation" : [ ]
               }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "294",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "NullInterval",
+        "localId" : "682",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateTimeIntervalStartsEndsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "294",
+            "r" : "682",
             "s" : [ {
-              "value" : [ "", "define ", "NullInterval", ": " ]
+              "value" : [ "", "define ", "DateTimeIntervalStartsEndsFalse", ": " ]
             }, {
-              "r" : "295",
+              "r" : "737",
               "s" : [ {
-                "value" : [ "end of " ]
-              }, {
-                "r" : "296",
+                "r" : "707",
                 "s" : [ {
-                  "value" : [ "(" ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "296",
+                  "r" : "691",
                   "s" : [ {
-                    "r" : "297",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "298",
-                    "s" : [ {
-                      "value" : [ "Interval<" ]
-                    }, {
-                      "r" : "299",
-                      "s" : [ {
-                        "value" : [ "DateTime" ]
-                      } ]
-                    }, {
-                      "value" : [ ">" ]
-                    } ]
+                    "r" : "683",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "703",
+                  "s" : [ {
+                    "r" : "695",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "25", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "End",
-          "localId" : "295",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "306",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "307",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "As",
-            "localId" : "296",
-            "strict" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "304",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "305",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "298",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "300",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "301",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              },
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "299",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }
-        }
-      }, {
-        "localId" : "310",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "OpenNotNull",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "310",
-            "s" : [ {
-              "value" : [ "", "define ", "OpenNotNull", ": " ]
-            }, {
-              "r" : "311",
-              "s" : [ {
-                "value" : [ "end of " ]
               }, {
-                "r" : "336",
+                "r" : "737",
+                "value" : [ " ", "starts day of", " " ]
+              }, {
+                "r" : "734",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "320",
+                  "r" : "718",
                   "s" : [ {
-                    "r" : "312",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                    "r" : "710",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "332",
+                  "r" : "730",
                   "s" : [ {
-                    "r" : "324",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
+                    "r" : "722",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "24", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "End",
-          "localId" : "311",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "type" : "Starts",
+          "localId" : "737",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "339",
+            "localId" : "738",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "340",
+              "localId" : "739",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "740",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "741",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
-          "operand" : {
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "336",
-            "lowClosed" : false,
-            "highClosed" : false,
+            "localId" : "707",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "337",
+              "localId" : "708",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "338",
+                "localId" : "709",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "320",
+              "localId" : "691",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "321",
+                "localId" : "692",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "322",
+                "localId" : "693",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "323",
+                "localId" : "694",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "312",
+                "localId" : "683",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -163639,7 +187134,7 @@ module.exports['End'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "313",
+                "localId" : "684",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -163647,45 +187142,108 @@ module.exports['End'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "314",
+                "localId" : "685",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "5",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "332",
+              "localId" : "703",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "333",
+                "localId" : "704",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "705",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "706",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "695",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "696",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "697",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "25",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "734",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "735",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "736",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "718",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "719",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "334",
+                "localId" : "720",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "335",
+                "localId" : "721",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "324",
+                "localId" : "710",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "325",
+                "localId" : "711",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -163693,115 +187251,45 @@ module.exports['End'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "326",
+                "localId" : "712",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            }
-          }
-        }
-      }, {
-        "localId" : "343",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-        "name" : "OpenNull",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "343",
-            "s" : [ {
-              "value" : [ "", "define ", "OpenNull", ": " ]
-            }, {
-              "r" : "344",
-              "s" : [ {
-                "value" : [ "end of " ]
-              }, {
-                "r" : "358",
-                "s" : [ {
-                  "value" : [ "Interval(" ]
-                }, {
-                  "r" : "353",
-                  "s" : [ {
-                    "r" : "345",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "r" : "357",
-                  "value" : [ ", ", "null", ")" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "End",
-          "localId" : "344",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "362",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "363",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : {
-            "type" : "Interval",
-            "localId" : "358",
-            "lowClosed" : false,
-            "highClosed" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "360",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "361",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "value" : "5",
                 "annotation" : [ ]
               }
             },
-            "low" : {
+            "high" : {
               "type" : "DateTime",
-              "localId" : "353",
+              "localId" : "730",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "354",
+                "localId" : "731",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "355",
+                "localId" : "732",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "356",
+                "localId" : "733",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "345",
+                "localId" : "722",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "346",
+                "localId" : "723",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -163809,54 +187297,44 @@ module.exports['End'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "347",
+                "localId" : "724",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "359",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "357",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "value" : "24",
                 "annotation" : [ ]
               }
             }
-          }
+          } ]
         }
       } ]
     }
   }
 }
 
-/* Starts
+/* Ends
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define TestStartsNull: Interval[null, null] starts Interval[1, 10]
-define IntegerIntervalStartsTrue: Interval[4,10] starts Interval[4, 15]
-define IntegerIntervalStartsFalse: Interval[1, 10] starts Interval[4, 10]
-define IntegerIntervalStartEndsFalse: Interval[4, 10] starts Interval[4, 9]
-define DecimalIntervalStartsTrue: Interval[4.0, 10.0] starts Interval[4.0, 15.0]
-define DecimalIntervalStartsFalse: Interval[1.0, 10.0] starts Interval[4.0, 10.0]
-define DecimalIntervalStartsEndsFalse: Interval[4.0, 10.0] starts Interval[4.0, 9.0]
-define QuantityIntervalStartsTrue: Interval[5.0 'g', 10.0 'g'] starts Interval[5.0 'g', 15.0 'g']
-define QuantityIntervalStartsFalse: Interval[1.0 'g', 10.0 'g'] starts Interval[5.0 'g', 10.0 'g']
-define QuantityIntervalStartsEndsFalse: Interval[5.0 'g', 10.0 'g'] starts Interval[5.0 'g', 9.9 'g']
-define DateTimeIntervalStartsTrue: Interval[DateTime(2012, 1, 5, 0, 0, 0, 0), DateTime(2012, 1, 25, 0, 0, 0, 0)] starts Interval[DateTime(2012, 1, 5, 0, 0, 0, 0), DateTime(2012, 1, 27, 0, 0, 0, 0)]
-define DateTimeIntervalStartsFalse: Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] starts day of Interval[DateTime(2012, 1, 6), DateTime(2012, 1, 27)]
-define DateTimeIntervalStartsDayOfTrue: Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] starts day of Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 27)]
-define DateTimeIntervalStartsEndsFalse: Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] starts day of Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 24)]
+define TestEndsNull: Interval[1, 10] ends Interval[null, null]
+define IntegerIntervalEndsTrue: Interval[4,10] ends Interval[1,10]
+define IntegerIntervalEndsFalse: Interval[4, 9] ends Interval[1,10]
+define IntegerIntervalEndsStartsFalse: Interval[0, 10] ends Interval[1,10]
+define LongIntervalEndsTrue: Interval[4L,10L] ends Interval[1L,10L]
+define LongIntervalEndsFalse: Interval[4L, 9L] ends Interval[1L,10L]
+define LongIntervalEndsStartsFalse: Interval[0L, 10L] ends Interval[1L,10L]
+define DecimalIntervalEndsTrue: Interval[4.0,10.0] ends Interval[1.0,10.0]
+define DecimalIntervalEndsFalse: Interval[11.0, 20.0] ends Interval[1.0,10.0]
+define DecimalIntervalEndsStartsFalse: Interval[0.0, 10.0] ends Interval[1.0, 10.0]
+define QuantityIntervalEndsTrue: Interval[5.0 'g', 10.0 'g'] ends Interval[1.0 'g', 10.0 'g']
+define QuantityIntervalEndsFalse: Interval[5.0 'g', 10.0 'g'] ends Interval[1.0 'g', 10.5 'g']
+define QuantityIntervalEndsStartsFalse: Interval[4.0 'g', 10.0 'g'] ends Interval[5.0 'g', 10.0 'g']
+define DateTimeIntervalEndsTrue: Interval[DateTime(2012, 1, 5, 0, 0, 0, 0), DateTime(2012, 1, 15, 0, 0, 0, 0)] ends Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 15, 0, 0, 0, 0)]
+define DateTimeIntervalEndsFalse: Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 15)] ends day of Interval[DateTime(2012, 1, 1), DateTime(2012, 1, 16)]
+define DateTimeIntervalEndsDayOfTrue: Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 15)] ends day of Interval[DateTime(2012, 1, 1), DateTime(2012, 1, 15)]
+define DateTimeIntervalEndsStartsFalse: Interval[DateTime(2012, 1, 5), DateTime(2012, 2, 16)] ends day of Interval[DateTime(2012, 2, 1), DateTime(2012, 2, 16)]
 */
 
-module.exports['Starts'] = {
+module.exports['Ends'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -163868,7 +187346,7 @@ module.exports['Starts'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "628",
+        "r" : "689",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -163943,7 +187421,7 @@ module.exports['Starts'] = {
       }, {
         "localId" : "214",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "TestStartsNull",
+        "name" : "TestEndsNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -163952,51 +187430,51 @@ module.exports['Starts'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "TestStartsNull", ": " ]
+              "value" : [ "", "define ", "TestEndsNull", ": " ]
             }, {
               "r" : "225",
               "s" : [ {
                 "r" : "217",
                 "s" : [ {
                   "r" : "215",
-                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
+                  "value" : [ "Interval[", "1", ", ", "10", "]" ]
                 } ]
               }, {
                 "r" : "225",
-                "value" : [ " ", "starts", " " ]
+                "value" : [ " ", "ends", " " ]
               }, {
                 "r" : "222",
                 "s" : [ {
                   "r" : "220",
-                  "value" : [ "Interval[", "1", ", ", "10", "]" ]
+                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Starts",
+          "type" : "Ends",
           "localId" : "225",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "226",
+            "localId" : "233",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "227",
-              "name" : "{urn:hl7-org:elm-types:r1}Any",
+              "localId" : "234",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "228",
+            "localId" : "235",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Any",
+              "localId" : "236",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
@@ -164013,42 +187491,303 @@ module.exports['Starts'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "219",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Null",
+              "type" : "Literal",
               "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Null",
+              "type" : "Literal",
               "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "222",
+            "localId" : "226",
+            "annotation" : [ ],
+            "low" : {
+              "type" : "As",
+              "localId" : "228",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "227",
+                "path" : "low",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "222",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "223",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "224",
+                      "name" : "{urn:hl7-org:elm-types:r1}Any",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Null",
+                    "localId" : "220",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  },
+                  "high" : {
+                    "type" : "Null",
+                    "localId" : "221",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "lowClosedExpression" : {
+              "type" : "Property",
+              "localId" : "229",
+              "path" : "lowClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "222",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "223",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "224",
+                    "name" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Null",
+                  "localId" : "220",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                },
+                "high" : {
+                  "type" : "Null",
+                  "localId" : "221",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "231",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Property",
+                "localId" : "230",
+                "path" : "high",
+                "annotation" : [ ],
+                "source" : {
+                  "type" : "Interval",
+                  "localId" : "222",
+                  "lowClosed" : true,
+                  "highClosed" : true,
+                  "annotation" : [ ],
+                  "resultTypeSpecifier" : {
+                    "type" : "IntervalTypeSpecifier",
+                    "localId" : "223",
+                    "annotation" : [ ],
+                    "pointType" : {
+                      "type" : "NamedTypeSpecifier",
+                      "localId" : "224",
+                      "name" : "{urn:hl7-org:elm-types:r1}Any",
+                      "annotation" : [ ]
+                    }
+                  },
+                  "low" : {
+                    "type" : "Null",
+                    "localId" : "220",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  },
+                  "high" : {
+                    "type" : "Null",
+                    "localId" : "221",
+                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                }
+              }
+            },
+            "highClosedExpression" : {
+              "type" : "Property",
+              "localId" : "232",
+              "path" : "highClosed",
+              "annotation" : [ ],
+              "source" : {
+                "type" : "Interval",
+                "localId" : "222",
+                "lowClosed" : true,
+                "highClosed" : true,
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "223",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "224",
+                    "name" : "{urn:hl7-org:elm-types:r1}Any",
+                    "annotation" : [ ]
+                  }
+                },
+                "low" : {
+                  "type" : "Null",
+                  "localId" : "220",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                },
+                "high" : {
+                  "type" : "Null",
+                  "localId" : "221",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "239",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntegerIntervalEndsTrue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "239",
+            "s" : [ {
+              "value" : [ "", "define ", "IntegerIntervalEndsTrue", ": " ]
+            }, {
+              "r" : "250",
+              "s" : [ {
+                "r" : "242",
+                "s" : [ {
+                  "r" : "240",
+                  "value" : [ "Interval[", "4", ",", "10", "]" ]
+                } ]
+              }, {
+                "r" : "250",
+                "value" : [ " ", "ends", " " ]
+              }, {
+                "r" : "247",
+                "s" : [ {
+                  "r" : "245",
+                  "value" : [ "Interval[", "1", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Ends",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "251",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "252",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "253",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "254",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "242",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "223",
+              "localId" : "243",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "224",
+                "localId" : "244",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "220",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "247",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "248",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "249",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "245",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -164056,7 +187795,7 @@ module.exports['Starts'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "221",
+              "localId" : "246",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -164065,85 +187804,85 @@ module.exports['Starts'] = {
           } ]
         }
       }, {
-        "localId" : "232",
+        "localId" : "257",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntegerIntervalStartsTrue",
+        "name" : "IntegerIntervalEndsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "232",
+            "r" : "257",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerIntervalStartsTrue", ": " ]
+              "value" : [ "", "define ", "IntegerIntervalEndsFalse", ": " ]
             }, {
-              "r" : "243",
+              "r" : "268",
               "s" : [ {
-                "r" : "235",
+                "r" : "260",
                 "s" : [ {
-                  "r" : "233",
-                  "value" : [ "Interval[", "4", ",", "10", "]" ]
+                  "r" : "258",
+                  "value" : [ "Interval[", "4", ", ", "9", "]" ]
                 } ]
               }, {
-                "r" : "243",
-                "value" : [ " ", "starts", " " ]
+                "r" : "268",
+                "value" : [ " ", "ends", " " ]
               }, {
-                "r" : "240",
+                "r" : "265",
                 "s" : [ {
-                  "r" : "238",
-                  "value" : [ "Interval[", "4", ", ", "15", "]" ]
+                  "r" : "263",
+                  "value" : [ "Interval[", "1", ",", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "243",
+          "type" : "Ends",
+          "localId" : "268",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "244",
+            "localId" : "269",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "245",
+              "localId" : "270",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "246",
+            "localId" : "271",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "247",
+              "localId" : "272",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "235",
+            "localId" : "260",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "236",
+              "localId" : "261",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "237",
+                "localId" : "262",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "233",
+              "localId" : "258",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -164151,135 +187890,135 @@ module.exports['Starts'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "234",
+              "localId" : "259",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "9",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "240",
+            "localId" : "265",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "241",
+              "localId" : "266",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "242",
+                "localId" : "267",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "238",
+              "localId" : "263",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "239",
+              "localId" : "264",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "15",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "250",
+        "localId" : "275",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntegerIntervalStartsFalse",
+        "name" : "IntegerIntervalEndsStartsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "250",
+            "r" : "275",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerIntervalStartsFalse", ": " ]
+              "value" : [ "", "define ", "IntegerIntervalEndsStartsFalse", ": " ]
             }, {
-              "r" : "261",
+              "r" : "286",
               "s" : [ {
-                "r" : "253",
+                "r" : "278",
                 "s" : [ {
-                  "r" : "251",
-                  "value" : [ "Interval[", "1", ", ", "10", "]" ]
+                  "r" : "276",
+                  "value" : [ "Interval[", "0", ", ", "10", "]" ]
                 } ]
               }, {
-                "r" : "261",
-                "value" : [ " ", "starts", " " ]
+                "r" : "286",
+                "value" : [ " ", "ends", " " ]
               }, {
-                "r" : "258",
+                "r" : "283",
                 "s" : [ {
-                  "r" : "256",
-                  "value" : [ "Interval[", "4", ", ", "10", "]" ]
+                  "r" : "281",
+                  "value" : [ "Interval[", "1", ",", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "261",
+          "type" : "Ends",
+          "localId" : "286",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "262",
+            "localId" : "287",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "263",
+              "localId" : "288",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
+            "localId" : "289",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "265",
+              "localId" : "290",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "253",
+            "localId" : "278",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "254",
+              "localId" : "279",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "255",
+                "localId" : "280",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "251",
+              "localId" : "276",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "252",
+              "localId" : "277",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -164287,32 +188026,32 @@ module.exports['Starts'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "258",
+            "localId" : "283",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "259",
+              "localId" : "284",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "260",
+                "localId" : "285",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "256",
+              "localId" : "281",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "257",
+              "localId" : "282",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -164321,213 +188060,469 @@ module.exports['Starts'] = {
           } ]
         }
       }, {
-        "localId" : "268",
+        "localId" : "293",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntegerIntervalStartEndsFalse",
+        "name" : "LongIntervalEndsTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "268",
+            "r" : "293",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerIntervalStartEndsFalse", ": " ]
+              "value" : [ "", "define ", "LongIntervalEndsTrue", ": " ]
             }, {
-              "r" : "279",
+              "r" : "304",
               "s" : [ {
-                "r" : "271",
+                "r" : "296",
                 "s" : [ {
-                  "r" : "269",
-                  "value" : [ "Interval[", "4", ", ", "10", "]" ]
+                  "r" : "294",
+                  "value" : [ "Interval[", "4L", ",", "10L", "]" ]
                 } ]
               }, {
-                "r" : "279",
-                "value" : [ " ", "starts", " " ]
+                "r" : "304",
+                "value" : [ " ", "ends", " " ]
               }, {
-                "r" : "276",
+                "r" : "301",
                 "s" : [ {
-                  "r" : "274",
-                  "value" : [ "Interval[", "4", ", ", "9", "]" ]
+                  "r" : "299",
+                  "value" : [ "Interval[", "1L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "279",
+          "type" : "Ends",
+          "localId" : "304",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "280",
+            "localId" : "305",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "281",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "306",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "282",
+            "localId" : "307",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "283",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "308",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "271",
+            "localId" : "296",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "272",
+              "localId" : "297",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "273",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "298",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "294",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "295",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "276",
+            "localId" : "301",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "277",
+              "localId" : "302",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "278",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "303",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "299",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "300",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "311",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIntervalEndsFalse",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "311",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIntervalEndsFalse", ": " ]
+            }, {
+              "r" : "322",
+              "s" : [ {
+                "r" : "314",
+                "s" : [ {
+                  "r" : "312",
+                  "value" : [ "Interval[", "4L", ", ", "9L", "]" ]
+                } ]
+              }, {
+                "r" : "322",
+                "value" : [ " ", "ends", " " ]
+              }, {
+                "r" : "319",
+                "s" : [ {
+                  "r" : "317",
+                  "value" : [ "Interval[", "1L", ",", "10L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Ends",
+          "localId" : "322",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "323",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "324",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "325",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "326",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "314",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "315",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "316",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "312",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "313",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "9",
               "annotation" : [ ]
             }
+          }, {
+            "type" : "Interval",
+            "localId" : "319",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "320",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "321",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "317",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "318",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "286",
+        "localId" : "329",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DecimalIntervalStartsTrue",
+        "name" : "LongIntervalEndsStartsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "286",
+            "r" : "329",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalIntervalStartsTrue", ": " ]
+              "value" : [ "", "define ", "LongIntervalEndsStartsFalse", ": " ]
             }, {
-              "r" : "297",
+              "r" : "340",
               "s" : [ {
-                "r" : "289",
+                "r" : "332",
                 "s" : [ {
-                  "r" : "287",
-                  "value" : [ "Interval[", "4.0", ", ", "10.0", "]" ]
+                  "r" : "330",
+                  "value" : [ "Interval[", "0L", ", ", "10L", "]" ]
                 } ]
               }, {
-                "r" : "297",
-                "value" : [ " ", "starts", " " ]
+                "r" : "340",
+                "value" : [ " ", "ends", " " ]
               }, {
-                "r" : "294",
+                "r" : "337",
                 "s" : [ {
-                  "r" : "292",
-                  "value" : [ "Interval[", "4.0", ", ", "15.0", "]" ]
+                  "r" : "335",
+                  "value" : [ "Interval[", "1L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "297",
+          "type" : "Ends",
+          "localId" : "340",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "298",
+            "localId" : "341",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "299",
+              "localId" : "342",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "343",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "344",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "332",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "333",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "334",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "330",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "331",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "337",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "338",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "339",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "335",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "336",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "347",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DecimalIntervalEndsTrue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "347",
+            "s" : [ {
+              "value" : [ "", "define ", "DecimalIntervalEndsTrue", ": " ]
+            }, {
+              "r" : "358",
+              "s" : [ {
+                "r" : "350",
+                "s" : [ {
+                  "r" : "348",
+                  "value" : [ "Interval[", "4.0", ",", "10.0", "]" ]
+                } ]
+              }, {
+                "r" : "358",
+                "value" : [ " ", "ends", " " ]
+              }, {
+                "r" : "355",
+                "s" : [ {
+                  "r" : "353",
+                  "value" : [ "Interval[", "1.0", ",", "10.0", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Ends",
+          "localId" : "358",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "359",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "360",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "300",
+            "localId" : "361",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "301",
+              "localId" : "362",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "289",
+            "localId" : "350",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "290",
+              "localId" : "351",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "291",
+                "localId" : "352",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "287",
+              "localId" : "348",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "4.0",
@@ -164535,7 +188530,7 @@ module.exports['Starts'] = {
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "288",
+              "localId" : "349",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "10.0",
@@ -164543,160 +188538,160 @@ module.exports['Starts'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "294",
+            "localId" : "355",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "295",
+              "localId" : "356",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "296",
+                "localId" : "357",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "292",
+              "localId" : "353",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.0",
+              "value" : "1.0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "293",
+              "localId" : "354",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "15.0",
+              "value" : "10.0",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "304",
+        "localId" : "365",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DecimalIntervalStartsFalse",
+        "name" : "DecimalIntervalEndsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "304",
+            "r" : "365",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalIntervalStartsFalse", ": " ]
+              "value" : [ "", "define ", "DecimalIntervalEndsFalse", ": " ]
             }, {
-              "r" : "315",
+              "r" : "376",
               "s" : [ {
-                "r" : "307",
+                "r" : "368",
                 "s" : [ {
-                  "r" : "305",
-                  "value" : [ "Interval[", "1.0", ", ", "10.0", "]" ]
+                  "r" : "366",
+                  "value" : [ "Interval[", "11.0", ", ", "20.0", "]" ]
                 } ]
               }, {
-                "r" : "315",
-                "value" : [ " ", "starts", " " ]
+                "r" : "376",
+                "value" : [ " ", "ends", " " ]
               }, {
-                "r" : "312",
+                "r" : "373",
                 "s" : [ {
-                  "r" : "310",
-                  "value" : [ "Interval[", "4.0", ", ", "10.0", "]" ]
+                  "r" : "371",
+                  "value" : [ "Interval[", "1.0", ",", "10.0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "315",
+          "type" : "Ends",
+          "localId" : "376",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "316",
+            "localId" : "377",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "317",
+              "localId" : "378",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "318",
+            "localId" : "379",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "319",
+              "localId" : "380",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "307",
+            "localId" : "368",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "308",
+              "localId" : "369",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "309",
+                "localId" : "370",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "305",
+              "localId" : "366",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
+              "value" : "11.0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "306",
+              "localId" : "367",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "10.0",
+              "value" : "20.0",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "312",
+            "localId" : "373",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "313",
+              "localId" : "374",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "314",
+                "localId" : "375",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "310",
+              "localId" : "371",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.0",
+              "value" : "1.0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "311",
+              "localId" : "372",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "10.0",
@@ -164705,93 +188700,93 @@ module.exports['Starts'] = {
           } ]
         }
       }, {
-        "localId" : "322",
+        "localId" : "383",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DecimalIntervalStartsEndsFalse",
+        "name" : "DecimalIntervalEndsStartsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "322",
+            "r" : "383",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalIntervalStartsEndsFalse", ": " ]
+              "value" : [ "", "define ", "DecimalIntervalEndsStartsFalse", ": " ]
             }, {
-              "r" : "333",
+              "r" : "394",
               "s" : [ {
-                "r" : "325",
+                "r" : "386",
                 "s" : [ {
-                  "r" : "323",
-                  "value" : [ "Interval[", "4.0", ", ", "10.0", "]" ]
+                  "r" : "384",
+                  "value" : [ "Interval[", "0.0", ", ", "10.0", "]" ]
                 } ]
               }, {
-                "r" : "333",
-                "value" : [ " ", "starts", " " ]
+                "r" : "394",
+                "value" : [ " ", "ends", " " ]
               }, {
-                "r" : "330",
+                "r" : "391",
                 "s" : [ {
-                  "r" : "328",
-                  "value" : [ "Interval[", "4.0", ", ", "9.0", "]" ]
+                  "r" : "389",
+                  "value" : [ "Interval[", "1.0", ", ", "10.0", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "333",
+          "type" : "Ends",
+          "localId" : "394",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "334",
+            "localId" : "395",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "335",
+              "localId" : "396",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "336",
+            "localId" : "397",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "337",
+              "localId" : "398",
               "name" : "{urn:hl7-org:elm-types:r1}Decimal",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "325",
+            "localId" : "386",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "326",
+              "localId" : "387",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "327",
+                "localId" : "388",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "323",
+              "localId" : "384",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.0",
+              "value" : "0.0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "324",
+              "localId" : "385",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
               "value" : "10.0",
@@ -164799,67 +188794,67 @@ module.exports['Starts'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "330",
+            "localId" : "391",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "331",
+              "localId" : "392",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "332",
+                "localId" : "393",
                 "name" : "{urn:hl7-org:elm-types:r1}Decimal",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "328",
+              "localId" : "389",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.0",
+              "value" : "1.0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "329",
+              "localId" : "390",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
               "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "9.0",
+              "value" : "10.0",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "340",
+        "localId" : "401",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "QuantityIntervalStartsTrue",
+        "name" : "QuantityIntervalEndsTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "340",
+            "r" : "401",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalStartsTrue", ": " ]
+              "value" : [ "", "define ", "QuantityIntervalEndsTrue", ": " ]
             }, {
-              "r" : "351",
+              "r" : "412",
               "s" : [ {
-                "r" : "343",
+                "r" : "404",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "341",
+                  "r" : "402",
                   "s" : [ {
                     "value" : [ "5.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "342",
+                  "r" : "403",
                   "s" : [ {
                     "value" : [ "10.0 ", "'g'" ]
                   } ]
@@ -164867,23 +188862,23 @@ module.exports['Starts'] = {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "351",
-                "value" : [ " ", "starts", " " ]
+                "r" : "412",
+                "value" : [ " ", "ends", " " ]
               }, {
-                "r" : "348",
+                "r" : "409",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "346",
+                  "r" : "407",
                   "s" : [ {
-                    "value" : [ "5.0 ", "'g'" ]
+                    "value" : [ "1.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "347",
+                  "r" : "408",
                   "s" : [ {
-                    "value" : [ "15.0 ", "'g'" ]
+                    "value" : [ "10.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -164893,51 +188888,51 @@ module.exports['Starts'] = {
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "351",
+          "type" : "Ends",
+          "localId" : "412",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "352",
+            "localId" : "413",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "353",
+              "localId" : "414",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "354",
+            "localId" : "415",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "355",
+              "localId" : "416",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "343",
+            "localId" : "404",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "344",
+              "localId" : "405",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "345",
+                "localId" : "406",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "341",
+              "localId" : "402",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5.0,
               "unit" : "g",
@@ -164945,7 +188940,7 @@ module.exports['Starts'] = {
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "342",
+              "localId" : "403",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 10.0,
               "unit" : "g",
@@ -164953,67 +188948,67 @@ module.exports['Starts'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "348",
+            "localId" : "409",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "349",
+              "localId" : "410",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "350",
+                "localId" : "411",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "346",
+              "localId" : "407",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
+              "value" : 1.0,
               "unit" : "g",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "347",
+              "localId" : "408",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 15.0,
+              "value" : 10.0,
               "unit" : "g",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "358",
+        "localId" : "419",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "QuantityIntervalStartsFalse",
+        "name" : "QuantityIntervalEndsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "358",
+            "r" : "419",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalStartsFalse", ": " ]
+              "value" : [ "", "define ", "QuantityIntervalEndsFalse", ": " ]
             }, {
-              "r" : "369",
+              "r" : "430",
               "s" : [ {
-                "r" : "361",
+                "r" : "422",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "359",
+                  "r" : "420",
                   "s" : [ {
-                    "value" : [ "1.0 ", "'g'" ]
+                    "value" : [ "5.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "360",
+                  "r" : "421",
                   "s" : [ {
                     "value" : [ "10.0 ", "'g'" ]
                   } ]
@@ -165021,23 +189016,23 @@ module.exports['Starts'] = {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "369",
-                "value" : [ " ", "starts", " " ]
+                "r" : "430",
+                "value" : [ " ", "ends", " " ]
               }, {
-                "r" : "366",
+                "r" : "427",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "364",
+                  "r" : "425",
                   "s" : [ {
-                    "value" : [ "5.0 ", "'g'" ]
+                    "value" : [ "1.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "365",
+                  "r" : "426",
                   "s" : [ {
-                    "value" : [ "10.0 ", "'g'" ]
+                    "value" : [ "10.5 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -165047,59 +189042,59 @@ module.exports['Starts'] = {
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "369",
+          "type" : "Ends",
+          "localId" : "430",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "370",
+            "localId" : "431",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "371",
+              "localId" : "432",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "372",
+            "localId" : "433",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "373",
+              "localId" : "434",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "361",
+            "localId" : "422",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "362",
+              "localId" : "423",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "363",
+                "localId" : "424",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "359",
+              "localId" : "420",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1.0,
+              "value" : 5.0,
               "unit" : "g",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "360",
+              "localId" : "421",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 10.0,
               "unit" : "g",
@@ -165107,67 +189102,67 @@ module.exports['Starts'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "366",
+            "localId" : "427",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "367",
+              "localId" : "428",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "368",
+                "localId" : "429",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "364",
+              "localId" : "425",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
+              "value" : 1.0,
               "unit" : "g",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "365",
+              "localId" : "426",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10.0,
+              "value" : 10.5,
               "unit" : "g",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "376",
+        "localId" : "437",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "QuantityIntervalStartsEndsFalse",
+        "name" : "QuantityIntervalEndsStartsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "376",
+            "r" : "437",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalStartsEndsFalse", ": " ]
+              "value" : [ "", "define ", "QuantityIntervalEndsStartsFalse", ": " ]
             }, {
-              "r" : "387",
+              "r" : "448",
               "s" : [ {
-                "r" : "379",
+                "r" : "440",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "377",
+                  "r" : "438",
                   "s" : [ {
-                    "value" : [ "5.0 ", "'g'" ]
+                    "value" : [ "4.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "378",
+                  "r" : "439",
                   "s" : [ {
                     "value" : [ "10.0 ", "'g'" ]
                   } ]
@@ -165175,23 +189170,23 @@ module.exports['Starts'] = {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "387",
-                "value" : [ " ", "starts", " " ]
+                "r" : "448",
+                "value" : [ " ", "ends", " " ]
               }, {
-                "r" : "384",
+                "r" : "445",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "382",
+                  "r" : "443",
                   "s" : [ {
                     "value" : [ "5.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "383",
+                  "r" : "444",
                   "s" : [ {
-                    "value" : [ "9.9 ", "'g'" ]
+                    "value" : [ "10.0 ", "'g'" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -165201,59 +189196,59 @@ module.exports['Starts'] = {
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "387",
+          "type" : "Ends",
+          "localId" : "448",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "388",
+            "localId" : "449",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "389",
+              "localId" : "450",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "390",
+            "localId" : "451",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "391",
+              "localId" : "452",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "379",
+            "localId" : "440",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "380",
+              "localId" : "441",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "381",
+                "localId" : "442",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "377",
+              "localId" : "438",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
+              "value" : 4.0,
               "unit" : "g",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "378",
+              "localId" : "439",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 10.0,
               "unit" : "g",
@@ -165261,24 +189256,24 @@ module.exports['Starts'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "384",
+            "localId" : "445",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "385",
+              "localId" : "446",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "386",
+                "localId" : "447",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Quantity",
-              "localId" : "382",
+              "localId" : "443",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "value" : 5.0,
               "unit" : "g",
@@ -165286,70 +189281,70 @@ module.exports['Starts'] = {
             },
             "high" : {
               "type" : "Quantity",
-              "localId" : "383",
+              "localId" : "444",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 9.9,
+              "value" : 10.0,
               "unit" : "g",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "394",
+        "localId" : "455",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeIntervalStartsTrue",
+        "name" : "DateTimeIntervalEndsTrue",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "394",
+            "r" : "455",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeIntervalStartsTrue", ": " ]
+              "value" : [ "", "define ", "DateTimeIntervalEndsTrue", ": " ]
             }, {
-              "r" : "497",
+              "r" : "558",
               "s" : [ {
-                "r" : "443",
+                "r" : "504",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "411",
+                  "r" : "472",
                   "s" : [ {
-                    "r" : "395",
+                    "r" : "456",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "435",
+                  "r" : "496",
                   "s" : [ {
-                    "r" : "419",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "25", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "480",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "497",
-                "value" : [ " ", "starts", " " ]
+                "r" : "558",
+                "value" : [ " ", "ends", " " ]
               }, {
-                "r" : "494",
+                "r" : "555",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "462",
+                  "r" : "523",
                   "s" : [ {
-                    "r" : "446",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "507",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "486",
+                  "r" : "547",
                   "s" : [ {
-                    "r" : "470",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "27", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "531",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -165359,92 +189354,92 @@ module.exports['Starts'] = {
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "497",
+          "type" : "Ends",
+          "localId" : "558",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "498",
+            "localId" : "559",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "499",
+              "localId" : "560",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "500",
+            "localId" : "561",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "501",
+              "localId" : "562",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "443",
+            "localId" : "504",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "444",
+              "localId" : "505",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "445",
+                "localId" : "506",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "411",
+              "localId" : "472",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "412",
+                "localId" : "473",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "413",
+                "localId" : "474",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "414",
+                "localId" : "475",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "415",
+                "localId" : "476",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "416",
+                "localId" : "477",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "417",
+                "localId" : "478",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "418",
+                "localId" : "479",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "395",
+                "localId" : "456",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -165452,7 +189447,7 @@ module.exports['Starts'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "396",
+                "localId" : "457",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -165460,7 +189455,7 @@ module.exports['Starts'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "397",
+                "localId" : "458",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "5",
@@ -165468,7 +189463,7 @@ module.exports['Starts'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "398",
+                "localId" : "459",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165476,7 +189471,7 @@ module.exports['Starts'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "399",
+                "localId" : "460",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165484,7 +189479,7 @@ module.exports['Starts'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "400",
+                "localId" : "461",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165492,7 +189487,7 @@ module.exports['Starts'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "401",
+                "localId" : "462",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165501,48 +189496,48 @@ module.exports['Starts'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "435",
+              "localId" : "496",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "436",
+                "localId" : "497",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "437",
+                "localId" : "498",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "438",
+                "localId" : "499",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "439",
+                "localId" : "500",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "440",
+                "localId" : "501",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "441",
+                "localId" : "502",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "442",
+                "localId" : "503",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "419",
+                "localId" : "480",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -165550,7 +189545,7 @@ module.exports['Starts'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "420",
+                "localId" : "481",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -165558,15 +189553,15 @@ module.exports['Starts'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "421",
+                "localId" : "482",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "25",
+                "value" : "15",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "422",
+                "localId" : "483",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165574,7 +189569,7 @@ module.exports['Starts'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "423",
+                "localId" : "484",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165582,7 +189577,7 @@ module.exports['Starts'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "424",
+                "localId" : "485",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165590,7 +189585,7 @@ module.exports['Starts'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "425",
+                "localId" : "486",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165599,65 +189594,65 @@ module.exports['Starts'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "494",
+            "localId" : "555",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "495",
+              "localId" : "556",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "496",
+                "localId" : "557",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "462",
+              "localId" : "523",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "463",
+                "localId" : "524",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "464",
+                "localId" : "525",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "465",
+                "localId" : "526",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "466",
+                "localId" : "527",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "467",
+                "localId" : "528",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "468",
+                "localId" : "529",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "469",
+                "localId" : "530",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "446",
+                "localId" : "507",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -165665,7 +189660,7 @@ module.exports['Starts'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "447",
+                "localId" : "508",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -165673,15 +189668,15 @@ module.exports['Starts'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "448",
+                "localId" : "509",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "449",
+                "localId" : "510",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165689,7 +189684,7 @@ module.exports['Starts'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "450",
+                "localId" : "511",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165697,7 +189692,7 @@ module.exports['Starts'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "451",
+                "localId" : "512",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165705,7 +189700,7 @@ module.exports['Starts'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "452",
+                "localId" : "513",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165714,48 +189709,48 @@ module.exports['Starts'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "486",
+              "localId" : "547",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "487",
+                "localId" : "548",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "488",
+                "localId" : "549",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "489",
+                "localId" : "550",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "490",
+                "localId" : "551",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "491",
+                "localId" : "552",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "492",
+                "localId" : "553",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "493",
+                "localId" : "554",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "470",
+                "localId" : "531",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -165763,7 +189758,7 @@ module.exports['Starts'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "471",
+                "localId" : "532",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -165771,15 +189766,15 @@ module.exports['Starts'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "472",
+                "localId" : "533",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "27",
+                "value" : "15",
                 "annotation" : [ ]
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "473",
+                "localId" : "534",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165787,7 +189782,7 @@ module.exports['Starts'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "474",
+                "localId" : "535",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165795,7 +189790,7 @@ module.exports['Starts'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "475",
+                "localId" : "536",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165803,7 +189798,7 @@ module.exports['Starts'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "476",
+                "localId" : "537",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -165813,61 +189808,683 @@ module.exports['Starts'] = {
           } ]
         }
       }, {
-        "localId" : "504",
+        "localId" : "565",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeIntervalStartsFalse",
+        "name" : "DateTimeIntervalEndsFalse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "504",
+            "r" : "565",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeIntervalStartsFalse", ": " ]
+              "value" : [ "", "define ", "DateTimeIntervalEndsFalse", ": " ]
             }, {
-              "r" : "559",
+              "r" : "620",
               "s" : [ {
-                "r" : "529",
+                "r" : "590",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "513",
+                  "r" : "574",
                   "s" : [ {
-                    "r" : "505",
+                    "r" : "566",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "525",
+                  "r" : "586",
                   "s" : [ {
-                    "r" : "517",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "25", ")" ]
+                    "r" : "578",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "620",
+                "value" : [ " ", "ends day of", " " ]
+              }, {
+                "r" : "617",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "601",
+                  "s" : [ {
+                    "r" : "593",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "613",
+                  "s" : [ {
+                    "r" : "605",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "16", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Ends",
+          "localId" : "620",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "621",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "622",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "623",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "624",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "590",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "591",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "592",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "574",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "575",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "576",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "577",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "566",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "567",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "568",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "586",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "587",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "588",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "589",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "578",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "579",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "580",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "15",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "617",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "618",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "619",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "601",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "602",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "603",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "604",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "593",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "594",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "595",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "613",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "614",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "615",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "616",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "605",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "606",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "607",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "16",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "627",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateTimeIntervalEndsDayOfTrue",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "627",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTimeIntervalEndsDayOfTrue", ": " ]
+            }, {
+              "r" : "682",
+              "s" : [ {
+                "r" : "652",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "636",
+                  "s" : [ {
+                    "r" : "628",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "648",
+                  "s" : [ {
+                    "r" : "640",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "682",
+                "value" : [ " ", "ends day of", " " ]
+              }, {
+                "r" : "679",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "663",
+                  "s" : [ {
+                    "r" : "655",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "675",
+                  "s" : [ {
+                    "r" : "667",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Ends",
+          "localId" : "682",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Day",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "683",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "684",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "685",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "686",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "652",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "653",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "654",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "636",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "637",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "638",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "639",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "628",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "629",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "630",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "648",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "649",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "650",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "651",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "640",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "641",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "642",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "15",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "679",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "680",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "681",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "663",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "664",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "665",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "666",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "655",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "656",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "657",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "675",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "676",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "677",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "678",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "667",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "668",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "669",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "15",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "689",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateTimeIntervalEndsStartsFalse",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "689",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTimeIntervalEndsStartsFalse", ": " ]
+            }, {
+              "r" : "744",
+              "s" : [ {
+                "r" : "714",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "698",
+                  "s" : [ {
+                    "r" : "690",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "710",
+                  "s" : [ {
+                    "r" : "702",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "16", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "559",
-                "value" : [ " ", "starts day of", " " ]
+                "r" : "744",
+                "value" : [ " ", "ends day of", " " ]
               }, {
-                "r" : "556",
+                "r" : "741",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "540",
+                  "r" : "725",
                   "s" : [ {
-                    "r" : "532",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "6", ")" ]
+                    "r" : "717",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "552",
+                  "r" : "737",
                   "s" : [ {
-                    "r" : "544",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "27", ")" ]
+                    "r" : "729",
+                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "16", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -165877,73 +190494,73 @@ module.exports['Starts'] = {
           }
         } ],
         "expression" : {
-          "type" : "Starts",
-          "localId" : "559",
+          "type" : "Ends",
+          "localId" : "744",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Day",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "560",
+            "localId" : "745",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "561",
+              "localId" : "746",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "562",
+            "localId" : "747",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "563",
+              "localId" : "748",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "529",
+            "localId" : "714",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "530",
+              "localId" : "715",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "531",
+                "localId" : "716",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "513",
+              "localId" : "698",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "514",
+                "localId" : "699",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "515",
+                "localId" : "700",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "516",
+                "localId" : "701",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "505",
+                "localId" : "690",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -165951,7 +190568,7 @@ module.exports['Starts'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "506",
+                "localId" : "691",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -165959,7 +190576,7 @@ module.exports['Starts'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "507",
+                "localId" : "692",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "5",
@@ -165968,28 +190585,28 @@ module.exports['Starts'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "525",
+              "localId" : "710",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "526",
+                "localId" : "711",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "527",
+                "localId" : "712",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "528",
+                "localId" : "713",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "517",
+                "localId" : "702",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -165997,62 +190614,62 @@ module.exports['Starts'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "518",
+                "localId" : "703",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "519",
+                "localId" : "704",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "25",
+                "value" : "16",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "556",
+            "localId" : "741",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "557",
+              "localId" : "742",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "558",
+                "localId" : "743",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "540",
+              "localId" : "725",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "541",
+                "localId" : "726",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "542",
+                "localId" : "727",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "543",
+                "localId" : "728",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "532",
+                "localId" : "717",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -166060,45 +190677,45 @@ module.exports['Starts'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "533",
+                "localId" : "718",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "534",
+                "localId" : "719",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "552",
+              "localId" : "737",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "553",
+                "localId" : "738",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "554",
+                "localId" : "739",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "555",
+                "localId" : "740",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "544",
+                "localId" : "729",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -166106,1132 +190723,1368 @@ module.exports['Starts'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "545",
+                "localId" : "730",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "546",
+                "localId" : "731",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "27",
+                "value" : "16",
                 "annotation" : [ ]
               }
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* IntegerIntervalUnion
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define IntFullInterval: Interval[0,10]
+define IntClosedUnionClosed: Interval[0,5] union Interval[5,10]
+define IntClosedUnionOpen: Interval[0,5] union Interval[5,10)
+define IntOpenUnionOpen: Interval(0,5] union Interval[5,10)
+define IntOpenUnionClosed: Interval(0,5] union Interval[5,10]
+define IntSameAsUnion: Interval[0,10] union Interval[0,10]
+define IntBeforeUnion: Interval[0,4] union Interval[6,10]
+define IntMeetsUnion: Interval[0,5] union Interval[5,10]
+define IntOverlapsUnion: Interval[0,7] union Interval[3,10]
+define IntBeginsUnion: Interval[0,5] union Interval[0,10]
+define IntDuringUnion: Interval[3,5] union Interval[0,10]
+define IntEndsUnion: Interval[5,10] union Interval[0,10]
+define NullUnion: null union Interval[0,10]
+define UnionNull: Interval[5,10] union null
+define NullUnionNull: (null as Interval<Integer>) union (null as Interval<Integer>)
+*/
+
+module.exports['IntegerIntervalUnion'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "508",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "566",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeIntervalStartsDayOfTrue",
+        "localId" : "214",
+        "name" : "IntFullInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "566",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeIntervalStartsDayOfTrue", ": " ]
+              "value" : [ "", "define ", "IntFullInterval", ": " ]
             }, {
-              "r" : "621",
+              "r" : "217",
               "s" : [ {
-                "r" : "591",
+                "r" : "215",
+                "value" : [ "Interval[", "0", ",", "10", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "220",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "217",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "218",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "219",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "224",
+        "name" : "IntClosedUnionClosed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "IntClosedUnionClosed", ": " ]
+            }, {
+              "r" : "235",
+              "s" : [ {
+                "r" : "227",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "575",
-                  "s" : [ {
-                    "r" : "567",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "587",
-                  "s" : [ {
-                    "r" : "579",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "25", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "225",
+                  "value" : [ "Interval[", "0", ",", "5", "]" ]
                 } ]
               }, {
-                "r" : "621",
-                "value" : [ " ", "starts day of", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "618",
+                "r" : "232",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "602",
-                  "s" : [ {
-                    "r" : "594",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "614",
-                  "s" : [ {
-                    "r" : "606",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "27", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "230",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "242",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "243",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Starts",
-          "localId" : "621",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Union",
+          "localId" : "235",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "240",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "241",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "622",
+            "localId" : "236",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "623",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "237",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "624",
+            "localId" : "238",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "625",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "239",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "591",
+            "localId" : "227",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "592",
+              "localId" : "228",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "593",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "229",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "575",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "225",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "226",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "232",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "233",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "576",
+                "localId" : "234",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "230",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "231",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "246",
+        "name" : "IntClosedUnionOpen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "246",
+            "s" : [ {
+              "value" : [ "", "define ", "IntClosedUnionOpen", ": " ]
+            }, {
+              "r" : "257",
+              "s" : [ {
+                "r" : "249",
+                "s" : [ {
+                  "r" : "247",
+                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "577",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ " union " ]
               }, {
+                "r" : "254",
+                "s" : [ {
+                  "r" : "252",
+                  "value" : [ "Interval[", "5", ",", "10", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "264",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "265",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Union",
+          "localId" : "257",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "262",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "263",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "258",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "259",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "260",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "249",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "250",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "578",
+                "localId" : "251",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "567",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "568",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "569",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "247",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "587",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "248",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "254",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "255",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "588",
+                "localId" : "256",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "253",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "268",
+        "name" : "IntOpenUnionOpen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "268",
+            "s" : [ {
+              "value" : [ "", "define ", "IntOpenUnionOpen", ": " ]
+            }, {
+              "r" : "279",
+              "s" : [ {
+                "r" : "271",
+                "s" : [ {
+                  "r" : "269",
+                  "value" : [ "Interval(", "0", ",", "5", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "589",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ " union " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "590",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "579",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "580",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "581",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "25",
-                "annotation" : [ ]
-              }
+                "r" : "276",
+                "s" : [ {
+                  "r" : "274",
+                  "value" : [ "Interval[", "5", ",", "10", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "286",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "287",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Union",
+          "localId" : "279",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "284",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "285",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "280",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "281",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "282",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "283",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "618",
-            "lowClosed" : true,
+            "localId" : "271",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "619",
+              "localId" : "272",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "620",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "273",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "602",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "276",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "277",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "603",
+                "localId" : "278",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "290",
+        "name" : "IntOpenUnionClosed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "290",
+            "s" : [ {
+              "value" : [ "", "define ", "IntOpenUnionClosed", ": " ]
+            }, {
+              "r" : "301",
+              "s" : [ {
+                "r" : "293",
+                "s" : [ {
+                  "r" : "291",
+                  "value" : [ "Interval(", "0", ",", "5", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "604",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ " union " ]
               }, {
+                "r" : "298",
+                "s" : [ {
+                  "r" : "296",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "308",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "309",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Union",
+          "localId" : "301",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "306",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "307",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "302",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "303",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "304",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "305",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "293",
+            "lowClosed" : false,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "294",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "605",
+                "localId" : "295",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "594",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "595",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "596",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "614",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "298",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "299",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "615",
+                "localId" : "300",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "297",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "312",
+        "name" : "IntSameAsUnion",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "312",
+            "s" : [ {
+              "value" : [ "", "define ", "IntSameAsUnion", ": " ]
+            }, {
+              "r" : "323",
+              "s" : [ {
+                "r" : "315",
+                "s" : [ {
+                  "r" : "313",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                } ]
+              }, {
+                "value" : [ " union " ]
               }, {
+                "r" : "320",
+                "s" : [ {
+                  "r" : "318",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "330",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "331",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Union",
+          "localId" : "323",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "328",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "329",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "324",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "325",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "326",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "327",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "315",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "316",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "616",
+                "localId" : "317",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "313",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "314",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "320",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "321",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "617",
+                "localId" : "322",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "606",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "607",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "608",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "27",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "318",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "319",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "628",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeIntervalStartsEndsFalse",
+        "localId" : "334",
+        "name" : "IntBeforeUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "628",
+            "r" : "334",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeIntervalStartsEndsFalse", ": " ]
+              "value" : [ "", "define ", "IntBeforeUnion", ": " ]
             }, {
-              "r" : "683",
+              "r" : "345",
               "s" : [ {
-                "r" : "653",
+                "r" : "337",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "637",
-                  "s" : [ {
-                    "r" : "629",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "649",
-                  "s" : [ {
-                    "r" : "641",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "25", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "335",
+                  "value" : [ "Interval[", "0", ",", "4", "]" ]
                 } ]
               }, {
-                "r" : "683",
-                "value" : [ " ", "starts day of", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "680",
+                "r" : "342",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "664",
-                  "s" : [ {
-                    "r" : "656",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "676",
-                  "s" : [ {
-                    "r" : "668",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "24", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "340",
+                  "value" : [ "Interval[", "6", ",", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "352",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "353",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Starts",
-          "localId" : "683",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Union",
+          "localId" : "345",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "350",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "351",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "684",
+            "localId" : "346",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "685",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "347",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "686",
+            "localId" : "348",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "687",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "349",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "653",
+            "localId" : "337",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "654",
+              "localId" : "338",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "655",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "339",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "637",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "638",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "639",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "640",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "629",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "630",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "631",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "335",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "649",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "650",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "651",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "652",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "641",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "642",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "643",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "25",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "336",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "680",
+            "localId" : "342",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "681",
+              "localId" : "343",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "682",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "344",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "664",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "665",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "666",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "667",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "656",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "657",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "658",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "340",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "676",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "677",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "678",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "679",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "668",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "669",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "670",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "24",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* Ends
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define TestEndsNull: Interval[1, 10] ends Interval[null, null]
-define IntegerIntervalEndsTrue: Interval[4,10] ends Interval[1,10]
-define IntegerIntervalEndsFalse: Interval[4, 9] ends Interval[1,10]
-define IntegerIntervalEndsStartsFalse: Interval[0, 10] ends Interval[1,10]
-define DecimalIntervalEndsTrue: Interval[4.0,10.0] ends Interval[1.0,10.0]
-define DecimalIntervalEndsFalse: Interval[11.0, 20.0] ends Interval[1.0,10.0]
-define DecimalIntervalEndsStartsFalse: Interval[0.0, 10.0] ends Interval[1.0, 10.0]
-define QuantityIntervalEndsTrue: Interval[5.0 'g', 10.0 'g'] ends Interval[1.0 'g', 10.0 'g']
-define QuantityIntervalEndsFalse: Interval[5.0 'g', 10.0 'g'] ends Interval[1.0 'g', 10.5 'g']
-define QuantityIntervalEndsStartsFalse: Interval[4.0 'g', 10.0 'g'] ends Interval[5.0 'g', 10.0 'g']
-define DateTimeIntervalEndsTrue: Interval[DateTime(2012, 1, 5, 0, 0, 0, 0), DateTime(2012, 1, 15, 0, 0, 0, 0)] ends Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 1, 15, 0, 0, 0, 0)]
-define DateTimeIntervalEndsFalse: Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 15)] ends day of Interval[DateTime(2012, 1, 1), DateTime(2012, 1, 16)]
-define DateTimeIntervalEndsDayOfTrue: Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 15)] ends day of Interval[DateTime(2012, 1, 1), DateTime(2012, 1, 15)]
-define DateTimeIntervalEndsStartsFalse: Interval[DateTime(2012, 1, 5), DateTime(2012, 2, 16)] ends day of Interval[DateTime(2012, 2, 1), DateTime(2012, 2, 16)]
-*/
-
-module.exports['Ends'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "635",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
       }, {
-        "localId" : "214",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "TestEndsNull",
+        "localId" : "356",
+        "name" : "IntMeetsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "356",
             "s" : [ {
-              "value" : [ "", "define ", "TestEndsNull", ": " ]
+              "value" : [ "", "define ", "IntMeetsUnion", ": " ]
             }, {
-              "r" : "225",
+              "r" : "367",
               "s" : [ {
-                "r" : "217",
+                "r" : "359",
                 "s" : [ {
-                  "r" : "215",
-                  "value" : [ "Interval[", "1", ", ", "10", "]" ]
+                  "r" : "357",
+                  "value" : [ "Interval[", "0", ",", "5", "]" ]
                 } ]
               }, {
-                "r" : "225",
-                "value" : [ " ", "ends", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "222",
+                "r" : "364",
                 "s" : [ {
-                  "r" : "220",
-                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
+                  "r" : "362",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "374",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "375",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "225",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "367",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "372",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "233",
+            "localId" : "368",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "234",
+              "localId" : "369",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "235",
+            "localId" : "370",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "236",
+              "localId" : "371",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "217",
+            "localId" : "359",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "218",
+              "localId" : "360",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "219",
+                "localId" : "361",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "215",
+              "localId" : "357",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "216",
+              "localId" : "358",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "226",
+            "localId" : "364",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "low" : {
-              "type" : "As",
-              "localId" : "228",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "365",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "227",
-                "path" : "low",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "222",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "223",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "224",
-                      "name" : "{urn:hl7-org:elm-types:r1}Any",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Null",
-                    "localId" : "220",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  },
-                  "high" : {
-                    "type" : "Null",
-                    "localId" : "221",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "366",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }
             },
-            "lowClosedExpression" : {
-              "type" : "Property",
-              "localId" : "229",
-              "path" : "lowClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "222",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "223",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "224",
-                    "name" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Null",
-                  "localId" : "220",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                },
-                "high" : {
-                  "type" : "Null",
-                  "localId" : "221",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                }
-              }
+            "low" : {
+              "type" : "Literal",
+              "localId" : "362",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "As",
-              "localId" : "231",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Property",
-                "localId" : "230",
-                "path" : "high",
-                "annotation" : [ ],
-                "source" : {
-                  "type" : "Interval",
-                  "localId" : "222",
-                  "lowClosed" : true,
-                  "highClosed" : true,
-                  "annotation" : [ ],
-                  "resultTypeSpecifier" : {
-                    "type" : "IntervalTypeSpecifier",
-                    "localId" : "223",
-                    "annotation" : [ ],
-                    "pointType" : {
-                      "type" : "NamedTypeSpecifier",
-                      "localId" : "224",
-                      "name" : "{urn:hl7-org:elm-types:r1}Any",
-                      "annotation" : [ ]
-                    }
-                  },
-                  "low" : {
-                    "type" : "Null",
-                    "localId" : "220",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  },
-                  "high" : {
-                    "type" : "Null",
-                    "localId" : "221",
-                    "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                }
-              }
-            },
-            "highClosedExpression" : {
-              "type" : "Property",
-              "localId" : "232",
-              "path" : "highClosed",
-              "annotation" : [ ],
-              "source" : {
-                "type" : "Interval",
-                "localId" : "222",
-                "lowClosed" : true,
-                "highClosed" : true,
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "223",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "224",
-                    "name" : "{urn:hl7-org:elm-types:r1}Any",
-                    "annotation" : [ ]
-                  }
-                },
-                "low" : {
-                  "type" : "Null",
-                  "localId" : "220",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                },
-                "high" : {
-                  "type" : "Null",
-                  "localId" : "221",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                  "annotation" : [ ]
-                }
-              }
+              "type" : "Literal",
+              "localId" : "363",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "239",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntegerIntervalEndsTrue",
+        "localId" : "378",
+        "name" : "IntOverlapsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "239",
+            "r" : "378",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerIntervalEndsTrue", ": " ]
+              "value" : [ "", "define ", "IntOverlapsUnion", ": " ]
             }, {
-              "r" : "250",
+              "r" : "389",
               "s" : [ {
-                "r" : "242",
+                "r" : "381",
                 "s" : [ {
-                  "r" : "240",
-                  "value" : [ "Interval[", "4", ",", "10", "]" ]
+                  "r" : "379",
+                  "value" : [ "Interval[", "0", ",", "7", "]" ]
                 } ]
               }, {
-                "r" : "250",
-                "value" : [ " ", "ends", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "247",
+                "r" : "386",
                 "s" : [ {
-                  "r" : "245",
-                  "value" : [ "Interval[", "1", ",", "10", "]" ]
+                  "r" : "384",
+                  "value" : [ "Interval[", "3", ",", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "396",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "397",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "250",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "389",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "394",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "395",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "251",
+            "localId" : "390",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "252",
+              "localId" : "391",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "253",
+            "localId" : "392",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "254",
+              "localId" : "393",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "242",
+            "localId" : "381",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "243",
+              "localId" : "382",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "244",
+                "localId" : "383",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "240",
+              "localId" : "379",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "241",
+              "localId" : "380",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "7",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "247",
+            "localId" : "386",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "248",
+              "localId" : "387",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "249",
+                "localId" : "388",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "245",
+              "localId" : "384",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "3",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "246",
+              "localId" : "385",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -167240,126 +192093,145 @@ module.exports['Ends'] = {
           } ]
         }
       }, {
-        "localId" : "257",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntegerIntervalEndsFalse",
+        "localId" : "400",
+        "name" : "IntBeginsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "257",
+            "r" : "400",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerIntervalEndsFalse", ": " ]
+              "value" : [ "", "define ", "IntBeginsUnion", ": " ]
             }, {
-              "r" : "268",
+              "r" : "411",
               "s" : [ {
-                "r" : "260",
+                "r" : "403",
                 "s" : [ {
-                  "r" : "258",
-                  "value" : [ "Interval[", "4", ", ", "9", "]" ]
+                  "r" : "401",
+                  "value" : [ "Interval[", "0", ",", "5", "]" ]
                 } ]
               }, {
-                "r" : "268",
-                "value" : [ " ", "ends", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "265",
+                "r" : "408",
                 "s" : [ {
-                  "r" : "263",
-                  "value" : [ "Interval[", "1", ",", "10", "]" ]
+                  "r" : "406",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "418",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "419",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "268",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "411",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "416",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "417",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "269",
+            "localId" : "412",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "270",
+              "localId" : "413",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "271",
+            "localId" : "414",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "272",
+              "localId" : "415",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "260",
+            "localId" : "403",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "261",
+              "localId" : "404",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "262",
+                "localId" : "405",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "258",
+              "localId" : "401",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "259",
+              "localId" : "402",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "265",
+            "localId" : "408",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "266",
+              "localId" : "409",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "267",
+                "localId" : "410",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "263",
+              "localId" : "406",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "264",
+              "localId" : "407",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -167368,126 +192240,145 @@ module.exports['Ends'] = {
           } ]
         }
       }, {
-        "localId" : "275",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntegerIntervalEndsStartsFalse",
+        "localId" : "422",
+        "name" : "IntDuringUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "275",
+            "r" : "422",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerIntervalEndsStartsFalse", ": " ]
+              "value" : [ "", "define ", "IntDuringUnion", ": " ]
             }, {
-              "r" : "286",
+              "r" : "433",
               "s" : [ {
-                "r" : "278",
+                "r" : "425",
                 "s" : [ {
-                  "r" : "276",
-                  "value" : [ "Interval[", "0", ", ", "10", "]" ]
+                  "r" : "423",
+                  "value" : [ "Interval[", "3", ",", "5", "]" ]
                 } ]
               }, {
-                "r" : "286",
-                "value" : [ " ", "ends", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "283",
+                "r" : "430",
                 "s" : [ {
-                  "r" : "281",
-                  "value" : [ "Interval[", "1", ",", "10", "]" ]
+                  "r" : "428",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "440",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "441",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "286",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "433",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "438",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "439",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "287",
+            "localId" : "434",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "288",
+              "localId" : "435",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "289",
+            "localId" : "436",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "290",
+              "localId" : "437",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "278",
+            "localId" : "425",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "279",
+              "localId" : "426",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "280",
+                "localId" : "427",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "276",
+              "localId" : "423",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "3",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "277",
+              "localId" : "424",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "283",
+            "localId" : "430",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "284",
+              "localId" : "431",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "285",
+                "localId" : "432",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "281",
+              "localId" : "428",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "282",
+              "localId" : "429",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -167496,2505 +192387,1857 @@ module.exports['Ends'] = {
           } ]
         }
       }, {
-        "localId" : "293",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DecimalIntervalEndsTrue",
+        "localId" : "444",
+        "name" : "IntEndsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "293",
+            "r" : "444",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalIntervalEndsTrue", ": " ]
+              "value" : [ "", "define ", "IntEndsUnion", ": " ]
             }, {
-              "r" : "304",
+              "r" : "455",
               "s" : [ {
-                "r" : "296",
+                "r" : "447",
                 "s" : [ {
-                  "r" : "294",
-                  "value" : [ "Interval[", "4.0", ",", "10.0", "]" ]
+                  "r" : "445",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
                 } ]
               }, {
-                "r" : "304",
-                "value" : [ " ", "ends", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "301",
+                "r" : "452",
                 "s" : [ {
-                  "r" : "299",
-                  "value" : [ "Interval[", "1.0", ",", "10.0", "]" ]
+                  "r" : "450",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "462",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "463",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "304",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "455",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "460",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "461",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "305",
+            "localId" : "456",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "306",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "457",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "307",
+            "localId" : "458",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "308",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "459",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "296",
+            "localId" : "447",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "297",
+              "localId" : "448",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "298",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "449",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "294",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "4.0",
+              "localId" : "445",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "295",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "10.0",
+              "localId" : "446",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "301",
+            "localId" : "452",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "302",
+              "localId" : "453",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "303",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "454",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "299",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
+              "localId" : "450",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "300",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "10.0",
+              "localId" : "451",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "311",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DecimalIntervalEndsFalse",
+        "localId" : "466",
+        "name" : "NullUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "311",
+            "r" : "466",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalIntervalEndsFalse", ": " ]
+              "value" : [ "", "define ", "NullUnion", ": " ]
             }, {
-              "r" : "322",
+              "r" : "473",
               "s" : [ {
-                "r" : "314",
-                "s" : [ {
-                  "r" : "312",
-                  "value" : [ "Interval[", "11.0", ", ", "20.0", "]" ]
-                } ]
-              }, {
-                "r" : "322",
-                "value" : [ " ", "ends", " " ]
+                "r" : "467",
+                "value" : [ "null", " union " ]
               }, {
-                "r" : "319",
+                "r" : "470",
                 "s" : [ {
-                  "r" : "317",
-                  "value" : [ "Interval[", "1.0", ",", "10.0", "]" ]
+                  "r" : "468",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "483",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "484",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "322",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "473",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "481",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "482",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "323",
+            "localId" : "477",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "324",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "478",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "325",
+            "localId" : "479",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "326",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "480",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "314",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "As",
+            "localId" : "474",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "467",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "315",
+              "localId" : "475",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "316",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "476",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "312",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "11.0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "313",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "20.0",
-              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "319",
+            "localId" : "470",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "320",
+              "localId" : "471",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "321",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "472",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "317",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
+              "localId" : "468",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "318",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "10.0",
+              "localId" : "469",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "329",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DecimalIntervalEndsStartsFalse",
+        "localId" : "487",
+        "name" : "UnionNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "329",
+            "r" : "487",
             "s" : [ {
-              "value" : [ "", "define ", "DecimalIntervalEndsStartsFalse", ": " ]
+              "value" : [ "", "define ", "UnionNull", ": " ]
             }, {
-              "r" : "340",
+              "r" : "494",
               "s" : [ {
-                "r" : "332",
+                "r" : "490",
                 "s" : [ {
-                  "r" : "330",
-                  "value" : [ "Interval[", "0.0", ", ", "10.0", "]" ]
+                  "r" : "488",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
                 } ]
               }, {
-                "r" : "340",
-                "value" : [ " ", "ends", " " ]
-              }, {
-                "r" : "337",
-                "s" : [ {
-                  "r" : "335",
-                  "value" : [ "Interval[", "1.0", ", ", "10.0", "]" ]
-                } ]
+                "r" : "493",
+                "value" : [ " union ", "null" ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "504",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "505",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "340",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "494",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "502",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "503",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "341",
+            "localId" : "498",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "342",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "499",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "343",
+            "localId" : "500",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "344",
-              "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+              "localId" : "501",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "332",
+            "localId" : "490",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "333",
+              "localId" : "491",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "334",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "492",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "330",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "0.0",
+              "localId" : "488",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "331",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "10.0",
+              "localId" : "489",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
-            "type" : "Interval",
-            "localId" : "337",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "As",
+            "localId" : "495",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "493",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "338",
+              "localId" : "496",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "339",
-                "name" : "{urn:hl7-org:elm-types:r1}Decimal",
+                "localId" : "497",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "335",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "1.0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "336",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-              "value" : "10.0",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "347",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "QuantityIntervalEndsTrue",
+        "localId" : "508",
+        "name" : "NullUnionNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "347",
+            "r" : "508",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalEndsTrue", ": " ]
+              "value" : [ "", "define ", "NullUnionNull", ": " ]
             }, {
-              "r" : "358",
+              "r" : "529",
               "s" : [ {
-                "r" : "350",
+                "r" : "509",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "348",
-                  "s" : [ {
-                    "value" : [ "5.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "value" : [ "(" ]
                 }, {
-                  "r" : "349",
+                  "r" : "509",
                   "s" : [ {
-                    "value" : [ "10.0 ", "'g'" ]
+                    "r" : "510",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "511",
+                    "s" : [ {
+                      "value" : [ "Interval<" ]
+                    }, {
+                      "r" : "512",
+                      "s" : [ {
+                        "value" : [ "Integer" ]
+                      } ]
+                    }, {
+                      "value" : [ ">" ]
+                    } ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "358",
-                "value" : [ " ", "ends", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "355",
+                "r" : "519",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "353",
-                  "s" : [ {
-                    "value" : [ "1.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "value" : [ "(" ]
                 }, {
-                  "r" : "354",
+                  "r" : "519",
                   "s" : [ {
-                    "value" : [ "10.0 ", "'g'" ]
+                    "r" : "520",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "521",
+                    "s" : [ {
+                      "value" : [ "Interval<" ]
+                    }, {
+                      "r" : "522",
+                      "s" : [ {
+                        "value" : [ "Integer" ]
+                      } ]
+                    }, {
+                      "value" : [ ">" ]
+                    } ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "536",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "537",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "358",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "529",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "534",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "535",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "359",
+            "localId" : "530",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "360",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "531",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "361",
+            "localId" : "532",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "362",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "533",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "350",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "As",
+            "localId" : "509",
+            "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "351",
+              "localId" : "517",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "352",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "518",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Quantity",
-              "localId" : "348",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
-              "unit" : "g",
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "510",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "Quantity",
-              "localId" : "349",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10.0,
-              "unit" : "g",
-              "annotation" : [ ]
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "511",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "513",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "514",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              },
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "512",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "355",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "As",
+            "localId" : "519",
+            "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "356",
+              "localId" : "527",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "357",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "528",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Quantity",
-              "localId" : "353",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1.0,
-              "unit" : "g",
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "520",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "Quantity",
-              "localId" : "354",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10.0,
-              "unit" : "g",
-              "annotation" : [ ]
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "521",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "523",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "524",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              },
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "522",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* LongIntervalUnion
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define LongFullInterval: Interval[0L,10L]
+define LongClosedUnionClosed: Interval[0L,5L] union Interval[5L,10L]
+define LongClosedUnionOpen: Interval[0L,5L] union Interval[5L,10L)
+define LongOpenUnionOpen: Interval(0L,5L] union Interval[5L,10L)
+define LongOpenUnionClosed: Interval(0L,5L] union Interval[5L,10L]
+define LongSameAsUnion: Interval[0L,10L] union Interval[0L,10L]
+define LongBeforeUnion: Interval[0L,4L] union Interval[6L,10L]
+define LongMeetsUnion: Interval[0L,5L] union Interval[5L,10L]
+define LongOverlapsUnion: Interval[0L,7L] union Interval[3L,10L]
+define LongBeginsUnion: Interval[0L,5L] union Interval[0L,10L]
+define LongDuringUnion: Interval[3L,5L] union Interval[0L,10L]
+define LongEndsUnion: Interval[5L,10L] union Interval[0L,10L]
+define NullUnion: null union Interval[0L,10L]
+define UnionNull: Interval[5L,10L] union null
+define NullUnionNull: (null as Interval<Long>) union (null as Interval<Long>)
+*/
+
+module.exports['LongIntervalUnion'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "508",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
       }, {
-        "localId" : "365",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "QuantityIntervalEndsFalse",
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "name" : "LongFullInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "365",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalEndsFalse", ": " ]
+              "value" : [ "", "define ", "LongFullInterval", ": " ]
             }, {
-              "r" : "376",
+              "r" : "217",
               "s" : [ {
-                "r" : "368",
+                "r" : "215",
+                "value" : [ "Interval[", "0L", ",", "10L", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "220",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "217",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "218",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "219",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "10",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "224",
+        "name" : "LongClosedUnionClosed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "LongClosedUnionClosed", ": " ]
+            }, {
+              "r" : "235",
+              "s" : [ {
+                "r" : "227",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "366",
-                  "s" : [ {
-                    "value" : [ "5.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "367",
-                  "s" : [ {
-                    "value" : [ "10.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "225",
+                  "value" : [ "Interval[", "0L", ",", "5L", "]" ]
                 } ]
               }, {
-                "r" : "376",
-                "value" : [ " ", "ends", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "373",
+                "r" : "232",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "371",
-                  "s" : [ {
-                    "value" : [ "1.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "372",
-                  "s" : [ {
-                    "value" : [ "10.5 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "230",
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "242",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "243",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "376",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "235",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "240",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "241",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "377",
+            "localId" : "236",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "378",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "237",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "379",
+            "localId" : "238",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "380",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "239",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "368",
+            "localId" : "227",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "369",
+              "localId" : "228",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "370",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "229",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
-              "localId" : "366",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "225",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
-              "localId" : "367",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10.0,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "226",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "373",
+            "localId" : "232",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "374",
+              "localId" : "233",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "375",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "234",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
-              "localId" : "371",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 1.0,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "230",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
-              "localId" : "372",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10.5,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "231",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "383",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "QuantityIntervalEndsStartsFalse",
+        "localId" : "246",
+        "name" : "LongClosedUnionOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "383",
+            "r" : "246",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalEndsStartsFalse", ": " ]
+              "value" : [ "", "define ", "LongClosedUnionOpen", ": " ]
             }, {
-              "r" : "394",
+              "r" : "257",
               "s" : [ {
-                "r" : "386",
+                "r" : "249",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "384",
-                  "s" : [ {
-                    "value" : [ "4.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "385",
-                  "s" : [ {
-                    "value" : [ "10.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "247",
+                  "value" : [ "Interval[", "0L", ",", "5L", "]" ]
                 } ]
               }, {
-                "r" : "394",
-                "value" : [ " ", "ends", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "391",
+                "r" : "254",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "389",
-                  "s" : [ {
-                    "value" : [ "5.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "390",
-                  "s" : [ {
-                    "value" : [ "10.0 ", "'g'" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "252",
+                  "value" : [ "Interval[", "5L", ",", "10L", ")" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "264",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "265",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "394",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "257",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "262",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "263",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "395",
+            "localId" : "258",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "396",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "259",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "397",
+            "localId" : "260",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "398",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "386",
+            "localId" : "249",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "387",
+              "localId" : "250",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "388",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "251",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
-              "localId" : "384",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 4.0,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "247",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
-              "localId" : "385",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10.0,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "248",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "391",
+            "localId" : "254",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "392",
+              "localId" : "255",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "393",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "256",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Quantity",
-              "localId" : "389",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 5.0,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Quantity",
-              "localId" : "390",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "value" : 10.0,
-              "unit" : "g",
+              "type" : "Literal",
+              "localId" : "253",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "401",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeIntervalEndsTrue",
+        "localId" : "268",
+        "name" : "LongOpenUnionOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "401",
+            "r" : "268",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeIntervalEndsTrue", ": " ]
+              "value" : [ "", "define ", "LongOpenUnionOpen", ": " ]
             }, {
-              "r" : "504",
+              "r" : "279",
               "s" : [ {
-                "r" : "450",
+                "r" : "271",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "418",
-                  "s" : [ {
-                    "r" : "402",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "442",
-                  "s" : [ {
-                    "r" : "426",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "269",
+                  "value" : [ "Interval(", "0L", ",", "5L", "]" ]
                 } ]
               }, {
-                "r" : "504",
-                "value" : [ " ", "ends", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "501",
+                "r" : "276",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "469",
-                  "s" : [ {
-                    "r" : "453",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "493",
-                  "s" : [ {
-                    "r" : "477",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "274",
+                  "value" : [ "Interval[", "5L", ",", "10L", ")" ]
                 } ]
               } ]
             } ]
           }
-        } ],
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "286",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "287",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "504",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "type" : "Union",
+          "localId" : "279",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "284",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "285",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "505",
+            "localId" : "280",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "506",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "281",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "507",
+            "localId" : "282",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "508",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "283",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "450",
-            "lowClosed" : true,
+            "localId" : "271",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "451",
+              "localId" : "272",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "452",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "273",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "418",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "419",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "420",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "421",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "422",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "423",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "424",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "425",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "402",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "403",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "404",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "405",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "406",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "407",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "408",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "442",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "443",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "444",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "445",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "446",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "447",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "448",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "449",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "426",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "427",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "428",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "429",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "430",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "431",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "432",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "501",
+            "localId" : "276",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "502",
+              "localId" : "277",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "503",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "278",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "469",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "470",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "471",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "472",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "473",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "474",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "475",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "476",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "453",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "454",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "455",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "456",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "457",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "458",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "459",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "493",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "494",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "495",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "496",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "497",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "498",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "499",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "500",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "477",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "478",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "479",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "480",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "481",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "482",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "483",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "511",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeIntervalEndsFalse",
+        "localId" : "290",
+        "name" : "LongOpenUnionClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "511",
+            "r" : "290",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeIntervalEndsFalse", ": " ]
+              "value" : [ "", "define ", "LongOpenUnionClosed", ": " ]
             }, {
-              "r" : "566",
+              "r" : "301",
               "s" : [ {
-                "r" : "536",
+                "r" : "293",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "520",
-                  "s" : [ {
-                    "r" : "512",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "532",
-                  "s" : [ {
-                    "r" : "524",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "291",
+                  "value" : [ "Interval(", "0L", ",", "5L", "]" ]
                 } ]
               }, {
-                "r" : "566",
-                "value" : [ " ", "ends day of", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "563",
+                "r" : "298",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "547",
-                  "s" : [ {
-                    "r" : "539",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "559",
-                  "s" : [ {
-                    "r" : "551",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "16", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "296",
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "308",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "309",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "566",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Union",
+          "localId" : "301",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "306",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "307",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "567",
+            "localId" : "302",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "568",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "303",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "569",
+            "localId" : "304",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "570",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "305",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "536",
-            "lowClosed" : true,
+            "localId" : "293",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "537",
+              "localId" : "294",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "538",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "295",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "520",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "521",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "522",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "523",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "512",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "513",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "514",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "532",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "533",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "534",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "535",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "524",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "525",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "526",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "563",
+            "localId" : "298",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "564",
+              "localId" : "299",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "565",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "300",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "547",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "548",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "549",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "550",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "539",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "540",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "541",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "559",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "560",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "561",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "562",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "551",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "552",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "553",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "16",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "297",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "573",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeIntervalEndsDayOfTrue",
+        "localId" : "312",
+        "name" : "LongSameAsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "573",
+            "r" : "312",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeIntervalEndsDayOfTrue", ": " ]
+              "value" : [ "", "define ", "LongSameAsUnion", ": " ]
             }, {
-              "r" : "628",
+              "r" : "323",
               "s" : [ {
-                "r" : "598",
+                "r" : "315",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "582",
-                  "s" : [ {
-                    "r" : "574",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "594",
-                  "s" : [ {
-                    "r" : "586",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "313",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               }, {
-                "r" : "628",
-                "value" : [ " ", "ends day of", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "625",
+                "r" : "320",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "609",
-                  "s" : [ {
-                    "r" : "601",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "621",
-                  "s" : [ {
-                    "r" : "613",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "318",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "330",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "331",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "628",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Union",
+          "localId" : "323",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "328",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "329",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "629",
+            "localId" : "324",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "630",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "325",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "631",
+            "localId" : "326",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "632",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "327",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "598",
+            "localId" : "315",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "599",
+              "localId" : "316",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "600",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "317",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "582",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "583",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "584",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "585",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "574",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "575",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "576",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "313",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "594",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "595",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "596",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "597",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "586",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "587",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "588",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "314",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "625",
+            "localId" : "320",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "626",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "627",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "609",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "610",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "611",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "612",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "601",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "602",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "603",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "621",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "321",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "622",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "623",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "624",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "613",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "614",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "615",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "15",
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "322",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "318",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "319",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "635",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeIntervalEndsStartsFalse",
+        "localId" : "334",
+        "name" : "LongBeforeUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "635",
+            "r" : "334",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeIntervalEndsStartsFalse", ": " ]
+              "value" : [ "", "define ", "LongBeforeUnion", ": " ]
             }, {
-              "r" : "690",
+              "r" : "345",
               "s" : [ {
-                "r" : "660",
+                "r" : "337",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "644",
-                  "s" : [ {
-                    "r" : "636",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "656",
-                  "s" : [ {
-                    "r" : "648",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "16", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "335",
+                  "value" : [ "Interval[", "0L", ",", "4L", "]" ]
                 } ]
               }, {
-                "r" : "690",
-                "value" : [ " ", "ends day of", " " ]
+                "value" : [ " union " ]
               }, {
-                "r" : "687",
+                "r" : "342",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "671",
-                  "s" : [ {
-                    "r" : "663",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "683",
-                  "s" : [ {
-                    "r" : "675",
-                    "value" : [ "DateTime", "(", "2012", ", ", "2", ", ", "16", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "340",
+                  "value" : [ "Interval[", "6L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
           }
         } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "352",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "353",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
         "expression" : {
-          "type" : "Ends",
-          "localId" : "690",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Day",
+          "type" : "Union",
+          "localId" : "345",
           "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "350",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "351",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "691",
+            "localId" : "346",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "692",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "347",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "693",
+            "localId" : "348",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "694",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "349",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "660",
+            "localId" : "337",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "661",
+              "localId" : "338",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "662",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "339",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "644",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "645",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "646",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "647",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "636",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "637",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "638",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "335",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "656",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "657",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "658",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "659",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "648",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "649",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "650",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "16",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "336",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "687",
+            "localId" : "342",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "688",
+              "localId" : "343",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "689",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "344",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "671",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "672",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "673",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "674",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "663",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "664",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "665",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "340",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "683",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "684",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "685",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "686",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "675",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "676",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "677",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "16",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* IntegerIntervalUnion
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define IntFullInterval: Interval[0,10]
-define IntClosedUnionClosed: Interval[0,5] union Interval[5,10]
-define IntClosedUnionOpen: Interval[0,5] union Interval[5,10)
-define IntOpenUnionOpen: Interval(0,5] union Interval[5,10)
-define IntOpenUnionClosed: Interval(0,5] union Interval[5,10]
-define IntSameAsUnion: Interval[0,10] union Interval[0,10]
-define IntBeforeUnion: Interval[0,4] union Interval[6,10]
-define IntMeetsUnion: Interval[0,5] union Interval[5,10]
-define IntOverlapsUnion: Interval[0,7] union Interval[3,10]
-define IntBeginsUnion: Interval[0,5] union Interval[0,10]
-define IntDuringUnion: Interval[3,5] union Interval[0,10]
-define IntEndsUnion: Interval[5,10] union Interval[0,10]
-define NullUnion: null union Interval[0,10]
-define UnionNull: Interval[5,10] union null
-define NullUnionNull: (null as Interval<Integer>) union (null as Interval<Integer>)
-*/
-
-module.exports['IntegerIntervalUnion'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "508",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
       }, {
-        "localId" : "214",
-        "name" : "IntFullInterval",
+        "localId" : "356",
+        "name" : "LongMeetsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "356",
             "s" : [ {
-              "value" : [ "", "define ", "IntFullInterval", ": " ]
+              "value" : [ "", "define ", "LongMeetsUnion", ": " ]
             }, {
-              "r" : "217",
+              "r" : "367",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "Interval[", "0", ",", "10", "]" ]
+                "r" : "359",
+                "s" : [ {
+                  "r" : "357",
+                  "value" : [ "Interval[", "0L", ",", "5L", "]" ]
+                } ]
+              }, {
+                "value" : [ " union " ]
+              }, {
+                "r" : "364",
+                "s" : [ {
+                  "r" : "362",
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "220",
+          "localId" : "374",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "221",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "375",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "217",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Union",
+          "localId" : "367",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "218",
+            "localId" : "372",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "219",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
-          "low" : {
-            "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "0",
-            "annotation" : [ ]
-          },
-          "high" : {
-            "type" : "Literal",
-            "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "10",
-            "annotation" : [ ]
-          }
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "368",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "369",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "370",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "359",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "360",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "361",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "357",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "358",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "364",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "365",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "366",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "362",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "363",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
         }
       }, {
-        "localId" : "224",
-        "name" : "IntClosedUnionClosed",
+        "localId" : "378",
+        "name" : "LongOverlapsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "224",
+            "r" : "378",
             "s" : [ {
-              "value" : [ "", "define ", "IntClosedUnionClosed", ": " ]
+              "value" : [ "", "define ", "LongOverlapsUnion", ": " ]
             }, {
-              "r" : "235",
+              "r" : "389",
               "s" : [ {
-                "r" : "227",
+                "r" : "381",
                 "s" : [ {
-                  "r" : "225",
-                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                  "r" : "379",
+                  "value" : [ "Interval[", "0L", ",", "7L", "]" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "232",
+                "r" : "386",
                 "s" : [ {
-                  "r" : "230",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                  "r" : "384",
+                  "value" : [ "Interval[", "3L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -170002,146 +194245,146 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "242",
+          "localId" : "396",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "243",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "397",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "235",
+          "localId" : "389",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "240",
+            "localId" : "394",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "241",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "395",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "236",
+            "localId" : "390",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "237",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "391",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "238",
+            "localId" : "392",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "239",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "393",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "227",
+            "localId" : "381",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "228",
+              "localId" : "382",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "229",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "383",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "225",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "379",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "226",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "localId" : "380",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "232",
+            "localId" : "386",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "233",
+              "localId" : "387",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "234",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "388",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "230",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "localId" : "384",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "231",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "385",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "246",
-        "name" : "IntClosedUnionOpen",
+        "localId" : "400",
+        "name" : "LongBeginsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "246",
+            "r" : "400",
             "s" : [ {
-              "value" : [ "", "define ", "IntClosedUnionOpen", ": " ]
+              "value" : [ "", "define ", "LongBeginsUnion", ": " ]
             }, {
-              "r" : "257",
+              "r" : "411",
               "s" : [ {
-                "r" : "249",
+                "r" : "403",
                 "s" : [ {
-                  "r" : "247",
-                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                  "r" : "401",
+                  "value" : [ "Interval[", "0L", ",", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "254",
+                "r" : "408",
                 "s" : [ {
-                  "r" : "252",
-                  "value" : [ "Interval[", "5", ",", "10", ")" ]
+                  "r" : "406",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -170149,146 +194392,146 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "264",
+          "localId" : "418",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "265",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "419",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "257",
+          "localId" : "411",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "262",
+            "localId" : "416",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "263",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "417",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "258",
+            "localId" : "412",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "259",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "413",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "260",
+            "localId" : "414",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "261",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "415",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "249",
+            "localId" : "403",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "250",
+              "localId" : "404",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "251",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "405",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "247",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "248",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "402",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "254",
+            "localId" : "408",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "255",
+              "localId" : "409",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "256",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "410",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "localId" : "406",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "253",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "407",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "268",
-        "name" : "IntOpenUnionOpen",
+        "localId" : "422",
+        "name" : "LongDuringUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "268",
+            "r" : "422",
             "s" : [ {
-              "value" : [ "", "define ", "IntOpenUnionOpen", ": " ]
+              "value" : [ "", "define ", "LongDuringUnion", ": " ]
             }, {
-              "r" : "279",
+              "r" : "433",
               "s" : [ {
-                "r" : "271",
+                "r" : "425",
                 "s" : [ {
-                  "r" : "269",
-                  "value" : [ "Interval(", "0", ",", "5", "]" ]
+                  "r" : "423",
+                  "value" : [ "Interval[", "3L", ",", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "276",
+                "r" : "430",
                 "s" : [ {
-                  "r" : "274",
-                  "value" : [ "Interval[", "5", ",", "10", ")" ]
+                  "r" : "428",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -170296,146 +194539,146 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "286",
+          "localId" : "440",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "287",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "441",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "279",
+          "localId" : "433",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "284",
+            "localId" : "438",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "285",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "439",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "280",
+            "localId" : "434",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "281",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "435",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "282",
+            "localId" : "436",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "283",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "437",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "271",
-            "lowClosed" : false,
+            "localId" : "425",
+            "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "272",
+              "localId" : "426",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "273",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "427",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "269",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "423",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "424",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "276",
+            "localId" : "430",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "277",
+              "localId" : "431",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "278",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "432",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "localId" : "428",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "429",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "290",
-        "name" : "IntOpenUnionClosed",
+        "localId" : "444",
+        "name" : "LongEndsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "290",
+            "r" : "444",
             "s" : [ {
-              "value" : [ "", "define ", "IntOpenUnionClosed", ": " ]
+              "value" : [ "", "define ", "LongEndsUnion", ": " ]
             }, {
-              "r" : "301",
+              "r" : "455",
               "s" : [ {
-                "r" : "293",
+                "r" : "447",
                 "s" : [ {
-                  "r" : "291",
-                  "value" : [ "Interval(", "0", ",", "5", "]" ]
+                  "r" : "445",
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "298",
+                "r" : "452",
                 "s" : [ {
-                  "r" : "296",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                  "r" : "450",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -170443,146 +194686,141 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "308",
+          "localId" : "462",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "309",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "463",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "301",
+          "localId" : "455",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "306",
+            "localId" : "460",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "307",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "461",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "302",
+            "localId" : "456",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "303",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "457",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "304",
+            "localId" : "458",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "305",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "459",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "293",
-            "lowClosed" : false,
+            "localId" : "447",
+            "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "294",
+              "localId" : "448",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "295",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "449",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "291",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "445",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "localId" : "446",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "298",
+            "localId" : "452",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "299",
+              "localId" : "453",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "300",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "454",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "localId" : "450",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "451",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "312",
-        "name" : "IntSameAsUnion",
+        "localId" : "466",
+        "name" : "NullUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "312",
+            "r" : "466",
             "s" : [ {
-              "value" : [ "", "define ", "IntSameAsUnion", ": " ]
+              "value" : [ "", "define ", "NullUnion", ": " ]
             }, {
-              "r" : "323",
+              "r" : "473",
               "s" : [ {
-                "r" : "315",
-                "s" : [ {
-                  "r" : "313",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
-                } ]
-              }, {
-                "value" : [ " union " ]
+                "r" : "467",
+                "value" : [ "null", " union " ]
               }, {
-                "r" : "320",
+                "r" : "470",
                 "s" : [ {
-                  "r" : "318",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "r" : "468",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -170590,146 +194828,304 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "330",
+          "localId" : "483",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "331",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "484",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "323",
+          "localId" : "473",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "328",
+            "localId" : "481",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "329",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "482",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "324",
+            "localId" : "477",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "325",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "478",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "326",
+            "localId" : "479",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "327",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "480",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
+            "type" : "As",
+            "localId" : "474",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "467",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "475",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "476",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            }
+          }, {
             "type" : "Interval",
-            "localId" : "315",
+            "localId" : "470",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "316",
+              "localId" : "471",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "317",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "472",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "313",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "468",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "314",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "469",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
+          } ]
+        }
+      }, {
+        "localId" : "487",
+        "name" : "UnionNull",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "487",
+            "s" : [ {
+              "value" : [ "", "define ", "UnionNull", ": " ]
+            }, {
+              "r" : "494",
+              "s" : [ {
+                "r" : "490",
+                "s" : [ {
+                  "r" : "488",
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
+                } ]
+              }, {
+                "r" : "493",
+                "value" : [ " union ", "null" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "504",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "505",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Union",
+          "localId" : "494",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "502",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "503",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "498",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "499",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "500",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "501",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "320",
+            "localId" : "490",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "321",
+              "localId" : "491",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "322",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "492",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "318",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "488",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "319",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "489",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
+          }, {
+            "type" : "As",
+            "localId" : "495",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "493",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "496",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "497",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            }
           } ]
         }
       }, {
-        "localId" : "334",
-        "name" : "IntBeforeUnion",
+        "localId" : "508",
+        "name" : "NullUnionNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "334",
+            "r" : "508",
             "s" : [ {
-              "value" : [ "", "define ", "IntBeforeUnion", ": " ]
+              "value" : [ "", "define ", "NullUnionNull", ": " ]
             }, {
-              "r" : "345",
+              "r" : "529",
               "s" : [ {
-                "r" : "337",
+                "r" : "509",
                 "s" : [ {
-                  "r" : "335",
-                  "value" : [ "Interval[", "0", ",", "4", "]" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "509",
+                  "s" : [ {
+                    "r" : "510",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "511",
+                    "s" : [ {
+                      "value" : [ "Interval<" ]
+                    }, {
+                      "r" : "512",
+                      "s" : [ {
+                        "value" : [ "Long" ]
+                      } ]
+                    }, {
+                      "value" : [ ">" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "342",
+                "r" : "519",
                 "s" : [ {
-                  "r" : "340",
-                  "value" : [ "Interval[", "6", ",", "10", "]" ]
+                  "value" : [ "(" ]
+                }, {
+                  "r" : "519",
+                  "s" : [ {
+                    "r" : "520",
+                    "value" : [ "null", " as " ]
+                  }, {
+                    "r" : "521",
+                    "s" : [ {
+                      "value" : [ "Interval<" ]
+                    }, {
+                      "r" : "522",
+                      "s" : [ {
+                        "value" : [ "Long" ]
+                      } ]
+                    }, {
+                      "value" : [ ">" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -170737,293 +195133,570 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "352",
+          "localId" : "536",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "353",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "537",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "345",
+          "localId" : "529",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "350",
+            "localId" : "534",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "351",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "535",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "346",
+            "localId" : "530",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "347",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "531",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "348",
+            "localId" : "532",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "349",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "533",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "Interval",
-            "localId" : "337",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "As",
+            "localId" : "509",
+            "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "338",
+              "localId" : "517",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "339",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "518",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "335",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "510",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "336",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "511",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "513",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "514",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
+                  "annotation" : [ ]
+                }
+              },
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "512",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "342",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "As",
+            "localId" : "519",
+            "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "343",
+              "localId" : "527",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "344",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "528",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "340",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "520",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "341",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "521",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "523",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "524",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
+                  "annotation" : [ ]
+                }
+              },
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "522",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* DateTimeIntervalUnion
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define DateTimeFullInterval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeClosedUnionClosed: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeClosedUnionOpen: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
+define DateTimeOpenUnionOpen: Interval(DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
+define DateTimeOpenUnionClosed: Interval(DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeSameAsUnion: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeBeforeUnion: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 4, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 7, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeMeetsUnion: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeOverlapsUnion: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 7, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeBeginsUnion: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeDuringUnion: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 5, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeEndsUnion: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+*/
+
+module.exports['DateTimeIntervalUnion'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "1410",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
       }, {
-        "localId" : "356",
-        "name" : "IntMeetsUnion",
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "name" : "DateTimeFullInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "356",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "IntMeetsUnion", ": " ]
+              "value" : [ "", "define ", "DateTimeFullInterval", ": " ]
             }, {
-              "r" : "367",
+              "r" : "263",
               "s" : [ {
-                "r" : "359",
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "231",
                 "s" : [ {
-                  "r" : "357",
-                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                  "r" : "215",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "value" : [ " union " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "364",
+                "r" : "255",
                 "s" : [ {
-                  "r" : "362",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                  "r" : "239",
+                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
+              }, {
+                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "374",
+          "localId" : "266",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "375",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "267",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Union",
-          "localId" : "367",
+          "type" : "Interval",
+          "localId" : "263",
+          "lowClosed" : true,
+          "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "372",
+            "localId" : "264",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "373",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "265",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "368",
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "231",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "369",
+              "localId" : "232",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "370",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "371",
+              "localId" : "233",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "359",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "360",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "361",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "234",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "235",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "236",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "237",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "238",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "357",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "218",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "358",
+              "localId" : "219",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "220",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "Interval",
-            "localId" : "364",
-            "lowClosed" : true,
-            "highClosed" : true,
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "365",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "366",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "256",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "257",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "258",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "259",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "260",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "262",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2013",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "362",
+              "localId" : "240",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "1",
               "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "363",
+              "localId" : "241",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "243",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "244",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "378",
-        "name" : "IntOverlapsUnion",
+        "localId" : "270",
+        "name" : "DateTimeClosedUnionClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "378",
+            "r" : "270",
             "s" : [ {
-              "value" : [ "", "define ", "IntOverlapsUnion", ": " ]
+              "value" : [ "", "define ", "DateTimeClosedUnionClosed", ": " ]
             }, {
-              "r" : "389",
+              "r" : "373",
               "s" : [ {
-                "r" : "381",
+                "r" : "319",
                 "s" : [ {
-                  "r" : "379",
-                  "value" : [ "Interval[", "0", ",", "7", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "287",
+                  "s" : [ {
+                    "r" : "271",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "311",
+                  "s" : [ {
+                    "r" : "295",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "386",
+                "r" : "370",
                 "s" : [ {
-                  "r" : "384",
-                  "value" : [ "Interval[", "3", ",", "10", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "338",
+                  "s" : [ {
+                    "r" : "322",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "362",
+                  "s" : [ {
+                    "r" : "346",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -171031,146 +195704,536 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "396",
+          "localId" : "380",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "397",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "381",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "389",
+          "localId" : "373",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "394",
+            "localId" : "378",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "395",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "379",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "390",
+            "localId" : "374",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "391",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "375",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "392",
+            "localId" : "376",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "393",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "377",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "381",
+            "localId" : "319",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "382",
+              "localId" : "320",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "383",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "321",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "379",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "288",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "289",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "290",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "291",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "292",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "293",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "294",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "271",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "272",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "273",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "274",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "275",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "276",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "277",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "380",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "312",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "313",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "314",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "315",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "316",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "317",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "318",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "295",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "296",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "297",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "298",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "299",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "300",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "301",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "386",
+            "localId" : "370",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "387",
+              "localId" : "371",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "388",
+                "localId" : "372",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "338",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "339",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "340",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "341",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "342",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "343",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "344",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "345",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "322",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "323",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "324",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "325",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "326",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "327",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "328",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "362",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "363",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "364",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "365",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "366",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "367",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "369",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "346",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "347",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "348",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "349",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "350",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "351",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "352",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "384",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "385",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "400",
-        "name" : "IntBeginsUnion",
+        "localId" : "384",
+        "name" : "DateTimeClosedUnionOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "400",
+            "r" : "384",
             "s" : [ {
-              "value" : [ "", "define ", "IntBeginsUnion", ": " ]
+              "value" : [ "", "define ", "DateTimeClosedUnionOpen", ": " ]
             }, {
-              "r" : "411",
+              "r" : "487",
               "s" : [ {
-                "r" : "403",
+                "r" : "433",
                 "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
                   "r" : "401",
-                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                  "s" : [ {
+                    "r" : "385",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "425",
+                  "s" : [ {
+                    "r" : "409",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "408",
+                "r" : "484",
                 "s" : [ {
-                  "r" : "406",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "452",
+                  "s" : [ {
+                    "r" : "436",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "476",
+                  "s" : [ {
+                    "r" : "460",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -171178,146 +196241,536 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "418",
+          "localId" : "494",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "419",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "495",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "411",
+          "localId" : "487",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "416",
+            "localId" : "492",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "417",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "493",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "412",
+            "localId" : "488",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "413",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "489",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "414",
+            "localId" : "490",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "415",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "491",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "403",
+            "localId" : "433",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "404",
+              "localId" : "434",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "405",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "435",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
+              "type" : "DateTime",
               "localId" : "401",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "402",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "403",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "404",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "405",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "406",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "407",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "408",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "385",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "386",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "387",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "388",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "389",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "390",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "391",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "402",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "425",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "426",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "427",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "428",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "429",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "430",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "431",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "432",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "409",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "410",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "411",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "412",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "413",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "414",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "415",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "408",
+            "localId" : "484",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "409",
+              "localId" : "485",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "410",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "486",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "406",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "452",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "453",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "454",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "455",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "456",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "457",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "458",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "459",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "436",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "437",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "438",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "439",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "440",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "441",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "442",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "407",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "476",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "477",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "478",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "479",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "480",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "481",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "482",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "483",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "460",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "461",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "462",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "463",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "464",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "465",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "466",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "422",
-        "name" : "IntDuringUnion",
+        "localId" : "498",
+        "name" : "DateTimeOpenUnionOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "422",
+            "r" : "498",
             "s" : [ {
-              "value" : [ "", "define ", "IntDuringUnion", ": " ]
+              "value" : [ "", "define ", "DateTimeOpenUnionOpen", ": " ]
             }, {
-              "r" : "433",
+              "r" : "601",
               "s" : [ {
-                "r" : "425",
+                "r" : "547",
                 "s" : [ {
-                  "r" : "423",
-                  "value" : [ "Interval[", "3", ",", "5", "]" ]
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "515",
+                  "s" : [ {
+                    "r" : "499",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "539",
+                  "s" : [ {
+                    "r" : "523",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "430",
+                "r" : "598",
                 "s" : [ {
-                  "r" : "428",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "566",
+                  "s" : [ {
+                    "r" : "550",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "590",
+                  "s" : [ {
+                    "r" : "574",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -171325,146 +196778,536 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "440",
+          "localId" : "608",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "441",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "609",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "433",
+          "localId" : "601",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "438",
+            "localId" : "606",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "439",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "607",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "434",
+            "localId" : "602",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "435",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "603",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "436",
+            "localId" : "604",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "437",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "605",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "425",
-            "lowClosed" : true,
+            "localId" : "547",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "426",
+              "localId" : "548",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "427",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "549",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "423",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "515",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "516",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "517",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "518",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "519",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "520",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "521",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "522",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "499",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "500",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "501",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "502",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "503",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "504",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "505",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "424",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "539",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "540",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "541",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "542",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "543",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "544",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "545",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "546",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "523",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "524",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "525",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "526",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "527",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "528",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "529",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "430",
+            "localId" : "598",
             "lowClosed" : true,
-            "highClosed" : true,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "431",
+              "localId" : "599",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "432",
+                "localId" : "600",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "566",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "567",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "568",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "569",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "570",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "571",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "572",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "573",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "550",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "551",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "552",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "553",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "554",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "555",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "556",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "590",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "591",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "592",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "593",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "594",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "595",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "596",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "597",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "574",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "575",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "576",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "577",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "578",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "579",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "580",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "428",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "429",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "444",
-        "name" : "IntEndsUnion",
+        "localId" : "612",
+        "name" : "DateTimeOpenUnionClosed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "444",
+            "r" : "612",
             "s" : [ {
-              "value" : [ "", "define ", "IntEndsUnion", ": " ]
+              "value" : [ "", "define ", "DateTimeOpenUnionClosed", ": " ]
             }, {
-              "r" : "455",
+              "r" : "715",
               "s" : [ {
-                "r" : "447",
+                "r" : "661",
                 "s" : [ {
-                  "r" : "445",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                  "value" : [ "Interval(" ]
+                }, {
+                  "r" : "629",
+                  "s" : [ {
+                    "r" : "613",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "653",
+                  "s" : [ {
+                    "r" : "637",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "452",
+                "r" : "712",
                 "s" : [ {
-                  "r" : "450",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "680",
+                  "s" : [ {
+                    "r" : "664",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "704",
+                  "s" : [ {
+                    "r" : "688",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -171472,141 +197315,536 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "462",
+          "localId" : "722",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "463",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "723",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "455",
+          "localId" : "715",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "460",
+            "localId" : "720",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "461",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "721",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "456",
+            "localId" : "716",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "457",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "717",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "458",
+            "localId" : "718",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "459",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "719",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "447",
-            "lowClosed" : true,
+            "localId" : "661",
+            "lowClosed" : false,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "448",
+              "localId" : "662",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "449",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "663",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "445",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "629",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "630",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "631",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "632",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "633",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "634",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "635",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "636",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "613",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "614",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "615",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "616",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "617",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "618",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "619",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "446",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "653",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "654",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "655",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "656",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "657",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "658",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "659",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "660",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "637",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "638",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "639",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "640",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "641",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "642",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "643",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "452",
+            "localId" : "712",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "453",
+              "localId" : "713",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "454",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "714",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "450",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "680",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "681",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "682",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "683",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "684",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "685",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "686",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "687",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "664",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "665",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "666",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "667",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "668",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "669",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "670",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "451",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "704",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "705",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "706",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "707",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "708",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "709",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "710",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "711",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "688",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "689",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "690",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "691",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "692",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "693",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "694",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "466",
-        "name" : "NullUnion",
+        "localId" : "726",
+        "name" : "DateTimeSameAsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "466",
+            "r" : "726",
             "s" : [ {
-              "value" : [ "", "define ", "NullUnion", ": " ]
+              "value" : [ "", "define ", "DateTimeSameAsUnion", ": " ]
             }, {
-              "r" : "473",
+              "r" : "829",
               "s" : [ {
-                "r" : "467",
-                "value" : [ "null", " union " ]
+                "r" : "775",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "743",
+                  "s" : [ {
+                    "r" : "727",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "767",
+                  "s" : [ {
+                    "r" : "751",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
               }, {
-                "r" : "470",
+                "value" : [ " union " ]
+              }, {
+                "r" : "826",
                 "s" : [ {
-                  "r" : "468",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "794",
+                  "s" : [ {
+                    "r" : "778",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "818",
+                  "s" : [ {
+                    "r" : "802",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -171614,304 +197852,536 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "483",
+          "localId" : "836",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "484",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "837",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "473",
+          "localId" : "829",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "481",
+            "localId" : "834",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "482",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "835",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "477",
+            "localId" : "830",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "478",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "831",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "479",
+            "localId" : "832",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "480",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "833",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "As",
-            "localId" : "474",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "467",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "475",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "476",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            }
-          }, {
             "type" : "Interval",
-            "localId" : "470",
+            "localId" : "775",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "471",
+              "localId" : "776",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "472",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "777",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "468",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "743",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "744",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "745",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "746",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "747",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "748",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "749",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "750",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "727",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "728",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "729",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "730",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "731",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "732",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "733",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "469",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "487",
-        "name" : "UnionNull",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "487",
-            "s" : [ {
-              "value" : [ "", "define ", "UnionNull", ": " ]
-            }, {
-              "r" : "494",
-              "s" : [ {
-                "r" : "490",
-                "s" : [ {
-                  "r" : "488",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
-                } ]
+              "type" : "DateTime",
+              "localId" : "767",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "768",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "493",
-                "value" : [ " union ", "null" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "504",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "505",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Union",
-          "localId" : "494",
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "502",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "503",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          },
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "498",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "499",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "769",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "770",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "771",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "772",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "773",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "774",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "751",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "752",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "753",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "754",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "755",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "756",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "757",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "500",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "501",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
             "type" : "Interval",
-            "localId" : "490",
+            "localId" : "826",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "491",
+              "localId" : "827",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "492",
+                "localId" : "828",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "794",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "795",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "796",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "797",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "798",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "799",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "800",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "801",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "778",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "779",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "780",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "781",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "782",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "783",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "784",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "488",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
             "high" : {
-              "type" : "Literal",
-              "localId" : "489",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "As",
-            "localId" : "495",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "493",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "496",
+              "type" : "DateTime",
+              "localId" : "818",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "497",
+                "localId" : "819",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "820",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "821",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "822",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "823",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "824",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "825",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "802",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "803",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "804",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "805",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "806",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "807",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "808",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "508",
-        "name" : "NullUnionNull",
+        "localId" : "840",
+        "name" : "DateTimeBeforeUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "508",
+            "r" : "840",
             "s" : [ {
-              "value" : [ "", "define ", "NullUnionNull", ": " ]
+              "value" : [ "", "define ", "DateTimeBeforeUnion", ": " ]
             }, {
-              "r" : "529",
+              "r" : "943",
               "s" : [ {
-                "r" : "509",
+                "r" : "889",
                 "s" : [ {
-                  "value" : [ "(" ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "509",
+                  "r" : "857",
                   "s" : [ {
-                    "r" : "510",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "511",
-                    "s" : [ {
-                      "value" : [ "Interval<" ]
-                    }, {
-                      "r" : "512",
-                      "s" : [ {
-                        "value" : [ "Integer" ]
-                      } ]
-                    }, {
-                      "value" : [ ">" ]
-                    } ]
+                    "r" : "841",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "881",
+                  "s" : [ {
+                    "r" : "865",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "519",
+                "r" : "940",
                 "s" : [ {
-                  "value" : [ "(" ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "519",
+                  "r" : "908",
                   "s" : [ {
-                    "r" : "520",
-                    "value" : [ "null", " as " ]
-                  }, {
-                    "r" : "521",
-                    "s" : [ {
-                      "value" : [ "Interval<" ]
-                    }, {
-                      "r" : "522",
-                      "s" : [ {
-                        "value" : [ "Integer" ]
-                      } ]
-                    }, {
-                      "value" : [ ">" ]
-                    } ]
+                    "r" : "892",
+                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "932",
+                  "s" : [ {
+                    "r" : "916",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -171919,543 +198389,509 @@ module.exports['IntegerIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "536",
+          "localId" : "950",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "537",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "951",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "529",
+          "localId" : "943",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "534",
+            "localId" : "948",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "535",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "949",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "530",
+            "localId" : "944",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "531",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "945",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "532",
+            "localId" : "946",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "533",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "947",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "As",
-            "localId" : "509",
-            "strict" : false,
+            "type" : "Interval",
+            "localId" : "889",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "517",
+              "localId" : "890",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "518",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "891",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "510",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "511",
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "857",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "513",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "514",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              },
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "512",
+                "localId" : "858",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "859",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "860",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "861",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "862",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "863",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "864",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "841",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "842",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "843",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "844",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "845",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "846",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "847",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "881",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "882",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "883",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "884",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "885",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "886",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "887",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "888",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "865",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "866",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "867",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "868",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "869",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "870",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "871",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             }
           }, {
-            "type" : "As",
-            "localId" : "519",
-            "strict" : false,
+            "type" : "Interval",
+            "localId" : "940",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "527",
+              "localId" : "941",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "528",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "942",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "520",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "521",
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "908",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "523",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "524",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              },
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "522",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "909",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      } ]
-    }
-  }
-}
-
-/* DateTimeIntervalUnion
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define DateTimeFullInterval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeClosedUnionClosed: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeClosedUnionOpen: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
-define DateTimeOpenUnionOpen: Interval(DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0))
-define DateTimeOpenUnionClosed: Interval(DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeSameAsUnion: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeBeforeUnion: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 4, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 7, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeMeetsUnion: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeOverlapsUnion: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 7, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeBeginsUnion: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeDuringUnion: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 5, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeEndsUnion: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)] union Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-*/
-
-module.exports['DateTimeIntervalUnion'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "1410",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
-      }, {
-        "localId" : "214",
-        "name" : "DateTimeFullInterval",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "214",
-            "s" : [ {
-              "value" : [ "", "define ", "DateTimeFullInterval", ": " ]
-            }, {
-              "r" : "263",
-              "s" : [ {
-                "value" : [ "Interval[" ]
               }, {
-                "r" : "231",
-                "s" : [ {
-                  "r" : "215",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "910",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "value" : [ ", " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "911",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "255",
-                "s" : [ {
-                  "r" : "239",
-                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "912",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "value" : [ "]" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "266",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "267",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "263",
-          "lowClosed" : true,
-          "highClosed" : true,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "265",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "231",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "232",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "233",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "234",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "235",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "236",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "237",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "238",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "219",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "255",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "256",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "257",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "258",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "259",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "260",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "261",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "262",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "240",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "241",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "242",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "243",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "244",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "913",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "914",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "915",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "892",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "893",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "7",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "894",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "895",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "896",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "897",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "898",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "245",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "932",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "933",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "934",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "935",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "936",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "937",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "938",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "939",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "916",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "917",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "918",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "919",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "920",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "921",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "922",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "270",
-        "name" : "DateTimeClosedUnionClosed",
+        "localId" : "954",
+        "name" : "DateTimeMeetsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "270",
+            "r" : "954",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeClosedUnionClosed", ": " ]
+              "value" : [ "", "define ", "DateTimeMeetsUnion", ": " ]
             }, {
-              "r" : "373",
+              "r" : "1057",
               "s" : [ {
-                "r" : "319",
+                "r" : "1003",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "287",
+                  "r" : "971",
                   "s" : [ {
-                    "r" : "271",
+                    "r" : "955",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "311",
+                  "r" : "995",
                   "s" : [ {
-                    "r" : "295",
+                    "r" : "979",
                     "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -172464,21 +198900,21 @@ module.exports['DateTimeIntervalUnion'] = {
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "370",
+                "r" : "1054",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "338",
+                  "r" : "1022",
                   "s" : [ {
-                    "r" : "322",
+                    "r" : "1006",
                     "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "362",
+                  "r" : "1046",
                   "s" : [ {
-                    "r" : "346",
+                    "r" : "1030",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -172490,112 +198926,112 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "380",
+          "localId" : "1064",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "381",
+            "localId" : "1065",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "373",
+          "localId" : "1057",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "378",
+            "localId" : "1062",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "379",
+              "localId" : "1063",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "374",
+            "localId" : "1058",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "375",
+              "localId" : "1059",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "376",
+            "localId" : "1060",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "377",
+              "localId" : "1061",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "319",
+            "localId" : "1003",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "320",
+              "localId" : "1004",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "321",
+                "localId" : "1005",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "287",
+              "localId" : "971",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "288",
+                "localId" : "972",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "289",
+                "localId" : "973",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "290",
+                "localId" : "974",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "291",
+                "localId" : "975",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "292",
+                "localId" : "976",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "293",
+                "localId" : "977",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "294",
+                "localId" : "978",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "271",
+                "localId" : "955",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -172603,7 +199039,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "272",
+                "localId" : "956",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -172611,7 +199047,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "273",
+                "localId" : "957",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -172619,7 +199055,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "274",
+                "localId" : "958",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172627,7 +199063,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "275",
+                "localId" : "959",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172635,7 +199071,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "276",
+                "localId" : "960",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172643,7 +199079,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "277",
+                "localId" : "961",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172652,48 +199088,48 @@ module.exports['DateTimeIntervalUnion'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "311",
+              "localId" : "995",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "312",
+                "localId" : "996",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "313",
+                "localId" : "997",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "314",
+                "localId" : "998",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "315",
+                "localId" : "999",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "316",
+                "localId" : "1000",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "317",
+                "localId" : "1001",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "318",
+                "localId" : "1002",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "295",
+                "localId" : "979",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -172701,7 +199137,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "296",
+                "localId" : "980",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -172709,7 +199145,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "297",
+                "localId" : "981",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -172717,7 +199153,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "298",
+                "localId" : "982",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172725,7 +199161,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "299",
+                "localId" : "983",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172733,7 +199169,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "300",
+                "localId" : "984",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172741,7 +199177,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "301",
+                "localId" : "985",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172750,65 +199186,65 @@ module.exports['DateTimeIntervalUnion'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "370",
+            "localId" : "1054",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "371",
+              "localId" : "1055",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "372",
+                "localId" : "1056",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "338",
+              "localId" : "1022",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "339",
+                "localId" : "1023",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "340",
+                "localId" : "1024",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "341",
+                "localId" : "1025",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "342",
+                "localId" : "1026",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "343",
+                "localId" : "1027",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "344",
+                "localId" : "1028",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "345",
+                "localId" : "1029",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "322",
+                "localId" : "1006",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -172816,7 +199252,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "323",
+                "localId" : "1007",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -172824,7 +199260,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "324",
+                "localId" : "1008",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -172832,7 +199268,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "325",
+                "localId" : "1009",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172840,7 +199276,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "326",
+                "localId" : "1010",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172848,7 +199284,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "327",
+                "localId" : "1011",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172856,7 +199292,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "328",
+                "localId" : "1012",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172865,48 +199301,48 @@ module.exports['DateTimeIntervalUnion'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "362",
+              "localId" : "1046",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "363",
+                "localId" : "1047",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "364",
+                "localId" : "1048",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "365",
+                "localId" : "1049",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "366",
+                "localId" : "1050",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "367",
+                "localId" : "1051",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "368",
+                "localId" : "1052",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "369",
+                "localId" : "1053",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "346",
+                "localId" : "1030",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -172914,7 +199350,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "347",
+                "localId" : "1031",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -172922,7 +199358,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "348",
+                "localId" : "1032",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -172930,7 +199366,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "349",
+                "localId" : "1033",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172938,7 +199374,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "350",
+                "localId" : "1034",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172946,7 +199382,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "351",
+                "localId" : "1035",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172954,7 +199390,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "352",
+                "localId" : "1036",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -172964,36 +199400,36 @@ module.exports['DateTimeIntervalUnion'] = {
           } ]
         }
       }, {
-        "localId" : "384",
-        "name" : "DateTimeClosedUnionOpen",
+        "localId" : "1068",
+        "name" : "DateTimeOverlapsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "384",
+            "r" : "1068",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeClosedUnionOpen", ": " ]
+              "value" : [ "", "define ", "DateTimeOverlapsUnion", ": " ]
             }, {
-              "r" : "487",
+              "r" : "1171",
               "s" : [ {
-                "r" : "433",
+                "r" : "1117",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "401",
+                  "r" : "1085",
                   "s" : [ {
-                    "r" : "385",
+                    "r" : "1069",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "425",
+                  "r" : "1109",
                   "s" : [ {
-                    "r" : "409",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1093",
+                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -173001,25 +199437,25 @@ module.exports['DateTimeIntervalUnion'] = {
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "484",
+                "r" : "1168",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "452",
+                  "r" : "1136",
                   "s" : [ {
-                    "r" : "436",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1120",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "476",
+                  "r" : "1160",
                   "s" : [ {
-                    "r" : "460",
+                    "r" : "1144",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -173027,112 +199463,112 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "494",
+          "localId" : "1178",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "495",
+            "localId" : "1179",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "487",
+          "localId" : "1171",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "492",
+            "localId" : "1176",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "493",
+              "localId" : "1177",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "488",
+            "localId" : "1172",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "489",
+              "localId" : "1173",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "490",
+            "localId" : "1174",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "491",
+              "localId" : "1175",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "433",
+            "localId" : "1117",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "434",
+              "localId" : "1118",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "435",
+                "localId" : "1119",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "401",
+              "localId" : "1085",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "402",
+                "localId" : "1086",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "403",
+                "localId" : "1087",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "404",
+                "localId" : "1088",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "405",
+                "localId" : "1089",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "406",
+                "localId" : "1090",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "407",
+                "localId" : "1091",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "408",
+                "localId" : "1092",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "385",
+                "localId" : "1069",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -173140,7 +199576,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "386",
+                "localId" : "1070",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173148,7 +199584,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "387",
+                "localId" : "1071",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173156,7 +199592,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "388",
+                "localId" : "1072",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173164,7 +199600,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "389",
+                "localId" : "1073",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173172,7 +199608,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "390",
+                "localId" : "1074",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173180,7 +199616,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "391",
+                "localId" : "1075",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173189,48 +199625,48 @@ module.exports['DateTimeIntervalUnion'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "425",
+              "localId" : "1109",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "426",
+                "localId" : "1110",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "427",
+                "localId" : "1111",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "428",
+                "localId" : "1112",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "429",
+                "localId" : "1113",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "430",
+                "localId" : "1114",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "431",
+                "localId" : "1115",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "432",
+                "localId" : "1116",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "409",
+                "localId" : "1093",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -173238,15 +199674,15 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "410",
+                "localId" : "1094",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "7",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "411",
+                "localId" : "1095",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173254,7 +199690,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "412",
+                "localId" : "1096",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173262,7 +199698,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "413",
+                "localId" : "1097",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173270,7 +199706,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "414",
+                "localId" : "1098",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173278,7 +199714,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "415",
+                "localId" : "1099",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173287,65 +199723,65 @@ module.exports['DateTimeIntervalUnion'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "484",
+            "localId" : "1168",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "485",
+              "localId" : "1169",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "486",
+                "localId" : "1170",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "452",
+              "localId" : "1136",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "453",
+                "localId" : "1137",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "454",
+                "localId" : "1138",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "455",
+                "localId" : "1139",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "456",
+                "localId" : "1140",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "457",
+                "localId" : "1141",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "458",
+                "localId" : "1142",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "459",
+                "localId" : "1143",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "436",
+                "localId" : "1120",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -173353,15 +199789,15 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "437",
+                "localId" : "1121",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "438",
+                "localId" : "1122",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173369,7 +199805,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "439",
+                "localId" : "1123",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173377,7 +199813,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "440",
+                "localId" : "1124",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173385,7 +199821,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "441",
+                "localId" : "1125",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173393,7 +199829,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "442",
+                "localId" : "1126",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173402,48 +199838,48 @@ module.exports['DateTimeIntervalUnion'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "476",
+              "localId" : "1160",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "477",
+                "localId" : "1161",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "478",
+                "localId" : "1162",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "479",
+                "localId" : "1163",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "480",
+                "localId" : "1164",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "481",
+                "localId" : "1165",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "482",
+                "localId" : "1166",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "483",
+                "localId" : "1167",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "460",
+                "localId" : "1144",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -173451,7 +199887,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "461",
+                "localId" : "1145",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173459,7 +199895,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "462",
+                "localId" : "1146",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173467,7 +199903,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "463",
+                "localId" : "1147",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173475,7 +199911,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "464",
+                "localId" : "1148",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173483,7 +199919,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "465",
+                "localId" : "1149",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173491,7 +199927,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "466",
+                "localId" : "1150",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173501,35 +199937,35 @@ module.exports['DateTimeIntervalUnion'] = {
           } ]
         }
       }, {
-        "localId" : "498",
-        "name" : "DateTimeOpenUnionOpen",
+        "localId" : "1182",
+        "name" : "DateTimeBeginsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "498",
+            "r" : "1182",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeOpenUnionOpen", ": " ]
+              "value" : [ "", "define ", "DateTimeBeginsUnion", ": " ]
             }, {
-              "r" : "601",
+              "r" : "1285",
               "s" : [ {
-                "r" : "547",
+                "r" : "1231",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "515",
+                  "r" : "1199",
                   "s" : [ {
-                    "r" : "499",
+                    "r" : "1183",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "539",
+                  "r" : "1223",
                   "s" : [ {
-                    "r" : "523",
+                    "r" : "1207",
                     "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -173538,25 +199974,25 @@ module.exports['DateTimeIntervalUnion'] = {
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "598",
+                "r" : "1282",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "566",
+                  "r" : "1250",
                   "s" : [ {
-                    "r" : "550",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1234",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "590",
+                  "r" : "1274",
                   "s" : [ {
-                    "r" : "574",
+                    "r" : "1258",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -173564,112 +200000,112 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "608",
+          "localId" : "1292",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "609",
+            "localId" : "1293",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "601",
+          "localId" : "1285",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "606",
+            "localId" : "1290",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "607",
+              "localId" : "1291",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "602",
+            "localId" : "1286",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "603",
+              "localId" : "1287",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "604",
+            "localId" : "1288",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "605",
+              "localId" : "1289",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "547",
-            "lowClosed" : false,
+            "localId" : "1231",
+            "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "548",
+              "localId" : "1232",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "549",
+                "localId" : "1233",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "515",
+              "localId" : "1199",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "516",
+                "localId" : "1200",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "517",
+                "localId" : "1201",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "518",
+                "localId" : "1202",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "519",
+                "localId" : "1203",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "520",
+                "localId" : "1204",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "521",
+                "localId" : "1205",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "522",
+                "localId" : "1206",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "499",
+                "localId" : "1183",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -173677,7 +200113,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "500",
+                "localId" : "1184",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173685,7 +200121,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "501",
+                "localId" : "1185",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173693,7 +200129,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "502",
+                "localId" : "1186",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173701,7 +200137,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "503",
+                "localId" : "1187",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173709,7 +200145,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "504",
+                "localId" : "1188",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173717,7 +200153,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "505",
+                "localId" : "1189",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173726,48 +200162,48 @@ module.exports['DateTimeIntervalUnion'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "539",
+              "localId" : "1223",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "540",
+                "localId" : "1224",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "541",
+                "localId" : "1225",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "542",
+                "localId" : "1226",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "543",
+                "localId" : "1227",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "544",
+                "localId" : "1228",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "545",
+                "localId" : "1229",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "546",
+                "localId" : "1230",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "523",
+                "localId" : "1207",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -173775,7 +200211,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "524",
+                "localId" : "1208",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -173783,7 +200219,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "525",
+                "localId" : "1209",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173791,7 +200227,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "526",
+                "localId" : "1210",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173799,7 +200235,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "527",
+                "localId" : "1211",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173807,7 +200243,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "528",
+                "localId" : "1212",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173815,7 +200251,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "529",
+                "localId" : "1213",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173824,65 +200260,65 @@ module.exports['DateTimeIntervalUnion'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "598",
+            "localId" : "1282",
             "lowClosed" : true,
-            "highClosed" : false,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "599",
+              "localId" : "1283",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "600",
+                "localId" : "1284",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "566",
+              "localId" : "1250",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "567",
+                "localId" : "1251",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "568",
+                "localId" : "1252",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "569",
+                "localId" : "1253",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "570",
+                "localId" : "1254",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "571",
+                "localId" : "1255",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "572",
+                "localId" : "1256",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "573",
+                "localId" : "1257",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "550",
+                "localId" : "1234",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -173890,15 +200326,15 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "551",
+                "localId" : "1235",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "552",
+                "localId" : "1236",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173906,7 +200342,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "553",
+                "localId" : "1237",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173914,7 +200350,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "554",
+                "localId" : "1238",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173922,7 +200358,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "555",
+                "localId" : "1239",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173930,7 +200366,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "556",
+                "localId" : "1240",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -173939,48 +200375,48 @@ module.exports['DateTimeIntervalUnion'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "590",
+              "localId" : "1274",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "591",
+                "localId" : "1275",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "592",
+                "localId" : "1276",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "593",
+                "localId" : "1277",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "594",
+                "localId" : "1278",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "595",
+                "localId" : "1279",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "596",
+                "localId" : "1280",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "597",
+                "localId" : "1281",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "574",
+                "localId" : "1258",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -173988,7 +200424,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "575",
+                "localId" : "1259",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -173996,7 +200432,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "576",
+                "localId" : "1260",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -174004,7 +200440,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "577",
+                "localId" : "1261",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174012,7 +200448,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "578",
+                "localId" : "1262",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174020,7 +200456,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "579",
+                "localId" : "1263",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174028,7 +200464,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "580",
+                "localId" : "1264",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174038,36 +200474,36 @@ module.exports['DateTimeIntervalUnion'] = {
           } ]
         }
       }, {
-        "localId" : "612",
-        "name" : "DateTimeOpenUnionClosed",
+        "localId" : "1296",
+        "name" : "DateTimeDuringUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "612",
+            "r" : "1296",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeOpenUnionClosed", ": " ]
+              "value" : [ "", "define ", "DateTimeDuringUnion", ": " ]
             }, {
-              "r" : "715",
+              "r" : "1399",
               "s" : [ {
-                "r" : "661",
+                "r" : "1345",
                 "s" : [ {
-                  "value" : [ "Interval(" ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "629",
+                  "r" : "1313",
                   "s" : [ {
-                    "r" : "613",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1297",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "653",
+                  "r" : "1337",
                   "s" : [ {
-                    "r" : "637",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1321",
+                    "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -174075,21 +200511,21 @@ module.exports['DateTimeIntervalUnion'] = {
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "712",
+                "r" : "1396",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "680",
+                  "r" : "1364",
                   "s" : [ {
-                    "r" : "664",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1348",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "704",
+                  "r" : "1388",
                   "s" : [ {
-                    "r" : "688",
+                    "r" : "1372",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -174101,112 +200537,112 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "722",
+          "localId" : "1406",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "723",
+            "localId" : "1407",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "715",
+          "localId" : "1399",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "720",
+            "localId" : "1404",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "721",
+              "localId" : "1405",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "716",
+            "localId" : "1400",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "717",
+              "localId" : "1401",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "718",
+            "localId" : "1402",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "719",
+              "localId" : "1403",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "661",
-            "lowClosed" : false,
+            "localId" : "1345",
+            "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "662",
+              "localId" : "1346",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "663",
+                "localId" : "1347",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "629",
+              "localId" : "1313",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "630",
+                "localId" : "1314",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "631",
+                "localId" : "1315",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "632",
+                "localId" : "1316",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "633",
+                "localId" : "1317",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "634",
+                "localId" : "1318",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "635",
+                "localId" : "1319",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "636",
+                "localId" : "1320",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "613",
+                "localId" : "1297",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -174214,15 +200650,15 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "614",
+                "localId" : "1298",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "615",
+                "localId" : "1299",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -174230,7 +200666,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "616",
+                "localId" : "1300",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174238,7 +200674,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "617",
+                "localId" : "1301",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174246,7 +200682,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "618",
+                "localId" : "1302",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174254,7 +200690,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "619",
+                "localId" : "1303",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174263,48 +200699,48 @@ module.exports['DateTimeIntervalUnion'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "653",
+              "localId" : "1337",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "654",
+                "localId" : "1338",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "655",
+                "localId" : "1339",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "656",
+                "localId" : "1340",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "657",
+                "localId" : "1341",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "658",
+                "localId" : "1342",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "659",
+                "localId" : "1343",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "660",
+                "localId" : "1344",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "637",
+                "localId" : "1321",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -174312,15 +200748,15 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "638",
+                "localId" : "1322",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "5",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "639",
+                "localId" : "1323",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -174328,7 +200764,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "640",
+                "localId" : "1324",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174336,7 +200772,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "641",
+                "localId" : "1325",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174344,7 +200780,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "642",
+                "localId" : "1326",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174352,7 +200788,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "643",
+                "localId" : "1327",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174361,65 +200797,65 @@ module.exports['DateTimeIntervalUnion'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "712",
+            "localId" : "1396",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "713",
+              "localId" : "1397",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "714",
+                "localId" : "1398",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "680",
+              "localId" : "1364",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "681",
+                "localId" : "1365",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "682",
+                "localId" : "1366",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "683",
+                "localId" : "1367",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "684",
+                "localId" : "1368",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "685",
+                "localId" : "1369",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "686",
+                "localId" : "1370",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "687",
+                "localId" : "1371",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "664",
+                "localId" : "1348",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -174427,15 +200863,15 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "665",
+                "localId" : "1349",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "666",
+                "localId" : "1350",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -174443,7 +200879,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "667",
+                "localId" : "1351",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174451,7 +200887,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "668",
+                "localId" : "1352",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174459,7 +200895,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "669",
+                "localId" : "1353",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174467,7 +200903,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "670",
+                "localId" : "1354",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174476,48 +200912,48 @@ module.exports['DateTimeIntervalUnion'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "704",
+              "localId" : "1388",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "705",
+                "localId" : "1389",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "706",
+                "localId" : "1390",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "707",
+                "localId" : "1391",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "708",
+                "localId" : "1392",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "709",
+                "localId" : "1393",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "710",
+                "localId" : "1394",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "711",
+                "localId" : "1395",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "688",
+                "localId" : "1372",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -174525,7 +200961,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "689",
+                "localId" : "1373",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -174533,7 +200969,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "690",
+                "localId" : "1374",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -174541,7 +200977,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "691",
+                "localId" : "1375",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174549,7 +200985,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "692",
+                "localId" : "1376",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174557,7 +200993,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "693",
+                "localId" : "1377",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174565,7 +201001,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "694",
+                "localId" : "1378",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174575,35 +201011,35 @@ module.exports['DateTimeIntervalUnion'] = {
           } ]
         }
       }, {
-        "localId" : "726",
-        "name" : "DateTimeSameAsUnion",
+        "localId" : "1410",
+        "name" : "DateTimeEndsUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "726",
+            "r" : "1410",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeSameAsUnion", ": " ]
+              "value" : [ "", "define ", "DateTimeEndsUnion", ": " ]
             }, {
-              "r" : "829",
+              "r" : "1513",
               "s" : [ {
-                "r" : "775",
+                "r" : "1459",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "743",
+                  "r" : "1427",
                   "s" : [ {
-                    "r" : "727",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1411",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "767",
+                  "r" : "1451",
                   "s" : [ {
-                    "r" : "751",
+                    "r" : "1435",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -174612,21 +201048,21 @@ module.exports['DateTimeIntervalUnion'] = {
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "826",
+                "r" : "1510",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "794",
+                  "r" : "1478",
                   "s" : [ {
-                    "r" : "778",
+                    "r" : "1462",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "818",
+                  "r" : "1502",
                   "s" : [ {
-                    "r" : "802",
+                    "r" : "1486",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -174638,112 +201074,325 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "836",
+          "localId" : "1520",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "837",
+            "localId" : "1521",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "829",
+          "localId" : "1513",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "834",
+            "localId" : "1518",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "835",
+              "localId" : "1519",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "830",
+            "localId" : "1514",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "831",
+              "localId" : "1515",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1516",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1517",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "1459",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1460",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1461",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "1427",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1428",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1429",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1430",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1431",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1432",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1433",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1434",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1411",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1412",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1413",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1414",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1415",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1416",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1417",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "1451",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1452",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1453",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1454",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1455",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1456",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1457",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1458",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "1435",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "1436",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "1437",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "1438",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "1439",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "1440",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1441",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "832",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "833",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
             "type" : "Interval",
-            "localId" : "775",
+            "localId" : "1510",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "776",
+              "localId" : "1511",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "777",
+                "localId" : "1512",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "743",
+              "localId" : "1478",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "744",
+                "localId" : "1479",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "745",
+                "localId" : "1480",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "746",
+                "localId" : "1481",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "747",
+                "localId" : "1482",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "748",
+                "localId" : "1483",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "749",
+                "localId" : "1484",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "750",
+                "localId" : "1485",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "727",
+                "localId" : "1462",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -174751,7 +201400,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "728",
+                "localId" : "1463",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -174759,7 +201408,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "729",
+                "localId" : "1464",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -174767,7 +201416,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "730",
+                "localId" : "1465",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174775,7 +201424,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "731",
+                "localId" : "1466",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174783,7 +201432,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "732",
+                "localId" : "1467",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174791,7 +201440,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "733",
+                "localId" : "1468",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174800,48 +201449,48 @@ module.exports['DateTimeIntervalUnion'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "767",
+              "localId" : "1502",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "768",
+                "localId" : "1503",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "769",
+                "localId" : "1504",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "770",
+                "localId" : "1505",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "771",
+                "localId" : "1506",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "772",
+                "localId" : "1507",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "773",
+                "localId" : "1508",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "774",
+                "localId" : "1509",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "751",
+                "localId" : "1486",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -174849,7 +201498,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "752",
+                "localId" : "1487",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -174857,7 +201506,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "753",
+                "localId" : "1488",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -174865,7 +201514,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "754",
+                "localId" : "1489",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174873,7 +201522,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "755",
+                "localId" : "1490",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174881,7 +201530,7 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "756",
+                "localId" : "1491",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -174889,285 +201538,1013 @@ module.exports['DateTimeIntervalUnion'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "757",
+                "localId" : "1492",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
               }
             }
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* IntegerIntervalExcept
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define IntFullInterval: Interval[0,10]
+define IntHalfInterval: Interval[0,5)
+define IntSameAsExcept: Interval[0,10] except Interval[0,10]
+define IntBeforeExcept: Interval[0,4] except Interval[6,10]
+define IntMeetsExcept: Interval[0,5] except Interval[5,10]
+define IntOverlapsExcept: Interval[0,7] except Interval[5,10]
+define IntBeginsExcept: Interval[0,5] except Interval[0,10]
+define IntDuringExcept: Interval[3,5] except Interval[0,10]
+define IntEndsExcept: Interval[5,10] except Interval[0,10]
+*/
+
+module.exports['IntegerIntervalExcept'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "366",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "name" : "IntFullInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "IntFullInterval", ": " ]
+            }, {
+              "r" : "217",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "Interval[", "0", ",", "10", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "220",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "217",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "218",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "219",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "224",
+        "name" : "IntHalfInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "IntHalfInterval", ": " ]
+            }, {
+              "r" : "227",
+              "s" : [ {
+                "r" : "225",
+                "value" : [ "Interval[", "0", ",", "5", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "230",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "227",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "228",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "226",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "234",
+        "name" : "IntSameAsExcept",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "IntSameAsExcept", ": " ]
+            }, {
+              "r" : "245",
+              "s" : [ {
+                "r" : "237",
+                "s" : [ {
+                  "r" : "235",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                } ]
+              }, {
+                "value" : [ " except " ]
+              }, {
+                "r" : "242",
+                "s" : [ {
+                  "r" : "240",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "252",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "253",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Except",
+          "localId" : "245",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "250",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "251",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "246",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "247",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "248",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "249",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "237",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "238",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "239",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "235",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "242",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "243",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "244",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "256",
+        "name" : "IntBeforeExcept",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "256",
+            "s" : [ {
+              "value" : [ "", "define ", "IntBeforeExcept", ": " ]
+            }, {
+              "r" : "267",
+              "s" : [ {
+                "r" : "259",
+                "s" : [ {
+                  "r" : "257",
+                  "value" : [ "Interval[", "0", ",", "4", "]" ]
+                } ]
+              }, {
+                "value" : [ " except " ]
+              }, {
+                "r" : "264",
+                "s" : [ {
+                  "r" : "262",
+                  "value" : [ "Interval[", "6", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "274",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "275",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Except",
+          "localId" : "267",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "272",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "273",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "268",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "269",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "270",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "271",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "259",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "260",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "261",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "257",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "258",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "264",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "265",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "266",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "262",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "263",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "278",
+        "name" : "IntMeetsExcept",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "278",
+            "s" : [ {
+              "value" : [ "", "define ", "IntMeetsExcept", ": " ]
+            }, {
+              "r" : "289",
+              "s" : [ {
+                "r" : "281",
+                "s" : [ {
+                  "r" : "279",
+                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                } ]
+              }, {
+                "value" : [ " except " ]
+              }, {
+                "r" : "286",
+                "s" : [ {
+                  "r" : "284",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "296",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "297",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Except",
+          "localId" : "289",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "294",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "295",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "290",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "291",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "292",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "293",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "281",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "282",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "283",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "279",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "280",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "286",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "287",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "288",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "285",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "300",
+        "name" : "IntOverlapsExcept",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "300",
+            "s" : [ {
+              "value" : [ "", "define ", "IntOverlapsExcept", ": " ]
+            }, {
+              "r" : "311",
+              "s" : [ {
+                "r" : "303",
+                "s" : [ {
+                  "r" : "301",
+                  "value" : [ "Interval[", "0", ",", "7", "]" ]
+                } ]
+              }, {
+                "value" : [ " except " ]
+              }, {
+                "r" : "308",
+                "s" : [ {
+                  "r" : "306",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "318",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "319",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Except",
+          "localId" : "311",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "316",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "312",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "313",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "314",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "315",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "303",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "304",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "305",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "301",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "302",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "7",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "308",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "309",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "310",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "307",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "322",
+        "name" : "IntBeginsExcept",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "322",
+            "s" : [ {
+              "value" : [ "", "define ", "IntBeginsExcept", ": " ]
+            }, {
+              "r" : "333",
+              "s" : [ {
+                "r" : "325",
+                "s" : [ {
+                  "r" : "323",
+                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                } ]
+              }, {
+                "value" : [ " except " ]
+              }, {
+                "r" : "330",
+                "s" : [ {
+                  "r" : "328",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "340",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "341",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Except",
+          "localId" : "333",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "338",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "339",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "334",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "335",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "336",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "337",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "325",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "326",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "327",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "324",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
           }, {
             "type" : "Interval",
-            "localId" : "826",
+            "localId" : "330",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "827",
+              "localId" : "331",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "828",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "332",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "794",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "795",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "796",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "797",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "798",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "799",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "800",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "801",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "778",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "779",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "780",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "781",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "782",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "783",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "784",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "818",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "819",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "820",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "821",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "822",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "823",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "824",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "825",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "802",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "803",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "804",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "805",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "806",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "807",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "808",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "840",
-        "name" : "DateTimeBeforeUnion",
+        "localId" : "344",
+        "name" : "IntDuringExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "840",
+            "r" : "344",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeBeforeUnion", ": " ]
+              "value" : [ "", "define ", "IntDuringExcept", ": " ]
             }, {
-              "r" : "943",
+              "r" : "355",
               "s" : [ {
-                "r" : "889",
+                "r" : "347",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "857",
-                  "s" : [ {
-                    "r" : "841",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "881",
-                  "s" : [ {
-                    "r" : "865",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "345",
+                  "value" : [ "Interval[", "3", ",", "5", "]" ]
                 } ]
               }, {
-                "value" : [ " union " ]
+                "value" : [ " except " ]
               }, {
-                "r" : "940",
+                "r" : "352",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "908",
-                  "s" : [ {
-                    "r" : "892",
-                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "932",
-                  "s" : [ {
-                    "r" : "916",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "350",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
                 } ]
               } ]
             } ]
@@ -175175,536 +202552,529 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "950",
+          "localId" : "362",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "951",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "363",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Union",
-          "localId" : "943",
+          "type" : "Except",
+          "localId" : "355",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "948",
+            "localId" : "360",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "949",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "361",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "944",
+            "localId" : "356",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "945",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "357",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "946",
+            "localId" : "358",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "947",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "359",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "889",
+            "localId" : "347",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "890",
+              "localId" : "348",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "891",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "349",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "857",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "352",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "353",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "858",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "859",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "860",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "861",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "862",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "863",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "864",
+                "localId" : "354",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "841",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "842",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "843",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "844",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "845",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "846",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "847",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "350",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "881",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "882",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "883",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "884",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "885",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "886",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "351",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "366",
+        "name" : "IntEndsExcept",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "366",
+            "s" : [ {
+              "value" : [ "", "define ", "IntEndsExcept", ": " ]
+            }, {
+              "r" : "377",
+              "s" : [ {
+                "r" : "369",
+                "s" : [ {
+                  "r" : "367",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "887",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ " except " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "888",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "865",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "866",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "867",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "868",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "869",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "870",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "871",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "r" : "374",
+                "s" : [ {
+                  "r" : "372",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "384",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "385",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Except",
+          "localId" : "377",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "382",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "383",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "378",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "379",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "380",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "381",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "940",
+            "localId" : "369",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "941",
+              "localId" : "370",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "942",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "371",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "908",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "909",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "910",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "911",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "912",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "913",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "914",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "915",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "892",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "893",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "7",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "894",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "895",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "896",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "897",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "898",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "367",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "932",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "368",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "374",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "375",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "933",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "934",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "935",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "936",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "937",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "938",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "939",
+                "localId" : "376",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "916",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "917",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "918",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "919",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "920",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "921",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "922",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "372",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "373",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* LongIntervalExcept
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define LongFullInterval: Interval[0L,10L]
+define LongHalfInterval: Interval[0L,5L)
+define LongSameAsExcept: Interval[0L,10L] except Interval[0L,10L]
+define LongBeforeExcept: Interval[0L,4L] except Interval[6L,10L]
+define LongMeetsExcept: Interval[0L,5L] except Interval[5L,10L]
+define LongOverlapsExcept: Interval[0L,7L] except Interval[5L,10L]
+define LongBeginsExcept: Interval[0L,5L] except Interval[0L,10L]
+define LongDuringExcept: Interval[3L,5L] except Interval[0L,10L]
+define LongEndsExcept: Interval[5L,10L] except Interval[0L,10L]
+*/
+
+module.exports['LongIntervalExcept'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "366",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "name" : "LongFullInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "LongFullInterval", ": " ]
+            }, {
+              "r" : "217",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "Interval[", "0L", ",", "10L", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "220",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "217",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "218",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "219",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "10",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "224",
+        "name" : "LongHalfInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "LongHalfInterval", ": " ]
+            }, {
+              "r" : "227",
+              "s" : [ {
+                "r" : "225",
+                "value" : [ "Interval[", "0L", ",", "5L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "230",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "227",
+          "lowClosed" : true,
+          "highClosed" : false,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "228",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
-          } ]
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "0",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "226",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "5",
+            "annotation" : [ ]
+          }
         }
       }, {
-        "localId" : "954",
-        "name" : "DateTimeMeetsUnion",
+        "localId" : "234",
+        "name" : "LongSameAsExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "954",
+            "r" : "234",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeMeetsUnion", ": " ]
+              "value" : [ "", "define ", "LongSameAsExcept", ": " ]
             }, {
-              "r" : "1057",
+              "r" : "245",
               "s" : [ {
-                "r" : "1003",
+                "r" : "237",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "971",
-                  "s" : [ {
-                    "r" : "955",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "995",
-                  "s" : [ {
-                    "r" : "979",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "235",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               }, {
-                "value" : [ " union " ]
+                "value" : [ " except " ]
               }, {
-                "r" : "1054",
+                "r" : "242",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1022",
-                  "s" : [ {
-                    "r" : "1006",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1046",
-                  "s" : [ {
-                    "r" : "1030",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "240",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -175712,536 +203082,146 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1064",
+          "localId" : "252",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1065",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "253",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Union",
-          "localId" : "1057",
+          "type" : "Except",
+          "localId" : "245",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1062",
+            "localId" : "250",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1063",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "251",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1058",
+            "localId" : "246",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1059",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "247",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1060",
+            "localId" : "248",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1061",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "249",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1003",
+            "localId" : "237",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1004",
+              "localId" : "238",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1005",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "239",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "971",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "972",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "973",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "974",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "975",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "976",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "977",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "978",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "955",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "956",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "957",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "958",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "959",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "960",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "961",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "235",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "995",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "996",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "997",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "998",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "999",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1000",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1001",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1002",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "979",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "980",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "981",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "982",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "983",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "984",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "985",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1054",
+            "localId" : "242",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1055",
+              "localId" : "243",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1056",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "244",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1022",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1023",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1024",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1025",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1026",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1027",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1028",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1029",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1006",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1007",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1008",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1009",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1010",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1011",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1012",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1046",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1047",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1048",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1049",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1050",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1051",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1052",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1053",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1030",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1031",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1032",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1033",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1034",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1035",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1036",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1068",
-        "name" : "DateTimeOverlapsUnion",
+        "localId" : "256",
+        "name" : "LongBeforeExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1068",
+            "r" : "256",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeOverlapsUnion", ": " ]
+              "value" : [ "", "define ", "LongBeforeExcept", ": " ]
             }, {
-              "r" : "1171",
+              "r" : "267",
               "s" : [ {
-                "r" : "1117",
+                "r" : "259",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1085",
-                  "s" : [ {
-                    "r" : "1069",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1109",
-                  "s" : [ {
-                    "r" : "1093",
-                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "257",
+                  "value" : [ "Interval[", "0L", ",", "4L", "]" ]
                 } ]
               }, {
-                "value" : [ " union " ]
+                "value" : [ " except " ]
               }, {
-                "r" : "1168",
+                "r" : "264",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1136",
-                  "s" : [ {
-                    "r" : "1120",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1160",
-                  "s" : [ {
-                    "r" : "1144",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "262",
+                  "value" : [ "Interval[", "6L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -176249,536 +203229,146 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1178",
+          "localId" : "274",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1179",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "275",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Union",
-          "localId" : "1171",
+          "type" : "Except",
+          "localId" : "267",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1176",
+            "localId" : "272",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1177",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "273",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1172",
+            "localId" : "268",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1173",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "269",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1174",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1175",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1117",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1118",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1119",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1085",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1086",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1087",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1088",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1089",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1090",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1091",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1092",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1069",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1070",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1071",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1072",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1073",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1074",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1075",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1109",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1110",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1111",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1112",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1113",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1114",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1115",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1116",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1093",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1094",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "7",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1095",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1096",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1097",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1098",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1099",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1168",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1169",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1170",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1136",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1137",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1138",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1139",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1140",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1141",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1142",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1143",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1120",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1121",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1122",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1123",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1124",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1125",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1126",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1160",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1161",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1162",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1163",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1164",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1165",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1166",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1167",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1144",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1145",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1146",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1147",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1148",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1149",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+            "localId" : "270",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "271",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "259",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "260",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "261",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1150",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "257",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "258",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "264",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "265",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "266",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "262",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "263",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1182",
-        "name" : "DateTimeBeginsUnion",
+        "localId" : "278",
+        "name" : "LongMeetsExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1182",
+            "r" : "278",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeBeginsUnion", ": " ]
+              "value" : [ "", "define ", "LongMeetsExcept", ": " ]
             }, {
-              "r" : "1285",
+              "r" : "289",
               "s" : [ {
-                "r" : "1231",
+                "r" : "281",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1199",
-                  "s" : [ {
-                    "r" : "1183",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1223",
-                  "s" : [ {
-                    "r" : "1207",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "279",
+                  "value" : [ "Interval[", "0L", ",", "5L", "]" ]
                 } ]
               }, {
-                "value" : [ " union " ]
+                "value" : [ " except " ]
               }, {
-                "r" : "1282",
+                "r" : "286",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1250",
-                  "s" : [ {
-                    "r" : "1234",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1274",
-                  "s" : [ {
-                    "r" : "1258",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "284",
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -176786,536 +203376,293 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1292",
+          "localId" : "296",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1293",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "297",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Union",
-          "localId" : "1285",
+          "type" : "Except",
+          "localId" : "289",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1290",
+            "localId" : "294",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1291",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "295",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1286",
+            "localId" : "290",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1287",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "291",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1288",
+            "localId" : "292",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1289",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "293",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1231",
+            "localId" : "281",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1232",
+              "localId" : "282",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1233",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "283",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1199",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "279",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "280",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "286",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "287",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1200",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1201",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1202",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1203",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1204",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1205",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1206",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1183",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1184",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1185",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1186",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1187",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1188",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1189",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "288",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1223",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1224",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1225",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1226",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1227",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1228",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "285",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "300",
+        "name" : "LongOverlapsExcept",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "300",
+            "s" : [ {
+              "value" : [ "", "define ", "LongOverlapsExcept", ": " ]
+            }, {
+              "r" : "311",
+              "s" : [ {
+                "r" : "303",
+                "s" : [ {
+                  "r" : "301",
+                  "value" : [ "Interval[", "0L", ",", "7L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1229",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ " except " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1230",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1207",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1208",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1209",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1210",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1211",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1212",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1213",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "r" : "308",
+                "s" : [ {
+                  "r" : "306",
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "318",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "319",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Except",
+          "localId" : "311",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "316",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "312",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "313",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "314",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "315",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1282",
+            "localId" : "303",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1283",
+              "localId" : "304",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1284",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "305",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1250",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1251",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1252",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1253",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1254",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1255",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1256",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1257",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1234",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1235",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1236",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1237",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1238",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1239",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1240",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "301",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "302",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "308",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "309",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1275",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1276",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1277",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1278",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1279",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1280",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1281",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1258",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1259",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1260",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1261",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1262",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1263",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1264",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "310",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "307",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1296",
-        "name" : "DateTimeDuringUnion",
+        "localId" : "322",
+        "name" : "LongBeginsExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1296",
+            "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeDuringUnion", ": " ]
+              "value" : [ "", "define ", "LongBeginsExcept", ": " ]
             }, {
-              "r" : "1399",
+              "r" : "333",
               "s" : [ {
-                "r" : "1345",
+                "r" : "325",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1313",
-                  "s" : [ {
-                    "r" : "1297",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1337",
-                  "s" : [ {
-                    "r" : "1321",
-                    "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "323",
+                  "value" : [ "Interval[", "0L", ",", "5L", "]" ]
                 } ]
               }, {
-                "value" : [ " union " ]
+                "value" : [ " except " ]
               }, {
-                "r" : "1396",
+                "r" : "330",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1364",
-                  "s" : [ {
-                    "r" : "1348",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1388",
-                  "s" : [ {
-                    "r" : "1372",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "328",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -177323,536 +203670,293 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1406",
+          "localId" : "340",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1407",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "341",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Union",
-          "localId" : "1399",
+          "type" : "Except",
+          "localId" : "333",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1404",
+            "localId" : "338",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1405",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "339",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1400",
+            "localId" : "334",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1401",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "335",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1402",
+            "localId" : "336",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1403",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "337",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1345",
+            "localId" : "325",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1346",
+              "localId" : "326",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1347",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "327",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1313",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "324",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "330",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "331",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1314",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1315",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1316",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1317",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1318",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1319",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1320",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1297",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1298",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1299",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1300",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1301",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1302",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1303",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "332",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "328",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1337",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1338",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1339",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1340",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1341",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1342",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "329",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "344",
+        "name" : "LongDuringExcept",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "344",
+            "s" : [ {
+              "value" : [ "", "define ", "LongDuringExcept", ": " ]
+            }, {
+              "r" : "355",
+              "s" : [ {
+                "r" : "347",
+                "s" : [ {
+                  "r" : "345",
+                  "value" : [ "Interval[", "3L", ",", "5L", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1343",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ " except " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1344",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1321",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1322",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1323",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1324",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1325",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1326",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1327",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "r" : "352",
+                "s" : [ {
+                  "r" : "350",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "362",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "363",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Except",
+          "localId" : "355",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "360",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "361",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "356",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "357",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "358",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "359",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1396",
+            "localId" : "347",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1397",
+              "localId" : "348",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1398",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "349",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1364",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1365",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1366",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1367",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1368",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1369",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1370",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1371",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1348",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1349",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1350",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1351",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1352",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1353",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1354",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1388",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "352",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "353",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1389",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1390",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1391",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1392",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1393",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1394",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1395",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1372",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1373",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1374",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1375",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1376",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1377",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1378",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "354",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "350",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "351",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1410",
-        "name" : "DateTimeEndsUnion",
+        "localId" : "366",
+        "name" : "LongEndsExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1410",
+            "r" : "366",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeEndsUnion", ": " ]
+              "value" : [ "", "define ", "LongEndsExcept", ": " ]
             }, {
-              "r" : "1513",
+              "r" : "377",
               "s" : [ {
-                "r" : "1459",
+                "r" : "369",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1427",
-                  "s" : [ {
-                    "r" : "1411",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1451",
-                  "s" : [ {
-                    "r" : "1435",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "367",
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
                 } ]
               }, {
-                "value" : [ " union " ]
+                "value" : [ " except " ]
               }, {
-                "r" : "1510",
+                "r" : "374",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1478",
-                  "s" : [ {
-                    "r" : "1462",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1502",
-                  "s" : [ {
-                    "r" : "1486",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "372",
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -177860,476 +203964,116 @@ module.exports['DateTimeIntervalUnion'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1520",
+          "localId" : "384",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1521",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "385",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Union",
-          "localId" : "1513",
+          "type" : "Except",
+          "localId" : "377",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1518",
+            "localId" : "382",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1519",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "383",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1514",
+            "localId" : "378",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1515",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "379",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1516",
+            "localId" : "380",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1517",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "381",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1459",
+            "localId" : "369",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1460",
+              "localId" : "370",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1461",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "371",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1427",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1428",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1429",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1430",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1431",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1432",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1433",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1434",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1411",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1412",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1413",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1414",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1415",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1416",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1417",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "367",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1451",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1452",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1453",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1454",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1455",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1456",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1457",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1458",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1435",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1436",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1437",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1438",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1439",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1440",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1441",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "368",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1510",
+            "localId" : "374",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1511",
+              "localId" : "375",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1512",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "376",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1478",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1479",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1480",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1481",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1482",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1483",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1484",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1485",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1462",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1463",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1464",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1465",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1466",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1467",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1468",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "372",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1502",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1503",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1504",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1505",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1506",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1507",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1508",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1509",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1486",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1487",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1488",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1489",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1490",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1491",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1492",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "373",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
@@ -178338,22 +204082,22 @@ module.exports['DateTimeIntervalUnion'] = {
   }
 }
 
-/* IntegerIntervalExcept
+/* DateTimeIntervalExcept
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define IntFullInterval: Interval[0,10]
-define IntHalfInterval: Interval[0,5)
-define IntSameAsExcept: Interval[0,10] except Interval[0,10]
-define IntBeforeExcept: Interval[0,4] except Interval[6,10]
-define IntMeetsExcept: Interval[0,5] except Interval[5,10]
-define IntOverlapsExcept: Interval[0,7] except Interval[5,10]
-define IntBeginsExcept: Interval[0,5] except Interval[0,10]
-define IntDuringExcept: Interval[3,5] except Interval[0,10]
-define IntEndsExcept: Interval[5,10] except Interval[0,10]
+define DateTimeFullInterval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeHalfInterval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
+define DateTimeSameAsExcept: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeBeforeExcept: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 4, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 7, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeMeetsExcept: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeOverlapsExcept: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 7, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeBeginsExcept: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeDuringExcept: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 5, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
+define DateTimeEndsExcept: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
 */
 
-module.exports['IntegerIntervalExcept'] = {
+module.exports['DateTimeIntervalExcept'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -178365,7 +204109,7 @@ module.exports['IntegerIntervalExcept'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "366",
+        "r" : "1010",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -178439,7 +204183,7 @@ module.exports['IntegerIntervalExcept'] = {
         }
       }, {
         "localId" : "214",
-        "name" : "IntFullInterval",
+        "name" : "DateTimeFullInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -178448,742 +204192,574 @@ module.exports['IntegerIntervalExcept'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "IntFullInterval", ": " ]
+              "value" : [ "", "define ", "DateTimeFullInterval", ": " ]
             }, {
-              "r" : "217",
+              "r" : "263",
               "s" : [ {
-                "r" : "215",
-                "value" : [ "Interval[", "0", ",", "10", "]" ]
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "231",
+                "s" : [ {
+                  "r" : "215",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "255",
+                "s" : [ {
+                  "r" : "239",
+                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "220",
+          "localId" : "266",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "221",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "267",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "217",
+          "localId" : "263",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "218",
+            "localId" : "264",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "219",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "265",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "low" : {
-            "type" : "Literal",
-            "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "0",
-            "annotation" : [ ]
-          },
-          "high" : {
-            "type" : "Literal",
-            "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "10",
-            "annotation" : [ ]
-          }
-        }
-      }, {
-        "localId" : "224",
-        "name" : "IntHalfInterval",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "224",
-            "s" : [ {
-              "value" : [ "", "define ", "IntHalfInterval", ": " ]
-            }, {
-              "r" : "227",
-              "s" : [ {
-                "r" : "225",
-                "value" : [ "Interval[", "0", ",", "5", ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "230",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
+            "type" : "DateTime",
             "localId" : "231",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "227",
-          "lowClosed" : true,
-          "highClosed" : false,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "228",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "229",
+              "localId" : "232",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "Literal",
-            "localId" : "225",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "0",
-            "annotation" : [ ]
-          },
-          "high" : {
-            "type" : "Literal",
-            "localId" : "226",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "value" : "5",
-            "annotation" : [ ]
-          }
-        }
-      }, {
-        "localId" : "234",
-        "name" : "IntSameAsExcept",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "234",
-            "s" : [ {
-              "value" : [ "", "define ", "IntSameAsExcept", ": " ]
             }, {
-              "r" : "245",
-              "s" : [ {
-                "r" : "237",
-                "s" : [ {
-                  "r" : "235",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
-                } ]
-              }, {
-                "value" : [ " except " ]
-              }, {
-                "r" : "242",
-                "s" : [ {
-                  "r" : "240",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "252",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "253",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Except",
-          "localId" : "245",
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "250",
-            "annotation" : [ ],
-            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "251",
+              "localId" : "233",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          },
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "246",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "247",
+              "localId" : "234",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "248",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "249",
+              "localId" : "235",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "237",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "236",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "237",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
               "localId" : "238",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "239",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "215",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "235",
+              "localId" : "216",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "1",
               "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "236",
+              "localId" : "217",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "219",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "242",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "243",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "244",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "240",
+              "localId" : "220",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "millisecond" : {
               "type" : "Literal",
-              "localId" : "241",
+              "localId" : "221",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
-        }
-      }, {
-        "localId" : "256",
-        "name" : "IntBeforeExcept",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "256",
-            "s" : [ {
-              "value" : [ "", "define ", "IntBeforeExcept", ": " ]
-            }, {
-              "r" : "267",
-              "s" : [ {
-                "r" : "259",
-                "s" : [ {
-                  "r" : "257",
-                  "value" : [ "Interval[", "0", ",", "4", "]" ]
-                } ]
-              }, {
-                "value" : [ " except " ]
-              }, {
-                "r" : "264",
-                "s" : [ {
-                  "r" : "262",
-                  "value" : [ "Interval[", "6", ",", "10", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "274",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "275",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Except",
-          "localId" : "267",
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "272",
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "273",
+              "localId" : "256",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          },
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "268",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "269",
+              "localId" : "257",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "270",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "271",
+              "localId" : "258",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "259",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "259",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
               "localId" : "260",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "261",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "262",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2013",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "257",
+              "localId" : "240",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "242",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "258",
+              "localId" : "243",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "0",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "264",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "265",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "266",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "262",
+              "localId" : "244",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "millisecond" : {
               "type" : "Literal",
-              "localId" : "263",
+              "localId" : "245",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "278",
-        "name" : "IntMeetsExcept",
+        "localId" : "270",
+        "name" : "DateTimeHalfInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "278",
+            "r" : "270",
             "s" : [ {
-              "value" : [ "", "define ", "IntMeetsExcept", ": " ]
+              "value" : [ "", "define ", "DateTimeHalfInterval", ": " ]
             }, {
-              "r" : "289",
+              "r" : "319",
               "s" : [ {
-                "r" : "281",
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "287",
                 "s" : [ {
-                  "r" : "279",
-                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                  "r" : "271",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "value" : [ " except " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "286",
+                "r" : "311",
                 "s" : [ {
-                  "r" : "284",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                  "r" : "295",
+                  "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
+              }, {
+                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "296",
+          "localId" : "322",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "297",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "323",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Except",
-          "localId" : "289",
+          "type" : "Interval",
+          "localId" : "319",
+          "lowClosed" : true,
+          "highClosed" : false,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "294",
+            "localId" : "320",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "295",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "321",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "290",
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "287",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "288",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "289",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "290",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
               "type" : "NamedTypeSpecifier",
               "localId" : "291",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "292",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "292",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
               "type" : "NamedTypeSpecifier",
               "localId" : "293",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "281",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "282",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "283",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "294",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "271",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "279",
+              "localId" : "272",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "273",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "274",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "280",
+              "localId" : "275",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "0",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "286",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "287",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "288",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "284",
+              "localId" : "276",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "millisecond" : {
               "type" : "Literal",
-              "localId" : "285",
+              "localId" : "277",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
-        }
-      }, {
-        "localId" : "300",
-        "name" : "IntOverlapsExcept",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "300",
-            "s" : [ {
-              "value" : [ "", "define ", "IntOverlapsExcept", ": " ]
-            }, {
-              "r" : "311",
-              "s" : [ {
-                "r" : "303",
-                "s" : [ {
-                  "r" : "301",
-                  "value" : [ "Interval[", "0", ",", "7", "]" ]
-                } ]
-              }, {
-                "value" : [ " except " ]
-              }, {
-                "r" : "308",
-                "s" : [ {
-                  "r" : "306",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "318",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "319",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Except",
-          "localId" : "311",
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "316",
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "311",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "pointType" : {
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "317",
+              "localId" : "312",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          },
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "312",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
               "type" : "NamedTypeSpecifier",
               "localId" : "313",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "314",
-            "annotation" : [ ],
-            "pointType" : {
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "314",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
               "type" : "NamedTypeSpecifier",
               "localId" : "315",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "303",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "304",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "305",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "316",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "317",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "318",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "295",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "301",
+              "localId" : "296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "297",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "298",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "302",
+              "localId" : "299",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
+              "value" : "0",
               "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "308",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "309",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "310",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
             },
-            "low" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "306",
+              "localId" : "300",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "high" : {
+            "millisecond" : {
               "type" : "Literal",
-              "localId" : "307",
+              "localId" : "301",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "322",
-        "name" : "IntBeginsExcept",
+        "localId" : "326",
+        "name" : "DateTimeSameAsExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "322",
+            "r" : "326",
             "s" : [ {
-              "value" : [ "", "define ", "IntBeginsExcept", ": " ]
+              "value" : [ "", "define ", "DateTimeSameAsExcept", ": " ]
             }, {
-              "r" : "333",
+              "r" : "429",
               "s" : [ {
-                "r" : "325",
+                "r" : "375",
                 "s" : [ {
-                  "r" : "323",
-                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "343",
+                  "s" : [ {
+                    "r" : "327",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "367",
+                  "s" : [ {
+                    "r" : "351",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "330",
+                "r" : "426",
                 "s" : [ {
-                  "r" : "328",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "394",
+                  "s" : [ {
+                    "r" : "378",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "418",
+                  "s" : [ {
+                    "r" : "402",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -179191,146 +204767,536 @@ module.exports['IntegerIntervalExcept'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "340",
+          "localId" : "436",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "341",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "437",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "333",
+          "localId" : "429",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "338",
+            "localId" : "434",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "339",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "435",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "334",
+            "localId" : "430",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "335",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "431",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "336",
+            "localId" : "432",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "337",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "433",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "325",
+            "localId" : "375",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "326",
+              "localId" : "376",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "327",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "377",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "323",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "343",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "344",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "345",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "346",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "347",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "348",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "349",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "350",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "327",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "328",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "329",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "330",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "331",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "332",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "333",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "324",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "367",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "369",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "370",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "371",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "372",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "373",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "374",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "351",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "352",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "353",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "354",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "355",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "356",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "357",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "330",
+            "localId" : "426",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "331",
+              "localId" : "427",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "332",
+                "localId" : "428",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "394",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "395",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "396",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "397",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "398",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "399",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "400",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "401",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "378",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "379",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "380",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "381",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "382",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "383",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "384",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "418",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "419",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "420",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "421",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "422",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "423",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "424",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "425",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "402",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "403",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "404",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "405",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "406",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "407",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "408",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "328",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "329",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "344",
-        "name" : "IntDuringExcept",
+        "localId" : "440",
+        "name" : "DateTimeBeforeExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "344",
+            "r" : "440",
             "s" : [ {
-              "value" : [ "", "define ", "IntDuringExcept", ": " ]
+              "value" : [ "", "define ", "DateTimeBeforeExcept", ": " ]
             }, {
-              "r" : "355",
+              "r" : "543",
               "s" : [ {
-                "r" : "347",
+                "r" : "489",
                 "s" : [ {
-                  "r" : "345",
-                  "value" : [ "Interval[", "3", ",", "5", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "457",
+                  "s" : [ {
+                    "r" : "441",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "481",
+                  "s" : [ {
+                    "r" : "465",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "352",
+                "r" : "540",
                 "s" : [ {
-                  "r" : "350",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "508",
+                  "s" : [ {
+                    "r" : "492",
+                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "532",
+                  "s" : [ {
+                    "r" : "516",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               } ]
             } ]
@@ -179338,923 +205304,1047 @@ module.exports['IntegerIntervalExcept'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "362",
+          "localId" : "550",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "363",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "551",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "355",
+          "localId" : "543",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "360",
+            "localId" : "548",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "361",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "549",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "356",
+            "localId" : "544",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "357",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "545",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "358",
+            "localId" : "546",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "359",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "547",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "347",
+            "localId" : "489",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "348",
+              "localId" : "490",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "349",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "491",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "345",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "346",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "352",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "353",
+              "type" : "DateTime",
+              "localId" : "457",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "354",
+                "localId" : "458",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "459",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "460",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "461",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "462",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "463",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "464",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "441",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "442",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "443",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "444",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "445",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "446",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "447",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "350",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
             "high" : {
-              "type" : "Literal",
-              "localId" : "351",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      }, {
-        "localId" : "366",
-        "name" : "IntEndsExcept",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "366",
-            "s" : [ {
-              "value" : [ "", "define ", "IntEndsExcept", ": " ]
-            }, {
-              "r" : "377",
-              "s" : [ {
-                "r" : "369",
-                "s" : [ {
-                  "r" : "367",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
-                } ]
+              "type" : "DateTime",
+              "localId" : "481",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "482",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "value" : [ " except " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "483",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "374",
-                "s" : [ {
-                  "r" : "372",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "384",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "385",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Except",
-          "localId" : "377",
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "382",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "383",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          },
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "378",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "379",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "484",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "485",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "486",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "487",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "488",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "465",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "466",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "467",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "468",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "469",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "470",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "471",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "380",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "381",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
             "type" : "Interval",
-            "localId" : "369",
+            "localId" : "540",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "370",
+              "localId" : "541",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "371",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "542",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "367",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "368",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "374",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "375",
+              "type" : "DateTime",
+              "localId" : "508",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "pointType" : {
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "376",
+                "localId" : "509",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "510",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "511",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "512",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "513",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "514",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "515",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "492",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "493",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "7",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "494",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "495",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "496",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "497",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "498",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "372",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
             "high" : {
-              "type" : "Literal",
-              "localId" : "373",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }
-}
-
-/* DateTimeIntervalExcept
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define DateTimeFullInterval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeHalfInterval: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0))
-define DateTimeSameAsExcept: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeBeforeExcept: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 4, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 7, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeMeetsExcept: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeOverlapsExcept: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 7, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeBeginsExcept: Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2012, 6, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeDuringExcept: Interval[DateTime(2012, 3, 1, 0, 0, 0, 0), DateTime(2012, 5, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-define DateTimeEndsExcept: Interval[DateTime(2012, 6, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)] except Interval[DateTime(2012, 1, 1, 0, 0, 0, 0), DateTime(2013, 1, 1, 0, 0, 0, 0)]
-*/
-
-module.exports['DateTimeIntervalExcept'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "1010",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
-      }, {
-        "localId" : "214",
-        "name" : "DateTimeFullInterval",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "214",
-            "s" : [ {
-              "value" : [ "", "define ", "DateTimeFullInterval", ": " ]
-            }, {
-              "r" : "263",
-              "s" : [ {
-                "value" : [ "Interval[" ]
+              "type" : "DateTime",
+              "localId" : "532",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "533",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "231",
-                "s" : [ {
-                  "r" : "215",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "534",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "value" : [ ", " ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "535",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "r" : "255",
-                "s" : [ {
-                  "r" : "239",
-                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "536",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }, {
-                "value" : [ "]" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "266",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "267",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "263",
-          "lowClosed" : true,
-          "highClosed" : true,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "264",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "265",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "231",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "232",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "233",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "234",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "235",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "236",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "237",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "238",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "215",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "219",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "220",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "255",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "256",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "257",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "258",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "259",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "260",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "261",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "262",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "239",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "240",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "241",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "242",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "243",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "244",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "245",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "537",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "538",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "539",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "516",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "517",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "518",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "519",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "520",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "521",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "522",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "270",
-        "name" : "DateTimeHalfInterval",
+        "localId" : "554",
+        "name" : "DateTimeMeetsExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "270",
+            "r" : "554",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeHalfInterval", ": " ]
+              "value" : [ "", "define ", "DateTimeMeetsExcept", ": " ]
             }, {
-              "r" : "319",
+              "r" : "657",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "287",
+                "r" : "603",
                 "s" : [ {
-                  "r" : "271",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "571",
+                  "s" : [ {
+                    "r" : "555",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "595",
+                  "s" : [ {
+                    "r" : "579",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "value" : [ " except " ]
               }, {
-                "r" : "311",
+                "r" : "654",
                 "s" : [ {
-                  "r" : "295",
-                  "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "622",
+                  "s" : [ {
+                    "r" : "606",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "646",
+                  "s" : [ {
+                    "r" : "630",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
-              }, {
-                "value" : [ ")" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "322",
+          "localId" : "664",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "323",
+            "localId" : "665",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "319",
-          "lowClosed" : true,
-          "highClosed" : false,
+          "type" : "Except",
+          "localId" : "657",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "320",
+            "localId" : "662",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "321",
+              "localId" : "663",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "287",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "658",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "288",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "289",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "290",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "291",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "292",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "293",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "294",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "271",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "272",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "273",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "276",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "277",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "659",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "311",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "660",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "312",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "313",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "314",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "315",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "316",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "317",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "318",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "295",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "296",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "localId" : "661",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "603",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "604",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "605",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "298",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "571",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "572",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "573",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "574",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "575",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "576",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "577",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "578",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "555",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "556",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "557",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "558",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "559",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "560",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "561",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "299",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "595",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "596",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "597",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "598",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "599",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "600",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "601",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "602",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "579",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "580",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "581",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "582",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "583",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "584",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "585",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "654",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "655",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "656",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "300",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "622",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "623",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "624",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "625",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "626",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "627",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "628",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "629",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "606",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "607",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "608",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "609",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "610",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "611",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "612",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "301",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "646",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "647",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "648",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "649",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "650",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "651",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "652",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "653",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "630",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "631",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "632",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "633",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "634",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "635",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "636",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "326",
-        "name" : "DateTimeSameAsExcept",
+        "localId" : "668",
+        "name" : "DateTimeOverlapsExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "326",
+            "r" : "668",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeSameAsExcept", ": " ]
+              "value" : [ "", "define ", "DateTimeOverlapsExcept", ": " ]
             }, {
-              "r" : "429",
+              "r" : "771",
               "s" : [ {
-                "r" : "375",
+                "r" : "717",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "343",
+                  "r" : "685",
                   "s" : [ {
-                    "r" : "327",
+                    "r" : "669",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "367",
+                  "r" : "709",
                   "s" : [ {
-                    "r" : "351",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "693",
+                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -180262,21 +206352,21 @@ module.exports['DateTimeIntervalExcept'] = {
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "426",
+                "r" : "768",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "394",
+                  "r" : "736",
                   "s" : [ {
-                    "r" : "378",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "720",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "418",
+                  "r" : "760",
                   "s" : [ {
-                    "r" : "402",
+                    "r" : "744",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -180288,112 +206378,112 @@ module.exports['DateTimeIntervalExcept'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "436",
+          "localId" : "778",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "437",
+            "localId" : "779",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "429",
+          "localId" : "771",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "434",
+            "localId" : "776",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "435",
+              "localId" : "777",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "430",
+            "localId" : "772",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "431",
+              "localId" : "773",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "432",
+            "localId" : "774",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "433",
+              "localId" : "775",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "375",
+            "localId" : "717",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "376",
+              "localId" : "718",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "377",
+                "localId" : "719",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "343",
+              "localId" : "685",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "344",
+                "localId" : "686",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "345",
+                "localId" : "687",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "346",
+                "localId" : "688",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "347",
+                "localId" : "689",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "348",
+                "localId" : "690",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "349",
+                "localId" : "691",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "350",
+                "localId" : "692",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "327",
+                "localId" : "669",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -180401,7 +206491,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "328",
+                "localId" : "670",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -180409,7 +206499,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "329",
+                "localId" : "671",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -180417,7 +206507,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "330",
+                "localId" : "672",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180425,7 +206515,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "331",
+                "localId" : "673",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180433,7 +206523,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "332",
+                "localId" : "674",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180441,7 +206531,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "333",
+                "localId" : "675",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180450,64 +206540,64 @@ module.exports['DateTimeIntervalExcept'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "367",
+              "localId" : "709",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "368",
+                "localId" : "710",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "369",
+                "localId" : "711",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "370",
+                "localId" : "712",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "371",
+                "localId" : "713",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "372",
+                "localId" : "714",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "373",
+                "localId" : "715",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "374",
+                "localId" : "716",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "351",
+                "localId" : "693",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "352",
+                "localId" : "694",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "7",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "353",
+                "localId" : "695",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -180515,7 +206605,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "354",
+                "localId" : "696",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180523,7 +206613,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "355",
+                "localId" : "697",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180531,7 +206621,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "356",
+                "localId" : "698",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180539,7 +206629,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "357",
+                "localId" : "699",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180548,65 +206638,65 @@ module.exports['DateTimeIntervalExcept'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "426",
+            "localId" : "768",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "427",
+              "localId" : "769",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "428",
+                "localId" : "770",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "394",
+              "localId" : "736",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "395",
+                "localId" : "737",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "396",
+                "localId" : "738",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "397",
+                "localId" : "739",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "398",
+                "localId" : "740",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "399",
+                "localId" : "741",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "400",
+                "localId" : "742",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "401",
+                "localId" : "743",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "378",
+                "localId" : "720",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -180614,15 +206704,15 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "379",
+                "localId" : "721",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "380",
+                "localId" : "722",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -180630,7 +206720,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "381",
+                "localId" : "723",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180638,7 +206728,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "382",
+                "localId" : "724",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180646,7 +206736,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "383",
+                "localId" : "725",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180654,7 +206744,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "384",
+                "localId" : "726",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180663,48 +206753,48 @@ module.exports['DateTimeIntervalExcept'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "418",
+              "localId" : "760",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "419",
+                "localId" : "761",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "420",
+                "localId" : "762",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "421",
+                "localId" : "763",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "422",
+                "localId" : "764",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "423",
+                "localId" : "765",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "424",
+                "localId" : "766",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "425",
+                "localId" : "767",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "402",
+                "localId" : "744",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -180712,7 +206802,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "403",
+                "localId" : "745",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -180720,7 +206810,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "404",
+                "localId" : "746",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -180728,7 +206818,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "405",
+                "localId" : "747",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180736,7 +206826,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "406",
+                "localId" : "748",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180744,7 +206834,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "407",
+                "localId" : "749",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180752,7 +206842,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "408",
+                "localId" : "750",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180762,36 +206852,36 @@ module.exports['DateTimeIntervalExcept'] = {
           } ]
         }
       }, {
-        "localId" : "440",
-        "name" : "DateTimeBeforeExcept",
+        "localId" : "782",
+        "name" : "DateTimeBeginsExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "440",
+            "r" : "782",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeBeforeExcept", ": " ]
+              "value" : [ "", "define ", "DateTimeBeginsExcept", ": " ]
             }, {
-              "r" : "543",
+              "r" : "885",
               "s" : [ {
-                "r" : "489",
+                "r" : "831",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "457",
+                  "r" : "799",
                   "s" : [ {
-                    "r" : "441",
+                    "r" : "783",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "481",
+                  "r" : "823",
                   "s" : [ {
-                    "r" : "465",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "807",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -180799,21 +206889,21 @@ module.exports['DateTimeIntervalExcept'] = {
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "540",
+                "r" : "882",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "508",
+                  "r" : "850",
                   "s" : [ {
-                    "r" : "492",
-                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "834",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "532",
+                  "r" : "874",
                   "s" : [ {
-                    "r" : "516",
+                    "r" : "858",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -180825,112 +206915,112 @@ module.exports['DateTimeIntervalExcept'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "550",
+          "localId" : "892",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "551",
+            "localId" : "893",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "543",
+          "localId" : "885",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "548",
+            "localId" : "890",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "549",
+              "localId" : "891",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "544",
+            "localId" : "886",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "545",
+              "localId" : "887",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "546",
+            "localId" : "888",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "547",
+              "localId" : "889",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "489",
+            "localId" : "831",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "490",
+              "localId" : "832",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "491",
+                "localId" : "833",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "457",
+              "localId" : "799",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "458",
+                "localId" : "800",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "459",
+                "localId" : "801",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "460",
+                "localId" : "802",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "461",
+                "localId" : "803",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "462",
+                "localId" : "804",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "463",
+                "localId" : "805",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "464",
+                "localId" : "806",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "441",
+                "localId" : "783",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -180938,7 +207028,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "442",
+                "localId" : "784",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -180946,7 +207036,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "443",
+                "localId" : "785",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -180954,7 +207044,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "444",
+                "localId" : "786",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180962,7 +207052,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "445",
+                "localId" : "787",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180970,7 +207060,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "446",
+                "localId" : "788",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180978,7 +207068,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "447",
+                "localId" : "789",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -180987,48 +207077,48 @@ module.exports['DateTimeIntervalExcept'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "481",
+              "localId" : "823",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "482",
+                "localId" : "824",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "483",
+                "localId" : "825",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "484",
+                "localId" : "826",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "485",
+                "localId" : "827",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "486",
+                "localId" : "828",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "487",
+                "localId" : "829",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "488",
+                "localId" : "830",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "465",
+                "localId" : "807",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -181036,15 +207126,15 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "466",
+                "localId" : "808",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "467",
+                "localId" : "809",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -181052,7 +207142,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "468",
+                "localId" : "810",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181060,7 +207150,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "469",
+                "localId" : "811",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181068,7 +207158,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "470",
+                "localId" : "812",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181076,7 +207166,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "471",
+                "localId" : "813",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181085,65 +207175,65 @@ module.exports['DateTimeIntervalExcept'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "540",
+            "localId" : "882",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "541",
+              "localId" : "883",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "542",
+                "localId" : "884",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "508",
+              "localId" : "850",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "509",
+                "localId" : "851",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "510",
+                "localId" : "852",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "511",
+                "localId" : "853",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "512",
+                "localId" : "854",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "513",
+                "localId" : "855",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "514",
+                "localId" : "856",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "515",
+                "localId" : "857",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "492",
+                "localId" : "834",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -181151,15 +207241,15 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "493",
+                "localId" : "835",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "7",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "494",
+                "localId" : "836",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -181167,7 +207257,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "495",
+                "localId" : "837",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181175,7 +207265,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "496",
+                "localId" : "838",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181183,7 +207273,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "497",
+                "localId" : "839",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181191,7 +207281,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "498",
+                "localId" : "840",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181200,48 +207290,48 @@ module.exports['DateTimeIntervalExcept'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "532",
+              "localId" : "874",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "533",
+                "localId" : "875",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "534",
+                "localId" : "876",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "535",
+                "localId" : "877",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "536",
+                "localId" : "878",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "537",
+                "localId" : "879",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "538",
+                "localId" : "880",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "539",
+                "localId" : "881",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "516",
+                "localId" : "858",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -181249,7 +207339,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "517",
+                "localId" : "859",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -181257,7 +207347,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "518",
+                "localId" : "860",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -181265,7 +207355,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "519",
+                "localId" : "861",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181273,7 +207363,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "520",
+                "localId" : "862",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181281,7 +207371,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "521",
+                "localId" : "863",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181289,7 +207379,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "522",
+                "localId" : "864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181299,36 +207389,36 @@ module.exports['DateTimeIntervalExcept'] = {
           } ]
         }
       }, {
-        "localId" : "554",
-        "name" : "DateTimeMeetsExcept",
+        "localId" : "896",
+        "name" : "DateTimeDuringExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "554",
+            "r" : "896",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeMeetsExcept", ": " ]
+              "value" : [ "", "define ", "DateTimeDuringExcept", ": " ]
             }, {
-              "r" : "657",
+              "r" : "999",
               "s" : [ {
-                "r" : "603",
+                "r" : "945",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "571",
+                  "r" : "913",
                   "s" : [ {
-                    "r" : "555",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "897",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "595",
+                  "r" : "937",
                   "s" : [ {
-                    "r" : "579",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "921",
+                    "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -181336,21 +207426,21 @@ module.exports['DateTimeIntervalExcept'] = {
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "654",
+                "r" : "996",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "622",
+                  "r" : "964",
                   "s" : [ {
-                    "r" : "606",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "948",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "646",
+                  "r" : "988",
                   "s" : [ {
-                    "r" : "630",
+                    "r" : "972",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -181362,112 +207452,112 @@ module.exports['DateTimeIntervalExcept'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "664",
+          "localId" : "1006",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "665",
+            "localId" : "1007",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "657",
+          "localId" : "999",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "662",
+            "localId" : "1004",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "663",
+              "localId" : "1005",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "658",
+            "localId" : "1000",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "659",
+              "localId" : "1001",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "660",
+            "localId" : "1002",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "661",
+              "localId" : "1003",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "603",
+            "localId" : "945",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "604",
+              "localId" : "946",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "605",
+                "localId" : "947",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "571",
+              "localId" : "913",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "572",
+                "localId" : "914",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "573",
+                "localId" : "915",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "574",
+                "localId" : "916",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "575",
+                "localId" : "917",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "576",
+                "localId" : "918",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "577",
+                "localId" : "919",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "578",
+                "localId" : "920",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "555",
+                "localId" : "897",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -181475,15 +207565,15 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "556",
+                "localId" : "898",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "557",
+                "localId" : "899",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -181491,7 +207581,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "558",
+                "localId" : "900",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181499,7 +207589,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "559",
+                "localId" : "901",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181507,7 +207597,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "560",
+                "localId" : "902",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181515,7 +207605,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "561",
+                "localId" : "903",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181524,48 +207614,48 @@ module.exports['DateTimeIntervalExcept'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "595",
+              "localId" : "937",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "596",
+                "localId" : "938",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "597",
+                "localId" : "939",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "598",
+                "localId" : "940",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "599",
+                "localId" : "941",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "600",
+                "localId" : "942",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "601",
+                "localId" : "943",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "602",
+                "localId" : "944",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "579",
+                "localId" : "921",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -181573,15 +207663,15 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "580",
+                "localId" : "922",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "5",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "581",
+                "localId" : "923",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -181589,7 +207679,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "582",
+                "localId" : "924",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181597,7 +207687,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "583",
+                "localId" : "925",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181605,7 +207695,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "584",
+                "localId" : "926",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181613,7 +207703,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "585",
+                "localId" : "927",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181622,65 +207712,65 @@ module.exports['DateTimeIntervalExcept'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "654",
+            "localId" : "996",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "655",
+              "localId" : "997",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "656",
+                "localId" : "998",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "622",
+              "localId" : "964",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "623",
+                "localId" : "965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "624",
+                "localId" : "966",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "625",
+                "localId" : "967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "626",
+                "localId" : "968",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "627",
+                "localId" : "969",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "628",
+                "localId" : "970",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "629",
+                "localId" : "971",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "606",
+                "localId" : "948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -181688,15 +207778,15 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "607",
+                "localId" : "949",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "608",
+                "localId" : "950",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -181704,7 +207794,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "609",
+                "localId" : "951",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181712,7 +207802,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "610",
+                "localId" : "952",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181720,7 +207810,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "611",
+                "localId" : "953",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181728,7 +207818,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "612",
+                "localId" : "954",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181737,48 +207827,48 @@ module.exports['DateTimeIntervalExcept'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "646",
+              "localId" : "988",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "647",
+                "localId" : "989",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "648",
+                "localId" : "990",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "649",
+                "localId" : "991",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "650",
+                "localId" : "992",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "651",
+                "localId" : "993",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "652",
+                "localId" : "994",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "653",
+                "localId" : "995",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "630",
+                "localId" : "972",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -181786,7 +207876,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "631",
+                "localId" : "973",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -181794,7 +207884,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "632",
+                "localId" : "974",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -181802,7 +207892,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "633",
+                "localId" : "975",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181810,7 +207900,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "634",
+                "localId" : "976",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181818,7 +207908,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "635",
+                "localId" : "977",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181826,7 +207916,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "636",
+                "localId" : "978",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -181836,36 +207926,36 @@ module.exports['DateTimeIntervalExcept'] = {
           } ]
         }
       }, {
-        "localId" : "668",
-        "name" : "DateTimeOverlapsExcept",
+        "localId" : "1010",
+        "name" : "DateTimeEndsExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "668",
+            "r" : "1010",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeOverlapsExcept", ": " ]
+              "value" : [ "", "define ", "DateTimeEndsExcept", ": " ]
             }, {
-              "r" : "771",
+              "r" : "1113",
               "s" : [ {
-                "r" : "717",
+                "r" : "1059",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "685",
+                  "r" : "1027",
                   "s" : [ {
-                    "r" : "669",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1011",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "709",
+                  "r" : "1051",
                   "s" : [ {
-                    "r" : "693",
-                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1035",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -181873,21 +207963,21 @@ module.exports['DateTimeIntervalExcept'] = {
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "768",
+                "r" : "1110",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "736",
+                  "r" : "1078",
                   "s" : [ {
-                    "r" : "720",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1062",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "760",
+                  "r" : "1102",
                   "s" : [ {
-                    "r" : "744",
+                    "r" : "1086",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -181899,112 +207989,112 @@ module.exports['DateTimeIntervalExcept'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "778",
+          "localId" : "1120",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "779",
+            "localId" : "1121",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "771",
+          "localId" : "1113",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "776",
+            "localId" : "1118",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "777",
+              "localId" : "1119",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "772",
+            "localId" : "1114",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "773",
+              "localId" : "1115",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "774",
+            "localId" : "1116",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "775",
+              "localId" : "1117",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "717",
+            "localId" : "1059",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "718",
+              "localId" : "1060",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "719",
+                "localId" : "1061",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "685",
+              "localId" : "1027",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "686",
+                "localId" : "1028",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "687",
+                "localId" : "1029",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "688",
+                "localId" : "1030",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "689",
+                "localId" : "1031",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "690",
+                "localId" : "1032",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "691",
+                "localId" : "1033",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "692",
+                "localId" : "1034",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "669",
+                "localId" : "1011",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -182012,15 +208102,15 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "670",
+                "localId" : "1012",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "671",
+                "localId" : "1013",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -182028,7 +208118,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "672",
+                "localId" : "1014",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182036,7 +208126,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "673",
+                "localId" : "1015",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182044,7 +208134,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "674",
+                "localId" : "1016",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182052,7 +208142,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "675",
+                "localId" : "1017",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182061,64 +208151,64 @@ module.exports['DateTimeIntervalExcept'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "709",
+              "localId" : "1051",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "710",
+                "localId" : "1052",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "711",
+                "localId" : "1053",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "712",
+                "localId" : "1054",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "713",
+                "localId" : "1055",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "714",
+                "localId" : "1056",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "715",
+                "localId" : "1057",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "716",
+                "localId" : "1058",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "693",
+                "localId" : "1035",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "694",
+                "localId" : "1036",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "7",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "695",
+                "localId" : "1037",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -182126,7 +208216,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "696",
+                "localId" : "1038",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182134,7 +208224,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "697",
+                "localId" : "1039",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182142,7 +208232,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "698",
+                "localId" : "1040",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182150,7 +208240,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "699",
+                "localId" : "1041",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182159,65 +208249,65 @@ module.exports['DateTimeIntervalExcept'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "768",
+            "localId" : "1110",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "769",
+              "localId" : "1111",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "770",
+                "localId" : "1112",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "736",
+              "localId" : "1078",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "737",
+                "localId" : "1079",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "738",
+                "localId" : "1080",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "739",
+                "localId" : "1081",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "740",
+                "localId" : "1082",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "741",
+                "localId" : "1083",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "742",
+                "localId" : "1084",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "743",
+                "localId" : "1085",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "720",
+                "localId" : "1062",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -182225,15 +208315,15 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "721",
+                "localId" : "1063",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "722",
+                "localId" : "1064",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -182241,7 +208331,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "723",
+                "localId" : "1065",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182249,7 +208339,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "724",
+                "localId" : "1066",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182257,7 +208347,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "725",
+                "localId" : "1067",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182265,7 +208355,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "726",
+                "localId" : "1068",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182274,48 +208364,48 @@ module.exports['DateTimeIntervalExcept'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "760",
+              "localId" : "1102",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "761",
+                "localId" : "1103",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "762",
+                "localId" : "1104",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "763",
+                "localId" : "1105",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "764",
+                "localId" : "1106",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "765",
+                "localId" : "1107",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
+                "localId" : "1108",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "767",
+                "localId" : "1109",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "744",
+                "localId" : "1086",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -182323,7 +208413,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "745",
+                "localId" : "1087",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -182331,7 +208421,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "746",
+                "localId" : "1088",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -182339,7 +208429,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "747",
+                "localId" : "1089",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182347,7 +208437,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "748",
+                "localId" : "1090",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182355,7 +208445,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "749",
+                "localId" : "1091",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182363,7 +208453,7 @@ module.exports['DateTimeIntervalExcept'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "750",
+                "localId" : "1092",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -182372,63 +208462,684 @@ module.exports['DateTimeIntervalExcept'] = {
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* IntegerIntervalIntersect
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define IntFullInterval: Interval[0,10]
+define IntMeetsInterval: Interval[5,5]
+define IntOverlapsInterval: Interval[5,7]
+define IntBeginsInterval: Interval[0,5]
+define IntDuringInterval: Interval[3,5]
+define IntEndsInterval: Interval[5,10]
+define IntSameAsIntersect: Interval[0,10] intersect Interval[0,10]
+define IntBeforeIntersect: Interval[0,4] intersect Interval[6,10]
+define IntMeetsIntersect: Interval[0,5] intersect Interval[5,10]
+define IntOverlapsIntersect: Interval[0,7] intersect Interval[5,10]
+define IntBeginsIntersect: Interval[0,5] intersect Interval[0,10]
+define IntDuringIntersect: Interval[3,5] intersect Interval[0,10]
+define IntEndsIntersect: Interval[5,10] intersect Interval[0,10]
+*/
+
+module.exports['IntegerIntervalIntersect'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "406",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "name" : "IntFullInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "IntFullInterval", ": " ]
+            }, {
+              "r" : "217",
+              "s" : [ {
+                "r" : "215",
+                "value" : [ "Interval[", "0", ",", "10", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "220",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "221",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "217",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "218",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "219",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "215",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "216",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "224",
+        "name" : "IntMeetsInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "224",
+            "s" : [ {
+              "value" : [ "", "define ", "IntMeetsInterval", ": " ]
+            }, {
+              "r" : "227",
+              "s" : [ {
+                "r" : "225",
+                "value" : [ "Interval[", "5", ",", "5", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "230",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "231",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "227",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "228",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "229",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "226",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "234",
+        "name" : "IntOverlapsInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "234",
+            "s" : [ {
+              "value" : [ "", "define ", "IntOverlapsInterval", ": " ]
+            }, {
+              "r" : "237",
+              "s" : [ {
+                "r" : "235",
+                "value" : [ "Interval[", "5", ",", "7", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "240",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "241",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "237",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "238",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "239",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "235",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "236",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "7",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "244",
+        "name" : "IntBeginsInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "244",
+            "s" : [ {
+              "value" : [ "", "define ", "IntBeginsInterval", ": " ]
+            }, {
+              "r" : "247",
+              "s" : [ {
+                "r" : "245",
+                "value" : [ "Interval[", "0", ",", "5", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "250",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "247",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "248",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "249",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "245",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "0",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "246",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "254",
+        "name" : "IntDuringInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "254",
+            "s" : [ {
+              "value" : [ "", "define ", "IntDuringInterval", ": " ]
+            }, {
+              "r" : "257",
+              "s" : [ {
+                "r" : "255",
+                "value" : [ "Interval[", "3", ",", "5", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "260",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "261",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "257",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "258",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "259",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "255",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "3",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "256",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "264",
+        "name" : "IntEndsInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "264",
+            "s" : [ {
+              "value" : [ "", "define ", "IntEndsInterval", ": " ]
+            }, {
+              "r" : "267",
+              "s" : [ {
+                "r" : "265",
+                "value" : [ "Interval[", "5", ",", "10", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "270",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "271",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "267",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "268",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "269",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "265",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "266",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "274",
+        "name" : "IntSameAsIntersect",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "274",
+            "s" : [ {
+              "value" : [ "", "define ", "IntSameAsIntersect", ": " ]
+            }, {
+              "r" : "285",
+              "s" : [ {
+                "r" : "277",
+                "s" : [ {
+                  "r" : "275",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                } ]
+              }, {
+                "value" : [ " intersect " ]
+              }, {
+                "r" : "282",
+                "s" : [ {
+                  "r" : "280",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "292",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "293",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Intersect",
+          "localId" : "285",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "290",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "291",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "286",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "287",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "288",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "289",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "277",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "278",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "279",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "276",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "282",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "283",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "284",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "280",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "281",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
       }, {
-        "localId" : "782",
-        "name" : "DateTimeBeginsExcept",
+        "localId" : "296",
+        "name" : "IntBeforeIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "782",
+            "r" : "296",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeBeginsExcept", ": " ]
+              "value" : [ "", "define ", "IntBeforeIntersect", ": " ]
             }, {
-              "r" : "885",
+              "r" : "307",
               "s" : [ {
-                "r" : "831",
+                "r" : "299",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "799",
-                  "s" : [ {
-                    "r" : "783",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "823",
-                  "s" : [ {
-                    "r" : "807",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "297",
+                  "value" : [ "Interval[", "0", ",", "4", "]" ]
                 } ]
               }, {
-                "value" : [ " except " ]
+                "value" : [ " intersect " ]
               }, {
-                "r" : "882",
+                "r" : "304",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "850",
-                  "s" : [ {
-                    "r" : "834",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "874",
-                  "s" : [ {
-                    "r" : "858",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "302",
+                  "value" : [ "Interval[", "6", ",", "10", "]" ]
                 } ]
               } ]
             } ]
@@ -182436,536 +209147,293 @@ module.exports['DateTimeIntervalExcept'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "892",
+          "localId" : "314",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "893",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "315",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Except",
-          "localId" : "885",
+          "type" : "Intersect",
+          "localId" : "307",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "890",
+            "localId" : "312",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "891",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "313",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "886",
+            "localId" : "308",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "887",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "309",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "888",
+            "localId" : "310",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "889",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "311",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "831",
+            "localId" : "299",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "832",
+              "localId" : "300",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "833",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "301",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "799",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "297",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "298",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "304",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "305",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "800",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "801",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "802",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "803",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "804",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "805",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "806",
+                "localId" : "306",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "783",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "784",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "785",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "786",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "787",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "788",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "789",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "302",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "823",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "824",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "825",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "826",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "827",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "828",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "303",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "318",
+        "name" : "IntMeetsIntersect",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "318",
+            "s" : [ {
+              "value" : [ "", "define ", "IntMeetsIntersect", ": " ]
+            }, {
+              "r" : "329",
+              "s" : [ {
+                "r" : "321",
+                "s" : [ {
+                  "r" : "319",
+                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "829",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ " intersect " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "830",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "807",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "808",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "809",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "810",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "811",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "812",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "813",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "r" : "326",
+                "s" : [ {
+                  "r" : "324",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "336",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "337",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Intersect",
+          "localId" : "329",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "334",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "335",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "330",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "331",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "332",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "333",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "882",
+            "localId" : "321",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "883",
+              "localId" : "322",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "884",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "323",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "850",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "851",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "852",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "853",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "854",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "855",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "856",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "857",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "834",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "835",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "836",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "837",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "838",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "839",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "840",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "319",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "874",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "320",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "326",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "327",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "875",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "876",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "877",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "878",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "879",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "880",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "881",
+                "localId" : "328",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "858",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "859",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "860",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "861",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "862",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "863",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "864",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "324",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "325",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "896",
-        "name" : "DateTimeDuringExcept",
+        "localId" : "340",
+        "name" : "IntOverlapsIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "896",
+            "r" : "340",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeDuringExcept", ": " ]
+              "value" : [ "", "define ", "IntOverlapsIntersect", ": " ]
             }, {
-              "r" : "999",
+              "r" : "351",
               "s" : [ {
-                "r" : "945",
+                "r" : "343",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "913",
-                  "s" : [ {
-                    "r" : "897",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "937",
-                  "s" : [ {
-                    "r" : "921",
-                    "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "341",
+                  "value" : [ "Interval[", "0", ",", "7", "]" ]
                 } ]
               }, {
-                "value" : [ " except " ]
+                "value" : [ " intersect " ]
               }, {
-                "r" : "996",
+                "r" : "348",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "964",
-                  "s" : [ {
-                    "r" : "948",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "988",
-                  "s" : [ {
-                    "r" : "972",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "346",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
                 } ]
               } ]
             } ]
@@ -182973,536 +209441,293 @@ module.exports['DateTimeIntervalExcept'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1006",
+          "localId" : "358",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1007",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "359",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Except",
-          "localId" : "999",
+          "type" : "Intersect",
+          "localId" : "351",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1004",
+            "localId" : "356",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1005",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "357",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1000",
+            "localId" : "352",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1001",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "353",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1002",
+            "localId" : "354",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1003",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "355",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "945",
+            "localId" : "343",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "946",
+              "localId" : "344",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "947",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "345",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "913",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "7",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "348",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "349",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "914",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "915",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "916",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "917",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "918",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "919",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "920",
+                "localId" : "350",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "897",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "898",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "899",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "900",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "901",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "902",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "903",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "937",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "938",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "939",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "940",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "941",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "942",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "362",
+        "name" : "IntBeginsIntersect",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "362",
+            "s" : [ {
+              "value" : [ "", "define ", "IntBeginsIntersect", ": " ]
+            }, {
+              "r" : "373",
+              "s" : [ {
+                "r" : "365",
+                "s" : [ {
+                  "r" : "363",
+                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "943",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ " intersect " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "944",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "921",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "922",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "923",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "924",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "925",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "926",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "927",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "r" : "370",
+                "s" : [ {
+                  "r" : "368",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "380",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "381",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Intersect",
+          "localId" : "373",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "378",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "379",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "374",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "375",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "376",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "377",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "996",
+            "localId" : "365",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "997",
+              "localId" : "366",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "998",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "367",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "964",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "965",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "966",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "967",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "968",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "969",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "970",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "971",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "948",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "949",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "950",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "951",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "952",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "953",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "954",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "363",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "988",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "370",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "371",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "989",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "990",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "991",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "992",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "993",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "994",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "995",
+                "localId" : "372",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "972",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "973",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "974",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "975",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "976",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "977",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "978",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "368",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "369",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1010",
-        "name" : "DateTimeEndsExcept",
+        "localId" : "384",
+        "name" : "IntDuringIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1010",
+            "r" : "384",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeEndsExcept", ": " ]
+              "value" : [ "", "define ", "IntDuringIntersect", ": " ]
             }, {
-              "r" : "1113",
+              "r" : "395",
               "s" : [ {
-                "r" : "1059",
+                "r" : "387",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1027",
-                  "s" : [ {
-                    "r" : "1011",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1051",
-                  "s" : [ {
-                    "r" : "1035",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "385",
+                  "value" : [ "Interval[", "3", ",", "5", "]" ]
                 } ]
               }, {
-                "value" : [ " except " ]
+                "value" : [ " intersect " ]
               }, {
-                "r" : "1110",
+                "r" : "392",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1078",
-                  "s" : [ {
-                    "r" : "1062",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1102",
-                  "s" : [ {
-                    "r" : "1086",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "390",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
                 } ]
               } ]
             } ]
@@ -183510,476 +209735,263 @@ module.exports['DateTimeIntervalExcept'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1120",
+          "localId" : "402",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1121",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "403",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Except",
-          "localId" : "1113",
+          "type" : "Intersect",
+          "localId" : "395",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1118",
+            "localId" : "400",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1119",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "401",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1114",
+            "localId" : "396",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1115",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "397",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1116",
+            "localId" : "398",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1117",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "399",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "1059",
+            "localId" : "387",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1060",
+              "localId" : "388",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1061",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "389",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1027",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "385",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "386",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "392",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "393",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1028",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1029",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1030",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1031",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1032",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1033",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1034",
+                "localId" : "394",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1011",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1012",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1013",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1014",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1015",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1016",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1017",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "390",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1051",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1052",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1053",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1054",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1055",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1056",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "391",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "406",
+        "name" : "IntEndsIntersect",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "406",
+            "s" : [ {
+              "value" : [ "", "define ", "IntEndsIntersect", ": " ]
+            }, {
+              "r" : "417",
+              "s" : [ {
+                "r" : "409",
+                "s" : [ {
+                  "r" : "407",
+                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1057",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ " intersect " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1058",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1035",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1036",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1037",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1038",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1039",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1040",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1041",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+                "r" : "414",
+                "s" : [ {
+                  "r" : "412",
+                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "424",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "425",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Intersect",
+          "localId" : "417",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "422",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "423",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "418",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "419",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "420",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "421",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "1110",
+            "localId" : "409",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1111",
+              "localId" : "410",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1112",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "411",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "1078",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1079",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1080",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1081",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1082",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1083",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1084",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1085",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1062",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1063",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1064",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1065",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1066",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1067",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1068",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "407",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "1102",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "408",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "414",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "415",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1103",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1104",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1105",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1106",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1107",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1108",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1109",
+                "localId" : "416",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1086",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1087",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1088",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1089",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1090",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1091",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1092",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "412",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "413",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
             }
           } ]
         }
@@ -183988,26 +210000,26 @@ module.exports['DateTimeIntervalExcept'] = {
   }
 }
 
-/* IntegerIntervalIntersect
+/* LongIntervalIntersect
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define IntFullInterval: Interval[0,10]
-define IntMeetsInterval: Interval[5,5]
-define IntOverlapsInterval: Interval[5,7]
-define IntBeginsInterval: Interval[0,5]
-define IntDuringInterval: Interval[3,5]
-define IntEndsInterval: Interval[5,10]
-define IntSameAsIntersect: Interval[0,10] intersect Interval[0,10]
-define IntBeforeIntersect: Interval[0,4] intersect Interval[6,10]
-define IntMeetsIntersect: Interval[0,5] intersect Interval[5,10]
-define IntOverlapsIntersect: Interval[0,7] intersect Interval[5,10]
-define IntBeginsIntersect: Interval[0,5] intersect Interval[0,10]
-define IntDuringIntersect: Interval[3,5] intersect Interval[0,10]
-define IntEndsIntersect: Interval[5,10] intersect Interval[0,10]
+define LongFullInterval: Interval[0L,10L]
+define LongMeetsInterval: Interval[5L,5L]
+define LongOverlapsInterval: Interval[5L,7L]
+define LongBeginsInterval: Interval[0L,5L]
+define LongDuringInterval: Interval[3L,5L]
+define LongEndsInterval: Interval[5L,10L]
+define LongSameAsIntersect: Interval[0L,10L] intersect Interval[0L,10L]
+define LongBeforeIntersect: Interval[0L,4L] intersect Interval[6L,10L]
+define LongMeetsIntersect: Interval[0L,5L] intersect Interval[5L,10L]
+define LongOverlapsIntersect: Interval[0L,7L] intersect Interval[5L,10L]
+define LongBeginsIntersect: Interval[0L,5L] intersect Interval[0L,10L]
+define LongDuringIntersect: Interval[3L,5L] intersect Interval[0L,10L]
+define LongEndsIntersect: Interval[5L,10L] intersect Interval[0L,10L]
 */
 
-module.exports['IntegerIntervalIntersect'] = {
+module.exports['LongIntervalIntersect'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -184093,7 +210105,7 @@ module.exports['IntegerIntervalIntersect'] = {
         }
       }, {
         "localId" : "214",
-        "name" : "IntFullInterval",
+        "name" : "LongFullInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -184102,12 +210114,12 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "IntFullInterval", ": " ]
+              "value" : [ "", "define ", "LongFullInterval", ": " ]
             }, {
               "r" : "217",
               "s" : [ {
                 "r" : "215",
-                "value" : [ "Interval[", "0", ",", "10", "]" ]
+                "value" : [ "Interval[", "0L", ",", "10L", "]" ]
               } ]
             } ]
           }
@@ -184119,7 +210131,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "221",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -184136,30 +210148,30 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "219",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "215",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "0",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "10",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "224",
-        "name" : "IntMeetsInterval",
+        "name" : "LongMeetsInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -184168,12 +210180,12 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "224",
             "s" : [ {
-              "value" : [ "", "define ", "IntMeetsInterval", ": " ]
+              "value" : [ "", "define ", "LongMeetsInterval", ": " ]
             }, {
               "r" : "227",
               "s" : [ {
                 "r" : "225",
-                "value" : [ "Interval[", "5", ",", "5", "]" ]
+                "value" : [ "Interval[", "5L", ",", "5L", "]" ]
               } ]
             } ]
           }
@@ -184185,7 +210197,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "231",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -184202,30 +210214,30 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "229",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "225",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "226",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "234",
-        "name" : "IntOverlapsInterval",
+        "name" : "LongOverlapsInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -184234,12 +210246,12 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "234",
             "s" : [ {
-              "value" : [ "", "define ", "IntOverlapsInterval", ": " ]
+              "value" : [ "", "define ", "LongOverlapsInterval", ": " ]
             }, {
               "r" : "237",
               "s" : [ {
                 "r" : "235",
-                "value" : [ "Interval[", "5", ",", "7", "]" ]
+                "value" : [ "Interval[", "5L", ",", "7L", "]" ]
               } ]
             } ]
           }
@@ -184251,7 +210263,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "241",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -184268,30 +210280,30 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "239",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "235",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "236",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "7",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "244",
-        "name" : "IntBeginsInterval",
+        "name" : "LongBeginsInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -184300,12 +210312,12 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "244",
             "s" : [ {
-              "value" : [ "", "define ", "IntBeginsInterval", ": " ]
+              "value" : [ "", "define ", "LongBeginsInterval", ": " ]
             }, {
               "r" : "247",
               "s" : [ {
                 "r" : "245",
-                "value" : [ "Interval[", "0", ",", "5", "]" ]
+                "value" : [ "Interval[", "0L", ",", "5L", "]" ]
               } ]
             } ]
           }
@@ -184317,7 +210329,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "251",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -184334,30 +210346,30 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "249",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "245",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "0",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "246",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "254",
-        "name" : "IntDuringInterval",
+        "name" : "LongDuringInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -184366,12 +210378,12 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "254",
             "s" : [ {
-              "value" : [ "", "define ", "IntDuringInterval", ": " ]
+              "value" : [ "", "define ", "LongDuringInterval", ": " ]
             }, {
               "r" : "257",
               "s" : [ {
                 "r" : "255",
-                "value" : [ "Interval[", "3", ",", "5", "]" ]
+                "value" : [ "Interval[", "3L", ",", "5L", "]" ]
               } ]
             } ]
           }
@@ -184383,7 +210395,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "261",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -184400,30 +210412,30 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "259",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "255",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "3",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "256",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "264",
-        "name" : "IntEndsInterval",
+        "name" : "LongEndsInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -184432,12 +210444,12 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "IntEndsInterval", ": " ]
+              "value" : [ "", "define ", "LongEndsInterval", ": " ]
             }, {
               "r" : "267",
               "s" : [ {
                 "r" : "265",
-                "value" : [ "Interval[", "5", ",", "10", "]" ]
+                "value" : [ "Interval[", "5L", ",", "10L", "]" ]
               } ]
             } ]
           }
@@ -184449,7 +210461,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "271",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -184466,30 +210478,30 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "269",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "265",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "266",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "10",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "274",
-        "name" : "IntSameAsIntersect",
+        "name" : "LongSameAsIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -184498,14 +210510,14 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "274",
             "s" : [ {
-              "value" : [ "", "define ", "IntSameAsIntersect", ": " ]
+              "value" : [ "", "define ", "LongSameAsIntersect", ": " ]
             }, {
               "r" : "285",
               "s" : [ {
                 "r" : "277",
                 "s" : [ {
                   "r" : "275",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
@@ -184513,7 +210525,7 @@ module.exports['IntegerIntervalIntersect'] = {
                 "r" : "282",
                 "s" : [ {
                   "r" : "280",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -184526,7 +210538,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "293",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -184541,7 +210553,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "291",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
@@ -184552,7 +210564,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "287",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -184562,7 +210574,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "289",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -184579,23 +210591,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "279",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "276",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
@@ -184612,23 +210624,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "284",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "280",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "281",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
@@ -184636,7 +210648,7 @@ module.exports['IntegerIntervalIntersect'] = {
         }
       }, {
         "localId" : "296",
-        "name" : "IntBeforeIntersect",
+        "name" : "LongBeforeIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -184645,14 +210657,14 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "296",
             "s" : [ {
-              "value" : [ "", "define ", "IntBeforeIntersect", ": " ]
+              "value" : [ "", "define ", "LongBeforeIntersect", ": " ]
             }, {
               "r" : "307",
               "s" : [ {
                 "r" : "299",
                 "s" : [ {
                   "r" : "297",
-                  "value" : [ "Interval[", "0", ",", "4", "]" ]
+                  "value" : [ "Interval[", "0L", ",", "4L", "]" ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
@@ -184660,7 +210672,7 @@ module.exports['IntegerIntervalIntersect'] = {
                 "r" : "304",
                 "s" : [ {
                   "r" : "302",
-                  "value" : [ "Interval[", "6", ",", "10", "]" ]
+                  "value" : [ "Interval[", "6L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -184673,7 +210685,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "315",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -184688,7 +210700,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "313",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
@@ -184699,7 +210711,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "309",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -184709,7 +210721,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "311",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -184726,23 +210738,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "301",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "297",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "298",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }
@@ -184759,23 +210771,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "306",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "302",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "6",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "303",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
@@ -184783,7 +210795,7 @@ module.exports['IntegerIntervalIntersect'] = {
         }
       }, {
         "localId" : "318",
-        "name" : "IntMeetsIntersect",
+        "name" : "LongMeetsIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -184792,14 +210804,14 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "318",
             "s" : [ {
-              "value" : [ "", "define ", "IntMeetsIntersect", ": " ]
+              "value" : [ "", "define ", "LongMeetsIntersect", ": " ]
             }, {
               "r" : "329",
               "s" : [ {
                 "r" : "321",
                 "s" : [ {
                   "r" : "319",
-                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                  "value" : [ "Interval[", "0L", ",", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
@@ -184807,7 +210819,7 @@ module.exports['IntegerIntervalIntersect'] = {
                 "r" : "326",
                 "s" : [ {
                   "r" : "324",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -184820,7 +210832,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "337",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -184835,7 +210847,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "335",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
@@ -184846,7 +210858,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "331",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -184856,7 +210868,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "333",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -184873,23 +210885,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "323",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "319",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "320",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             }
@@ -184906,23 +210918,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "328",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "324",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "325",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
@@ -184930,7 +210942,7 @@ module.exports['IntegerIntervalIntersect'] = {
         }
       }, {
         "localId" : "340",
-        "name" : "IntOverlapsIntersect",
+        "name" : "LongOverlapsIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -184939,14 +210951,14 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "340",
             "s" : [ {
-              "value" : [ "", "define ", "IntOverlapsIntersect", ": " ]
+              "value" : [ "", "define ", "LongOverlapsIntersect", ": " ]
             }, {
               "r" : "351",
               "s" : [ {
                 "r" : "343",
                 "s" : [ {
                   "r" : "341",
-                  "value" : [ "Interval[", "0", ",", "7", "]" ]
+                  "value" : [ "Interval[", "0L", ",", "7L", "]" ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
@@ -184954,7 +210966,7 @@ module.exports['IntegerIntervalIntersect'] = {
                 "r" : "348",
                 "s" : [ {
                   "r" : "346",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -184967,7 +210979,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "359",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -184982,7 +210994,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "357",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
@@ -184993,7 +211005,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "353",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -185003,7 +211015,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "355",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -185020,23 +211032,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "345",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "341",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "342",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "7",
               "annotation" : [ ]
             }
@@ -185053,23 +211065,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "350",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "346",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "347",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
@@ -185077,7 +211089,7 @@ module.exports['IntegerIntervalIntersect'] = {
         }
       }, {
         "localId" : "362",
-        "name" : "IntBeginsIntersect",
+        "name" : "LongBeginsIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -185086,14 +211098,14 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "362",
             "s" : [ {
-              "value" : [ "", "define ", "IntBeginsIntersect", ": " ]
+              "value" : [ "", "define ", "LongBeginsIntersect", ": " ]
             }, {
               "r" : "373",
               "s" : [ {
                 "r" : "365",
                 "s" : [ {
                   "r" : "363",
-                  "value" : [ "Interval[", "0", ",", "5", "]" ]
+                  "value" : [ "Interval[", "0L", ",", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
@@ -185101,7 +211113,7 @@ module.exports['IntegerIntervalIntersect'] = {
                 "r" : "370",
                 "s" : [ {
                   "r" : "368",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -185114,7 +211126,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "381",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -185129,7 +211141,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "379",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
@@ -185140,7 +211152,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "375",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -185150,7 +211162,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "377",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -185167,23 +211179,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "367",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "363",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "364",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             }
@@ -185200,23 +211212,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "372",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "368",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "369",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
@@ -185224,7 +211236,7 @@ module.exports['IntegerIntervalIntersect'] = {
         }
       }, {
         "localId" : "384",
-        "name" : "IntDuringIntersect",
+        "name" : "LongDuringIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -185233,14 +211245,14 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "384",
             "s" : [ {
-              "value" : [ "", "define ", "IntDuringIntersect", ": " ]
+              "value" : [ "", "define ", "LongDuringIntersect", ": " ]
             }, {
               "r" : "395",
               "s" : [ {
                 "r" : "387",
                 "s" : [ {
                   "r" : "385",
-                  "value" : [ "Interval[", "3", ",", "5", "]" ]
+                  "value" : [ "Interval[", "3L", ",", "5L", "]" ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
@@ -185248,7 +211260,7 @@ module.exports['IntegerIntervalIntersect'] = {
                 "r" : "392",
                 "s" : [ {
                   "r" : "390",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -185261,7 +211273,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "403",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -185276,7 +211288,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "401",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
@@ -185287,7 +211299,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "397",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -185297,7 +211309,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "399",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -185314,23 +211326,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "389",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "385",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "3",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "386",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             }
@@ -185347,23 +211359,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "394",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "390",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "391",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
@@ -185371,7 +211383,7 @@ module.exports['IntegerIntervalIntersect'] = {
         }
       }, {
         "localId" : "406",
-        "name" : "IntEndsIntersect",
+        "name" : "LongEndsIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -185380,14 +211392,14 @@ module.exports['IntegerIntervalIntersect'] = {
           "s" : {
             "r" : "406",
             "s" : [ {
-              "value" : [ "", "define ", "IntEndsIntersect", ": " ]
+              "value" : [ "", "define ", "LongEndsIntersect", ": " ]
             }, {
               "r" : "417",
               "s" : [ {
                 "r" : "409",
                 "s" : [ {
                   "r" : "407",
-                  "value" : [ "Interval[", "5", ",", "10", "]" ]
+                  "value" : [ "Interval[", "5L", ",", "10L", "]" ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
@@ -185395,7 +211407,7 @@ module.exports['IntegerIntervalIntersect'] = {
                 "r" : "414",
                 "s" : [ {
                   "r" : "412",
-                  "value" : [ "Interval[", "0", ",", "10", "]" ]
+                  "value" : [ "Interval[", "0L", ",", "10L", "]" ]
                 } ]
               } ]
             } ]
@@ -185408,7 +211420,7 @@ module.exports['IntegerIntervalIntersect'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "425",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -185423,7 +211435,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "423",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
@@ -185434,7 +211446,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "419",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -185444,7 +211456,7 @@ module.exports['IntegerIntervalIntersect'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "421",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -185461,23 +211473,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "411",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "407",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "408",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
@@ -185494,23 +211506,23 @@ module.exports['IntegerIntervalIntersect'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "416",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
               "localId" : "412",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "0",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
               "localId" : "413",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "10",
               "annotation" : [ ]
             }
@@ -186658,569 +212670,2180 @@ module.exports['DateTimeIntervalIntersect'] = {
               "value" : "0",
               "annotation" : [ ]
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "413",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "413",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "438",
+        "name" : "DateTimeDuringInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "438",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTimeDuringInterval", ": " ]
+            }, {
+              "r" : "487",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "455",
+                "s" : [ {
+                  "r" : "439",
+                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "479",
+                "s" : [ {
+                  "r" : "463",
+                  "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "490",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "491",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "487",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "488",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "489",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "455",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "456",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "457",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "458",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "459",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "460",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "461",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "462",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "439",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "440",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "441",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "442",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "443",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "444",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "445",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "479",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "480",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "481",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "482",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "483",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "484",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "485",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "486",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "463",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "464",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "465",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "466",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "467",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "468",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "469",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "494",
+        "name" : "DateTimeEndsInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "494",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTimeEndsInterval", ": " ]
+            }, {
+              "r" : "543",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "511",
+                "s" : [ {
+                  "r" : "495",
+                  "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "535",
+                "s" : [ {
+                  "r" : "519",
+                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "546",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "547",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "543",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "544",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "545",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "511",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "512",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "513",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "514",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "515",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "516",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "517",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "518",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "495",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "496",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "497",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "498",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "499",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "500",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "501",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "535",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "536",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "537",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "538",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "539",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "540",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "541",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "542",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "519",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2013",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "520",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "521",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "522",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "523",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "524",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "525",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "550",
+        "name" : "DateTimeSameAsIntersect",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "550",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTimeSameAsIntersect", ": " ]
+            }, {
+              "r" : "653",
+              "s" : [ {
+                "r" : "599",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "567",
+                  "s" : [ {
+                    "r" : "551",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "591",
+                  "s" : [ {
+                    "r" : "575",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ " intersect " ]
+              }, {
+                "r" : "650",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "618",
+                  "s" : [ {
+                    "r" : "602",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "642",
+                  "s" : [ {
+                    "r" : "626",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "660",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "661",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Intersect",
+          "localId" : "653",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "658",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "659",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "654",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "655",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "656",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "657",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "599",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "600",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "601",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "567",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "568",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "569",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "570",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "571",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "572",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "573",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "574",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "551",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "552",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "553",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "554",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "555",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "556",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "557",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "591",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "592",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "593",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "594",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "595",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "596",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "597",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "598",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "575",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "576",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "577",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "578",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "579",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "580",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "581",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "650",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "651",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "652",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "618",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "619",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "620",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "621",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "622",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "623",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "624",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "625",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "602",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "603",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "604",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "605",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "606",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "607",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "608",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "642",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "643",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "644",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "645",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "646",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "647",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "648",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "649",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "626",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "627",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "628",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "629",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "630",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "631",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "632",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "438",
-        "name" : "DateTimeDuringInterval",
+        "localId" : "664",
+        "name" : "DateTimeBeforeIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "438",
+            "r" : "664",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeDuringInterval", ": " ]
+              "value" : [ "", "define ", "DateTimeBeforeIntersect", ": " ]
             }, {
-              "r" : "487",
+              "r" : "767",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "455",
+                "r" : "713",
                 "s" : [ {
-                  "r" : "439",
-                  "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "681",
+                  "s" : [ {
+                    "r" : "665",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "705",
+                  "s" : [ {
+                    "r" : "689",
+                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "value" : [ " intersect " ]
               }, {
-                "r" : "479",
+                "r" : "764",
                 "s" : [ {
-                  "r" : "463",
-                  "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "732",
+                  "s" : [ {
+                    "r" : "716",
+                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "756",
+                  "s" : [ {
+                    "r" : "740",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "490",
+          "localId" : "774",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "491",
+            "localId" : "775",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "487",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Intersect",
+          "localId" : "767",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "488",
+            "localId" : "772",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "489",
+              "localId" : "773",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "455",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "768",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "456",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "457",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "458",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "459",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "460",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "461",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "462",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "439",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "440",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "441",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "442",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "443",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "444",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "445",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "769",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "479",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "770",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "480",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "481",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "482",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "483",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "484",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "485",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "486",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "463",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "464",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "465",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "localId" : "771",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "713",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "714",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "715",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "466",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "681",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "682",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "683",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "684",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "685",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "686",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "687",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "688",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "665",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "666",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "667",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "668",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "669",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "670",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "671",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "467",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "705",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "706",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "707",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "708",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "709",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "710",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "711",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "712",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "689",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "690",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "691",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "692",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "693",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "694",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "695",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "764",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "765",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "766",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "468",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "732",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "733",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "734",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "735",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "736",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "737",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "738",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "739",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "716",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "717",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "7",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "718",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "719",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "720",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "721",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "722",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "469",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "756",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "757",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "758",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "759",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "760",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "761",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "762",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "763",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "740",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "741",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "742",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "743",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "744",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "745",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "746",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "494",
-        "name" : "DateTimeEndsInterval",
+        "localId" : "778",
+        "name" : "DateTimeMeetsIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "494",
+            "r" : "778",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeEndsInterval", ": " ]
+              "value" : [ "", "define ", "DateTimeMeetsIntersect", ": " ]
             }, {
-              "r" : "543",
+              "r" : "881",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "511",
+                "r" : "827",
                 "s" : [ {
-                  "r" : "495",
-                  "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "795",
+                  "s" : [ {
+                    "r" : "779",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "819",
+                  "s" : [ {
+                    "r" : "803",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "value" : [ " intersect " ]
               }, {
-                "r" : "535",
+                "r" : "878",
                 "s" : [ {
-                  "r" : "519",
-                  "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "846",
+                  "s" : [ {
+                    "r" : "830",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "870",
+                  "s" : [ {
+                    "r" : "854",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "546",
+          "localId" : "888",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "547",
+            "localId" : "889",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "543",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Intersect",
+          "localId" : "881",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "544",
+            "localId" : "886",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "545",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "511",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "512",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "513",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "514",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "515",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "516",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "517",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "518",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "495",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "496",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "497",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "498",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "499",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "500",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "501",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "535",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "536",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "537",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "538",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "539",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "540",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "541",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "887",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
-            }, {
+            }
+          },
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "882",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "542",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "519",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2013",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "520",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "localId" : "883",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "521",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "884",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "885",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "827",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "828",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "829",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "522",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "795",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "796",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "797",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "798",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "799",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "800",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "801",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "802",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "779",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "780",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "781",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "782",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "783",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "784",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "785",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "523",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "819",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "820",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "821",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "822",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "823",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "824",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "825",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "826",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "803",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "804",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "805",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "806",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "807",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "808",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "809",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "878",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "879",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "880",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "524",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "846",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "847",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "848",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "849",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "850",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "851",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "852",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "853",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "830",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "831",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "832",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "833",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "834",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "835",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "836",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "525",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "870",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "871",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "872",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "873",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "874",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "875",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "876",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "877",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "854",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2013",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "855",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "856",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "857",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "858",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "859",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "860",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "550",
-        "name" : "DateTimeSameAsIntersect",
+        "localId" : "892",
+        "name" : "DateTimeOverlapsIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "550",
+            "r" : "892",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeSameAsIntersect", ": " ]
+              "value" : [ "", "define ", "DateTimeOverlapsIntersect", ": " ]
             }, {
-              "r" : "653",
+              "r" : "995",
               "s" : [ {
-                "r" : "599",
+                "r" : "941",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "567",
+                  "r" : "909",
                   "s" : [ {
-                    "r" : "551",
+                    "r" : "893",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "591",
+                  "r" : "933",
                   "s" : [ {
-                    "r" : "575",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "917",
+                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -187228,21 +214851,21 @@ module.exports['DateTimeIntervalIntersect'] = {
               }, {
                 "value" : [ " intersect " ]
               }, {
-                "r" : "650",
+                "r" : "992",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "618",
+                  "r" : "960",
                   "s" : [ {
-                    "r" : "602",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "944",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "642",
+                  "r" : "984",
                   "s" : [ {
-                    "r" : "626",
+                    "r" : "968",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -187254,112 +214877,112 @@ module.exports['DateTimeIntervalIntersect'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "660",
+          "localId" : "1002",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "661",
+            "localId" : "1003",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "653",
+          "localId" : "995",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "658",
+            "localId" : "1000",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "659",
+              "localId" : "1001",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "654",
+            "localId" : "996",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "655",
+              "localId" : "997",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "656",
+            "localId" : "998",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "657",
+              "localId" : "999",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "599",
+            "localId" : "941",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "600",
+              "localId" : "942",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "601",
+                "localId" : "943",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "567",
+              "localId" : "909",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "568",
+                "localId" : "910",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "569",
+                "localId" : "911",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "570",
+                "localId" : "912",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "571",
+                "localId" : "913",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "572",
+                "localId" : "914",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "573",
+                "localId" : "915",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "574",
+                "localId" : "916",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "551",
+                "localId" : "893",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -187367,7 +214990,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "552",
+                "localId" : "894",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -187375,7 +214998,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "553",
+                "localId" : "895",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -187383,7 +215006,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "554",
+                "localId" : "896",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187391,7 +215014,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "555",
+                "localId" : "897",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187399,7 +215022,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "556",
+                "localId" : "898",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187407,7 +215030,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "557",
+                "localId" : "899",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187416,64 +215039,64 @@ module.exports['DateTimeIntervalIntersect'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "591",
+              "localId" : "933",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "592",
+                "localId" : "934",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "593",
+                "localId" : "935",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "594",
+                "localId" : "936",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "595",
+                "localId" : "937",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "596",
+                "localId" : "938",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "597",
+                "localId" : "939",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "598",
+                "localId" : "940",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "575",
+                "localId" : "917",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
+                "value" : "2012",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "576",
+                "localId" : "918",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "7",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "577",
+                "localId" : "919",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -187481,7 +215104,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "578",
+                "localId" : "920",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187489,7 +215112,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "579",
+                "localId" : "921",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187497,7 +215120,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "580",
+                "localId" : "922",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187505,7 +215128,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "581",
+                "localId" : "923",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187514,65 +215137,65 @@ module.exports['DateTimeIntervalIntersect'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "650",
+            "localId" : "992",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "651",
+              "localId" : "993",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "652",
+                "localId" : "994",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "618",
+              "localId" : "960",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "619",
+                "localId" : "961",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "620",
+                "localId" : "962",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "621",
+                "localId" : "963",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "622",
+                "localId" : "964",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "623",
+                "localId" : "965",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "624",
+                "localId" : "966",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "625",
+                "localId" : "967",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "602",
+                "localId" : "944",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -187580,15 +215203,15 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "603",
+                "localId" : "945",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "604",
+                "localId" : "946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -187596,7 +215219,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "605",
+                "localId" : "947",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187604,7 +215227,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "606",
+                "localId" : "948",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187612,7 +215235,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "607",
+                "localId" : "949",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187620,7 +215243,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "608",
+                "localId" : "950",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187629,48 +215252,48 @@ module.exports['DateTimeIntervalIntersect'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "642",
+              "localId" : "984",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "643",
+                "localId" : "985",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "644",
+                "localId" : "986",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "645",
+                "localId" : "987",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "646",
+                "localId" : "988",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "647",
+                "localId" : "989",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "648",
+                "localId" : "990",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "649",
+                "localId" : "991",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "626",
+                "localId" : "968",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -187678,7 +215301,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "627",
+                "localId" : "969",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -187686,7 +215309,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "628",
+                "localId" : "970",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -187694,7 +215317,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "629",
+                "localId" : "971",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187702,7 +215325,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "630",
+                "localId" : "972",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187710,7 +215333,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "631",
+                "localId" : "973",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187718,7 +215341,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "632",
+                "localId" : "974",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187728,36 +215351,36 @@ module.exports['DateTimeIntervalIntersect'] = {
           } ]
         }
       }, {
-        "localId" : "664",
-        "name" : "DateTimeBeforeIntersect",
+        "localId" : "1006",
+        "name" : "DateTimeBeginsIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "664",
+            "r" : "1006",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeBeforeIntersect", ": " ]
+              "value" : [ "", "define ", "DateTimeBeginsIntersect", ": " ]
             }, {
-              "r" : "767",
+              "r" : "1109",
               "s" : [ {
-                "r" : "713",
+                "r" : "1055",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "681",
+                  "r" : "1023",
                   "s" : [ {
-                    "r" : "665",
+                    "r" : "1007",
                     "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "705",
+                  "r" : "1047",
                   "s" : [ {
-                    "r" : "689",
-                    "value" : [ "DateTime", "(", "2012", ", ", "4", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1031",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -187765,21 +215388,21 @@ module.exports['DateTimeIntervalIntersect'] = {
               }, {
                 "value" : [ " intersect " ]
               }, {
-                "r" : "764",
+                "r" : "1106",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "732",
+                  "r" : "1074",
                   "s" : [ {
-                    "r" : "716",
-                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1058",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "756",
+                  "r" : "1098",
                   "s" : [ {
-                    "r" : "740",
+                    "r" : "1082",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -187791,112 +215414,112 @@ module.exports['DateTimeIntervalIntersect'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "774",
+          "localId" : "1116",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "775",
+            "localId" : "1117",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "767",
+          "localId" : "1109",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "772",
+            "localId" : "1114",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "773",
+              "localId" : "1115",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "768",
+            "localId" : "1110",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "769",
+              "localId" : "1111",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "770",
+            "localId" : "1112",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "771",
+              "localId" : "1113",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "713",
+            "localId" : "1055",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "714",
+              "localId" : "1056",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "715",
+                "localId" : "1057",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "681",
+              "localId" : "1023",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "682",
+                "localId" : "1024",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "683",
+                "localId" : "1025",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "684",
+                "localId" : "1026",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "685",
+                "localId" : "1027",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "686",
+                "localId" : "1028",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "687",
+                "localId" : "1029",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "688",
+                "localId" : "1030",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "665",
+                "localId" : "1007",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -187904,7 +215527,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "666",
+                "localId" : "1008",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -187912,7 +215535,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "667",
+                "localId" : "1009",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -187920,7 +215543,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "668",
+                "localId" : "1010",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187928,7 +215551,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "669",
+                "localId" : "1011",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187936,7 +215559,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "670",
+                "localId" : "1012",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187944,7 +215567,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "671",
+                "localId" : "1013",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -187953,48 +215576,48 @@ module.exports['DateTimeIntervalIntersect'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "705",
+              "localId" : "1047",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "706",
+                "localId" : "1048",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "707",
+                "localId" : "1049",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "708",
+                "localId" : "1050",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "709",
+                "localId" : "1051",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "710",
+                "localId" : "1052",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "711",
+                "localId" : "1053",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "712",
+                "localId" : "1054",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "689",
+                "localId" : "1031",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -188002,15 +215625,15 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "690",
+                "localId" : "1032",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "691",
+                "localId" : "1033",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -188018,7 +215641,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "692",
+                "localId" : "1034",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188026,7 +215649,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "693",
+                "localId" : "1035",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188034,7 +215657,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "694",
+                "localId" : "1036",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188042,7 +215665,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "695",
+                "localId" : "1037",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188051,65 +215674,65 @@ module.exports['DateTimeIntervalIntersect'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "764",
+            "localId" : "1106",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "765",
+              "localId" : "1107",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
+                "localId" : "1108",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "732",
+              "localId" : "1074",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "733",
+                "localId" : "1075",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "734",
+                "localId" : "1076",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "735",
+                "localId" : "1077",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "736",
+                "localId" : "1078",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "737",
+                "localId" : "1079",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "738",
+                "localId" : "1080",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "739",
+                "localId" : "1081",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "716",
+                "localId" : "1058",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -188117,15 +215740,15 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "717",
+                "localId" : "1059",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "7",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "718",
+                "localId" : "1060",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -188133,7 +215756,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "719",
+                "localId" : "1061",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188141,7 +215764,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "720",
+                "localId" : "1062",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188149,7 +215772,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "721",
+                "localId" : "1063",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188157,7 +215780,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "722",
+                "localId" : "1064",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188166,48 +215789,48 @@ module.exports['DateTimeIntervalIntersect'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "756",
+              "localId" : "1098",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "757",
+                "localId" : "1099",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "758",
+                "localId" : "1100",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "759",
+                "localId" : "1101",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "760",
+                "localId" : "1102",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "761",
+                "localId" : "1103",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "762",
+                "localId" : "1104",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "763",
+                "localId" : "1105",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "740",
+                "localId" : "1082",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -188215,7 +215838,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "741",
+                "localId" : "1083",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -188223,7 +215846,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "742",
+                "localId" : "1084",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -188231,7 +215854,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "743",
+                "localId" : "1085",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188239,7 +215862,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "744",
+                "localId" : "1086",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188247,7 +215870,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "745",
+                "localId" : "1087",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188255,7 +215878,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "746",
+                "localId" : "1088",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188265,36 +215888,36 @@ module.exports['DateTimeIntervalIntersect'] = {
           } ]
         }
       }, {
-        "localId" : "778",
-        "name" : "DateTimeMeetsIntersect",
+        "localId" : "1120",
+        "name" : "DateTimeDuringIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "778",
+            "r" : "1120",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeMeetsIntersect", ": " ]
+              "value" : [ "", "define ", "DateTimeDuringIntersect", ": " ]
             }, {
-              "r" : "881",
+              "r" : "1223",
               "s" : [ {
-                "r" : "827",
+                "r" : "1169",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "795",
+                  "r" : "1137",
                   "s" : [ {
-                    "r" : "779",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1121",
+                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "819",
+                  "r" : "1161",
                   "s" : [ {
-                    "r" : "803",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1145",
+                    "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -188302,21 +215925,21 @@ module.exports['DateTimeIntervalIntersect'] = {
               }, {
                 "value" : [ " intersect " ]
               }, {
-                "r" : "878",
+                "r" : "1220",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "846",
+                  "r" : "1188",
                   "s" : [ {
-                    "r" : "830",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1172",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "870",
+                  "r" : "1212",
                   "s" : [ {
-                    "r" : "854",
+                    "r" : "1196",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -188328,112 +215951,112 @@ module.exports['DateTimeIntervalIntersect'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "888",
+          "localId" : "1230",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "889",
+            "localId" : "1231",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "881",
+          "localId" : "1223",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "886",
+            "localId" : "1228",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "887",
+              "localId" : "1229",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "882",
+            "localId" : "1224",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "883",
+              "localId" : "1225",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "884",
+            "localId" : "1226",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "885",
+              "localId" : "1227",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "827",
+            "localId" : "1169",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "828",
+              "localId" : "1170",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "829",
+                "localId" : "1171",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "795",
+              "localId" : "1137",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "796",
+                "localId" : "1138",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "797",
+                "localId" : "1139",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "798",
+                "localId" : "1140",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "799",
+                "localId" : "1141",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "800",
+                "localId" : "1142",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "801",
+                "localId" : "1143",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "802",
+                "localId" : "1144",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "779",
+                "localId" : "1121",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -188441,15 +216064,15 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "780",
+                "localId" : "1122",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "3",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "781",
+                "localId" : "1123",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -188457,7 +216080,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "782",
+                "localId" : "1124",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188465,7 +216088,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "783",
+                "localId" : "1125",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188473,7 +216096,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "784",
+                "localId" : "1126",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188481,7 +216104,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "785",
+                "localId" : "1127",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188490,48 +216113,48 @@ module.exports['DateTimeIntervalIntersect'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "819",
+              "localId" : "1161",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "820",
+                "localId" : "1162",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "821",
+                "localId" : "1163",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "822",
+                "localId" : "1164",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "823",
+                "localId" : "1165",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "824",
+                "localId" : "1166",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "825",
+                "localId" : "1167",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "826",
+                "localId" : "1168",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "803",
+                "localId" : "1145",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -188539,15 +216162,15 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "804",
+                "localId" : "1146",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "5",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "805",
+                "localId" : "1147",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -188555,7 +216178,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "806",
+                "localId" : "1148",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188563,7 +216186,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "807",
+                "localId" : "1149",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188571,7 +216194,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "808",
+                "localId" : "1150",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188579,7 +216202,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "809",
+                "localId" : "1151",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188588,65 +216211,65 @@ module.exports['DateTimeIntervalIntersect'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "878",
+            "localId" : "1220",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "879",
+              "localId" : "1221",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "880",
+                "localId" : "1222",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "846",
+              "localId" : "1188",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "847",
+                "localId" : "1189",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "848",
+                "localId" : "1190",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "849",
+                "localId" : "1191",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "850",
+                "localId" : "1192",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "851",
+                "localId" : "1193",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "852",
+                "localId" : "1194",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "853",
+                "localId" : "1195",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "830",
+                "localId" : "1172",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -188654,15 +216277,15 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "831",
+                "localId" : "1173",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "832",
+                "localId" : "1174",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -188670,7 +216293,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "833",
+                "localId" : "1175",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188678,7 +216301,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "834",
+                "localId" : "1176",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188686,7 +216309,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "835",
+                "localId" : "1177",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188694,7 +216317,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "836",
+                "localId" : "1178",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188703,48 +216326,48 @@ module.exports['DateTimeIntervalIntersect'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "870",
+              "localId" : "1212",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "871",
+                "localId" : "1213",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "872",
+                "localId" : "1214",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "873",
+                "localId" : "1215",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "874",
+                "localId" : "1216",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "875",
+                "localId" : "1217",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "876",
+                "localId" : "1218",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "877",
+                "localId" : "1219",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "854",
+                "localId" : "1196",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -188752,7 +216375,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "855",
+                "localId" : "1197",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -188760,7 +216383,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "856",
+                "localId" : "1198",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -188768,7 +216391,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "857",
+                "localId" : "1199",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188776,7 +216399,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "858",
+                "localId" : "1200",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188784,7 +216407,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "859",
+                "localId" : "1201",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188792,7 +216415,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "860",
+                "localId" : "1202",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -188802,36 +216425,36 @@ module.exports['DateTimeIntervalIntersect'] = {
           } ]
         }
       }, {
-        "localId" : "892",
-        "name" : "DateTimeOverlapsIntersect",
+        "localId" : "1234",
+        "name" : "DateTimeEndsIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "892",
+            "r" : "1234",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeOverlapsIntersect", ": " ]
+              "value" : [ "", "define ", "DateTimeEndsIntersect", ": " ]
             }, {
-              "r" : "995",
+              "r" : "1337",
               "s" : [ {
-                "r" : "941",
+                "r" : "1283",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "909",
+                  "r" : "1251",
                   "s" : [ {
-                    "r" : "893",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1235",
+                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "933",
+                  "r" : "1275",
                   "s" : [ {
-                    "r" : "917",
-                    "value" : [ "DateTime", "(", "2012", ", ", "7", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1259",
+                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -188839,21 +216462,21 @@ module.exports['DateTimeIntervalIntersect'] = {
               }, {
                 "value" : [ " intersect " ]
               }, {
-                "r" : "992",
+                "r" : "1334",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "960",
+                  "r" : "1302",
                   "s" : [ {
-                    "r" : "944",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "1286",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "984",
+                  "r" : "1326",
                   "s" : [ {
-                    "r" : "968",
+                    "r" : "1310",
                     "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
                 }, {
@@ -188865,112 +216488,112 @@ module.exports['DateTimeIntervalIntersect'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "1002",
+          "localId" : "1344",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1003",
+            "localId" : "1345",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "995",
+          "localId" : "1337",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1000",
+            "localId" : "1342",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1001",
+              "localId" : "1343",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "996",
+            "localId" : "1338",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "997",
+              "localId" : "1339",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "998",
+            "localId" : "1340",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "999",
+              "localId" : "1341",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "941",
+            "localId" : "1283",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "942",
+              "localId" : "1284",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "943",
+                "localId" : "1285",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "909",
+              "localId" : "1251",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "910",
+                "localId" : "1252",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "911",
+                "localId" : "1253",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "912",
+                "localId" : "1254",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "913",
+                "localId" : "1255",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "914",
+                "localId" : "1256",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "915",
+                "localId" : "1257",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "916",
+                "localId" : "1258",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "893",
+                "localId" : "1235",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -188978,15 +216601,15 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "894",
+                "localId" : "1236",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "value" : "6",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "895",
+                "localId" : "1237",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -188994,7 +216617,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "896",
+                "localId" : "1238",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189002,7 +216625,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "897",
+                "localId" : "1239",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189010,7 +216633,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "898",
+                "localId" : "1240",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189018,7 +216641,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "899",
+                "localId" : "1241",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189027,64 +216650,64 @@ module.exports['DateTimeIntervalIntersect'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "933",
+              "localId" : "1275",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "934",
+                "localId" : "1276",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "935",
+                "localId" : "1277",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "936",
+                "localId" : "1278",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "937",
+                "localId" : "1279",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "938",
+                "localId" : "1280",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "939",
+                "localId" : "1281",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "940",
+                "localId" : "1282",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "917",
+                "localId" : "1259",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
+                "value" : "2013",
                 "annotation" : [ ]
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "918",
+                "localId" : "1260",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "7",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "919",
+                "localId" : "1261",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -189092,7 +216715,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "920",
+                "localId" : "1262",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189100,7 +216723,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "921",
+                "localId" : "1263",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189108,7 +216731,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "922",
+                "localId" : "1264",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189116,7 +216739,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "923",
+                "localId" : "1265",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189125,65 +216748,65 @@ module.exports['DateTimeIntervalIntersect'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "992",
+            "localId" : "1334",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "993",
+              "localId" : "1335",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "994",
+                "localId" : "1336",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "960",
+              "localId" : "1302",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "961",
+                "localId" : "1303",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "962",
+                "localId" : "1304",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "963",
+                "localId" : "1305",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "964",
+                "localId" : "1306",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "965",
+                "localId" : "1307",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "966",
+                "localId" : "1308",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "967",
+                "localId" : "1309",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "944",
+                "localId" : "1286",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -189191,15 +216814,15 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "945",
+                "localId" : "1287",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
+                "value" : "1",
                 "annotation" : [ ]
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "946",
+                "localId" : "1288",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -189207,7 +216830,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "947",
+                "localId" : "1289",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189215,7 +216838,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "948",
+                "localId" : "1290",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189223,7 +216846,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "949",
+                "localId" : "1291",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189231,7 +216854,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "950",
+                "localId" : "1292",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189240,48 +216863,48 @@ module.exports['DateTimeIntervalIntersect'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "984",
+              "localId" : "1326",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "985",
+                "localId" : "1327",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "986",
+                "localId" : "1328",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "987",
+                "localId" : "1329",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "988",
+                "localId" : "1330",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "989",
+                "localId" : "1331",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "990",
+                "localId" : "1332",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "991",
+                "localId" : "1333",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "968",
+                "localId" : "1310",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2013",
@@ -189289,7 +216912,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "969",
+                "localId" : "1311",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -189297,7 +216920,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "970",
+                "localId" : "1312",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -189305,7 +216928,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "971",
+                "localId" : "1313",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189313,7 +216936,7 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "972",
+                "localId" : "1314",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
@@ -189321,1632 +216944,2531 @@ module.exports['DateTimeIntervalIntersect'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "973",
+                "localId" : "1315",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "1316",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "0",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "974",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* IntegerIntervalCollapse
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define IntEmptyIntervalList: List<Interval<Integer>>{}
+define Int1_6Interval: Interval[1, 6]
+define Int1_10Interval: Interval[1, 10]
+define Int5_10Interval: Interval[5, 10]
+define Int5_12Interval: Interval[5, 12]
+define Int10_15Interval: Interval[10, 15]
+define Int15_20Interval: Interval[15, 20]
+define Int1_12Interval: Interval[1, 12]
+define Int1_15Interval: Interval[1, 15]
+define Int1_10IntervalList: { Int1_10Interval }
+define Int1_12IntervalList: { Int1_12Interval }
+define Int1_15IntervalList: { Int1_15Interval }
+define IntTwoItemDisjointList: { Int1_10Interval, Int15_20Interval }
+define IntCollapseEmpty: collapse IntEmptyIntervalList
+define IntCollapseSingleInterval: collapse Int1_10IntervalList
+define IntCollapseDisjoint: collapse IntTwoItemDisjointList
+define IntCollapseDisjointReversed: collapse { Int15_20Interval, Int1_10Interval }
+define IntCollapseAdjacent: collapse { Int1_10Interval, Int10_15Interval }
+define IntCollapseOverlap: collapse { Int1_10Interval, Int5_12Interval }
+define IntCollapseOverlapContained: collapse { Int1_15Interval, Int5_12Interval }
+define IntCollapseOverlapContainedEdge: collapse { Int1_10Interval, Int5_10Interval }
+define IntCollapseOverlapContainedEdge2: collapse { Int1_15Interval, Int1_10Interval }
+define IntCollapseOverlapMultipleCombine: collapse { Int1_6Interval, Int5_12Interval, Int10_15Interval }
+*/
+
+module.exports['IntegerIntervalCollapse'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "571",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "name" : "IntEmptyIntervalList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "IntEmptyIntervalList", ": " ]
+            }, {
+              "r" : "219",
+              "s" : [ {
+                "value" : [ "List<" ]
+              }, {
+                "r" : "215",
+                "s" : [ {
+                  "value" : [ "Interval<" ]
+                }, {
+                  "r" : "216",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                }, {
+                  "value" : [ ">" ]
+                } ]
+              }, {
+                "value" : [ ">{}" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "224",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "225",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "226",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "219",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "221",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "222",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "223",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "element" : [ ]
+        }
+      }, {
+        "localId" : "229",
+        "name" : "Int1_6Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "229",
+            "s" : [ {
+              "value" : [ "", "define ", "Int1_6Interval", ": " ]
+            }, {
+              "r" : "232",
+              "s" : [ {
+                "r" : "230",
+                "value" : [ "Interval[", "1", ", ", "6", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "235",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "236",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "232",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "233",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "234",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "230",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "231",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "6",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "239",
+        "name" : "Int1_10Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "239",
+            "s" : [ {
+              "value" : [ "", "define ", "Int1_10Interval", ": " ]
+            }, {
+              "r" : "242",
+              "s" : [ {
+                "r" : "240",
+                "value" : [ "Interval[", "1", ", ", "10", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "245",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "246",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "242",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "243",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "244",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "240",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "249",
+        "name" : "Int5_10Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "249",
+            "s" : [ {
+              "value" : [ "", "define ", "Int5_10Interval", ": " ]
+            }, {
+              "r" : "252",
+              "s" : [ {
+                "r" : "250",
+                "value" : [ "Interval[", "5", ", ", "10", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "255",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "256",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "252",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "253",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "254",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "250",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "251",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "259",
+        "name" : "Int5_12Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "259",
+            "s" : [ {
+              "value" : [ "", "define ", "Int5_12Interval", ": " ]
+            }, {
+              "r" : "262",
+              "s" : [ {
+                "r" : "260",
+                "value" : [ "Interval[", "5", ", ", "12", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "265",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "266",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "262",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "263",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "264",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "260",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "5",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "261",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "12",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "269",
+        "name" : "Int10_15Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "269",
+            "s" : [ {
+              "value" : [ "", "define ", "Int10_15Interval", ": " ]
+            }, {
+              "r" : "272",
+              "s" : [ {
+                "r" : "270",
+                "value" : [ "Interval[", "10", ", ", "15", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "275",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "276",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "272",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "273",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "274",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "270",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "10",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "271",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "15",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "279",
+        "name" : "Int15_20Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "279",
+            "s" : [ {
+              "value" : [ "", "define ", "Int15_20Interval", ": " ]
+            }, {
+              "r" : "282",
+              "s" : [ {
+                "r" : "280",
+                "value" : [ "Interval[", "15", ", ", "20", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "285",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "286",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "282",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "283",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "284",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "280",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "15",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "281",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "20",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "289",
+        "name" : "Int1_12Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "289",
+            "s" : [ {
+              "value" : [ "", "define ", "Int1_12Interval", ": " ]
+            }, {
+              "r" : "292",
+              "s" : [ {
+                "r" : "290",
+                "value" : [ "Interval[", "1", ", ", "12", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "295",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "296",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "292",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "293",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "294",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "290",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "291",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "12",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "299",
+        "name" : "Int1_15Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "299",
+            "s" : [ {
+              "value" : [ "", "define ", "Int1_15Interval", ": " ]
+            }, {
+              "r" : "302",
+              "s" : [ {
+                "r" : "300",
+                "value" : [ "Interval[", "1", ", ", "15", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "305",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "306",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "302",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "303",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "304",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "Literal",
+            "localId" : "300",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          },
+          "high" : {
+            "type" : "Literal",
+            "localId" : "301",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "15",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "309",
+        "name" : "Int1_10IntervalList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "309",
+            "s" : [ {
+              "value" : [ "", "define ", "Int1_10IntervalList", ": " ]
+            }, {
+              "r" : "310",
+              "s" : [ {
+                "value" : [ "{ " ]
+              }, {
+                "r" : "311",
+                "s" : [ {
+                  "value" : [ "Int1_10Interval" ]
+                } ]
+              }, {
+                "value" : [ " }" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "317",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "318",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "319",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "310",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "314",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "315",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "316",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "element" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "311",
+            "name" : "Int1_10Interval",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "312",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "313",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1006",
-        "name" : "DateTimeBeginsIntersect",
+        "localId" : "322",
+        "name" : "Int1_12IntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1006",
+            "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeBeginsIntersect", ": " ]
+              "value" : [ "", "define ", "Int1_12IntervalList", ": " ]
             }, {
-              "r" : "1109",
+              "r" : "323",
               "s" : [ {
-                "r" : "1055",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1023",
-                  "s" : [ {
-                    "r" : "1007",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1047",
-                  "s" : [ {
-                    "r" : "1031",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "value" : [ " intersect " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "1106",
+                "r" : "324",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1074",
-                  "s" : [ {
-                    "r" : "1058",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1098",
-                  "s" : [ {
-                    "r" : "1082",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "value" : [ "Int1_12Interval" ]
                 } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1116",
+          "type" : "ListTypeSpecifier",
+          "localId" : "330",
           "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1117",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "331",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "332",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
           }
         },
         "expression" : {
-          "type" : "Intersect",
-          "localId" : "1109",
+          "type" : "List",
+          "localId" : "323",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1114",
+            "type" : "ListTypeSpecifier",
+            "localId" : "327",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1115",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "328",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "329",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             }
           },
-          "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1110",
+          "element" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "324",
+            "name" : "Int1_12Interval",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1111",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "325",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "326",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             }
-          }, {
+          } ]
+        }
+      }, {
+        "localId" : "335",
+        "name" : "Int1_15IntervalList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "335",
+            "s" : [ {
+              "value" : [ "", "define ", "Int1_15IntervalList", ": " ]
+            }, {
+              "r" : "336",
+              "s" : [ {
+                "value" : [ "{ " ]
+              }, {
+                "r" : "337",
+                "s" : [ {
+                  "value" : [ "Int1_15Interval" ]
+                } ]
+              }, {
+                "value" : [ " }" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "343",
+          "annotation" : [ ],
+          "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1112",
+            "localId" : "344",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1113",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "345",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1055",
-            "lowClosed" : true,
-            "highClosed" : true,
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "336",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "340",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1056",
+              "localId" : "341",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1057",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "342",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1023",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          },
+          "element" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "337",
+            "name" : "Int1_15Interval",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "338",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1024",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1025",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1026",
+                "localId" : "339",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "348",
+        "name" : "IntTwoItemDisjointList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "348",
+            "s" : [ {
+              "value" : [ "", "define ", "IntTwoItemDisjointList", ": " ]
+            }, {
+              "r" : "349",
+              "s" : [ {
+                "value" : [ "{ " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1027",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "350",
+                "s" : [ {
+                  "value" : [ "Int1_10Interval" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1028",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "value" : [ ", " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1029",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "353",
+                "s" : [ {
+                  "value" : [ "Int15_20Interval" ]
+                } ]
               }, {
+                "value" : [ " }" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "359",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "360",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "361",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "349",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "356",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "357",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1030",
+                "localId" : "358",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1007",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1008",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1009",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1010",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1011",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1012",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1013",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1047",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          },
+          "element" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "350",
+            "name" : "Int1_10Interval",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "351",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1048",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1049",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1050",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1051",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1052",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1053",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1054",
+                "localId" : "352",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1031",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1032",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1033",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1034",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1035",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1036",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1037",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1106",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "353",
+            "name" : "Int15_20Interval",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1107",
+              "localId" : "354",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1108",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1074",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1075",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1076",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1077",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1078",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1079",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1080",
+                "localId" : "355",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "364",
+        "name" : "IntCollapseEmpty",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "364",
+            "s" : [ {
+              "value" : [ "", "define ", "IntCollapseEmpty", ": " ]
+            }, {
+              "r" : "370",
+              "s" : [ {
+                "value" : [ "collapse " ]
               }, {
+                "r" : "365",
+                "s" : [ {
+                  "value" : [ "IntEmptyIntervalList" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "378",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "379",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "380",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "370",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "375",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "376",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1081",
+                "localId" : "377",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1058",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1059",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1060",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1061",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1062",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1063",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1064",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1098",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "371",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "372",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1099",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1100",
+                "localId" : "373",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "374",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "365",
+            "name" : "IntEmptyIntervalList",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "366",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "367",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "368",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "Null",
+            "localId" : "369",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "383",
+        "name" : "IntCollapseSingleInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "383",
+            "s" : [ {
+              "value" : [ "", "define ", "IntCollapseSingleInterval", ": " ]
+            }, {
+              "r" : "389",
+              "s" : [ {
+                "value" : [ "collapse " ]
               }, {
+                "r" : "384",
+                "s" : [ {
+                  "value" : [ "Int1_10IntervalList" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "397",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "398",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "399",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "389",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "394",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "395",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1101",
+                "localId" : "396",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "390",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "391",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1102",
+                "localId" : "392",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "393",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "384",
+            "name" : "Int1_10IntervalList",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "385",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "386",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "387",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "Null",
+            "localId" : "388",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "402",
+        "name" : "IntCollapseDisjoint",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "402",
+            "s" : [ {
+              "value" : [ "", "define ", "IntCollapseDisjoint", ": " ]
+            }, {
+              "r" : "408",
+              "s" : [ {
+                "value" : [ "collapse " ]
               }, {
+                "r" : "403",
+                "s" : [ {
+                  "value" : [ "IntTwoItemDisjointList" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "416",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "417",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "418",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "408",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "413",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "414",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1103",
+                "localId" : "415",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "409",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "410",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1104",
+                "localId" : "411",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "412",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "403",
+            "name" : "IntTwoItemDisjointList",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "404",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "405",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "406",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "Null",
+            "localId" : "407",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "421",
+        "name" : "IntCollapseDisjointReversed",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "421",
+            "s" : [ {
+              "value" : [ "", "define ", "IntCollapseDisjointReversed", ": " ]
+            }, {
+              "r" : "433",
+              "s" : [ {
+                "value" : [ "collapse " ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1105",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1082",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1083",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1084",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1085",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1086",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1087",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "r" : "422",
+                "s" : [ {
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "423",
+                  "s" : [ {
+                    "value" : [ "Int15_20Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "426",
+                  "s" : [ {
+                    "value" : [ "Int1_10Interval" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "441",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "442",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "443",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "433",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "438",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "439",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "440",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1088",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "434",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "435",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "436",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "437",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "422",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "429",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "430",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "431",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "423",
+              "name" : "Int15_20Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "424",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "425",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "426",
+              "name" : "Int1_10Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "427",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "428",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "432",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1120",
-        "name" : "DateTimeDuringIntersect",
+        "localId" : "446",
+        "name" : "IntCollapseAdjacent",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1120",
+            "r" : "446",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeDuringIntersect", ": " ]
+              "value" : [ "", "define ", "IntCollapseAdjacent", ": " ]
             }, {
-              "r" : "1223",
+              "r" : "458",
               "s" : [ {
-                "r" : "1169",
+                "value" : [ "collapse " ]
+              }, {
+                "r" : "447",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "1137",
+                  "r" : "448",
                   "s" : [ {
-                    "r" : "1121",
-                    "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "Int1_10Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1161",
+                  "r" : "451",
                   "s" : [ {
-                    "r" : "1145",
-                    "value" : [ "DateTime", "(", "2012", ", ", "5", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "Int10_15Interval" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ " }" ]
                 } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "466",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "467",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "468",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "458",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "463",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "464",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "465",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "459",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "460",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "461",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "462",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "447",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "454",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "455",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "456",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "448",
+              "name" : "Int1_10Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "449",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "450",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "451",
+              "name" : "Int10_15Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "452",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "453",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "457",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "471",
+        "name" : "IntCollapseOverlap",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "471",
+            "s" : [ {
+              "value" : [ "", "define ", "IntCollapseOverlap", ": " ]
+            }, {
+              "r" : "483",
+              "s" : [ {
+                "value" : [ "collapse " ]
               }, {
-                "value" : [ " intersect " ]
-              }, {
-                "r" : "1220",
+                "r" : "472",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "1188",
+                  "r" : "473",
                   "s" : [ {
-                    "r" : "1172",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "Int1_10Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1212",
+                  "r" : "476",
                   "s" : [ {
-                    "r" : "1196",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "Int5_12Interval" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ " }" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1230",
+          "type" : "ListTypeSpecifier",
+          "localId" : "491",
           "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1231",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "492",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "493",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
           }
         },
         "expression" : {
-          "type" : "Intersect",
-          "localId" : "1223",
+          "type" : "Collapse",
+          "localId" : "483",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1228",
+            "type" : "ListTypeSpecifier",
+            "localId" : "488",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1229",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "489",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "490",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             }
           },
           "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1224",
+            "type" : "ListTypeSpecifier",
+            "localId" : "484",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1225",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "485",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "486",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             }
           }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "487",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "472",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "479",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "480",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "481",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "473",
+              "name" : "Int1_10Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "474",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "475",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "476",
+              "name" : "Int5_12Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "477",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "478",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "482",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "496",
+        "name" : "IntCollapseOverlapContained",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "496",
+            "s" : [ {
+              "value" : [ "", "define ", "IntCollapseOverlapContained", ": " ]
+            }, {
+              "r" : "508",
+              "s" : [ {
+                "value" : [ "collapse " ]
+              }, {
+                "r" : "497",
+                "s" : [ {
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "498",
+                  "s" : [ {
+                    "value" : [ "Int1_15Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "501",
+                  "s" : [ {
+                    "value" : [ "Int5_12Interval" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "516",
+          "annotation" : [ ],
+          "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1226",
+            "localId" : "517",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1227",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "518",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1169",
-            "lowClosed" : true,
-            "highClosed" : true,
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "508",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "513",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1170",
+              "localId" : "514",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1171",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1137",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1138",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1139",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1140",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1141",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1142",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1143",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1144",
+                "localId" : "515",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1121",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1122",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1123",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1124",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1125",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1126",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1127",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1161",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "509",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "510",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1162",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1163",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1164",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1165",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1166",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1167",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1168",
+                "localId" : "511",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1145",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1146",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1147",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1148",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1149",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1150",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1151",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1220",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "NamedTypeSpecifier",
+            "localId" : "512",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "497",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1221",
+              "type" : "ListTypeSpecifier",
+              "localId" : "504",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1222",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "505",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "506",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
               }
             },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1188",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "498",
+              "name" : "Int1_15Interval",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1189",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1190",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1191",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1192",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1193",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1194",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1195",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1172",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1173",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1174",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1175",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1176",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1177",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1178",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "499",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "500",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1212",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "501",
+              "name" : "Int5_12Interval",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1213",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1214",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1215",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1216",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1217",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "502",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "503",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "507",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "521",
+        "name" : "IntCollapseOverlapContainedEdge",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "521",
+            "s" : [ {
+              "value" : [ "", "define ", "IntCollapseOverlapContainedEdge", ": " ]
+            }, {
+              "r" : "533",
+              "s" : [ {
+                "value" : [ "collapse " ]
               }, {
+                "r" : "522",
+                "s" : [ {
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "523",
+                  "s" : [ {
+                    "value" : [ "Int1_10Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "526",
+                  "s" : [ {
+                    "value" : [ "Int5_10Interval" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "541",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "542",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "543",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "533",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "538",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "539",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1218",
+                "localId" : "540",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "534",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "535",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1219",
+                "localId" : "536",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1196",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1197",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1198",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1199",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1200",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1201",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1202",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
-            }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "537",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "522",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "529",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "530",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "531",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "523",
+              "name" : "Int1_10Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "524",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "525",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "526",
+              "name" : "Int5_10Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "527",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "528",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "532",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1234",
-        "name" : "DateTimeEndsIntersect",
+        "localId" : "546",
+        "name" : "IntCollapseOverlapContainedEdge2",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1234",
+            "r" : "546",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeEndsIntersect", ": " ]
+              "value" : [ "", "define ", "IntCollapseOverlapContainedEdge2", ": " ]
             }, {
-              "r" : "1337",
+              "r" : "558",
               "s" : [ {
-                "r" : "1283",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1251",
-                  "s" : [ {
-                    "r" : "1235",
-                    "value" : [ "DateTime", "(", "2012", ", ", "6", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1275",
-                  "s" : [ {
-                    "r" : "1259",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "value" : [ " intersect " ]
+                "value" : [ "collapse " ]
               }, {
-                "r" : "1334",
+                "r" : "547",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "1302",
+                  "r" : "548",
                   "s" : [ {
-                    "r" : "1286",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "Int1_15Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1326",
+                  "r" : "551",
                   "s" : [ {
-                    "r" : "1310",
-                    "value" : [ "DateTime", "(", "2013", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "Int1_10Interval" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ " }" ]
                 } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1344",
+          "type" : "ListTypeSpecifier",
+          "localId" : "566",
           "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1345",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "567",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "568",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
           }
         },
         "expression" : {
-          "type" : "Intersect",
-          "localId" : "1337",
+          "type" : "Collapse",
+          "localId" : "558",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1342",
+            "type" : "ListTypeSpecifier",
+            "localId" : "563",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1343",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "564",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "565",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             }
           },
           "signature" : [ {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1338",
+            "type" : "ListTypeSpecifier",
+            "localId" : "559",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1339",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "560",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "561",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             }
           }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "562",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "547",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "554",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "555",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "556",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "548",
+              "name" : "Int1_15Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "549",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "550",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "551",
+              "name" : "Int1_10Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "552",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "553",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "557",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "571",
+        "name" : "IntCollapseOverlapMultipleCombine",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "571",
+            "s" : [ {
+              "value" : [ "", "define ", "IntCollapseOverlapMultipleCombine", ": " ]
+            }, {
+              "r" : "586",
+              "s" : [ {
+                "value" : [ "collapse " ]
+              }, {
+                "r" : "572",
+                "s" : [ {
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "573",
+                  "s" : [ {
+                    "value" : [ "Int1_6Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "576",
+                  "s" : [ {
+                    "value" : [ "Int5_12Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "579",
+                  "s" : [ {
+                    "value" : [ "Int10_15Interval" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "594",
+          "annotation" : [ ],
+          "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1340",
+            "localId" : "595",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1341",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "596",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
-          } ],
-          "operand" : [ {
-            "type" : "Interval",
-            "localId" : "1283",
-            "lowClosed" : true,
-            "highClosed" : true,
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "586",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "591",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1284",
+              "localId" : "592",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1285",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1252",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1253",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1254",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1255",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1256",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1257",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1258",
+                "localId" : "593",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1235",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1236",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "6",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1237",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1238",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1239",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1240",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1241",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "587",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "588",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1276",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1277",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1278",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1279",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1280",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1281",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1282",
+                "localId" : "589",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1259",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1260",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1261",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1262",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1263",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1264",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1265",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1334",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "NamedTypeSpecifier",
+            "localId" : "590",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "572",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1335",
+              "type" : "ListTypeSpecifier",
+              "localId" : "582",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1336",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "583",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "584",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
               }
             },
-            "low" : {
-              "type" : "DateTime",
-              "localId" : "1302",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "573",
+              "name" : "Int1_6Interval",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1303",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1304",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1305",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1306",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1307",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1308",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1309",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1286",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1287",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1288",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1289",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1290",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1291",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1292",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "574",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "575",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
               }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "1326",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "576",
+              "name" : "Int5_12Interval",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1327",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1328",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1329",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1330",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1331",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1332",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1333",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "1310",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2013",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "1311",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "1312",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "1313",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "1314",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "1315",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "1316",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "577",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "578",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
               }
-            }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "579",
+              "name" : "Int10_15Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "580",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "581",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "585",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
       } ]
@@ -190954,36 +219476,36 @@ module.exports['DateTimeIntervalIntersect'] = {
   }
 }
 
-/* IntegerIntervalCollapse
+/* LongIntervalCollapse
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define IntEmptyIntervalList: List<Interval<Integer>>{}
-define Int1_6Interval: Interval[1, 6]
-define Int1_10Interval: Interval[1, 10]
-define Int5_10Interval: Interval[5, 10]
-define Int5_12Interval: Interval[5, 12]
-define Int10_15Interval: Interval[10, 15]
-define Int15_20Interval: Interval[15, 20]
-define Int1_12Interval: Interval[1, 12]
-define Int1_15Interval: Interval[1, 15]
-define Int1_10IntervalList: { Int1_10Interval }
-define Int1_12IntervalList: { Int1_12Interval }
-define Int1_15IntervalList: { Int1_15Interval }
-define IntTwoItemDisjointList: { Int1_10Interval, Int15_20Interval }
-define IntCollapseEmpty: collapse IntEmptyIntervalList
-define IntCollapseSingleInterval: collapse Int1_10IntervalList
-define IntCollapseDisjoint: collapse IntTwoItemDisjointList
-define IntCollapseDisjointReversed: collapse { Int15_20Interval, Int1_10Interval }
-define IntCollapseAdjacent: collapse { Int1_10Interval, Int10_15Interval }
-define IntCollapseOverlap: collapse { Int1_10Interval, Int5_12Interval }
-define IntCollapseOverlapContained: collapse { Int1_15Interval, Int5_12Interval }
-define IntCollapseOverlapContainedEdge: collapse { Int1_10Interval, Int5_10Interval }
-define IntCollapseOverlapContainedEdge2: collapse { Int1_15Interval, Int1_10Interval }
-define IntCollapseOverlapMultipleCombine: collapse { Int1_6Interval, Int5_12Interval, Int10_15Interval }
+define LongEmptyIntervalList: List<Interval<Long>>{}
+define Long1_6Interval: Interval[1L, 6L]
+define Long1_10Interval: Interval[1L, 10L]
+define Long5_10Interval: Interval[5L, 10L]
+define Long5_12Interval: Interval[5L, 12L]
+define Long10_15Interval: Interval[10L, 15L]
+define Long15_20Interval: Interval[15L, 20L]
+define Long1_12Interval: Interval[1L, 12L]
+define Long1_15Interval: Interval[1L, 15L]
+define Long1_10IntervalList: { Long1_10Interval }
+define Long1_12IntervalList: { Long1_12Interval }
+define Long1_15IntervalList: { Long1_15Interval }
+define LongTwoItemDisjointList: { Long1_10Interval, Long15_20Interval }
+define LongCollapseEmpty: collapse LongEmptyIntervalList
+define LongCollapseSingleInterval: collapse Long1_10IntervalList
+define LongCollapseDisjoint: collapse LongTwoItemDisjointList
+define LongCollapseDisjointReversed: collapse { Long15_20Interval, Long1_10Interval }
+define LongCollapseAdjacent: collapse { Long1_10Interval, Long10_15Interval }
+define LongCollapseOverlap: collapse { Long1_10Interval, Long5_12Interval }
+define LongCollapseOverlapContained: collapse { Long1_15Interval, Long5_12Interval }
+define LongCollapseOverlapContainedEdge: collapse { Long1_10Interval, Long5_10Interval }
+define LongCollapseOverlapContainedEdge2: collapse { Long1_15Interval, Long1_10Interval }
+define LongCollapseOverlapMultipleCombine: collapse { Long1_6Interval, Long5_12Interval, Long10_15Interval }
 */
 
-module.exports['IntegerIntervalCollapse'] = {
+module.exports['LongIntervalCollapse'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -191069,7 +219591,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "214",
-        "name" : "IntEmptyIntervalList",
+        "name" : "LongEmptyIntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191078,7 +219600,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "IntEmptyIntervalList", ": " ]
+              "value" : [ "", "define ", "LongEmptyIntervalList", ": " ]
             }, {
               "r" : "219",
               "s" : [ {
@@ -191090,7 +219612,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 }, {
                   "r" : "216",
                   "s" : [ {
-                    "value" : [ "Integer" ]
+                    "value" : [ "Long" ]
                   } ]
                 }, {
                   "value" : [ ">" ]
@@ -191112,7 +219634,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "226",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -191132,7 +219654,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "223",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -191141,7 +219663,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "229",
-        "name" : "Int1_6Interval",
+        "name" : "Long1_6Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191150,12 +219672,12 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "229",
             "s" : [ {
-              "value" : [ "", "define ", "Int1_6Interval", ": " ]
+              "value" : [ "", "define ", "Long1_6Interval", ": " ]
             }, {
               "r" : "232",
               "s" : [ {
                 "r" : "230",
-                "value" : [ "Interval[", "1", ", ", "6", "]" ]
+                "value" : [ "Interval[", "1L", ", ", "6L", "]" ]
               } ]
             } ]
           }
@@ -191167,7 +219689,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "236",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -191184,30 +219706,30 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "234",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "230",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "1",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "231",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "6",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "239",
-        "name" : "Int1_10Interval",
+        "name" : "Long1_10Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191216,12 +219738,12 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "239",
             "s" : [ {
-              "value" : [ "", "define ", "Int1_10Interval", ": " ]
+              "value" : [ "", "define ", "Long1_10Interval", ": " ]
             }, {
               "r" : "242",
               "s" : [ {
                 "r" : "240",
-                "value" : [ "Interval[", "1", ", ", "10", "]" ]
+                "value" : [ "Interval[", "1L", ", ", "10L", "]" ]
               } ]
             } ]
           }
@@ -191233,7 +219755,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "246",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -191250,30 +219772,30 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "244",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "240",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "1",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "241",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "10",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "249",
-        "name" : "Int5_10Interval",
+        "name" : "Long5_10Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191282,12 +219804,12 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "249",
             "s" : [ {
-              "value" : [ "", "define ", "Int5_10Interval", ": " ]
+              "value" : [ "", "define ", "Long5_10Interval", ": " ]
             }, {
               "r" : "252",
               "s" : [ {
                 "r" : "250",
-                "value" : [ "Interval[", "5", ", ", "10", "]" ]
+                "value" : [ "Interval[", "5L", ", ", "10L", "]" ]
               } ]
             } ]
           }
@@ -191299,7 +219821,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "256",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -191316,30 +219838,30 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "254",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "250",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "251",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "10",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "259",
-        "name" : "Int5_12Interval",
+        "name" : "Long5_12Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191348,12 +219870,12 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "259",
             "s" : [ {
-              "value" : [ "", "define ", "Int5_12Interval", ": " ]
+              "value" : [ "", "define ", "Long5_12Interval", ": " ]
             }, {
               "r" : "262",
               "s" : [ {
                 "r" : "260",
-                "value" : [ "Interval[", "5", ", ", "12", "]" ]
+                "value" : [ "Interval[", "5L", ", ", "12L", "]" ]
               } ]
             } ]
           }
@@ -191365,7 +219887,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "266",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -191382,30 +219904,30 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "264",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "260",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "5",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "261",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "12",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "269",
-        "name" : "Int10_15Interval",
+        "name" : "Long10_15Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191414,12 +219936,12 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "269",
             "s" : [ {
-              "value" : [ "", "define ", "Int10_15Interval", ": " ]
+              "value" : [ "", "define ", "Long10_15Interval", ": " ]
             }, {
               "r" : "272",
               "s" : [ {
                 "r" : "270",
-                "value" : [ "Interval[", "10", ", ", "15", "]" ]
+                "value" : [ "Interval[", "10L", ", ", "15L", "]" ]
               } ]
             } ]
           }
@@ -191431,7 +219953,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "276",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -191448,30 +219970,30 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "274",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "270",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "10",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "271",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "15",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "279",
-        "name" : "Int15_20Interval",
+        "name" : "Long15_20Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191480,12 +220002,12 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "279",
             "s" : [ {
-              "value" : [ "", "define ", "Int15_20Interval", ": " ]
+              "value" : [ "", "define ", "Long15_20Interval", ": " ]
             }, {
               "r" : "282",
               "s" : [ {
                 "r" : "280",
-                "value" : [ "Interval[", "15", ", ", "20", "]" ]
+                "value" : [ "Interval[", "15L", ", ", "20L", "]" ]
               } ]
             } ]
           }
@@ -191497,7 +220019,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "286",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -191514,30 +220036,30 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "284",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "280",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "15",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "281",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "20",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "289",
-        "name" : "Int1_12Interval",
+        "name" : "Long1_12Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191546,12 +220068,12 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "Int1_12Interval", ": " ]
+              "value" : [ "", "define ", "Long1_12Interval", ": " ]
             }, {
               "r" : "292",
               "s" : [ {
                 "r" : "290",
-                "value" : [ "Interval[", "1", ", ", "12", "]" ]
+                "value" : [ "Interval[", "1L", ", ", "12L", "]" ]
               } ]
             } ]
           }
@@ -191563,7 +220085,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "296",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -191580,30 +220102,30 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "294",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "290",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "1",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "291",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "12",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "299",
-        "name" : "Int1_15Interval",
+        "name" : "Long1_15Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191612,12 +220134,12 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "299",
             "s" : [ {
-              "value" : [ "", "define ", "Int1_15Interval", ": " ]
+              "value" : [ "", "define ", "Long1_15Interval", ": " ]
             }, {
               "r" : "302",
               "s" : [ {
                 "r" : "300",
-                "value" : [ "Interval[", "1", ", ", "15", "]" ]
+                "value" : [ "Interval[", "1L", ", ", "15L", "]" ]
               } ]
             } ]
           }
@@ -191629,7 +220151,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "pointType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "306",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -191646,30 +220168,30 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "304",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
           "low" : {
             "type" : "Literal",
             "localId" : "300",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "1",
             "annotation" : [ ]
           },
           "high" : {
             "type" : "Literal",
             "localId" : "301",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
             "value" : "15",
             "annotation" : [ ]
           }
         }
       }, {
         "localId" : "309",
-        "name" : "Int1_10IntervalList",
+        "name" : "Long1_10IntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191678,7 +220200,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "309",
             "s" : [ {
-              "value" : [ "", "define ", "Int1_10IntervalList", ": " ]
+              "value" : [ "", "define ", "Long1_10IntervalList", ": " ]
             }, {
               "r" : "310",
               "s" : [ {
@@ -191686,7 +220208,7 @@ module.exports['IntegerIntervalCollapse'] = {
               }, {
                 "r" : "311",
                 "s" : [ {
-                  "value" : [ "Int1_10Interval" ]
+                  "value" : [ "Long1_10Interval" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -191705,7 +220227,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "319",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -191725,7 +220247,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "316",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -191733,7 +220255,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "element" : [ {
             "type" : "ExpressionRef",
             "localId" : "311",
-            "name" : "Int1_10Interval",
+            "name" : "Long1_10Interval",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
@@ -191742,7 +220264,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "313",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -191750,7 +220272,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "322",
-        "name" : "Int1_12IntervalList",
+        "name" : "Long1_12IntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191759,7 +220281,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "Int1_12IntervalList", ": " ]
+              "value" : [ "", "define ", "Long1_12IntervalList", ": " ]
             }, {
               "r" : "323",
               "s" : [ {
@@ -191767,7 +220289,7 @@ module.exports['IntegerIntervalCollapse'] = {
               }, {
                 "r" : "324",
                 "s" : [ {
-                  "value" : [ "Int1_12Interval" ]
+                  "value" : [ "Long1_12Interval" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -191786,7 +220308,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "332",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -191806,7 +220328,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "329",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -191814,7 +220336,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "element" : [ {
             "type" : "ExpressionRef",
             "localId" : "324",
-            "name" : "Int1_12Interval",
+            "name" : "Long1_12Interval",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
@@ -191823,7 +220345,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "326",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -191831,7 +220353,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "335",
-        "name" : "Int1_15IntervalList",
+        "name" : "Long1_15IntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191840,7 +220362,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "335",
             "s" : [ {
-              "value" : [ "", "define ", "Int1_15IntervalList", ": " ]
+              "value" : [ "", "define ", "Long1_15IntervalList", ": " ]
             }, {
               "r" : "336",
               "s" : [ {
@@ -191848,7 +220370,7 @@ module.exports['IntegerIntervalCollapse'] = {
               }, {
                 "r" : "337",
                 "s" : [ {
-                  "value" : [ "Int1_15Interval" ]
+                  "value" : [ "Long1_15Interval" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -191867,7 +220389,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "345",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -191887,7 +220409,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "342",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -191895,7 +220417,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "element" : [ {
             "type" : "ExpressionRef",
             "localId" : "337",
-            "name" : "Int1_15Interval",
+            "name" : "Long1_15Interval",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
@@ -191904,7 +220426,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "339",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -191912,7 +220434,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "348",
-        "name" : "IntTwoItemDisjointList",
+        "name" : "LongTwoItemDisjointList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -191921,7 +220443,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "348",
             "s" : [ {
-              "value" : [ "", "define ", "IntTwoItemDisjointList", ": " ]
+              "value" : [ "", "define ", "LongTwoItemDisjointList", ": " ]
             }, {
               "r" : "349",
               "s" : [ {
@@ -191929,14 +220451,14 @@ module.exports['IntegerIntervalCollapse'] = {
               }, {
                 "r" : "350",
                 "s" : [ {
-                  "value" : [ "Int1_10Interval" ]
+                  "value" : [ "Long1_10Interval" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
                 "r" : "353",
                 "s" : [ {
-                  "value" : [ "Int15_20Interval" ]
+                  "value" : [ "Long15_20Interval" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -191955,7 +220477,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "361",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -191975,7 +220497,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "358",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -191983,7 +220505,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "element" : [ {
             "type" : "ExpressionRef",
             "localId" : "350",
-            "name" : "Int1_10Interval",
+            "name" : "Long1_10Interval",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
@@ -191992,14 +220514,14 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "352",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "ExpressionRef",
             "localId" : "353",
-            "name" : "Int15_20Interval",
+            "name" : "Long15_20Interval",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
@@ -192008,7 +220530,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "355",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192016,7 +220538,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "364",
-        "name" : "IntCollapseEmpty",
+        "name" : "LongCollapseEmpty",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -192025,7 +220547,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "364",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseEmpty", ": " ]
+              "value" : [ "", "define ", "LongCollapseEmpty", ": " ]
             }, {
               "r" : "370",
               "s" : [ {
@@ -192033,7 +220555,7 @@ module.exports['IntegerIntervalCollapse'] = {
               }, {
                 "r" : "365",
                 "s" : [ {
-                  "value" : [ "IntEmptyIntervalList" ]
+                  "value" : [ "LongEmptyIntervalList" ]
                 } ]
               } ]
             } ]
@@ -192050,7 +220572,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "380",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -192070,7 +220592,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "377",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192086,7 +220608,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "373",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192099,7 +220621,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "operand" : [ {
             "type" : "ExpressionRef",
             "localId" : "365",
-            "name" : "IntEmptyIntervalList",
+            "name" : "LongEmptyIntervalList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
@@ -192112,7 +220634,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "368",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192126,7 +220648,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "383",
-        "name" : "IntCollapseSingleInterval",
+        "name" : "LongCollapseSingleInterval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -192135,7 +220657,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "383",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseSingleInterval", ": " ]
+              "value" : [ "", "define ", "LongCollapseSingleInterval", ": " ]
             }, {
               "r" : "389",
               "s" : [ {
@@ -192143,7 +220665,7 @@ module.exports['IntegerIntervalCollapse'] = {
               }, {
                 "r" : "384",
                 "s" : [ {
-                  "value" : [ "Int1_10IntervalList" ]
+                  "value" : [ "Long1_10IntervalList" ]
                 } ]
               } ]
             } ]
@@ -192160,7 +220682,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "399",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -192180,7 +220702,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "396",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192196,7 +220718,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "392",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192209,7 +220731,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "operand" : [ {
             "type" : "ExpressionRef",
             "localId" : "384",
-            "name" : "Int1_10IntervalList",
+            "name" : "Long1_10IntervalList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
@@ -192222,7 +220744,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "387",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192236,7 +220758,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "402",
-        "name" : "IntCollapseDisjoint",
+        "name" : "LongCollapseDisjoint",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -192245,7 +220767,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "402",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseDisjoint", ": " ]
+              "value" : [ "", "define ", "LongCollapseDisjoint", ": " ]
             }, {
               "r" : "408",
               "s" : [ {
@@ -192253,7 +220775,7 @@ module.exports['IntegerIntervalCollapse'] = {
               }, {
                 "r" : "403",
                 "s" : [ {
-                  "value" : [ "IntTwoItemDisjointList" ]
+                  "value" : [ "LongTwoItemDisjointList" ]
                 } ]
               } ]
             } ]
@@ -192270,7 +220792,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "418",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -192290,7 +220812,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "415",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192306,7 +220828,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "411",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192319,7 +220841,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "operand" : [ {
             "type" : "ExpressionRef",
             "localId" : "403",
-            "name" : "IntTwoItemDisjointList",
+            "name" : "LongTwoItemDisjointList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
@@ -192332,7 +220854,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "406",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192346,7 +220868,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "421",
-        "name" : "IntCollapseDisjointReversed",
+        "name" : "LongCollapseDisjointReversed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -192355,7 +220877,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "421",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseDisjointReversed", ": " ]
+              "value" : [ "", "define ", "LongCollapseDisjointReversed", ": " ]
             }, {
               "r" : "433",
               "s" : [ {
@@ -192367,14 +220889,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 }, {
                   "r" : "423",
                   "s" : [ {
-                    "value" : [ "Int15_20Interval" ]
+                    "value" : [ "Long15_20Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
                   "r" : "426",
                   "s" : [ {
-                    "value" : [ "Int1_10Interval" ]
+                    "value" : [ "Long1_10Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -192394,7 +220916,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "443",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -192414,7 +220936,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "440",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192430,7 +220952,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "436",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192455,7 +220977,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "431",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192463,7 +220985,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "element" : [ {
               "type" : "ExpressionRef",
               "localId" : "423",
-              "name" : "Int15_20Interval",
+              "name" : "Long15_20Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -192472,14 +220994,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "425",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
               "localId" : "426",
-              "name" : "Int1_10Interval",
+              "name" : "Long1_10Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -192488,7 +221010,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "428",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192502,7 +221024,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "446",
-        "name" : "IntCollapseAdjacent",
+        "name" : "LongCollapseAdjacent",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -192511,7 +221033,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "446",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseAdjacent", ": " ]
+              "value" : [ "", "define ", "LongCollapseAdjacent", ": " ]
             }, {
               "r" : "458",
               "s" : [ {
@@ -192523,14 +221045,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 }, {
                   "r" : "448",
                   "s" : [ {
-                    "value" : [ "Int1_10Interval" ]
+                    "value" : [ "Long1_10Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
                   "r" : "451",
                   "s" : [ {
-                    "value" : [ "Int10_15Interval" ]
+                    "value" : [ "Long10_15Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -192550,7 +221072,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "468",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -192570,7 +221092,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "465",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192586,7 +221108,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "461",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192611,7 +221133,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "456",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192619,7 +221141,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "element" : [ {
               "type" : "ExpressionRef",
               "localId" : "448",
-              "name" : "Int1_10Interval",
+              "name" : "Long1_10Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -192628,14 +221150,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "450",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
               "localId" : "451",
-              "name" : "Int10_15Interval",
+              "name" : "Long10_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -192644,7 +221166,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "453",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192658,7 +221180,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "471",
-        "name" : "IntCollapseOverlap",
+        "name" : "LongCollapseOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -192667,7 +221189,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "471",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseOverlap", ": " ]
+              "value" : [ "", "define ", "LongCollapseOverlap", ": " ]
             }, {
               "r" : "483",
               "s" : [ {
@@ -192679,14 +221201,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 }, {
                   "r" : "473",
                   "s" : [ {
-                    "value" : [ "Int1_10Interval" ]
+                    "value" : [ "Long1_10Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
                   "r" : "476",
                   "s" : [ {
-                    "value" : [ "Int5_12Interval" ]
+                    "value" : [ "Long5_12Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -192706,7 +221228,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "493",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -192726,7 +221248,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "490",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192742,7 +221264,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "486",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192767,7 +221289,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "481",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192775,7 +221297,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "element" : [ {
               "type" : "ExpressionRef",
               "localId" : "473",
-              "name" : "Int1_10Interval",
+              "name" : "Long1_10Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -192784,14 +221306,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "475",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
               "localId" : "476",
-              "name" : "Int5_12Interval",
+              "name" : "Long5_12Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -192800,7 +221322,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "478",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192814,7 +221336,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "496",
-        "name" : "IntCollapseOverlapContained",
+        "name" : "LongCollapseOverlapContained",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -192823,7 +221345,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "496",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseOverlapContained", ": " ]
+              "value" : [ "", "define ", "LongCollapseOverlapContained", ": " ]
             }, {
               "r" : "508",
               "s" : [ {
@@ -192835,14 +221357,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 }, {
                   "r" : "498",
                   "s" : [ {
-                    "value" : [ "Int1_15Interval" ]
+                    "value" : [ "Long1_15Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
                   "r" : "501",
                   "s" : [ {
-                    "value" : [ "Int5_12Interval" ]
+                    "value" : [ "Long5_12Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -192862,7 +221384,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "518",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -192882,7 +221404,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "515",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192898,7 +221420,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "511",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -192923,7 +221445,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "506",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192931,7 +221453,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "element" : [ {
               "type" : "ExpressionRef",
               "localId" : "498",
-              "name" : "Int1_15Interval",
+              "name" : "Long1_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -192940,14 +221462,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "500",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
               "localId" : "501",
-              "name" : "Int5_12Interval",
+              "name" : "Long5_12Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -192956,7 +221478,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "503",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -192970,7 +221492,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "521",
-        "name" : "IntCollapseOverlapContainedEdge",
+        "name" : "LongCollapseOverlapContainedEdge",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -192979,7 +221501,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "521",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseOverlapContainedEdge", ": " ]
+              "value" : [ "", "define ", "LongCollapseOverlapContainedEdge", ": " ]
             }, {
               "r" : "533",
               "s" : [ {
@@ -192991,14 +221513,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 }, {
                   "r" : "523",
                   "s" : [ {
-                    "value" : [ "Int1_10Interval" ]
+                    "value" : [ "Long1_10Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
                   "r" : "526",
                   "s" : [ {
-                    "value" : [ "Int5_10Interval" ]
+                    "value" : [ "Long5_10Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -193018,7 +221540,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "543",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -193038,7 +221560,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "540",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -193054,7 +221576,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "536",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -193079,7 +221601,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "531",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -193087,7 +221609,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "element" : [ {
               "type" : "ExpressionRef",
               "localId" : "523",
-              "name" : "Int1_10Interval",
+              "name" : "Long1_10Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -193096,14 +221618,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "525",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
               "localId" : "526",
-              "name" : "Int5_10Interval",
+              "name" : "Long5_10Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -193112,7 +221634,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "528",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -193126,7 +221648,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "546",
-        "name" : "IntCollapseOverlapContainedEdge2",
+        "name" : "LongCollapseOverlapContainedEdge2",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -193135,7 +221657,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "546",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseOverlapContainedEdge2", ": " ]
+              "value" : [ "", "define ", "LongCollapseOverlapContainedEdge2", ": " ]
             }, {
               "r" : "558",
               "s" : [ {
@@ -193147,14 +221669,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 }, {
                   "r" : "548",
                   "s" : [ {
-                    "value" : [ "Int1_15Interval" ]
+                    "value" : [ "Long1_15Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
                   "r" : "551",
                   "s" : [ {
-                    "value" : [ "Int1_10Interval" ]
+                    "value" : [ "Long1_10Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -193174,7 +221696,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "568",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -193194,7 +221716,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "565",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -193210,7 +221732,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "561",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -193235,7 +221757,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "556",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -193243,7 +221765,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "element" : [ {
               "type" : "ExpressionRef",
               "localId" : "548",
-              "name" : "Int1_15Interval",
+              "name" : "Long1_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -193252,14 +221774,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "550",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
               "localId" : "551",
-              "name" : "Int1_10Interval",
+              "name" : "Long1_10Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -193268,7 +221790,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "553",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -193282,7 +221804,7 @@ module.exports['IntegerIntervalCollapse'] = {
         }
       }, {
         "localId" : "571",
-        "name" : "IntCollapseOverlapMultipleCombine",
+        "name" : "LongCollapseOverlapMultipleCombine",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -193291,7 +221813,7 @@ module.exports['IntegerIntervalCollapse'] = {
           "s" : {
             "r" : "571",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseOverlapMultipleCombine", ": " ]
+              "value" : [ "", "define ", "LongCollapseOverlapMultipleCombine", ": " ]
             }, {
               "r" : "586",
               "s" : [ {
@@ -193303,21 +221825,21 @@ module.exports['IntegerIntervalCollapse'] = {
                 }, {
                   "r" : "573",
                   "s" : [ {
-                    "value" : [ "Int1_6Interval" ]
+                    "value" : [ "Long1_6Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
                   "r" : "576",
                   "s" : [ {
-                    "value" : [ "Int5_12Interval" ]
+                    "value" : [ "Long5_12Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
                   "r" : "579",
                   "s" : [ {
-                    "value" : [ "Int10_15Interval" ]
+                    "value" : [ "Long10_15Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -193337,7 +221859,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "596",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -193357,7 +221879,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "593",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -193373,7 +221895,7 @@ module.exports['IntegerIntervalCollapse'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "589",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -193398,7 +221920,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "584",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -193406,7 +221928,7 @@ module.exports['IntegerIntervalCollapse'] = {
             "element" : [ {
               "type" : "ExpressionRef",
               "localId" : "573",
-              "name" : "Int1_6Interval",
+              "name" : "Long1_6Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -193415,14 +221937,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "575",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
               "localId" : "576",
-              "name" : "Int5_12Interval",
+              "name" : "Long5_12Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -193431,14 +221953,14 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "578",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
               "localId" : "579",
-              "name" : "Int10_15Interval",
+              "name" : "Long10_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
@@ -193447,7 +221969,7 @@ module.exports['IntegerIntervalCollapse'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "581",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -197958,10 +226480,12 @@ define CollapseSeparatedQuantityPer3: collapse QuantitySeparatedBy3 per 3
 
 // Quantity Intervals with units
 define QuantityMeterIntervalList: { Interval[ToQuantity('1 \'m\''), ToQuantity('1.995 \'m\'')], Interval[ToQuantity('2 \'m\''), ToQuantity('3 \'m\'')] }
-define CollapseDisjointQuantityUnits: collapse QuantityMeterIntervalList
 define ExpectedQuantityUnitsCollapse: { Interval[ToQuantity('1 \'m\''), ToQuantity('3 \'m\'')] }
 define CollapseQuantityUnitsWithinPer: collapse QuantityMeterIntervalList per ToQuantity('1 \'cm\'')
 define CollapseQuantityUnitsNotWithinPer: collapse QuantityMeterIntervalList per ToQuantity('1 \'mm\'')
+define CollapseDisjointQuantityUnits: collapse QuantityMeterIntervalList
+define QuantityMeterIntervalListWithinDefaultPer: { Interval[ToQuantity('1 \'m\''), ToQuantity('1.99999999 \'m\'')], Interval[ToQuantity('2 \'m\''), ToQuantity('3 \'m\'')] }
+define CollapseQuantityUnitsWithinDefaultPer: collapse QuantityMeterIntervalListWithinDefaultPer
 
 // Null test cases
 define NullLowIntervalList: { Interval[null, 4], Interval[3, 5] }
@@ -198019,7 +226543,7 @@ module.exports['Collapse'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "2661",
+        "r" : "2724",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -198204,118 +226728,594 @@ module.exports['Collapse'] = {
               "value" : "4",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "Interval",
-            "localId" : "223",
-            "lowClosed" : true,
-            "highClosed" : true,
+          }, {
+            "type" : "Interval",
+            "localId" : "223",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "224",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "225",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "221",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "222",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "8",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "228",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "229",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "230",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "226",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "7",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "227",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "239",
+        "name" : "IntCollapsePerUnit1",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "239",
+            "s" : [ {
+              "value" : [ "", "define ", "IntCollapsePerUnit1", ": " ]
+            }, {
+              "r" : "251",
+              "s" : [ {
+                "value" : [ "collapse " ]
+              }, {
+                "r" : "240",
+                "s" : [ {
+                  "value" : [ "IntIntervalList" ]
+                } ]
+              }, {
+                "value" : [ " per " ]
+              }, {
+                "r" : "249",
+                "s" : [ {
+                  "r" : "245",
+                  "value" : [ "ToQuantity", "(", "1", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "259",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "260",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "251",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "256",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "257",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "258",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "252",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "253",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "254",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "255",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "240",
+            "name" : "IntIntervalList",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "241",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "242",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "243",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "ToQuantity",
+            "localId" : "249",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "250",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "264",
+        "name" : "IntCollapseNoPer",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "264",
+            "s" : [ {
+              "value" : [ "", "define ", "IntCollapseNoPer", ": " ]
+            }, {
+              "r" : "270",
+              "s" : [ {
+                "value" : [ "collapse " ]
+              }, {
+                "r" : "265",
+                "s" : [ {
+                  "value" : [ "IntIntervalList" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "278",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "279",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "280",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "270",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "275",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "276",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "277",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "271",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "272",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "273",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "274",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "265",
+            "name" : "IntIntervalList",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "266",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "267",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "268",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "Null",
+            "localId" : "269",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "283",
+        "name" : "IntIntervalSeparatedList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "283",
+            "s" : [ {
+              "value" : [ "", "define ", "IntIntervalSeparatedList", ": " ]
+            }, {
+              "r" : "284",
+              "s" : [ {
+                "value" : [ "{ " ]
+              }, {
+                "r" : "287",
+                "s" : [ {
+                  "r" : "285",
+                  "value" : [ "Interval[", "3", ", ", "5", "]" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "292",
+                "s" : [ {
+                  "r" : "290",
+                  "value" : [ "Interval[", "8", ", ", "10", "]" ]
+                } ]
+              }, {
+                "value" : [ " }" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "298",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "299",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "300",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "284",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "295",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "296",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "297",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "287",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "288",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "289",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "285",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "286",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "292",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "293",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "294",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "290",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "8",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "291",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "303",
+        "name" : "ExpectedIntervalList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "303",
+            "s" : [ {
+              "value" : [ "", "define ", "ExpectedIntervalList", ": " ]
+            }, {
+              "r" : "304",
+              "s" : [ {
+                "value" : [ "{ " ]
+              }, {
+                "r" : "307",
+                "s" : [ {
+                  "r" : "305",
+                  "value" : [ "Interval[", "3", ",", "10", "]" ]
+                } ]
+              }, {
+                "value" : [ " }" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "313",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "314",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "315",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "304",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "310",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "224",
+              "localId" : "311",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "225",
+                "localId" : "312",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "221",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "222",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
-              "annotation" : [ ]
             }
-          }, {
+          },
+          "element" : [ {
             "type" : "Interval",
-            "localId" : "228",
+            "localId" : "307",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "229",
+              "localId" : "308",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "230",
+                "localId" : "309",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "226",
+              "localId" : "305",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
+              "value" : "3",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "227",
+              "localId" : "306",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
+              "value" : "10",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "239",
-        "name" : "IntCollapsePerUnit1",
+        "localId" : "318",
+        "name" : "IntCollapseSeparatedListPer3",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "239",
+            "r" : "318",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapsePerUnit1", ": " ]
+              "value" : [ "", "define ", "IntCollapseSeparatedListPer3", ": " ]
             }, {
-              "r" : "251",
+              "r" : "326",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "240",
+                "r" : "319",
                 "s" : [ {
-                  "value" : [ "IntIntervalList" ]
+                  "value" : [ "IntIntervalSeparatedList" ]
                 } ]
               }, {
-                "value" : [ " per " ]
-              }, {
-                "r" : "249",
-                "s" : [ {
-                  "r" : "245",
-                  "value" : [ "ToQuantity", "(", "1", ")" ]
-                } ]
+                "r" : "324",
+                "value" : [ " per ", "3" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "259",
+          "localId" : "334",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "260",
+            "localId" : "335",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "261",
+              "localId" : "336",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
@@ -198323,19 +227323,19 @@ module.exports['Collapse'] = {
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "251",
+          "localId" : "326",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "256",
+            "localId" : "331",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "257",
+              "localId" : "332",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "258",
+                "localId" : "333",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -198343,559 +227343,1421 @@ module.exports['Collapse'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "252",
+            "localId" : "327",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "253",
+              "localId" : "328",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "254",
+                "localId" : "329",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "255",
+            "localId" : "330",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "240",
-            "name" : "IntIntervalList",
+            "localId" : "319",
+            "name" : "IntIntervalSeparatedList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "241",
+              "localId" : "320",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "242",
+                "localId" : "321",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "243",
+                  "localId" : "322",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             }
           }, {
-            "type" : "ToQuantity",
-            "localId" : "249",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "325",
+            "value" : 3,
+            "unit" : "1",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "339",
+        "name" : "DateTime1_12Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "339",
+            "s" : [ {
+              "value" : [ "// DateTime Intervals\n", "define ", "DateTime1_12Interval", ": " ]
+            }, {
+              "r" : "388",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "356",
+                "s" : [ {
+                  "r" : "340",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "380",
+                "s" : [ {
+                  "r" : "364",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "12", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "391",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "392",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "388",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "389",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "390",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "356",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "250",
+              "localId" : "357",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "358",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "359",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "360",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "361",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "362",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "363",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "operand" : {
+            "year" : {
               "type" : "Literal",
-              "localId" : "245",
+              "localId" : "340",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "343",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "344",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "346",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "380",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "381",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "382",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "383",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "384",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "385",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "386",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "387",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "365",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "367",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "368",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "369",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "370",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "264",
-        "name" : "IntCollapseNoPer",
+        "localId" : "395",
+        "name" : "DateTime3_15Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "395",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseNoPer", ": " ]
+              "value" : [ "", "define ", "DateTime3_15Interval", ": " ]
             }, {
-              "r" : "270",
+              "r" : "444",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "Interval[" ]
               }, {
-                "r" : "265",
+                "r" : "412",
                 "s" : [ {
-                  "value" : [ "IntIntervalList" ]
+                  "r" : "396",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "436",
+                "s" : [ {
+                  "r" : "420",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "447",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "448",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "444",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "445",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "446",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "412",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "413",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "414",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "415",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "416",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "417",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "418",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "419",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "397",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "398",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "399",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "400",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "402",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "436",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "437",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "438",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "439",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "440",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "441",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "442",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "443",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "420",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "421",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "422",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "15",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "423",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "424",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "425",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "426",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "451",
+        "name" : "DateTime1_15Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "451",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTime1_15Interval", ": " ]
+            }, {
+              "r" : "500",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "468",
+                "s" : [ {
+                  "r" : "452",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "492",
+                "s" : [ {
+                  "r" : "476",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "503",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "504",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "500",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "501",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "502",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "468",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "469",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "470",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "471",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "472",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "473",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "474",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "475",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "452",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "453",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "454",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "455",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "456",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "457",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "458",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "492",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "493",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "494",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "495",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "496",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "497",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "498",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "499",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "476",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "477",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "478",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "15",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "479",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "480",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "481",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "482",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "507",
+        "name" : "DateTime1_15IntervalList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "507",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTime1_15IntervalList", ": " ]
+            }, {
+              "r" : "508",
+              "s" : [ {
+                "value" : [ "{ " ]
+              }, {
+                "r" : "509",
+                "s" : [ {
+                  "value" : [ "DateTime1_15Interval" ]
                 } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "278",
+          "localId" : "515",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "279",
+            "localId" : "516",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "280",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "517",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "270",
+          "type" : "List",
+          "localId" : "508",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "275",
+            "localId" : "512",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "276",
+              "localId" : "513",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "277",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "514",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "271",
+          "element" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "509",
+            "name" : "DateTime1_15Interval",
             "annotation" : [ ],
-            "elementType" : {
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "272",
+              "localId" : "510",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "273",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "511",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "274",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "265",
-            "name" : "IntIntervalList",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "266",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "267",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "268",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              }
-            }
-          }, {
-            "type" : "Null",
-            "localId" : "269",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "283",
-        "name" : "IntIntervalSeparatedList",
+        "localId" : "520",
+        "name" : "DateTimeCollapseNoPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "283",
+            "r" : "520",
             "s" : [ {
-              "value" : [ "", "define ", "IntIntervalSeparatedList", ": " ]
+              "value" : [ "", "define ", "DateTimeCollapseNoPer", ": " ]
             }, {
-              "r" : "284",
+              "r" : "532",
               "s" : [ {
-                "value" : [ "{ " ]
-              }, {
-                "r" : "287",
-                "s" : [ {
-                  "r" : "285",
-                  "value" : [ "Interval[", "3", ", ", "5", "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "collapse " ]
               }, {
-                "r" : "292",
+                "r" : "521",
                 "s" : [ {
-                  "r" : "290",
-                  "value" : [ "Interval[", "8", ", ", "10", "]" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "522",
+                  "s" : [ {
+                    "value" : [ "DateTime1_12Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "525",
+                  "s" : [ {
+                    "value" : [ "DateTime3_15Interval" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
-              }, {
-                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "298",
+          "localId" : "540",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "299",
+            "localId" : "541",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "300",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "542",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "284",
+          "type" : "Collapse",
+          "localId" : "532",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "295",
+            "localId" : "537",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "296",
+              "localId" : "538",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "297",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "539",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "287",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "533",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "288",
+              "localId" : "534",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "289",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "535",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "285",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "286",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
             }
           }, {
-            "type" : "Interval",
-            "localId" : "292",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "NamedTypeSpecifier",
+            "localId" : "536",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "521",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "293",
+              "type" : "ListTypeSpecifier",
+              "localId" : "528",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "294",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "529",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "530",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "290",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "291",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            }
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "522",
+              "name" : "DateTime1_12Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "523",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "524",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "525",
+              "name" : "DateTime3_15Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "526",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "527",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "531",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "303",
-        "name" : "ExpectedIntervalList",
+        "localId" : "545",
+        "name" : "DateTimeCollapsePerMs",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "303",
+            "r" : "545",
             "s" : [ {
-              "value" : [ "", "define ", "ExpectedIntervalList", ": " ]
+              "value" : [ "", "define ", "DateTimeCollapsePerMs", ": " ]
             }, {
-              "r" : "304",
+              "r" : "558",
               "s" : [ {
-                "value" : [ "{ " ]
+                "value" : [ "collapse " ]
               }, {
-                "r" : "307",
+                "r" : "546",
                 "s" : [ {
-                  "r" : "305",
-                  "value" : [ "Interval[", "3", ",", "10", "]" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "547",
+                  "s" : [ {
+                    "value" : [ "DateTime1_12Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "550",
+                  "s" : [ {
+                    "value" : [ "DateTime3_15Interval" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "313",
+          "localId" : "566",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "314",
+            "localId" : "567",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "315",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "568",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "304",
+          "type" : "Collapse",
+          "localId" : "558",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "310",
+            "localId" : "563",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "311",
+              "localId" : "564",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "312",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "565",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "307",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "559",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "308",
+              "localId" : "560",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "309",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "561",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "305",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "306",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
             }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "562",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "546",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "553",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "554",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "555",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "547",
+              "name" : "DateTime1_12Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "548",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "549",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "550",
+              "name" : "DateTime3_15Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "551",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "552",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "557",
+            "value" : 1.0,
+            "unit" : "millisecond",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "318",
-        "name" : "IntCollapseSeparatedListPer3",
+        "localId" : "571",
+        "name" : "DateTimeCollapsePerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "318",
+            "r" : "571",
             "s" : [ {
-              "value" : [ "", "define ", "IntCollapseSeparatedListPer3", ": " ]
+              "value" : [ "", "define ", "DateTimeCollapsePerDay", ": " ]
             }, {
-              "r" : "326",
+              "r" : "584",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "319",
+                "r" : "572",
                 "s" : [ {
-                  "value" : [ "IntIntervalSeparatedList" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "573",
+                  "s" : [ {
+                    "value" : [ "DateTime1_12Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "576",
+                  "s" : [ {
+                    "value" : [ "DateTime3_15Interval" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "324",
-                "value" : [ " per ", "3" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "334",
+          "localId" : "592",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "335",
+            "localId" : "593",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "336",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "594",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "326",
+          "localId" : "584",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "331",
+            "localId" : "589",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "332",
+              "localId" : "590",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "333",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "591",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "327",
+            "localId" : "585",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "328",
+              "localId" : "586",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "329",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "587",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "330",
+            "localId" : "588",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "319",
-            "name" : "IntIntervalSeparatedList",
+            "type" : "List",
+            "localId" : "572",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "320",
+              "localId" : "579",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "321",
+                "localId" : "580",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "322",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "581",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
-            }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "573",
+              "name" : "DateTime1_12Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "574",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "575",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "576",
+              "name" : "DateTime3_15Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "577",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "578",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
           }, {
             "type" : "Quantity",
-            "localId" : "325",
-            "value" : 3,
-            "unit" : "1",
+            "localId" : "583",
+            "value" : 1.0,
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "339",
-        "name" : "DateTime1_12Interval",
+        "localId" : "597",
+        "name" : "Date1_12Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "339",
+            "r" : "597",
             "s" : [ {
-              "value" : [ "// DateTime Intervals\n", "define ", "DateTime1_12Interval", ": " ]
+              "value" : [ "// Date Intervals\n", "define ", "Date1_12Interval", ": " ]
             }, {
-              "r" : "388",
+              "r" : "622",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "356",
+                "r" : "606",
                 "s" : [ {
-                  "r" : "340",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "598",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "380",
+                "r" : "618",
                 "s" : [ {
-                  "r" : "364",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "12", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "610",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "12", ")" ]
                 } ]
               }, {
                 "value" : [ "]" ]
@@ -198905,76 +228767,56 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "391",
+          "localId" : "625",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "392",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "626",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "388",
+          "localId" : "622",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "389",
+            "localId" : "623",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "390",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "624",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           },
           "low" : {
-            "type" : "DateTime",
-            "localId" : "356",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Date",
+            "localId" : "606",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "357",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "358",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "359",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "360",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "361",
+              "localId" : "607",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "362",
+              "localId" : "608",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "363",
+              "localId" : "609",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "340",
+              "localId" : "598",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -198982,7 +228824,7 @@ module.exports['Collapse'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "341",
+              "localId" : "599",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -198990,89 +228832,148 @@ module.exports['Collapse'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "342",
+              "localId" : "600",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "343",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "344",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "345",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "346",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             }
           },
           "high" : {
-            "type" : "DateTime",
-            "localId" : "380",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Date",
+            "localId" : "618",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "381",
+              "localId" : "619",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "382",
+              "localId" : "620",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "383",
+              "localId" : "621",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "610",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "611",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "612",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "12",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "629",
+        "name" : "Date1_2Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "629",
+            "s" : [ {
+              "value" : [ "", "define ", "Date1_2Interval", ": " ]
             }, {
+              "r" : "654",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "638",
+                "s" : [ {
+                  "r" : "630",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "650",
+                "s" : [ {
+                  "r" : "642",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "2", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "657",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "658",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "654",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "655",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "384",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "656",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
-            }, {
+            }
+          },
+          "low" : {
+            "type" : "Date",
+            "localId" : "638",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "385",
+              "localId" : "639",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "386",
+              "localId" : "640",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "387",
+              "localId" : "641",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "364",
+              "localId" : "630",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -199080,7 +228981,7 @@ module.exports['Collapse'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "365",
+              "localId" : "631",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -199088,75 +228989,89 @@ module.exports['Collapse'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "366",
+              "localId" : "632",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
+              "value" : "1",
               "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "367",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+            }
+          },
+          "high" : {
+            "type" : "Date",
+            "localId" : "650",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "651",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            },
-            "minute" : {
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "652",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "653",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
               "type" : "Literal",
-              "localId" : "368",
+              "localId" : "642",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "2012",
               "annotation" : [ ]
             },
-            "second" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "369",
+              "localId" : "643",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "1",
               "annotation" : [ ]
             },
-            "millisecond" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "370",
+              "localId" : "644",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "2",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "395",
-        "name" : "DateTime3_15Interval",
+        "localId" : "661",
+        "name" : "Date3_15Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "395",
+            "r" : "661",
             "s" : [ {
-              "value" : [ "", "define ", "DateTime3_15Interval", ": " ]
+              "value" : [ "", "define ", "Date3_15Interval", ": " ]
             }, {
-              "r" : "444",
+              "r" : "686",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "412",
+                "r" : "670",
                 "s" : [ {
-                  "r" : "396",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "3", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "662",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "436",
+                "r" : "682",
                 "s" : [ {
-                  "r" : "420",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "674",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ "]" ]
@@ -199166,76 +229081,56 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "447",
+          "localId" : "689",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "448",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "690",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "444",
+          "localId" : "686",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "445",
+            "localId" : "687",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "446",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "688",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           },
           "low" : {
-            "type" : "DateTime",
-            "localId" : "412",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Date",
+            "localId" : "670",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "413",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "414",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "415",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "416",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "417",
+              "localId" : "671",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "418",
+              "localId" : "672",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "419",
+              "localId" : "673",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "396",
+              "localId" : "662",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -199243,7 +229138,7 @@ module.exports['Collapse'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "397",
+              "localId" : "663",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -199251,89 +229146,148 @@ module.exports['Collapse'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "398",
+              "localId" : "664",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "399",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "400",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "401",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "402",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             }
           },
           "high" : {
-            "type" : "DateTime",
-            "localId" : "436",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Date",
+            "localId" : "682",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "437",
+              "localId" : "683",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "438",
+              "localId" : "684",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "439",
+              "localId" : "685",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "674",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "675",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "676",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "15",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "693",
+        "name" : "Date4_15Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "693",
+            "s" : [ {
+              "value" : [ "", "define ", "Date4_15Interval", ": " ]
             }, {
+              "r" : "718",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "702",
+                "s" : [ {
+                  "r" : "694",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "4", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "714",
+                "s" : [ {
+                  "r" : "706",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "15", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "721",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "722",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "718",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "719",
+            "annotation" : [ ],
+            "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "440",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "720",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
-            }, {
+            }
+          },
+          "low" : {
+            "type" : "Date",
+            "localId" : "702",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "441",
+              "localId" : "703",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "442",
+              "localId" : "704",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "443",
+              "localId" : "705",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "420",
+              "localId" : "694",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -199341,7 +229295,7 @@ module.exports['Collapse'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "421",
+              "localId" : "695",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -199349,75 +229303,89 @@ module.exports['Collapse'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "422",
+              "localId" : "696",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "15",
+              "value" : "4",
               "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "423",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+            }
+          },
+          "high" : {
+            "type" : "Date",
+            "localId" : "714",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "715",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
-            },
-            "minute" : {
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "716",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "717",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
               "type" : "Literal",
-              "localId" : "424",
+              "localId" : "706",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "2012",
               "annotation" : [ ]
             },
-            "second" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "425",
+              "localId" : "707",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "1",
               "annotation" : [ ]
             },
-            "millisecond" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "426",
+              "localId" : "708",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "value" : "15",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "451",
-        "name" : "DateTime1_15Interval",
+        "localId" : "725",
+        "name" : "Date1_15Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "451",
+            "r" : "725",
             "s" : [ {
-              "value" : [ "", "define ", "DateTime1_15Interval", ": " ]
+              "value" : [ "", "define ", "Date1_15Interval", ": " ]
             }, {
-              "r" : "500",
+              "r" : "750",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "468",
+                "r" : "734",
                 "s" : [ {
-                  "r" : "452",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "726",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "492",
+                "r" : "746",
                 "s" : [ {
-                  "r" : "476",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "15", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "738",
+                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ "]" ]
@@ -199427,76 +229395,56 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "503",
+          "localId" : "753",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "504",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "localId" : "754",
+            "name" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "500",
+          "localId" : "750",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "501",
+            "localId" : "751",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "502",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "752",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           },
           "low" : {
-            "type" : "DateTime",
-            "localId" : "468",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Date",
+            "localId" : "734",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "469",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "470",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "471",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "472",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "473",
+              "localId" : "735",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "474",
+              "localId" : "736",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "475",
+              "localId" : "737",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "452",
+              "localId" : "726",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -199504,7 +229452,7 @@ module.exports['Collapse'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "453",
+              "localId" : "727",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -199512,89 +229460,37 @@ module.exports['Collapse'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "454",
+              "localId" : "728",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "455",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "456",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "457",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "458",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             }
           },
           "high" : {
-            "type" : "DateTime",
-            "localId" : "492",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "Date",
+            "localId" : "746",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "493",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "494",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "495",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "496",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "497",
+              "localId" : "747",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "498",
+              "localId" : "748",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "499",
+              "localId" : "749",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "476",
+              "localId" : "738",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -199602,7 +229498,7 @@ module.exports['Collapse'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "477",
+              "localId" : "739",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -199610,161 +229506,360 @@ module.exports['Collapse'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "478",
+              "localId" : "740",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
               "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "479",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "480",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "481",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "482",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "507",
-        "name" : "DateTime1_15IntervalList",
+        "localId" : "757",
+        "name" : "OverlappingDateCollapseNoPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "507",
+            "r" : "757",
             "s" : [ {
-              "value" : [ "", "define ", "DateTime1_15IntervalList", ": " ]
+              "value" : [ "", "define ", "OverlappingDateCollapseNoPer", ": " ]
             }, {
-              "r" : "508",
+              "r" : "769",
               "s" : [ {
-                "value" : [ "{ " ]
+                "value" : [ "collapse " ]
               }, {
-                "r" : "509",
+                "r" : "758",
                 "s" : [ {
-                  "value" : [ "DateTime1_15Interval" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "759",
+                  "s" : [ {
+                    "value" : [ "Date1_12Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "762",
+                  "s" : [ {
+                    "value" : [ "Date3_15Interval" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "515",
+          "localId" : "777",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "516",
+            "localId" : "778",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "517",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "779",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "508",
+          "type" : "Collapse",
+          "localId" : "769",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "512",
+            "localId" : "774",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "513",
+              "localId" : "775",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "514",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "776",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "509",
-            "name" : "DateTime1_15Interval",
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "770",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "771",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "772",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "773",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "758",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "765",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "766",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "767",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "759",
+              "name" : "Date1_12Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "760",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "761",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "762",
+              "name" : "Date3_15Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "763",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "764",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "768",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "782",
+        "name" : "AdjacentDateCollapseNoPer",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "782",
+            "s" : [ {
+              "value" : [ "", "define ", "AdjacentDateCollapseNoPer", ": " ]
+            }, {
+              "r" : "794",
+              "s" : [ {
+                "value" : [ "collapse " ]
+              }, {
+                "r" : "783",
+                "s" : [ {
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "784",
+                  "s" : [ {
+                    "value" : [ "Date1_2Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "787",
+                  "s" : [ {
+                    "value" : [ "Date3_15Interval" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "802",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "803",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "804",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "794",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "799",
+            "annotation" : [ ],
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "510",
+              "localId" : "800",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "511",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "801",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "795",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "796",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "797",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "798",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "783",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "790",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "791",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "792",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "784",
+              "name" : "Date1_2Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "785",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "786",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "787",
+              "name" : "Date3_15Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "788",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "789",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "793",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "520",
-        "name" : "DateTimeCollapseNoPer",
+        "localId" : "807",
+        "name" : "DisjointDateCollapseNoPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "520",
+            "r" : "807",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeCollapseNoPer", ": " ]
+              "value" : [ "", "define ", "DisjointDateCollapseNoPer", ": " ]
             }, {
-              "r" : "532",
+              "r" : "819",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "521",
+                "r" : "808",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "522",
+                  "r" : "809",
                   "s" : [ {
-                    "value" : [ "DateTime1_12Interval" ]
+                    "value" : [ "Date1_2Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "525",
+                  "r" : "812",
                   "s" : [ {
-                    "value" : [ "DateTime3_15Interval" ]
+                    "value" : [ "Date4_15Interval" ]
                   } ]
                 }, {
-                  "value" : [ "}" ]
+                  "value" : [ " }" ]
                 } ]
               } ]
             } ]
@@ -199772,468 +229867,468 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "540",
+          "localId" : "827",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "541",
+            "localId" : "828",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "542",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "829",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "532",
+          "localId" : "819",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "537",
+            "localId" : "824",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "538",
+              "localId" : "825",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "539",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "826",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "533",
+            "localId" : "820",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "534",
+              "localId" : "821",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "535",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "822",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "536",
+            "localId" : "823",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "521",
+            "localId" : "808",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "528",
+              "localId" : "815",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "529",
+                "localId" : "816",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "530",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "817",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "ExpressionRef",
-              "localId" : "522",
-              "name" : "DateTime1_12Interval",
+              "localId" : "809",
+              "name" : "Date1_2Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "523",
+                "localId" : "810",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "524",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "811",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
-              "localId" : "525",
-              "name" : "DateTime3_15Interval",
+              "localId" : "812",
+              "name" : "Date4_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "526",
+                "localId" : "813",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "527",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "814",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Null",
-            "localId" : "531",
+            "localId" : "818",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "545",
-        "name" : "DateTimeCollapsePerMs",
+        "localId" : "832",
+        "name" : "DateCollapsePerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "545",
+            "r" : "832",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeCollapsePerMs", ": " ]
+              "value" : [ "", "define ", "DateCollapsePerDay", ": " ]
             }, {
-              "r" : "558",
+              "r" : "845",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "546",
+                "r" : "833",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "547",
+                  "r" : "834",
                   "s" : [ {
-                    "value" : [ "DateTime1_12Interval" ]
+                    "value" : [ "Date1_2Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "550",
+                  "r" : "837",
                   "s" : [ {
-                    "value" : [ "DateTime3_15Interval" ]
+                    "value" : [ "Date4_15Interval" ]
                   } ]
                 }, {
-                  "value" : [ "}" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "millisecond" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "566",
+          "localId" : "853",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "567",
+            "localId" : "854",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "568",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "855",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "558",
+          "localId" : "845",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "563",
+            "localId" : "850",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "564",
+              "localId" : "851",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "565",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "852",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "559",
+            "localId" : "846",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "560",
+              "localId" : "847",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "561",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "848",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "562",
+            "localId" : "849",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "546",
+            "localId" : "833",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "553",
+              "localId" : "840",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "554",
+                "localId" : "841",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "555",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "842",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "ExpressionRef",
-              "localId" : "547",
-              "name" : "DateTime1_12Interval",
+              "localId" : "834",
+              "name" : "Date1_2Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "548",
+                "localId" : "835",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "549",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "836",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
-              "localId" : "550",
-              "name" : "DateTime3_15Interval",
+              "localId" : "837",
+              "name" : "Date4_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "551",
+                "localId" : "838",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "552",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "839",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "557",
+            "localId" : "844",
             "value" : 1.0,
-            "unit" : "millisecond",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "571",
-        "name" : "DateTimeCollapsePerDay",
+        "localId" : "858",
+        "name" : "DateCollapsePerMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "571",
+            "r" : "858",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeCollapsePerDay", ": " ]
+              "value" : [ "", "define ", "DateCollapsePerMonth", ": " ]
             }, {
-              "r" : "584",
+              "r" : "871",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "572",
+                "r" : "859",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "573",
+                  "r" : "860",
                   "s" : [ {
-                    "value" : [ "DateTime1_12Interval" ]
+                    "value" : [ "Date1_2Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "576",
+                  "r" : "863",
                   "s" : [ {
-                    "value" : [ "DateTime3_15Interval" ]
+                    "value" : [ "Date4_15Interval" ]
                   } ]
                 }, {
-                  "value" : [ "}" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "592",
+          "localId" : "879",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "593",
+            "localId" : "880",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "594",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "881",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "584",
+          "localId" : "871",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "589",
+            "localId" : "876",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "590",
+              "localId" : "877",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "591",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "878",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "585",
+            "localId" : "872",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "586",
+              "localId" : "873",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "587",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "874",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "588",
+            "localId" : "875",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "572",
+            "localId" : "859",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "579",
+              "localId" : "866",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "580",
+                "localId" : "867",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "581",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "868",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "ExpressionRef",
-              "localId" : "573",
-              "name" : "DateTime1_12Interval",
+              "localId" : "860",
+              "name" : "Date1_2Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "574",
+                "localId" : "861",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "575",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "862",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
-              "localId" : "576",
-              "name" : "DateTime3_15Interval",
+              "localId" : "863",
+              "name" : "Date4_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "577",
+                "localId" : "864",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "578",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "865",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "583",
+            "localId" : "870",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "597",
-        "name" : "Date1_12Interval",
+        "localId" : "884",
+        "name" : "Time1_12Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "597",
+            "r" : "884",
             "s" : [ {
-              "value" : [ "// Date Intervals\n", "define ", "Date1_12Interval", ": " ]
+              "value" : [ "// Time Intervals\n", "define ", "Time1_12Interval", ": " ]
             }, {
-              "r" : "622",
+              "r" : "909",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "606",
+                "r" : "893",
                 "s" : [ {
-                  "r" : "598",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                  "r" : "885",
+                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "1", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "618",
+                "r" : "905",
                 "s" : [ {
-                  "r" : "610",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "12", ")" ]
+                  "r" : "897",
+                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "12", ")" ]
                 } ]
               }, {
                 "value" : [ "]" ]
@@ -200243,72 +230338,72 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "625",
+          "localId" : "912",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "626",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "localId" : "913",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "622",
+          "localId" : "909",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "623",
+            "localId" : "910",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "624",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "911",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           },
           "low" : {
-            "type" : "Date",
-            "localId" : "606",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "Time",
+            "localId" : "893",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "607",
+              "localId" : "894",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "608",
+              "localId" : "895",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "609",
+              "localId" : "896",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "598",
+              "localId" : "885",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "599",
+              "localId" : "886",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "600",
+              "localId" : "887",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -200316,45 +230411,45 @@ module.exports['Collapse'] = {
             }
           },
           "high" : {
-            "type" : "Date",
-            "localId" : "618",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "Time",
+            "localId" : "905",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "619",
+              "localId" : "906",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "620",
+              "localId" : "907",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "621",
+              "localId" : "908",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "610",
+              "localId" : "897",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "611",
+              "localId" : "898",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "612",
+              "localId" : "899",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -200363,34 +230458,34 @@ module.exports['Collapse'] = {
           }
         }
       }, {
-        "localId" : "629",
-        "name" : "Date1_2Interval",
+        "localId" : "916",
+        "name" : "Time1_2Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "629",
+            "r" : "916",
             "s" : [ {
-              "value" : [ "", "define ", "Date1_2Interval", ": " ]
+              "value" : [ "", "define ", "Time1_2Interval", ": " ]
             }, {
-              "r" : "654",
+              "r" : "941",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "638",
+                "r" : "925",
                 "s" : [ {
-                  "r" : "630",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                  "r" : "917",
+                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "1", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "650",
+                "r" : "937",
                 "s" : [ {
-                  "r" : "642",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "2", ")" ]
+                  "r" : "929",
+                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "2", ")" ]
                 } ]
               }, {
                 "value" : [ "]" ]
@@ -200400,72 +230495,72 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "657",
+          "localId" : "944",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "658",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "localId" : "945",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "654",
+          "localId" : "941",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "655",
+            "localId" : "942",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "656",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "943",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           },
           "low" : {
-            "type" : "Date",
-            "localId" : "638",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "Time",
+            "localId" : "925",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "639",
+              "localId" : "926",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "640",
+              "localId" : "927",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "641",
+              "localId" : "928",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "630",
+              "localId" : "917",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "631",
+              "localId" : "918",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "632",
+              "localId" : "919",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -200473,45 +230568,45 @@ module.exports['Collapse'] = {
             }
           },
           "high" : {
-            "type" : "Date",
-            "localId" : "650",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "Time",
+            "localId" : "937",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "651",
+              "localId" : "938",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "652",
+              "localId" : "939",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "653",
+              "localId" : "940",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "642",
+              "localId" : "929",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "643",
+              "localId" : "930",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "644",
+              "localId" : "931",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -200520,34 +230615,34 @@ module.exports['Collapse'] = {
           }
         }
       }, {
-        "localId" : "661",
-        "name" : "Date3_15Interval",
+        "localId" : "948",
+        "name" : "Time3_15Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "661",
+            "r" : "948",
             "s" : [ {
-              "value" : [ "", "define ", "Date3_15Interval", ": " ]
+              "value" : [ "", "define ", "Time3_15Interval", ": " ]
             }, {
-              "r" : "686",
+              "r" : "973",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "670",
+                "r" : "957",
                 "s" : [ {
-                  "r" : "662",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "3", ")" ]
+                  "r" : "949",
+                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "3", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "682",
+                "r" : "969",
                 "s" : [ {
-                  "r" : "674",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "15", ")" ]
+                  "r" : "961",
+                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ "]" ]
@@ -200557,72 +230652,72 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "689",
+          "localId" : "976",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "690",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "localId" : "977",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "686",
+          "localId" : "973",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "687",
+            "localId" : "974",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "688",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "975",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           },
           "low" : {
-            "type" : "Date",
-            "localId" : "670",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "Time",
+            "localId" : "957",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "671",
+              "localId" : "958",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "672",
+              "localId" : "959",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "673",
+              "localId" : "960",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "662",
+              "localId" : "949",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "663",
+              "localId" : "950",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "664",
+              "localId" : "951",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -200630,45 +230725,45 @@ module.exports['Collapse'] = {
             }
           },
           "high" : {
-            "type" : "Date",
-            "localId" : "682",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "Time",
+            "localId" : "969",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "683",
+              "localId" : "970",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "684",
+              "localId" : "971",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "685",
+              "localId" : "972",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "674",
+              "localId" : "961",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "675",
+              "localId" : "962",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "676",
+              "localId" : "963",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -200677,34 +230772,34 @@ module.exports['Collapse'] = {
           }
         }
       }, {
-        "localId" : "693",
-        "name" : "Date4_15Interval",
+        "localId" : "980",
+        "name" : "Time4_15Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "693",
+            "r" : "980",
             "s" : [ {
-              "value" : [ "", "define ", "Date4_15Interval", ": " ]
+              "value" : [ "", "define ", "Time4_15Interval", ": " ]
             }, {
-              "r" : "718",
+              "r" : "1005",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "702",
+                "r" : "989",
                 "s" : [ {
-                  "r" : "694",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "4", ")" ]
+                  "r" : "981",
+                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "4", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "714",
+                "r" : "1001",
                 "s" : [ {
-                  "r" : "706",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "15", ")" ]
+                  "r" : "993",
+                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ "]" ]
@@ -200714,72 +230809,72 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "721",
+          "localId" : "1008",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "722",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "localId" : "1009",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "718",
+          "localId" : "1005",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "719",
+            "localId" : "1006",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "720",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "1007",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           },
           "low" : {
-            "type" : "Date",
-            "localId" : "702",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "Time",
+            "localId" : "989",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "703",
+              "localId" : "990",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "704",
+              "localId" : "991",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "705",
+              "localId" : "992",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "694",
+              "localId" : "981",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "695",
+              "localId" : "982",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "696",
+              "localId" : "983",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -200787,45 +230882,45 @@ module.exports['Collapse'] = {
             }
           },
           "high" : {
-            "type" : "Date",
-            "localId" : "714",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "Time",
+            "localId" : "1001",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "715",
+              "localId" : "1002",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "716",
+              "localId" : "1003",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "717",
+              "localId" : "1004",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "706",
+              "localId" : "993",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "707",
+              "localId" : "994",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "708",
+              "localId" : "995",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -200834,34 +230929,34 @@ module.exports['Collapse'] = {
           }
         }
       }, {
-        "localId" : "725",
-        "name" : "Date1_15Interval",
+        "localId" : "1012",
+        "name" : "Time1_15Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "725",
+            "r" : "1012",
             "s" : [ {
-              "value" : [ "", "define ", "Date1_15Interval", ": " ]
+              "value" : [ "", "define ", "Time1_15Interval", ": " ]
             }, {
-              "r" : "750",
+              "r" : "1037",
               "s" : [ {
                 "value" : [ "Interval[" ]
               }, {
-                "r" : "734",
+                "r" : "1021",
                 "s" : [ {
-                  "r" : "726",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "1", ")" ]
+                  "r" : "1013",
+                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "1", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "746",
+                "r" : "1033",
                 "s" : [ {
-                  "r" : "738",
-                  "value" : [ "Date", "(", "2012", ", ", "1", ", ", "15", ")" ]
+                  "r" : "1025",
+                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "15", ")" ]
                 } ]
               }, {
                 "value" : [ "]" ]
@@ -200871,72 +230966,72 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "IntervalTypeSpecifier",
-          "localId" : "753",
+          "localId" : "1040",
           "annotation" : [ ],
           "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "754",
-            "name" : "{urn:hl7-org:elm-types:r1}Date",
+            "localId" : "1041",
+            "name" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Interval",
-          "localId" : "750",
+          "localId" : "1037",
           "lowClosed" : true,
           "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "751",
+            "localId" : "1038",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "752",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "1039",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           },
           "low" : {
-            "type" : "Date",
-            "localId" : "734",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "Time",
+            "localId" : "1021",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "735",
+              "localId" : "1022",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "736",
+              "localId" : "1023",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "737",
+              "localId" : "1024",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "726",
+              "localId" : "1013",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "727",
+              "localId" : "1014",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "728",
+              "localId" : "1015",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -200944,45 +231039,45 @@ module.exports['Collapse'] = {
             }
           },
           "high" : {
-            "type" : "Date",
-            "localId" : "746",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+            "type" : "Time",
+            "localId" : "1033",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "747",
+              "localId" : "1034",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "748",
+              "localId" : "1035",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "749",
+              "localId" : "1036",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "year" : {
+            "hour" : {
               "type" : "Literal",
-              "localId" : "738",
+              "localId" : "1025",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "month" : {
+            "minute" : {
               "type" : "Literal",
-              "localId" : "739",
+              "localId" : "1026",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "0",
               "annotation" : [ ]
             },
-            "day" : {
+            "second" : {
               "type" : "Literal",
-              "localId" : "740",
+              "localId" : "1027",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -200991,36 +231086,36 @@ module.exports['Collapse'] = {
           }
         }
       }, {
-        "localId" : "757",
-        "name" : "OverlappingDateCollapseNoPer",
+        "localId" : "1044",
+        "name" : "OverlappingTimeCollapseNoPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "757",
+            "r" : "1044",
             "s" : [ {
-              "value" : [ "", "define ", "OverlappingDateCollapseNoPer", ": " ]
+              "value" : [ "", "define ", "OverlappingTimeCollapseNoPer", ": " ]
             }, {
-              "r" : "769",
+              "r" : "1056",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "758",
+                "r" : "1045",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "759",
+                  "r" : "1046",
                   "s" : [ {
-                    "value" : [ "Date1_12Interval" ]
+                    "value" : [ "Time1_12Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "762",
+                  "r" : "1049",
                   "s" : [ {
-                    "value" : [ "Date3_15Interval" ]
+                    "value" : [ "Time3_15Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -201031,152 +231126,152 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "777",
+          "localId" : "1064",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "778",
+            "localId" : "1065",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "779",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "1066",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "769",
+          "localId" : "1056",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "774",
+            "localId" : "1061",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "775",
+              "localId" : "1062",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "776",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1063",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "770",
+            "localId" : "1057",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "771",
+              "localId" : "1058",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "772",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1059",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "773",
+            "localId" : "1060",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "758",
+            "localId" : "1045",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "765",
+              "localId" : "1052",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "766",
+                "localId" : "1053",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "767",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1054",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "ExpressionRef",
-              "localId" : "759",
-              "name" : "Date1_12Interval",
+              "localId" : "1046",
+              "name" : "Time1_12Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "760",
+                "localId" : "1047",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "761",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1048",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
-              "localId" : "762",
-              "name" : "Date3_15Interval",
+              "localId" : "1049",
+              "name" : "Time3_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "763",
+                "localId" : "1050",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "764",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1051",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Null",
-            "localId" : "768",
+            "localId" : "1055",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "782",
-        "name" : "AdjacentDateCollapseNoPer",
+        "localId" : "1069",
+        "name" : "AdjacentTimeCollapseNoPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "782",
+            "r" : "1069",
             "s" : [ {
-              "value" : [ "", "define ", "AdjacentDateCollapseNoPer", ": " ]
+              "value" : [ "", "define ", "AdjacentTimeCollapseNoPer", ": " ]
             }, {
-              "r" : "794",
+              "r" : "1081",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "783",
+                "r" : "1070",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "784",
+                  "r" : "1071",
                   "s" : [ {
-                    "value" : [ "Date1_2Interval" ]
+                    "value" : [ "Time1_2Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "787",
+                  "r" : "1074",
                   "s" : [ {
-                    "value" : [ "Date3_15Interval" ]
+                    "value" : [ "Time3_15Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -201187,152 +231282,152 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "802",
+          "localId" : "1089",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "803",
+            "localId" : "1090",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "804",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "1091",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "794",
+          "localId" : "1081",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "799",
+            "localId" : "1086",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "800",
+              "localId" : "1087",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "801",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1088",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "795",
+            "localId" : "1082",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "796",
+              "localId" : "1083",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "797",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1084",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "798",
+            "localId" : "1085",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "783",
+            "localId" : "1070",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "790",
+              "localId" : "1077",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "791",
+                "localId" : "1078",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "792",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1079",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "ExpressionRef",
-              "localId" : "784",
-              "name" : "Date1_2Interval",
+              "localId" : "1071",
+              "name" : "Time1_2Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "785",
+                "localId" : "1072",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "786",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1073",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
-              "localId" : "787",
-              "name" : "Date3_15Interval",
+              "localId" : "1074",
+              "name" : "Time3_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "788",
+                "localId" : "1075",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "789",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1076",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Null",
-            "localId" : "793",
+            "localId" : "1080",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "807",
-        "name" : "DisjointDateCollapseNoPer",
+        "localId" : "1094",
+        "name" : "DisjointTimeCollapseNoPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "807",
+            "r" : "1094",
             "s" : [ {
-              "value" : [ "", "define ", "DisjointDateCollapseNoPer", ": " ]
+              "value" : [ "", "define ", "DisjointTimeCollapseNoPer", ": " ]
             }, {
-              "r" : "819",
+              "r" : "1106",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "808",
+                "r" : "1095",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "809",
+                  "r" : "1096",
                   "s" : [ {
-                    "value" : [ "Date1_2Interval" ]
+                    "value" : [ "Time1_2Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "812",
+                  "r" : "1099",
                   "s" : [ {
-                    "value" : [ "Date4_15Interval" ]
+                    "value" : [ "Time4_15Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -201343,2043 +231438,2440 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "827",
+          "localId" : "1114",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "828",
+            "localId" : "1115",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "829",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "1116",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "819",
+          "localId" : "1106",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "824",
+            "localId" : "1111",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "825",
+              "localId" : "1112",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "826",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1113",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "820",
+            "localId" : "1107",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "821",
+              "localId" : "1108",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "822",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1109",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "823",
+            "localId" : "1110",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "808",
+            "localId" : "1095",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "815",
+              "localId" : "1102",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "816",
+                "localId" : "1103",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "817",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1104",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "ExpressionRef",
-              "localId" : "809",
-              "name" : "Date1_2Interval",
+              "localId" : "1096",
+              "name" : "Time1_2Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "810",
+                "localId" : "1097",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "811",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1098",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
-              "localId" : "812",
-              "name" : "Date4_15Interval",
+              "localId" : "1099",
+              "name" : "Time4_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "813",
+                "localId" : "1100",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "814",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1101",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Null",
-            "localId" : "818",
+            "localId" : "1105",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "832",
-        "name" : "DateCollapsePerDay",
+        "localId" : "1119",
+        "name" : "TimeCollapsePerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "832",
+            "r" : "1119",
             "s" : [ {
-              "value" : [ "", "define ", "DateCollapsePerDay", ": " ]
+              "value" : [ "", "define ", "TimeCollapsePerSecond", ": " ]
             }, {
-              "r" : "845",
+              "r" : "1132",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "833",
+                "r" : "1120",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "834",
+                  "r" : "1121",
                   "s" : [ {
-                    "value" : [ "Date1_2Interval" ]
+                    "value" : [ "Time1_2Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "837",
+                  "r" : "1124",
                   "s" : [ {
-                    "value" : [ "Date4_15Interval" ]
+                    "value" : [ "Time4_15Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "853",
+          "localId" : "1140",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "854",
+            "localId" : "1141",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "855",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "1142",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "845",
+          "localId" : "1132",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "850",
+            "localId" : "1137",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "851",
+              "localId" : "1138",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "852",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1139",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "846",
+            "localId" : "1133",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "847",
+              "localId" : "1134",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "848",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1135",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "849",
+            "localId" : "1136",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "833",
+            "localId" : "1120",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "840",
+              "localId" : "1127",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "841",
+                "localId" : "1128",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "842",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1129",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "ExpressionRef",
-              "localId" : "834",
-              "name" : "Date1_2Interval",
+              "localId" : "1121",
+              "name" : "Time1_2Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "835",
+                "localId" : "1122",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "836",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1123",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             }, {
               "type" : "ExpressionRef",
-              "localId" : "837",
-              "name" : "Date4_15Interval",
+              "localId" : "1124",
+              "name" : "Time4_15Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "838",
+                "localId" : "1125",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "839",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1126",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "844",
+            "localId" : "1131",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "858",
-        "name" : "DateCollapsePerMonth",
+        "localId" : "1145",
+        "name" : "TimeCollapsePerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "858",
+            "r" : "1145",
             "s" : [ {
-              "value" : [ "", "define ", "DateCollapsePerMonth", ": " ]
+              "value" : [ "", "define ", "TimeCollapsePerMinute", ": " ]
             }, {
-              "r" : "871",
+              "r" : "1158",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "859",
+                "r" : "1146",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "860",
+                  "r" : "1147",
                   "s" : [ {
-                    "value" : [ "Date1_2Interval" ]
+                    "value" : [ "Time1_2Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "863",
+                  "r" : "1150",
                   "s" : [ {
-                    "value" : [ "Date4_15Interval" ]
+                    "value" : [ "Time4_15Interval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "minute" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "1166",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1167",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1168",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "1158",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1163",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1164",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1165",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1159",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1160",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1161",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1162",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "1146",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "1153",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1154",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1155",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "1147",
+              "name" : "Time1_2Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1148",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1149",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "1150",
+              "name" : "Time4_15Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1151",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1152",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "1157",
+            "value" : 1.0,
+            "unit" : "minute",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1171",
+        "name" : "QuantityIntervalList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1171",
+            "s" : [ {
+              "value" : [ "// Quantity Intervals with default units\n", "define ", "QuantityIntervalList", ": " ]
+            }, {
+              "r" : "1172",
+              "s" : [ {
+                "value" : [ "{ " ]
+              }, {
+                "r" : "1185",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1177",
+                  "s" : [ {
+                    "r" : "1173",
+                    "value" : [ "ToQuantity", "(", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1183",
+                  "s" : [ {
+                    "r" : "1179",
+                    "value" : [ "ToQuantity", "(", "4", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "1200",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1192",
+                  "s" : [ {
+                    "r" : "1188",
+                    "value" : [ "ToQuantity", "(", "4", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1198",
+                  "s" : [ {
+                    "r" : "1194",
+                    "value" : [ "ToQuantity", "(", "8", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ " }" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "1206",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1207",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1208",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "1172",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1203",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1204",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1205",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "1185",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1186",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1187",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "1177",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1178",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1173",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "1183",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1184",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1179",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1200",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1201",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1202",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "1192",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1193",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1188",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "1198",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1199",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1194",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "8",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1211",
+        "name" : "ExpectedQuantityList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1211",
+            "s" : [ {
+              "value" : [ "", "define ", "ExpectedQuantityList", ": " ]
+            }, {
+              "r" : "1212",
+              "s" : [ {
+                "value" : [ "{ " ]
+              }, {
+                "r" : "1225",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1217",
+                  "s" : [ {
+                    "r" : "1213",
+                    "value" : [ "ToQuantity", "(", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1223",
+                  "s" : [ {
+                    "r" : "1219",
+                    "value" : [ "ToQuantity", "(", "8", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ " }" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "1231",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1232",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1233",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "1212",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1228",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1229",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1230",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "1225",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1226",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1227",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "1217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1218",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1213",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "1223",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1219",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "8",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1236",
+        "name" : "QuantityIntervalCollapseNoPer",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1236",
+            "s" : [ {
+              "value" : [ "", "define ", "QuantityIntervalCollapseNoPer", ": " ]
+            }, {
+              "r" : "1242",
+              "s" : [ {
+                "value" : [ "collapse " ]
+              }, {
+                "r" : "1237",
+                "s" : [ {
+                  "value" : [ "QuantityIntervalList" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "1250",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1251",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1252",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "1242",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1247",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1248",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1249",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1243",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1244",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1245",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1246",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1237",
+            "name" : "QuantityIntervalList",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "1238",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1239",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1240",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "Null",
+            "localId" : "1241",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1255",
+        "name" : "QuantityIntervalCollapsePerUnit1",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1255",
+            "s" : [ {
+              "value" : [ "", "define ", "QuantityIntervalCollapsePerUnit1", ": " ]
+            }, {
+              "r" : "1267",
+              "s" : [ {
+                "value" : [ "collapse " ]
+              }, {
+                "r" : "1256",
+                "s" : [ {
+                  "value" : [ "QuantityIntervalList" ]
+                } ]
+              }, {
+                "value" : [ " per " ]
+              }, {
+                "r" : "1265",
+                "s" : [ {
+                  "r" : "1261",
+                  "value" : [ "ToQuantity", "(", "1", ")" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "879",
+          "localId" : "1275",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "880",
+            "localId" : "1276",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "881",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "1277",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "871",
+          "localId" : "1267",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "876",
+            "localId" : "1272",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "877",
+              "localId" : "1273",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "878",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1274",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "872",
+            "localId" : "1268",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "873",
+              "localId" : "1269",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "874",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "1270",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "875",
+            "localId" : "1271",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "List",
-            "localId" : "859",
+            "type" : "ExpressionRef",
+            "localId" : "1256",
+            "name" : "QuantityIntervalList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "866",
+              "localId" : "1257",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "867",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "868",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "860",
-              "name" : "Date1_2Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "861",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "862",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "863",
-              "name" : "Date4_15Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "864",
+                "localId" : "1258",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "865",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "1259",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
-            } ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "870",
-            "value" : 1.0,
-            "unit" : "month",
-            "annotation" : [ ]
-          } ]
-        }
-      }, {
-        "localId" : "884",
-        "name" : "Time1_12Interval",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "884",
-            "s" : [ {
-              "value" : [ "// Time Intervals\n", "define ", "Time1_12Interval", ": " ]
-            }, {
-              "r" : "909",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "893",
-                "s" : [ {
-                  "r" : "885",
-                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "1", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "905",
-                "s" : [ {
-                  "r" : "897",
-                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "12", ")" ]
-                } ]
-              }, {
-                "value" : [ "]" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "912",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "913",
-            "name" : "{urn:hl7-org:elm-types:r1}Time",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "909",
-          "lowClosed" : true,
-          "highClosed" : true,
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "910",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "911",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
-              "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "Time",
-            "localId" : "893",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          }, {
+            "type" : "ToQuantity",
+            "localId" : "1265",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "894",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "895",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "896",
+              "localId" : "1266",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "885",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "886",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "887",
+              "localId" : "1261",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }
-          },
-          "high" : {
-            "type" : "Time",
-            "localId" : "905",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "906",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "907",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "908",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "897",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "898",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "899",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "12",
-              "annotation" : [ ]
-            }
-          }
+          } ]
         }
       }, {
-        "localId" : "916",
-        "name" : "Time1_2Interval",
+        "localId" : "1280",
+        "name" : "QuantitySeparatedBy3",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "916",
+            "r" : "1280",
             "s" : [ {
-              "value" : [ "", "define ", "Time1_2Interval", ": " ]
+              "value" : [ "", "define ", "QuantitySeparatedBy3", ": " ]
             }, {
-              "r" : "941",
+              "r" : "1281",
               "s" : [ {
-                "value" : [ "Interval[" ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "925",
+                "r" : "1294",
                 "s" : [ {
-                  "r" : "917",
-                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "1", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1286",
+                  "s" : [ {
+                    "r" : "1282",
+                    "value" : [ "ToQuantity", "(", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1292",
+                  "s" : [ {
+                    "r" : "1288",
+                    "value" : [ "ToQuantity", "(", "5", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "937",
+                "r" : "1309",
                 "s" : [ {
-                  "r" : "929",
-                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "2", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1301",
+                  "s" : [ {
+                    "r" : "1297",
+                    "value" : [ "ToQuantity", "(", "8", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1307",
+                  "s" : [ {
+                    "r" : "1303",
+                    "value" : [ "ToQuantity", "(", "10", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "value" : [ "]" ]
+                "value" : [ "}" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "944",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "945",
-            "name" : "{urn:hl7-org:elm-types:r1}Time",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "941",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "ListTypeSpecifier",
+          "localId" : "1315",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "942",
+            "localId" : "1316",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "943",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "Time",
-            "localId" : "925",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "926",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "927",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "928",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "917",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "918",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "919",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "Time",
-            "localId" : "937",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "938",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "939",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "940",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "929",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "930",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "931",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "localId" : "1317",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
-        }
-      }, {
-        "localId" : "948",
-        "name" : "Time3_15Interval",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "948",
-            "s" : [ {
-              "value" : [ "", "define ", "Time3_15Interval", ": " ]
-            }, {
-              "r" : "973",
-              "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "957",
-                "s" : [ {
-                  "r" : "949",
-                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "3", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "969",
-                "s" : [ {
-                  "r" : "961",
-                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "15", ")" ]
-                } ]
-              }, {
-                "value" : [ "]" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "976",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "977",
-            "name" : "{urn:hl7-org:elm-types:r1}Time",
-            "annotation" : [ ]
-          }
         },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "973",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "List",
+          "localId" : "1281",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "974",
+            "type" : "ListTypeSpecifier",
+            "localId" : "1312",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "975",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1313",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1314",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             }
           },
-          "low" : {
-            "type" : "Time",
-            "localId" : "957",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "1294",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "958",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "959",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "960",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "949",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1295",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1296",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "950",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "1286",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1287",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1282",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "951",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "1292",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1293",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1288",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
+                "annotation" : [ ]
+              }
             }
-          },
-          "high" : {
-            "type" : "Time",
-            "localId" : "969",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          }, {
+            "type" : "Interval",
+            "localId" : "1309",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "970",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "971",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "972",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "961",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1310",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1311",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "962",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "1301",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1302",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1297",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "8",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "963",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "15",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "1307",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1308",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1303",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "980",
-        "name" : "Time4_15Interval",
+        "localId" : "1320",
+        "name" : "CollapseSeparatedQuantity",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "980",
+            "r" : "1320",
             "s" : [ {
-              "value" : [ "", "define ", "Time4_15Interval", ": " ]
+              "value" : [ "", "define ", "CollapseSeparatedQuantity", ": " ]
             }, {
-              "r" : "1005",
+              "r" : "1326",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "989",
-                "s" : [ {
-                  "r" : "981",
-                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "4", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "collapse " ]
               }, {
-                "r" : "1001",
+                "r" : "1321",
                 "s" : [ {
-                  "r" : "993",
-                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "15", ")" ]
+                  "value" : [ "QuantitySeparatedBy3" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1008",
+          "type" : "ListTypeSpecifier",
+          "localId" : "1334",
           "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1009",
-            "name" : "{urn:hl7-org:elm-types:r1}Time",
-            "annotation" : [ ]
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1335",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1336",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
           }
         },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "1005",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Collapse",
+          "localId" : "1326",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1006",
+            "type" : "ListTypeSpecifier",
+            "localId" : "1331",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1007",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1332",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1333",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             }
           },
-          "low" : {
-            "type" : "Time",
-            "localId" : "989",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1327",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "990",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "991",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "992",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "981",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "982",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "983",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1328",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1329",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             }
-          },
-          "high" : {
-            "type" : "Time",
-            "localId" : "1001",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1330",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1321",
+            "name" : "QuantitySeparatedBy3",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1002",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1003",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1004",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "993",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "994",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "995",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "15",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "1322",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1323",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1324",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "annotation" : [ ]
+                }
+              }
             }
-          }
+          }, {
+            "type" : "Null",
+            "localId" : "1325",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "1012",
-        "name" : "Time1_15Interval",
+        "localId" : "1339",
+        "name" : "ExpectedSeparatedQuantity",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1012",
+            "r" : "1339",
             "s" : [ {
-              "value" : [ "", "define ", "Time1_15Interval", ": " ]
+              "value" : [ "", "define ", "ExpectedSeparatedQuantity", ": " ]
             }, {
-              "r" : "1037",
+              "r" : "1340",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "1021",
-                "s" : [ {
-                  "r" : "1013",
-                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "1", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "1033",
+                "r" : "1353",
                 "s" : [ {
-                  "r" : "1025",
-                  "value" : [ "Time", "(", "0", ", ", "0", ", ", "15", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1345",
+                  "s" : [ {
+                    "r" : "1341",
+                    "value" : [ "ToQuantity", "(", "3", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1351",
+                  "s" : [ {
+                    "r" : "1347",
+                    "value" : [ "ToQuantity", "(", "10", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "value" : [ "]" ]
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1040",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1041",
-            "name" : "{urn:hl7-org:elm-types:r1}Time",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "1037",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "ListTypeSpecifier",
+          "localId" : "1359",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1038",
+            "localId" : "1360",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1039",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "1361",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "Time",
-            "localId" : "1021",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "1340",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1356",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1022",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1023",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1024",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1013",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1014",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1015",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1357",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1358",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             }
           },
-          "high" : {
-            "type" : "Time",
-            "localId" : "1033",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "1353",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1034",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1035",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1036",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1025",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1354",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1355",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1026",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "1345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1346",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1341",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1027",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "15",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "1351",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1352",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1347",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "1044",
-        "name" : "OverlappingTimeCollapseNoPer",
+        "localId" : "1364",
+        "name" : "CollapseSeparatedQuantityPer3",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1044",
+            "r" : "1364",
             "s" : [ {
-              "value" : [ "", "define ", "OverlappingTimeCollapseNoPer", ": " ]
+              "value" : [ "", "define ", "CollapseSeparatedQuantityPer3", ": " ]
             }, {
-              "r" : "1056",
+              "r" : "1372",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1045",
+                "r" : "1365",
                 "s" : [ {
-                  "value" : [ "{ " ]
-                }, {
-                  "r" : "1046",
-                  "s" : [ {
-                    "value" : [ "Time1_12Interval" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1049",
-                  "s" : [ {
-                    "value" : [ "Time3_15Interval" ]
-                  } ]
-                }, {
-                  "value" : [ " }" ]
+                  "value" : [ "QuantitySeparatedBy3" ]
                 } ]
+              }, {
+                "r" : "1370",
+                "value" : [ " per ", "3" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1064",
+          "localId" : "1380",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1065",
+            "localId" : "1381",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1066",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "1382",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1056",
+          "localId" : "1372",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1061",
+            "localId" : "1377",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1062",
+              "localId" : "1378",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1063",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "1379",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1057",
+            "localId" : "1373",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1058",
+              "localId" : "1374",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1059",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "1375",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1060",
+            "localId" : "1376",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "List",
-            "localId" : "1045",
+            "type" : "ExpressionRef",
+            "localId" : "1365",
+            "name" : "QuantitySeparatedBy3",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1052",
+              "localId" : "1366",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1053",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1054",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "1046",
-              "name" : "Time1_12Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1047",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1048",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "1049",
-              "name" : "Time3_15Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1050",
+                "localId" : "1367",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1051",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "1368",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
-            } ]
+            }
           }, {
-            "type" : "Null",
-            "localId" : "1055",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "1371",
+            "value" : 3,
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1069",
-        "name" : "AdjacentTimeCollapseNoPer",
+        "localId" : "1385",
+        "name" : "QuantityMeterIntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1069",
+            "r" : "1385",
             "s" : [ {
-              "value" : [ "", "define ", "AdjacentTimeCollapseNoPer", ": " ]
+              "value" : [ "// Quantity Intervals with units\n", "define ", "QuantityMeterIntervalList", ": " ]
             }, {
-              "r" : "1081",
+              "r" : "1386",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "1070",
+                "r" : "1401",
                 "s" : [ {
-                  "value" : [ "{ " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1071",
+                  "r" : "1392",
                   "s" : [ {
-                    "value" : [ "Time1_2Interval" ]
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "1387",
+                    "s" : [ {
+                      "value" : [ "'1 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1074",
+                  "r" : "1399",
                   "s" : [ {
-                    "value" : [ "Time3_15Interval" ]
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "1394",
+                    "s" : [ {
+                      "value" : [ "'1.995 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "1418",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "1409",
+                  "s" : [ {
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "1404",
+                    "s" : [ {
+                      "value" : [ "'2 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "1416",
+                  "s" : [ {
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "1411",
+                    "s" : [ {
+                      "value" : [ "'3 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1089",
+          "localId" : "1424",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1090",
+            "localId" : "1425",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1091",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "1426",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "1081",
+          "type" : "List",
+          "localId" : "1386",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1086",
+            "localId" : "1421",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1087",
+              "localId" : "1422",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1088",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "1423",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "1082",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "1401",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "elementType" : {
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1083",
+              "localId" : "1402",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1084",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "1403",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "1392",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1393",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1387",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "1 'm'",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "1399",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1400",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1394",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "1.995 'm'",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1085",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "List",
-            "localId" : "1070",
+            "type" : "Interval",
+            "localId" : "1418",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "1077",
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1419",
               "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1078",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1079",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1420",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
               }
             },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "1071",
-              "name" : "Time1_2Interval",
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "1409",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1072",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1073",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1410",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1404",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "2 'm'",
+                "annotation" : [ ]
               }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "1074",
-              "name" : "Time3_15Interval",
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "1416",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1075",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1076",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1417",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1411",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "3 'm'",
+                "annotation" : [ ]
               }
-            } ]
-          }, {
-            "type" : "Null",
-            "localId" : "1080",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "1094",
-        "name" : "DisjointTimeCollapseNoPer",
+        "localId" : "1429",
+        "name" : "ExpectedQuantityUnitsCollapse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1094",
+            "r" : "1429",
             "s" : [ {
-              "value" : [ "", "define ", "DisjointTimeCollapseNoPer", ": " ]
+              "value" : [ "", "define ", "ExpectedQuantityUnitsCollapse", ": " ]
             }, {
-              "r" : "1106",
+              "r" : "1430",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "1095",
+                "r" : "1445",
                 "s" : [ {
-                  "value" : [ "{ " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1096",
+                  "r" : "1436",
                   "s" : [ {
-                    "value" : [ "Time1_2Interval" ]
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "1431",
+                    "s" : [ {
+                      "value" : [ "'1 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1099",
+                  "r" : "1443",
                   "s" : [ {
-                    "value" : [ "Time4_15Interval" ]
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "1438",
+                    "s" : [ {
+                      "value" : [ "'3 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ "]" ]
                 } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1114",
+          "localId" : "1451",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1115",
+            "localId" : "1452",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1116",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "1453",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "1430",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1448",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1449",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1450",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "1445",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1446",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1447",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "1436",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1437",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1431",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "1 'm'",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "1443",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1444",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "1438",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "3 'm'",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "1456",
+        "name" : "CollapseQuantityUnitsWithinPer",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1456",
+            "s" : [ {
+              "value" : [ "", "define ", "CollapseQuantityUnitsWithinPer", ": " ]
+            }, {
+              "r" : "1469",
+              "s" : [ {
+                "value" : [ "collapse " ]
+              }, {
+                "r" : "1457",
+                "s" : [ {
+                  "value" : [ "QuantityMeterIntervalList" ]
+                } ]
+              }, {
+                "value" : [ " per " ]
+              }, {
+                "r" : "1467",
+                "s" : [ {
+                  "value" : [ "ToQuantity", "(" ]
+                }, {
+                  "r" : "1462",
+                  "s" : [ {
+                    "value" : [ "'1 \\'cm\\''" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "1477",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1478",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1479",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1106",
+          "localId" : "1469",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1111",
+            "localId" : "1474",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1112",
+              "localId" : "1475",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1113",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "1476",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1107",
+            "localId" : "1470",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1108",
+              "localId" : "1471",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1109",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "1472",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1110",
+            "localId" : "1473",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "List",
-            "localId" : "1095",
+            "type" : "ExpressionRef",
+            "localId" : "1457",
+            "name" : "QuantityMeterIntervalList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1102",
+              "localId" : "1458",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1103",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1104",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "1096",
-              "name" : "Time1_2Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1097",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1098",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "1099",
-              "name" : "Time4_15Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1100",
+                "localId" : "1459",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1101",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "1460",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
-            } ]
+            }
           }, {
-            "type" : "Null",
-            "localId" : "1105",
+            "type" : "ToQuantity",
+            "localId" : "1467",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1468",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "1462",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "1 'cm'",
+              "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "1119",
-        "name" : "TimeCollapsePerSecond",
+        "localId" : "1482",
+        "name" : "CollapseQuantityUnitsNotWithinPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1119",
+            "r" : "1482",
             "s" : [ {
-              "value" : [ "", "define ", "TimeCollapsePerSecond", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityUnitsNotWithinPer", ": " ]
             }, {
-              "r" : "1132",
+              "r" : "1495",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1120",
+                "r" : "1483",
                 "s" : [ {
-                  "value" : [ "{ " ]
-                }, {
-                  "r" : "1121",
-                  "s" : [ {
-                    "value" : [ "Time1_2Interval" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "value" : [ "QuantityMeterIntervalList" ]
+                } ]
+              }, {
+                "value" : [ " per " ]
+              }, {
+                "r" : "1493",
+                "s" : [ {
+                  "value" : [ "ToQuantity", "(" ]
                 }, {
-                  "r" : "1124",
+                  "r" : "1488",
                   "s" : [ {
-                    "value" : [ "Time4_15Interval" ]
+                    "value" : [ "'1 \\'mm\\''" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ ")" ]
                 } ]
-              }, {
-                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1140",
+          "localId" : "1503",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1141",
+            "localId" : "1504",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1142",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "1505",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1132",
+          "localId" : "1495",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1137",
+            "localId" : "1500",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1138",
+              "localId" : "1501",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1139",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "1502",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1133",
+            "localId" : "1496",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1134",
+              "localId" : "1497",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1135",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "1498",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1136",
+            "localId" : "1499",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "List",
-            "localId" : "1120",
+            "type" : "ExpressionRef",
+            "localId" : "1483",
+            "name" : "QuantityMeterIntervalList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1127",
+              "localId" : "1484",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1128",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1129",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "1121",
-              "name" : "Time1_2Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1122",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1123",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "1124",
-              "name" : "Time4_15Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1125",
+                "localId" : "1485",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1126",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "1486",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
-            } ]
+            }
           }, {
-            "type" : "Quantity",
-            "localId" : "1131",
-            "value" : 1.0,
-            "unit" : "second",
-            "annotation" : [ ]
+            "type" : "ToQuantity",
+            "localId" : "1493",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1494",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "1488",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "1 'mm'",
+              "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "1145",
-        "name" : "TimeCollapsePerMinute",
+        "localId" : "1508",
+        "name" : "CollapseDisjointQuantityUnits",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1145",
+            "r" : "1508",
             "s" : [ {
-              "value" : [ "", "define ", "TimeCollapsePerMinute", ": " ]
+              "value" : [ "", "define ", "CollapseDisjointQuantityUnits", ": " ]
             }, {
-              "r" : "1158",
+              "r" : "1514",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1146",
+                "r" : "1509",
                 "s" : [ {
-                  "value" : [ "{ " ]
-                }, {
-                  "r" : "1147",
-                  "s" : [ {
-                    "value" : [ "Time1_2Interval" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1150",
-                  "s" : [ {
-                    "value" : [ "Time4_15Interval" ]
-                  } ]
-                }, {
-                  "value" : [ " }" ]
+                  "value" : [ "QuantityMeterIntervalList" ]
                 } ]
-              }, {
-                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1166",
+          "localId" : "1522",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1167",
+            "localId" : "1523",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1168",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "1524",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1158",
+          "localId" : "1514",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1163",
+            "localId" : "1519",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1164",
+              "localId" : "1520",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1165",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "1521",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1159",
+            "localId" : "1515",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1160",
+              "localId" : "1516",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1161",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "1517",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1162",
+            "localId" : "1518",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "List",
-            "localId" : "1146",
+            "type" : "ExpressionRef",
+            "localId" : "1509",
+            "name" : "QuantityMeterIntervalList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1153",
+              "localId" : "1510",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1154",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1155",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "1147",
-              "name" : "Time1_2Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1148",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1149",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "1150",
-              "name" : "Time4_15Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1151",
+                "localId" : "1511",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1152",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "1512",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
-            } ]
+            }
           }, {
-            "type" : "Quantity",
-            "localId" : "1157",
-            "value" : 1.0,
-            "unit" : "minute",
+            "type" : "Null",
+            "localId" : "1513",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1171",
-        "name" : "QuantityIntervalList",
+        "localId" : "1527",
+        "name" : "QuantityMeterIntervalListWithinDefaultPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1171",
+            "r" : "1527",
             "s" : [ {
-              "value" : [ "// Quantity Intervals with default units\n", "define ", "QuantityIntervalList", ": " ]
+              "value" : [ "", "define ", "QuantityMeterIntervalListWithinDefaultPer", ": " ]
             }, {
-              "r" : "1172",
+              "r" : "1528",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "1185",
+                "r" : "1543",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1177",
+                  "r" : "1534",
                   "s" : [ {
-                    "r" : "1173",
-                    "value" : [ "ToQuantity", "(", "1", ")" ]
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "1529",
+                    "s" : [ {
+                      "value" : [ "'1 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1183",
+                  "r" : "1541",
                   "s" : [ {
-                    "r" : "1179",
-                    "value" : [ "ToQuantity", "(", "4", ")" ]
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "1536",
+                    "s" : [ {
+                      "value" : [ "'1.99999999 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -203387,22 +233879,34 @@ module.exports['Collapse'] = {
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "1200",
+                "r" : "1560",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1192",
+                  "r" : "1551",
                   "s" : [ {
-                    "r" : "1188",
-                    "value" : [ "ToQuantity", "(", "4", ")" ]
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "1546",
+                    "s" : [ {
+                      "value" : [ "'2 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1198",
+                  "r" : "1558",
                   "s" : [ {
-                    "r" : "1194",
-                    "value" : [ "ToQuantity", "(", "8", ")" ]
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "1553",
+                    "s" : [ {
+                      "value" : [ "'3 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -203415,15 +233919,15 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1206",
+          "localId" : "1566",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1207",
+            "localId" : "1567",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1208",
+              "localId" : "1568",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
@@ -203431,19 +233935,19 @@ module.exports['Collapse'] = {
         },
         "expression" : {
           "type" : "List",
-          "localId" : "1172",
+          "localId" : "1528",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1203",
+            "localId" : "1563",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1204",
+              "localId" : "1564",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1205",
+                "localId" : "1565",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
@@ -203451,156 +233955,259 @@ module.exports['Collapse'] = {
           },
           "element" : [ {
             "type" : "Interval",
-            "localId" : "1185",
+            "localId" : "1543",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1186",
+              "localId" : "1544",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1187",
+                "localId" : "1545",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "ToQuantity",
-              "localId" : "1177",
+              "localId" : "1534",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1178",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1535",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "1173",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "localId" : "1529",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "1 'm'",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "ToQuantity",
-              "localId" : "1183",
+              "localId" : "1541",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1184",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1542",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "1179",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "localId" : "1536",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "1.99999999 'm'",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "1200",
+            "localId" : "1560",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1201",
+              "localId" : "1561",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1202",
+                "localId" : "1562",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "ToQuantity",
-              "localId" : "1192",
+              "localId" : "1551",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1193",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1552",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "1188",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "localId" : "1546",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "2 'm'",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "ToQuantity",
-              "localId" : "1198",
+              "localId" : "1558",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1199",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "1559",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "1194",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "8",
+                "localId" : "1553",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "3 'm'",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1211",
-        "name" : "ExpectedQuantityList",
+        "localId" : "1571",
+        "name" : "CollapseQuantityUnitsWithinDefaultPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1211",
+            "r" : "1571",
             "s" : [ {
-              "value" : [ "", "define ", "ExpectedQuantityList", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityUnitsWithinDefaultPer", ": " ]
             }, {
-              "r" : "1212",
+              "r" : "1577",
+              "s" : [ {
+                "value" : [ "collapse " ]
+              }, {
+                "r" : "1572",
+                "s" : [ {
+                  "value" : [ "QuantityMeterIntervalListWithinDefaultPer" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "1585",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1586",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1587",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Collapse",
+          "localId" : "1577",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1582",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1583",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1584",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1578",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1579",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1580",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1581",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "1572",
+            "name" : "QuantityMeterIntervalListWithinDefaultPer",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "1573",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1574",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1575",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "Null",
+            "localId" : "1576",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1590",
+        "name" : "NullLowIntervalList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1590",
+            "s" : [ {
+              "value" : [ "// Null test cases\n", "define ", "NullLowIntervalList", ": " ]
+            }, {
+              "r" : "1591",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "1225",
+                "r" : "1594",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1217",
-                  "s" : [ {
-                    "r" : "1213",
-                    "value" : [ "ToQuantity", "(", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1223",
-                  "s" : [ {
-                    "r" : "1219",
-                    "value" : [ "ToQuantity", "(", "8", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1592",
+                  "value" : [ "Interval[", "null", ", ", "4", "]" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "1600",
+                "s" : [ {
+                  "r" : "1598",
+                  "value" : [ "Interval[", "3", ", ", "5", "]" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -203610,119 +234217,133 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1231",
+          "localId" : "1606",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1232",
+            "localId" : "1607",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1233",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1608",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "1212",
+          "localId" : "1591",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1228",
+            "localId" : "1603",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1229",
+              "localId" : "1604",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1230",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1605",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
             "type" : "Interval",
-            "localId" : "1225",
+            "localId" : "1594",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1226",
+              "localId" : "1596",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1227",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1597",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "ToQuantity",
-              "localId" : "1217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "As",
+              "localId" : "1595",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1218",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
+              "signature" : [ ],
               "operand" : {
-                "type" : "Literal",
-                "localId" : "1213",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
+                "type" : "Null",
+                "localId" : "1592",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "ToQuantity",
-              "localId" : "1223",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "Literal",
+              "localId" : "1593",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "1600",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1601",
               "annotation" : [ ],
-              "signature" : [ {
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1224",
+                "localId" : "1602",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1219",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "8",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1598",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1599",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1236",
-        "name" : "QuantityIntervalCollapseNoPer",
+        "localId" : "1611",
+        "name" : "CollapseNullLowIntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1236",
+            "r" : "1611",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalCollapseNoPer", ": " ]
+              "value" : [ "", "define ", "CollapseNullLowIntervalList", ": " ]
             }, {
-              "r" : "1242",
+              "r" : "1617",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1237",
+                "r" : "1612",
                 "s" : [ {
-                  "value" : [ "QuantityIntervalList" ]
+                  "value" : [ "NullLowIntervalList" ]
                 } ]
               } ]
             } ]
@@ -203730,459 +234351,358 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1250",
+          "localId" : "1625",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1251",
+            "localId" : "1626",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1252",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1627",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1242",
+          "localId" : "1617",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1247",
+            "localId" : "1622",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1248",
+              "localId" : "1623",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1249",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1624",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1243",
+            "localId" : "1618",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1244",
+              "localId" : "1619",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1245",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1620",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1246",
+            "localId" : "1621",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1237",
-            "name" : "QuantityIntervalList",
+            "localId" : "1612",
+            "name" : "NullLowIntervalList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1238",
+              "localId" : "1613",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1239",
+                "localId" : "1614",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1240",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "1615",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             }
           }, {
             "type" : "Null",
-            "localId" : "1241",
+            "localId" : "1616",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1255",
-        "name" : "QuantityIntervalCollapsePerUnit1",
+        "localId" : "1630",
+        "name" : "ExpectedNullLowIntervalCollapse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1255",
+            "r" : "1630",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalCollapsePerUnit1", ": " ]
+              "value" : [ "", "define ", "ExpectedNullLowIntervalCollapse", ": " ]
             }, {
-              "r" : "1267",
+              "r" : "1631",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "1256",
+                "r" : "1634",
                 "s" : [ {
-                  "value" : [ "QuantityIntervalList" ]
+                  "r" : "1632",
+                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
                 } ]
               }, {
-                "value" : [ " per " ]
-              }, {
-                "r" : "1265",
-                "s" : [ {
-                  "r" : "1261",
-                  "value" : [ "ToQuantity", "(", "1", ")" ]
-                } ]
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1275",
+          "localId" : "1641",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1276",
+            "localId" : "1642",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1277",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1643",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "1267",
+          "type" : "List",
+          "localId" : "1631",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1272",
+            "localId" : "1638",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1273",
+              "localId" : "1639",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1274",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1640",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "1268",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "1634",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "elementType" : {
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1269",
+              "localId" : "1636",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1270",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1637",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1271",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1256",
-            "name" : "QuantityIntervalList",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "1257",
+            },
+            "low" : {
+              "type" : "As",
+              "localId" : "1635",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1258",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1259",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                  "annotation" : [ ]
-                }
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1632",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "ToQuantity",
-            "localId" : "1265",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1266",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
+            },
+            "high" : {
               "type" : "Literal",
-              "localId" : "1261",
+              "localId" : "1633",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "5",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1280",
-        "name" : "QuantitySeparatedBy3",
+        "localId" : "1646",
+        "name" : "NullHighIntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1280",
+            "r" : "1646",
             "s" : [ {
-              "value" : [ "", "define ", "QuantitySeparatedBy3", ": " ]
+              "value" : [ "", "define ", "NullHighIntervalList", ": " ]
             }, {
-              "r" : "1281",
+              "r" : "1647",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "1294",
+                "r" : "1650",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1286",
-                  "s" : [ {
-                    "r" : "1282",
-                    "value" : [ "ToQuantity", "(", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1292",
-                  "s" : [ {
-                    "r" : "1288",
-                    "value" : [ "ToQuantity", "(", "5", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1648",
+                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "1309",
+                "r" : "1655",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1301",
-                  "s" : [ {
-                    "r" : "1297",
-                    "value" : [ "ToQuantity", "(", "8", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1307",
-                  "s" : [ {
-                    "r" : "1303",
-                    "value" : [ "ToQuantity", "(", "10", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1653",
+                  "value" : [ "Interval[", "3", ", ", "null", "]" ]
                 } ]
               }, {
-                "value" : [ "}" ]
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1315",
+          "localId" : "1662",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1316",
+            "localId" : "1663",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1317",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1664",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "1281",
+          "localId" : "1647",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1312",
+            "localId" : "1659",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1313",
+              "localId" : "1660",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1314",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1661",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
             "type" : "Interval",
-            "localId" : "1294",
+            "localId" : "1650",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1295",
+              "localId" : "1651",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1296",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1652",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "ToQuantity",
-              "localId" : "1286",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1287",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1282",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1648",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "ToQuantity",
-              "localId" : "1292",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1293",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1288",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "5",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1649",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "1309",
+            "localId" : "1655",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1310",
+              "localId" : "1657",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1311",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1658",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "ToQuantity",
-              "localId" : "1301",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1302",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1297",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "8",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1653",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "ToQuantity",
-              "localId" : "1307",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "As",
+              "localId" : "1656",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1308",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
+              "signature" : [ ],
               "operand" : {
-                "type" : "Literal",
-                "localId" : "1303",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
+                "type" : "Null",
+                "localId" : "1654",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1320",
-        "name" : "CollapseSeparatedQuantity",
+        "localId" : "1667",
+        "name" : "CollapseNullHighIntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1320",
+            "r" : "1667",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseSeparatedQuantity", ": " ]
+              "value" : [ "", "define ", "CollapseNullHighIntervalList", ": " ]
             }, {
-              "r" : "1326",
+              "r" : "1673",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1321",
+                "r" : "1668",
                 "s" : [ {
-                  "value" : [ "QuantitySeparatedBy3" ]
+                  "value" : [ "NullHighIntervalList" ]
                 } ]
               } ]
             } ]
@@ -204190,125 +234710,110 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1334",
+          "localId" : "1681",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1335",
+            "localId" : "1682",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1336",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1683",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1326",
+          "localId" : "1673",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1331",
+            "localId" : "1678",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1332",
+              "localId" : "1679",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1333",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1680",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1327",
+            "localId" : "1674",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1328",
+              "localId" : "1675",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1329",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1676",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1330",
+            "localId" : "1677",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "1321",
-            "name" : "QuantitySeparatedBy3",
+            "localId" : "1668",
+            "name" : "NullHighIntervalList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1322",
+              "localId" : "1669",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1323",
+                "localId" : "1670",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1324",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "1671",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             }
           }, {
             "type" : "Null",
-            "localId" : "1325",
+            "localId" : "1672",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1339",
-        "name" : "ExpectedSeparatedQuantity",
+        "localId" : "1686",
+        "name" : "ExpectedNullHighIntervalCollapse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1339",
+            "r" : "1686",
             "s" : [ {
-              "value" : [ "", "define ", "ExpectedSeparatedQuantity", ": " ]
+              "value" : [ "", "define ", "ExpectedNullHighIntervalCollapse", ": " ]
             }, {
-              "r" : "1340",
+              "r" : "1687",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "1353",
+                "r" : "1690",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1345",
-                  "s" : [ {
-                    "r" : "1341",
-                    "value" : [ "ToQuantity", "(", "3", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1351",
-                  "s" : [ {
-                    "r" : "1347",
-                    "value" : [ "ToQuantity", "(", "10", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1688",
+                  "value" : [ "Interval[", "1", ", ", "null", "]" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -204318,296 +234823,275 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1359",
+          "localId" : "1697",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1360",
+            "localId" : "1698",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1361",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1699",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "1340",
+          "localId" : "1687",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1356",
+            "localId" : "1694",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1357",
+              "localId" : "1695",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1358",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1696",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
             "type" : "Interval",
-            "localId" : "1353",
+            "localId" : "1690",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1354",
+              "localId" : "1692",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1355",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1693",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "ToQuantity",
-              "localId" : "1345",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1346",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1341",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1688",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "ToQuantity",
-              "localId" : "1351",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "As",
+              "localId" : "1691",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1352",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
+              "signature" : [ ],
               "operand" : {
-                "type" : "Literal",
-                "localId" : "1347",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
+                "type" : "Null",
+                "localId" : "1689",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1364",
-        "name" : "CollapseSeparatedQuantityPer3",
+        "localId" : "1702",
+        "name" : "NullInCollapse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1364",
+            "r" : "1702",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseSeparatedQuantityPer3", ": " ]
+              "value" : [ "", "define ", "NullInCollapse", ": " ]
             }, {
-              "r" : "1372",
+              "r" : "1717",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1365",
+                "r" : "1703",
                 "s" : [ {
-                  "value" : [ "QuantitySeparatedBy3" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "1706",
+                  "s" : [ {
+                    "r" : "1704",
+                    "value" : [ "Interval[", "1", ",", "3", "]" ]
+                  } ]
+                }, {
+                  "r" : "1709",
+                  "value" : [ ", ", "null", " }" ]
                 } ]
-              }, {
-                "r" : "1370",
-                "value" : [ " per ", "3" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1380",
+          "localId" : "1725",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1381",
+            "localId" : "1726",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1382",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1727",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1372",
+          "localId" : "1717",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1377",
+            "localId" : "1722",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1378",
+              "localId" : "1723",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1379",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1724",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1373",
+            "localId" : "1718",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1374",
+              "localId" : "1719",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1375",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1720",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1376",
+            "localId" : "1721",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1365",
-            "name" : "QuantitySeparatedBy3",
+            "type" : "List",
+            "localId" : "1703",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1366",
+              "localId" : "1713",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1367",
+                "localId" : "1714",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1368",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "1715",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
-            }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "1706",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1707",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1708",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Literal",
+                "localId" : "1704",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Literal",
+                "localId" : "1705",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "As",
+              "localId" : "1710",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "1709",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              },
+              "asTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1711",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1712",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "1371",
-            "value" : 3,
-            "unit" : "1",
+            "type" : "Null",
+            "localId" : "1716",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1385",
-        "name" : "QuantityMeterIntervalList",
+        "localId" : "1730",
+        "name" : "ExpectedResultWithNull",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1385",
+            "r" : "1730",
             "s" : [ {
-              "value" : [ "// Quantity Intervals with units\n", "define ", "QuantityMeterIntervalList", ": " ]
+              "value" : [ "", "define ", "ExpectedResultWithNull", ": " ]
             }, {
-              "r" : "1386",
+              "r" : "1731",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "1401",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1392",
-                  "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "1387",
-                    "s" : [ {
-                      "value" : [ "'1 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1399",
-                  "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "1394",
-                    "s" : [ {
-                      "value" : [ "'1.995 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "1418",
+                "r" : "1734",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "1409",
-                  "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "1404",
-                    "s" : [ {
-                      "value" : [ "'2 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "1416",
-                  "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "1411",
-                    "s" : [ {
-                      "value" : [ "'3 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "1732",
+                  "value" : [ "Interval[", "1", ",", "3", "]" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -204617,176 +235101,115 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1424",
+          "localId" : "1740",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1425",
+            "localId" : "1741",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1426",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1742",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "1386",
+          "localId" : "1731",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1421",
+            "localId" : "1737",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1422",
+              "localId" : "1738",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1423",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1739",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
             "type" : "Interval",
-            "localId" : "1401",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1402",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1403",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "1392",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1393",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1387",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "1 'm'",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "1399",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1400",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1394",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "1.995 'm'",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "1418",
+            "localId" : "1734",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1419",
+              "localId" : "1735",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1420",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1736",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "ToQuantity",
-              "localId" : "1409",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1410",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1404",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "2 'm'",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1732",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             },
             "high" : {
-              "type" : "ToQuantity",
-              "localId" : "1416",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1417",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "1411",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "3 'm'",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "1733",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1429",
-        "name" : "CollapseDisjointQuantityUnits",
+        "localId" : "1745",
+        "name" : "NullCollapse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1429",
+            "r" : "1745",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseDisjointQuantityUnits", ": " ]
+              "value" : [ "", "define ", "NullCollapse", ": " ]
             }, {
-              "r" : "1435",
+              "r" : "1760",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1430",
+                "r" : "1746",
                 "s" : [ {
-                  "value" : [ "QuantityMeterIntervalList" ]
+                  "r" : "1747",
+                  "value" : [ "null", " as " ]
+                }, {
+                  "r" : "1748",
+                  "s" : [ {
+                    "value" : [ "List<" ]
+                  }, {
+                    "r" : "1749",
+                    "s" : [ {
+                      "value" : [ "Interval<" ]
+                    }, {
+                      "r" : "1750",
+                      "s" : [ {
+                        "value" : [ "Integer" ]
+                      } ]
+                    }, {
+                      "value" : [ ">" ]
+                    } ]
+                  }, {
+                    "value" : [ ">" ]
+                  } ]
                 } ]
               } ]
             } ]
@@ -204794,680 +235217,1596 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1443",
+          "localId" : "1768",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1444",
+            "localId" : "1769",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1445",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1770",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1435",
+          "localId" : "1760",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1440",
+            "localId" : "1765",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1441",
+              "localId" : "1766",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1442",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1767",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1436",
+            "localId" : "1761",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1437",
+              "localId" : "1762",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1438",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1763",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1439",
+            "localId" : "1764",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1430",
-            "name" : "QuantityMeterIntervalList",
+            "type" : "As",
+            "localId" : "1746",
+            "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1431",
+              "localId" : "1756",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1432",
+                "localId" : "1757",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1433",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "1758",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1747",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "1748",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "ListTypeSpecifier",
+                "localId" : "1753",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "1754",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1755",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }
+              },
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1749",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "IntervalTypeSpecifier",
+                  "localId" : "1751",
+                  "annotation" : [ ],
+                  "pointType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "1752",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                },
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1750",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             }
           }, {
             "type" : "Null",
-            "localId" : "1434",
+            "localId" : "1759",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1448",
-        "name" : "ExpectedQuantityUnitsCollapse",
+        "localId" : "1773",
+        "name" : "NullPerCollapse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1448",
+            "r" : "1773",
             "s" : [ {
-              "value" : [ "", "define ", "ExpectedQuantityUnitsCollapse", ": " ]
+              "value" : [ "", "define ", "NullPerCollapse", ": " ]
             }, {
-              "r" : "1449",
+              "r" : "1790",
               "s" : [ {
-                "value" : [ "{ " ]
+                "value" : [ "collapse " ]
               }, {
-                "r" : "1464",
+                "r" : "1774",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "1455",
+                  "r" : "1777",
                   "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "1450",
-                    "s" : [ {
-                      "value" : [ "'1 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "1775",
+                    "value" : [ "Interval[", "1", ",", "4", "]" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1462",
+                  "r" : "1782",
                   "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "1457",
-                    "s" : [ {
-                      "value" : [ "'3 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "1780",
+                    "value" : [ "Interval[", "4", ",", "7", "]" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "r" : "1789",
+                "value" : [ " per ", "null" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1470",
+          "localId" : "1799",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1471",
+            "localId" : "1800",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1472",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1801",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "1449",
+          "type" : "Collapse",
+          "localId" : "1790",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1467",
+            "localId" : "1796",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1468",
+              "localId" : "1797",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1469",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1798",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "1464",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1792",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1465",
+              "localId" : "1793",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1466",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1794",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1795",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "1774",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "1785",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1786",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1787",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
             },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "1455",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "1777",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1456",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1778",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1779",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Literal",
+                "localId" : "1775",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
+              },
+              "high" : {
                 "type" : "Literal",
-                "localId" : "1450",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "1 'm'",
+                "localId" : "1776",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "1462",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            }, {
+              "type" : "Interval",
+              "localId" : "1782",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1463",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1783",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1784",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Literal",
+                "localId" : "1780",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
-              } ],
-              "operand" : {
+              },
+              "high" : {
                 "type" : "Literal",
-                "localId" : "1457",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "3 'm'",
+                "localId" : "1781",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "7",
                 "annotation" : [ ]
               }
+            } ]
+          }, {
+            "type" : "As",
+            "localId" : "1791",
+            "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1789",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1475",
-        "name" : "CollapseQuantityUnitsWithinPer",
+        "localId" : "1804",
+        "name" : "ExpectedResultNullPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1475",
+            "r" : "1804",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityUnitsWithinPer", ": " ]
+              "value" : [ "", "define ", "ExpectedResultNullPer", ": " ]
             }, {
-              "r" : "1488",
+              "r" : "1805",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "1476",
+                "r" : "1808",
                 "s" : [ {
-                  "value" : [ "QuantityMeterIntervalList" ]
+                  "r" : "1806",
+                  "value" : [ "Interval[", "1", ",", "7", "]" ]
                 } ]
               }, {
-                "value" : [ " per " ]
-              }, {
-                "r" : "1486",
-                "s" : [ {
-                  "value" : [ "ToQuantity", "(" ]
-                }, {
-                  "r" : "1481",
-                  "s" : [ {
-                    "value" : [ "'1 \\'cm\\''" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
-                } ]
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1496",
+          "localId" : "1814",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1497",
+            "localId" : "1815",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1498",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "1816",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "1488",
+          "type" : "List",
+          "localId" : "1805",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1493",
+            "localId" : "1811",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1494",
+              "localId" : "1812",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1495",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1813",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "1489",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "1808",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "elementType" : {
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1490",
+              "localId" : "1809",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1491",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "1810",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "1806",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "1807",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "7",
+              "annotation" : [ ]
             }
-          }, {
+          } ]
+        }
+      }, {
+        "localId" : "1819",
+        "name" : "DateTime5_NullInterval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1819",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTime5_NullInterval", ": " ]
+            }, {
+              "r" : "1845",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "1836",
+                "s" : [ {
+                  "r" : "1820",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "r" : "1844",
+                "value" : [ ", ", "null", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1849",
+          "annotation" : [ ],
+          "pointType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1492",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "localId" : "1850",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1476",
-            "name" : "QuantityMeterIntervalList",
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1845",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1847",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "1477",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1478",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1479",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                  "annotation" : [ ]
-                }
-              }
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1848",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
             }
-          }, {
-            "type" : "ToQuantity",
-            "localId" : "1486",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "1836",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1487",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "localId" : "1837",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1838",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1839",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1840",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1841",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1842",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1843",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1820",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1821",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1822",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "1823",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1824",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1825",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1826",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "As",
+            "localId" : "1846",
+            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "1844",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1853",
+        "name" : "DateTimeNull_5Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1853",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTimeNull_5Interval", ": " ]
+            }, {
+              "r" : "1879",
+              "s" : [ {
+                "r" : "1854",
+                "value" : [ "Interval[", "null", ", " ]
+              }, {
+                "r" : "1871",
+                "s" : [ {
+                  "r" : "1855",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1883",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1884",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1879",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1881",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1882",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "As",
+            "localId" : "1880",
+            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ ],
             "operand" : {
+              "type" : "Null",
+              "localId" : "1854",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "1871",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1872",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1873",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1874",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1875",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1876",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1877",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1878",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
               "type" : "Literal",
-              "localId" : "1481",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "1 'cm'",
+              "localId" : "1855",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1856",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1857",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "1858",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1859",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1860",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1861",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1501",
-        "name" : "CollapseQuantityUnitsNotWithinPer",
+        "localId" : "1887",
+        "name" : "DateTime1_10Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1501",
+            "r" : "1887",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityUnitsNotWithinPer", ": " ]
+              "value" : [ "", "define ", "DateTime1_10Interval", ": " ]
             }, {
-              "r" : "1514",
+              "r" : "1936",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "Interval[" ]
               }, {
-                "r" : "1502",
+                "r" : "1904",
                 "s" : [ {
-                  "value" : [ "QuantityMeterIntervalList" ]
+                  "r" : "1888",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "1928",
+                "s" : [ {
+                  "r" : "1912",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                } ]
+              }, {
+                "value" : [ "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1939",
+          "annotation" : [ ],
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1940",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Interval",
+          "localId" : "1936",
+          "lowClosed" : true,
+          "highClosed" : true,
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1937",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1938",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          },
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "1904",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1905",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1906",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1907",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1908",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1909",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1910",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1911",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1888",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1889",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1890",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "1891",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1892",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1893",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1894",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "1928",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1929",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1930",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1931",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1932",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1933",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1934",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1935",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1912",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1913",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1914",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "1915",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1916",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1917",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1918",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            }
+          }
+        }
+      }, {
+        "localId" : "1943",
+        "name" : "DateTime9_10Interval",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1943",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTime9_10Interval", ": " ]
+            }, {
+              "r" : "1992",
+              "s" : [ {
+                "value" : [ "Interval[" ]
+              }, {
+                "r" : "1960",
+                "s" : [ {
+                  "r" : "1944",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "9", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "value" : [ " per " ]
+                "value" : [ ", " ]
               }, {
-                "r" : "1512",
+                "r" : "1984",
                 "s" : [ {
-                  "value" : [ "ToQuantity", "(" ]
-                }, {
-                  "r" : "1507",
-                  "s" : [ {
-                    "value" : [ "'1 \\'mm\\''" ]
-                  } ]
-                }, {
-                  "value" : [ ")" ]
+                  "r" : "1968",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
+              }, {
+                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "ListTypeSpecifier",
-          "localId" : "1522",
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "1995",
           "annotation" : [ ],
-          "elementType" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1523",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1524",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            }
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1996",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "1514",
+          "type" : "Interval",
+          "localId" : "1992",
+          "lowClosed" : true,
+          "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
-            "type" : "ListTypeSpecifier",
-            "localId" : "1519",
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1993",
             "annotation" : [ ],
-            "elementType" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1520",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1521",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1994",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
             }
           },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "1515",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1516",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1517",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1518",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1502",
-            "name" : "QuantityMeterIntervalList",
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "1960",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "1503",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1504",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1505",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                  "annotation" : [ ]
-                }
-              }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1961",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1962",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1963",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1964",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1965",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1966",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1967",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "1944",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1945",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1946",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "9",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "1947",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1948",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1949",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1950",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
             }
-          }, {
-            "type" : "ToQuantity",
-            "localId" : "1512",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "1984",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1513",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "localId" : "1985",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1986",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1987",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1988",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1989",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1990",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1991",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
-            "operand" : {
+            "year" : {
               "type" : "Literal",
-              "localId" : "1507",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "1 'mm'",
+              "localId" : "1968",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
+            },
+            "month" : {
+              "type" : "Literal",
+              "localId" : "1969",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "day" : {
+              "type" : "Literal",
+              "localId" : "1970",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "10",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "1971",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "1972",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "1973",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "1974",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1527",
-        "name" : "NullLowIntervalList",
+        "localId" : "1999",
+        "name" : "DateTime1_2Interval",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1527",
+            "r" : "1999",
             "s" : [ {
-              "value" : [ "// Null test cases\n", "define ", "NullLowIntervalList", ": " ]
+              "value" : [ "", "define ", "DateTime1_2Interval", ": " ]
             }, {
-              "r" : "1528",
+              "r" : "2048",
               "s" : [ {
-                "value" : [ "{ " ]
+                "value" : [ "Interval[" ]
               }, {
-                "r" : "1531",
+                "r" : "2016",
                 "s" : [ {
-                  "r" : "1529",
-                  "value" : [ "Interval[", "null", ", ", "4", "]" ]
+                  "r" : "2000",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "1537",
+                "r" : "2040",
                 "s" : [ {
-                  "r" : "1535",
-                  "value" : [ "Interval[", "3", ", ", "5", "]" ]
+                  "r" : "2024",
+                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "ListTypeSpecifier",
-          "localId" : "1543",
+          "type" : "IntervalTypeSpecifier",
+          "localId" : "2051",
           "annotation" : [ ],
-          "elementType" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1544",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1545",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
+          "pointType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "2052",
+            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "annotation" : [ ]
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "1528",
+          "type" : "Interval",
+          "localId" : "2048",
+          "lowClosed" : true,
+          "highClosed" : true,
           "annotation" : [ ],
           "resultTypeSpecifier" : {
-            "type" : "ListTypeSpecifier",
-            "localId" : "1540",
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2049",
             "annotation" : [ ],
-            "elementType" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1541",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1542",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2050",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "1531",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "low" : {
+            "type" : "DateTime",
+            "localId" : "2016",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1533",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1534",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2017",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2018",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2019",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2020",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2021",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2022",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2023",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "2000",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
-              "type" : "As",
-              "localId" : "1532",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1529",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+            "month" : {
+              "type" : "Literal",
+              "localId" : "2001",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "1530",
+              "localId" : "2002",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "2003",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "2004",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "2005",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "2006",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
-          }, {
-            "type" : "Interval",
-            "localId" : "1537",
-            "lowClosed" : true,
-            "highClosed" : true,
+          },
+          "high" : {
+            "type" : "DateTime",
+            "localId" : "2040",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1538",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1539",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2041",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2042",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2043",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2044",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2045",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2046",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }, {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2047",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            } ],
+            "year" : {
+              "type" : "Literal",
+              "localId" : "2024",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2012",
+              "annotation" : [ ]
             },
-            "low" : {
+            "month" : {
               "type" : "Literal",
-              "localId" : "1535",
+              "localId" : "2025",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "1",
               "annotation" : [ ]
             },
-            "high" : {
+            "day" : {
               "type" : "Literal",
-              "localId" : "1536",
+              "localId" : "2026",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "hour" : {
+              "type" : "Literal",
+              "localId" : "2027",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "minute" : {
+              "type" : "Literal",
+              "localId" : "2028",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "second" : {
+              "type" : "Literal",
+              "localId" : "2029",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
+              "annotation" : [ ]
+            },
+            "millisecond" : {
+              "type" : "Literal",
+              "localId" : "2030",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "0",
               "annotation" : [ ]
             }
-          } ]
+          }
         }
       }, {
-        "localId" : "1548",
-        "name" : "CollapseNullLowIntervalList",
+        "localId" : "2055",
+        "name" : "DateTimeNullStartCollapse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1548",
+            "r" : "2055",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseNullLowIntervalList", ": " ]
+              "value" : [ "", "define ", "DateTimeNullStartCollapse", ": " ]
             }, {
-              "r" : "1554",
+              "r" : "2067",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1549",
+                "r" : "2056",
                 "s" : [ {
-                  "value" : [ "NullLowIntervalList" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "2057",
+                  "s" : [ {
+                    "value" : [ "DateTime1_10Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2060",
+                  "s" : [ {
+                    "value" : [ "DateTimeNull_5Interval" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               } ]
             } ]
@@ -205475,110 +236814,150 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1562",
+          "localId" : "2075",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1563",
+            "localId" : "2076",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1564",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2077",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1554",
+          "localId" : "2067",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1559",
+            "localId" : "2072",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1560",
+              "localId" : "2073",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1561",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2074",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1555",
+            "localId" : "2068",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1556",
+              "localId" : "2069",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1557",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2070",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1558",
+            "localId" : "2071",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1549",
-            "name" : "NullLowIntervalList",
+            "type" : "List",
+            "localId" : "2056",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1550",
+              "localId" : "2063",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1551",
+                "localId" : "2064",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1552",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2065",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
-            }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "2057",
+              "name" : "DateTime1_10Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2058",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2059",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "2060",
+              "name" : "DateTimeNull_5Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2061",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2062",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
           }, {
             "type" : "Null",
-            "localId" : "1553",
+            "localId" : "2066",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1567",
-        "name" : "ExpectedNullLowIntervalCollapse",
+        "localId" : "2080",
+        "name" : "DateTimeNullStartCollapseExpected",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1567",
+            "r" : "2080",
             "s" : [ {
-              "value" : [ "", "define ", "ExpectedNullLowIntervalCollapse", ": " ]
+              "value" : [ "", "define ", "DateTimeNullStartCollapseExpected", ": " ]
             }, {
-              "r" : "1568",
+              "r" : "2081",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "1571",
+                "r" : "2107",
                 "s" : [ {
-                  "r" : "1569",
-                  "value" : [ "Interval[", "null", ", ", "5", "]" ]
+                  "r" : "2082",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "2099",
+                  "s" : [ {
+                    "r" : "2083",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -205588,245 +236967,360 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1578",
+          "localId" : "2114",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1579",
+            "localId" : "2115",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1580",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2116",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "1568",
+          "localId" : "2081",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1575",
+            "localId" : "2111",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1576",
+              "localId" : "2112",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1577",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2113",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
             "type" : "Interval",
-            "localId" : "1571",
+            "localId" : "2107",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1573",
+              "localId" : "2109",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1574",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2110",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "1572",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2108",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "1569",
+                "localId" : "2082",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1570",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "DateTime",
+              "localId" : "2099",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2100",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2101",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2102",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2103",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2104",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2105",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2106",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2083",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2084",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2085",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2086",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2087",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2088",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2089",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "1583",
-        "name" : "NullHighIntervalList",
+        "localId" : "2119",
+        "name" : "DateTimeNullEndCollapse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1583",
+            "r" : "2119",
             "s" : [ {
-              "value" : [ "", "define ", "NullHighIntervalList", ": " ]
+              "value" : [ "", "define ", "DateTimeNullEndCollapse", ": " ]
             }, {
-              "r" : "1584",
+              "r" : "2131",
               "s" : [ {
-                "value" : [ "{ " ]
-              }, {
-                "r" : "1587",
-                "s" : [ {
-                  "r" : "1585",
-                  "value" : [ "Interval[", "1", ", ", "4", "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "collapse " ]
               }, {
-                "r" : "1592",
+                "r" : "2120",
                 "s" : [ {
-                  "r" : "1590",
-                  "value" : [ "Interval[", "3", ", ", "null", "]" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "2121",
+                  "s" : [ {
+                    "value" : [ "DateTime1_10Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2124",
+                  "s" : [ {
+                    "value" : [ "DateTime5_NullInterval" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1599",
+          "localId" : "2139",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1600",
+            "localId" : "2140",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1601",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2141",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "1584",
+          "type" : "Collapse",
+          "localId" : "2131",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1596",
+            "localId" : "2136",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1597",
+              "localId" : "2137",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1598",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2138",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "1587",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "2132",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1588",
+              "localId" : "2133",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1589",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2134",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1585",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1586",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
             }
           }, {
-            "type" : "Interval",
-            "localId" : "1592",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "NamedTypeSpecifier",
+            "localId" : "2135",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "2120",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "1594",
+              "type" : "ListTypeSpecifier",
+              "localId" : "2127",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "1595",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2128",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2129",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
               }
             },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1590",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1593",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "2121",
+              "name" : "DateTime1_10Interval",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1591",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2122",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2123",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
               }
-            }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "2124",
+              "name" : "DateTime5_NullInterval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2125",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2126",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "2130",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1604",
-        "name" : "CollapseNullHighIntervalList",
+        "localId" : "2144",
+        "name" : "DateTimeNullEndCollapseNoOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1604",
+            "r" : "2144",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseNullHighIntervalList", ": " ]
+              "value" : [ "", "define ", "DateTimeNullEndCollapseNoOverlap", ": " ]
             }, {
-              "r" : "1610",
+              "r" : "2156",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1605",
+                "r" : "2145",
                 "s" : [ {
-                  "value" : [ "NullHighIntervalList" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "2146",
+                  "s" : [ {
+                    "value" : [ "DateTime1_2Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2149",
+                  "s" : [ {
+                    "value" : [ "DateTime5_NullInterval" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               } ]
             } ]
@@ -205834,110 +237328,148 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1618",
+          "localId" : "2164",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1619",
+            "localId" : "2165",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1620",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2166",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1610",
+          "localId" : "2156",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1615",
+            "localId" : "2161",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1616",
+              "localId" : "2162",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1617",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2163",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1611",
+            "localId" : "2157",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1612",
+              "localId" : "2158",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1613",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2159",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1614",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "1605",
-            "name" : "NullHighIntervalList",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "1606",
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "2160",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "2145",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "2152",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2153",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2154",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "ExpressionRef",
+              "localId" : "2146",
+              "name" : "DateTime1_2Interval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2147",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2148",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "2149",
+              "name" : "DateTime5_NullInterval",
               "annotation" : [ ],
-              "elementType" : {
+              "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1607",
+                "localId" : "2150",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1608",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2151",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
-            }
+            } ]
           }, {
             "type" : "Null",
-            "localId" : "1609",
+            "localId" : "2155",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1623",
-        "name" : "ExpectedNullHighIntervalCollapse",
+        "localId" : "2169",
+        "name" : "DateTimeNullEndCollapseNoOverlapExpected",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1623",
+            "r" : "2169",
             "s" : [ {
-              "value" : [ "", "define ", "ExpectedNullHighIntervalCollapse", ": " ]
+              "value" : [ "", "define ", "DateTimeNullEndCollapseNoOverlapExpected", ": " ]
             }, {
-              "r" : "1624",
+              "r" : "2170",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "1627",
+                "r" : "2171",
                 "s" : [ {
-                  "r" : "1625",
-                  "value" : [ "Interval[", "1", ", ", "null", "]" ]
+                  "value" : [ "DateTime1_2Interval" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "2174",
+                "s" : [ {
+                  "value" : [ "DateTime5_NullInterval" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -205947,109 +237479,108 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1634",
+          "localId" : "2180",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1635",
+            "localId" : "2181",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1636",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2182",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "1624",
+          "localId" : "2170",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1631",
+            "localId" : "2177",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1632",
+              "localId" : "2178",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1633",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2179",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
-            "type" : "Interval",
-            "localId" : "1627",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "2171",
+            "name" : "DateTime1_2Interval",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1629",
+              "localId" : "2172",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1630",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2173",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1625",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "1628",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "2174",
+            "name" : "DateTime5_NullInterval",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2175",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1626",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2176",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "1639",
-        "name" : "NullInCollapse",
+        "localId" : "2185",
+        "name" : "DateTimeNullStartCollapseNoOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1639",
+            "r" : "2185",
             "s" : [ {
-              "value" : [ "", "define ", "NullInCollapse", ": " ]
+              "value" : [ "", "define ", "DateTimeNullStartCollapseNoOverlap", ": " ]
             }, {
-              "r" : "1654",
+              "r" : "2197",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1640",
+                "r" : "2186",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1643",
+                  "r" : "2187",
                   "s" : [ {
-                    "r" : "1641",
-                    "value" : [ "Interval[", "1", ",", "3", "]" ]
+                    "value" : [ "DateTime9_10Interval" ]
                   } ]
                 }, {
-                  "r" : "1646",
-                  "value" : [ ", ", "null", " }" ]
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2190",
+                  "s" : [ {
+                    "value" : [ "DateTimeNull_5Interval" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               } ]
             } ]
@@ -206057,165 +237588,148 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1662",
+          "localId" : "2205",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1663",
+            "localId" : "2206",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1664",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2207",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1654",
+          "localId" : "2197",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1659",
+            "localId" : "2202",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1660",
+              "localId" : "2203",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1661",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2204",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1655",
+            "localId" : "2198",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1656",
+              "localId" : "2199",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1657",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2200",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1658",
+            "localId" : "2201",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1640",
+            "localId" : "2186",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1650",
+              "localId" : "2193",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1651",
+                "localId" : "2194",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1652",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2195",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
-              "type" : "Interval",
-              "localId" : "1643",
-              "lowClosed" : true,
-              "highClosed" : true,
+              "type" : "ExpressionRef",
+              "localId" : "2187",
+              "name" : "DateTime9_10Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1644",
+                "localId" : "2188",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1645",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2189",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
-              },
-              "low" : {
-                "type" : "Literal",
-                "localId" : "1641",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "high" : {
-                "type" : "Literal",
-                "localId" : "1642",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "3",
-                "annotation" : [ ]
               }
             }, {
-              "type" : "As",
-              "localId" : "1647",
+              "type" : "ExpressionRef",
+              "localId" : "2190",
+              "name" : "DateTimeNull_5Interval",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "1646",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              },
-              "asTypeSpecifier" : {
+              "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1648",
+                "localId" : "2191",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1649",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2192",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Null",
-            "localId" : "1653",
+            "localId" : "2196",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1667",
-        "name" : "ExpectedResultWithNull",
+        "localId" : "2210",
+        "name" : "DateTimeNullStartCollapseNoOverlapExpected",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1667",
+            "r" : "2210",
             "s" : [ {
-              "value" : [ "", "define ", "ExpectedResultWithNull", ": " ]
+              "value" : [ "", "define ", "DateTimeNullStartCollapseNoOverlapExpected", ": " ]
             }, {
-              "r" : "1668",
+              "r" : "2211",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "1671",
+                "r" : "2212",
                 "s" : [ {
-                  "r" : "1669",
-                  "value" : [ "Interval[", "1", ",", "3", "]" ]
+                  "value" : [ "DateTimeNull_5Interval" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "2215",
+                "s" : [ {
+                  "value" : [ "DateTime9_10Interval" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -206225,479 +237739,476 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1677",
+          "localId" : "2221",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1678",
+            "localId" : "2222",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1679",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2223",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "1668",
+          "localId" : "2211",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1674",
+            "localId" : "2218",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1675",
+              "localId" : "2219",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1676",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2220",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
-            "type" : "Interval",
-            "localId" : "1671",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "ExpressionRef",
+            "localId" : "2212",
+            "name" : "DateTimeNull_5Interval",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1672",
+              "localId" : "2213",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1673",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2214",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "ExpressionRef",
+            "localId" : "2215",
+            "name" : "DateTime9_10Interval",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2216",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2217",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Literal",
-              "localId" : "1669",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Literal",
-              "localId" : "1670",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1682",
-        "name" : "NullCollapse",
+        "localId" : "2226",
+        "name" : "DateTimeNullEndCollapseExpected",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1682",
+            "r" : "2226",
             "s" : [ {
-              "value" : [ "", "define ", "NullCollapse", ": " ]
+              "value" : [ "", "define ", "DateTimeNullEndCollapseExpected", ": " ]
             }, {
-              "r" : "1697",
+              "r" : "2227",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "1683",
+                "r" : "2253",
                 "s" : [ {
-                  "r" : "1684",
-                  "value" : [ "null", " as " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "1685",
+                  "r" : "2244",
                   "s" : [ {
-                    "value" : [ "List<" ]
-                  }, {
-                    "r" : "1686",
-                    "s" : [ {
-                      "value" : [ "Interval<" ]
-                    }, {
-                      "r" : "1687",
-                      "s" : [ {
-                        "value" : [ "Integer" ]
-                      } ]
-                    }, {
-                      "value" : [ ">" ]
-                    } ]
-                  }, {
-                    "value" : [ ">" ]
+                    "r" : "2228",
+                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
                   } ]
+                }, {
+                  "r" : "2252",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1705",
+          "localId" : "2260",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1706",
+            "localId" : "2261",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1707",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2262",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "1697",
+          "type" : "List",
+          "localId" : "2227",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1702",
+            "localId" : "2257",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1703",
+              "localId" : "2258",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1704",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2259",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "1698",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "2253",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "elementType" : {
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1699",
+              "localId" : "2255",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1700",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2256",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1701",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "As",
-            "localId" : "1683",
-            "strict" : false,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "1693",
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2244",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1694",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1695",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2245",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2246",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2247",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2248",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2249",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2250",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2251",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2228",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2012",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2229",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2230",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2231",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2232",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2233",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2234",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "0",
+                "annotation" : [ ]
               }
             },
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1684",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "1685",
+            "high" : {
+              "type" : "As",
+              "localId" : "2254",
+              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "ListTypeSpecifier",
-                "localId" : "1690",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "1691",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1692",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }
-              },
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1686",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "IntervalTypeSpecifier",
-                  "localId" : "1688",
-                  "annotation" : [ ],
-                  "pointType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "1689",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                },
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1687",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2252",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "Null",
-            "localId" : "1696",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1710",
-        "name" : "NullPerCollapse",
+        "localId" : "2265",
+        "name" : "DateTimeNullStartEndCollapse",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1710",
+            "r" : "2265",
             "s" : [ {
-              "value" : [ "", "define ", "NullPerCollapse", ": " ]
+              "value" : [ "", "define ", "DateTimeNullStartEndCollapse", ": " ]
             }, {
-              "r" : "1727",
+              "r" : "2280",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1711",
+                "r" : "2266",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1714",
+                  "r" : "2267",
                   "s" : [ {
-                    "r" : "1712",
-                    "value" : [ "Interval[", "1", ",", "4", "]" ]
+                    "value" : [ "DateTimeNull_5Interval" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "1719",
+                  "r" : "2270",
                   "s" : [ {
-                    "r" : "1717",
-                    "value" : [ "Interval[", "4", ",", "7", "]" ]
+                    "value" : [ "DateTime1_10Interval" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2273",
+                  "s" : [ {
+                    "value" : [ "DateTime5_NullInterval" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
-              }, {
-                "r" : "1726",
-                "value" : [ " per ", "null" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1736",
+          "localId" : "2288",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1737",
+            "localId" : "2289",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1738",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2290",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "1727",
+          "localId" : "2280",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1733",
+            "localId" : "2285",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1734",
+              "localId" : "2286",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1735",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2287",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1729",
+            "localId" : "2281",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1730",
+              "localId" : "2282",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1731",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2283",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1732",
+            "localId" : "2284",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1711",
+            "localId" : "2266",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1722",
+              "localId" : "2276",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1723",
+                "localId" : "2277",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1724",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2278",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
-              "type" : "Interval",
-              "localId" : "1714",
-              "lowClosed" : true,
-              "highClosed" : true,
+              "type" : "ExpressionRef",
+              "localId" : "2267",
+              "name" : "DateTimeNull_5Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1715",
+                "localId" : "2268",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1716",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2269",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
-              },
-              "low" : {
-                "type" : "Literal",
-                "localId" : "1712",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "high" : {
-                "type" : "Literal",
-                "localId" : "1713",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
               }
             }, {
-              "type" : "Interval",
-              "localId" : "1719",
-              "lowClosed" : true,
-              "highClosed" : true,
+              "type" : "ExpressionRef",
+              "localId" : "2270",
+              "name" : "DateTime1_10Interval",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1720",
+                "localId" : "2271",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1721",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2272",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "ExpressionRef",
+              "localId" : "2273",
+              "name" : "DateTime5_NullInterval",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2274",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2275",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
-              },
-              "low" : {
-                "type" : "Literal",
-                "localId" : "1717",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              },
-              "high" : {
-                "type" : "Literal",
-                "localId" : "1718",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "7",
-                "annotation" : [ ]
               }
             } ]
           }, {
-            "type" : "As",
-            "localId" : "1728",
-            "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1726",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            }
+            "type" : "Null",
+            "localId" : "2279",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1741",
-        "name" : "ExpectedResultNullPer",
+        "localId" : "2293",
+        "name" : "DateTimeNullStartEndCollapseExpected",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1741",
+            "r" : "2293",
             "s" : [ {
-              "value" : [ "", "define ", "ExpectedResultNullPer", ": " ]
+              "value" : [ "", "define ", "DateTimeNullStartEndCollapseExpected", ": " ]
             }, {
-              "r" : "1742",
+              "r" : "2294",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "1745",
+                "r" : "2297",
                 "s" : [ {
-                  "r" : "1743",
-                  "value" : [ "Interval[", "1", ",", "7", "]" ]
+                  "r" : "2295",
+                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -206707,1230 +238218,817 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1751",
+          "localId" : "2303",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1752",
+            "localId" : "2304",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1753",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2305",
+              "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "1742",
+          "localId" : "2294",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1748",
+            "localId" : "2300",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1749",
+              "localId" : "2301",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1750",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2302",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
             "type" : "Interval",
-            "localId" : "1745",
+            "localId" : "2297",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1746",
+              "localId" : "2298",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1747",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2299",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "1743",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "type" : "Null",
+              "localId" : "2295",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "1744",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
+              "type" : "Null",
+              "localId" : "2296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "1756",
-        "name" : "DateTime5_NullInterval",
+        "localId" : "2308",
+        "name" : "QuantityMeterNullLowIntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1756",
+            "r" : "2308",
             "s" : [ {
-              "value" : [ "", "define ", "DateTime5_NullInterval", ": " ]
+              "value" : [ "", "define ", "QuantityMeterNullLowIntervalList", ": " ]
             }, {
-              "r" : "1782",
+              "r" : "2309",
               "s" : [ {
-                "value" : [ "Interval[" ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "1773",
+                "r" : "2318",
                 "s" : [ {
-                  "r" : "1757",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "2310",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "2316",
+                  "s" : [ {
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "2311",
+                    "s" : [ {
+                      "value" : [ "'1.995 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "1781",
-                "value" : [ ", ", "null", "]" ]
+                "value" : [ ", " ]
+              }, {
+                "r" : "2336",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2327",
+                  "s" : [ {
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "2322",
+                    "s" : [ {
+                      "value" : [ "'2 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2334",
+                  "s" : [ {
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "2329",
+                    "s" : [ {
+                      "value" : [ "'3 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1786",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1787",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "1782",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "ListTypeSpecifier",
+          "localId" : "2342",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1784",
+            "localId" : "2343",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1785",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "1773",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1774",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1775",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1776",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1777",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1778",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1779",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1780",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1757",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1758",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1759",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1760",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1761",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1762",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1763",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            }
-          },
-          "high" : {
-            "type" : "As",
-            "localId" : "1783",
-            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1781",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "localId" : "2344",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
-        }
-      }, {
-        "localId" : "1790",
-        "name" : "DateTimeNull_5Interval",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "1790",
-            "s" : [ {
-              "value" : [ "", "define ", "DateTimeNull_5Interval", ": " ]
-            }, {
-              "r" : "1816",
-              "s" : [ {
-                "r" : "1791",
-                "value" : [ "Interval[", "null", ", " ]
-              }, {
-                "r" : "1808",
-                "s" : [ {
-                  "r" : "1792",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "5", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "value" : [ "]" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1820",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1821",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
         },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "1816",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "List",
+          "localId" : "2309",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1818",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1819",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
-            }
-          },
-          "low" : {
-            "type" : "As",
-            "localId" : "1817",
-            "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+            "type" : "ListTypeSpecifier",
+            "localId" : "2339",
             "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "1791",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2340",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2341",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             }
           },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "1808",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "2318",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1809",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1810",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1811",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1812",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1813",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1814",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1815",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1792",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1793",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1794",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2320",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2321",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1795",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "As",
+              "localId" : "2319",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2310",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1796",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2316",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2317",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2311",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "1.995 'm'",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2336",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2337",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2338",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1797",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "2327",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2328",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2322",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "2 'm'",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1798",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2334",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2335",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2329",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "3 'm'",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "1824",
-        "name" : "DateTime1_10Interval",
+        "localId" : "2347",
+        "name" : "CollapseQuantityNullLowUnitsWithinPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1824",
+            "r" : "2347",
             "s" : [ {
-              "value" : [ "", "define ", "DateTime1_10Interval", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityNullLowUnitsWithinPer", ": " ]
             }, {
-              "r" : "1873",
+              "r" : "2360",
               "s" : [ {
-                "value" : [ "Interval[" ]
+                "value" : [ "collapse " ]
               }, {
-                "r" : "1841",
+                "r" : "2348",
                 "s" : [ {
-                  "r" : "1825",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "QuantityMeterNullLowIntervalList" ]
                 } ]
               }, {
-                "value" : [ ", " ]
+                "value" : [ " per " ]
               }, {
-                "r" : "1865",
+                "r" : "2358",
                 "s" : [ {
-                  "r" : "1849",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "ToQuantity", "(" ]
+                }, {
+                  "r" : "2353",
+                  "s" : [ {
+                    "value" : [ "'1 \\'cm\\''" ]
+                  } ]
+                }, {
+                  "value" : [ ")" ]
                 } ]
-              }, {
-                "value" : [ "]" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1876",
+          "type" : "ListTypeSpecifier",
+          "localId" : "2368",
           "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1877",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2369",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2370",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
           }
         },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "1873",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "Collapse",
+          "localId" : "2360",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1874",
+            "type" : "ListTypeSpecifier",
+            "localId" : "2365",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1875",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2366",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2367",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             }
           },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "1841",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "2361",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1842",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1843",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1844",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1845",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1846",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1847",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1848",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1825",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1826",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1827",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1828",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1829",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1830",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1831",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2362",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2363",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "1865",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "2364",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "2348",
+            "name" : "QuantityMeterNullLowIntervalList",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "2349",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2350",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2351",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "ToQuantity",
+            "localId" : "2358",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1866",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1867",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1868",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1869",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1870",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1871",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1872",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2359",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1849",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1850",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1851",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1852",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1853",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1854",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
+            "operand" : {
               "type" : "Literal",
-              "localId" : "1855",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
+              "localId" : "2353",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "1 'cm'",
               "annotation" : [ ]
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "1880",
-        "name" : "DateTime9_10Interval",
+        "localId" : "2373",
+        "name" : "CollapseQuantityNullLowUnitsWithinPerExpected",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1880",
+            "r" : "2373",
             "s" : [ {
-              "value" : [ "", "define ", "DateTime9_10Interval", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityNullLowUnitsWithinPerExpected", " : " ]
             }, {
-              "r" : "1929",
+              "r" : "2374",
               "s" : [ {
-                "value" : [ "Interval[" ]
-              }, {
-                "r" : "1897",
-                "s" : [ {
-                  "r" : "1881",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "9", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "1921",
+                "r" : "2383",
                 "s" : [ {
-                  "r" : "1905",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "r" : "2375",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "2381",
+                  "s" : [ {
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "2376",
+                    "s" : [ {
+                      "value" : [ "'3 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "value" : [ "]" ]
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1932",
-          "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1933",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Interval",
-          "localId" : "1929",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "ListTypeSpecifier",
+          "localId" : "2390",
           "annotation" : [ ],
-          "resultTypeSpecifier" : {
+          "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1930",
+            "localId" : "2391",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1931",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2392",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
-          },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "1897",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "2374",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "2387",
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1898",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1899",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1900",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1901",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1902",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1903",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1904",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1881",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1882",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1883",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1884",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1885",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1886",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1887",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2388",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2389",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             }
           },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "1921",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "2383",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1922",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1923",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1924",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1925",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1926",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1927",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1928",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1905",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1906",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1907",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1908",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1909",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2385",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2386",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1910",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "As",
+              "localId" : "2384",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2375",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1911",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2381",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2382",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2376",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "3 'm'",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "1936",
-        "name" : "DateTime1_2Interval",
+        "localId" : "2395",
+        "name" : "QuantityMeterNullHighIntervalList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1936",
+            "r" : "2395",
             "s" : [ {
-              "value" : [ "", "define ", "DateTime1_2Interval", ": " ]
+              "value" : [ "", "define ", "QuantityMeterNullHighIntervalList", ": " ]
             }, {
-              "r" : "1985",
+              "r" : "2396",
               "s" : [ {
-                "value" : [ "Interval[" ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "1953",
+                "r" : "2411",
                 "s" : [ {
-                  "r" : "1937",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2402",
+                  "s" : [ {
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "2397",
+                    "s" : [ {
+                      "value" : [ "'1 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                }, {
+                  "value" : [ "," ]
+                }, {
+                  "r" : "2409",
+                  "s" : [ {
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "2404",
+                    "s" : [ {
+                      "value" : [ "'1.995 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "1977",
+                "r" : "2422",
                 "s" : [ {
-                  "r" : "1961",
-                  "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "2", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2419",
+                  "s" : [ {
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "2414",
+                    "s" : [ {
+                      "value" : [ "'2 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
+                  } ]
+                }, {
+                  "r" : "2421",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "value" : [ "]" ]
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
-          "type" : "IntervalTypeSpecifier",
-          "localId" : "1988",
+          "type" : "ListTypeSpecifier",
+          "localId" : "2429",
           "annotation" : [ ],
-          "pointType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "1989",
-            "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-            "annotation" : [ ]
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2430",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2431",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ]
+            }
           }
         },
         "expression" : {
-          "type" : "Interval",
-          "localId" : "1985",
-          "lowClosed" : true,
-          "highClosed" : true,
+          "type" : "List",
+          "localId" : "2396",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "1986",
+            "type" : "ListTypeSpecifier",
+            "localId" : "2426",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1987",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ]
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2427",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2428",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             }
           },
-          "low" : {
-            "type" : "DateTime",
-            "localId" : "1953",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "2411",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1954",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1955",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1956",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1957",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1958",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1959",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1960",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1937",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1938",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1939",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1940",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1941",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2412",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2413",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1942",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "2402",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2403",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2397",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "1 'm'",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1943",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2409",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2410",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2404",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "1.995 'm'",
+                "annotation" : [ ]
+              }
             }
-          },
-          "high" : {
-            "type" : "DateTime",
-            "localId" : "1977",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+          }, {
+            "type" : "Interval",
+            "localId" : "2422",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1978",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1979",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1980",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1981",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1982",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1983",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }, {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "1984",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            } ],
-            "year" : {
-              "type" : "Literal",
-              "localId" : "1961",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2012",
-              "annotation" : [ ]
-            },
-            "month" : {
-              "type" : "Literal",
-              "localId" : "1962",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            },
-            "day" : {
-              "type" : "Literal",
-              "localId" : "1963",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            },
-            "hour" : {
-              "type" : "Literal",
-              "localId" : "1964",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
-            },
-            "minute" : {
-              "type" : "Literal",
-              "localId" : "1965",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2424",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2425",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
             },
-            "second" : {
-              "type" : "Literal",
-              "localId" : "1966",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "2419",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2420",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2414",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "2 'm'",
+                "annotation" : [ ]
+              }
             },
-            "millisecond" : {
-              "type" : "Literal",
-              "localId" : "1967",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "0",
-              "annotation" : [ ]
+            "high" : {
+              "type" : "As",
+              "localId" : "2423",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2421",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
-          }
+          } ]
         }
       }, {
-        "localId" : "1992",
-        "name" : "DateTimeNullStartCollapse",
+        "localId" : "2434",
+        "name" : "CollapseQuantityNullHighUnitsWithinPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1992",
+            "r" : "2434",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeNullStartCollapse", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityNullHighUnitsWithinPer", ": " ]
             }, {
-              "r" : "2004",
+              "r" : "2447",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "1993",
+                "r" : "2435",
                 "s" : [ {
-                  "value" : [ "{ " ]
-                }, {
-                  "r" : "1994",
-                  "s" : [ {
-                    "value" : [ "DateTime1_10Interval" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "value" : [ "QuantityMeterNullHighIntervalList" ]
+                } ]
+              }, {
+                "value" : [ " per " ]
+              }, {
+                "r" : "2445",
+                "s" : [ {
+                  "value" : [ "ToQuantity", "(" ]
                 }, {
-                  "r" : "1997",
+                  "r" : "2440",
                   "s" : [ {
-                    "value" : [ "DateTimeNull_5Interval" ]
+                    "value" : [ "'1 \\'cm\\''" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ ")" ]
                 } ]
               } ]
             } ]
@@ -207938,150 +239036,138 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2012",
+          "localId" : "2455",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2013",
+            "localId" : "2456",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2014",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2457",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "2004",
+          "localId" : "2447",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2009",
+            "localId" : "2452",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2010",
+              "localId" : "2453",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2011",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2454",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2005",
+            "localId" : "2448",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2006",
+              "localId" : "2449",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2007",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2450",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2008",
+            "localId" : "2451",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "List",
-            "localId" : "1993",
+            "type" : "ExpressionRef",
+            "localId" : "2435",
+            "name" : "QuantityMeterNullHighIntervalList",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2000",
+              "localId" : "2436",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2001",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2002",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "1994",
-              "name" : "DateTime1_10Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1995",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1996",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "1997",
-              "name" : "DateTimeNull_5Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "1998",
+                "localId" : "2437",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1999",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "2438",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
-            } ]
+            }
           }, {
-            "type" : "Null",
-            "localId" : "2003",
+            "type" : "ToQuantity",
+            "localId" : "2445",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2446",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            } ],
+            "operand" : {
+              "type" : "Literal",
+              "localId" : "2440",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "1 'cm'",
+              "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "2017",
-        "name" : "DateTimeNullStartCollapseExpected",
+        "localId" : "2460",
+        "name" : "CollapseQuantityNullHighUnitsWithinPerExpected",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2017",
+            "r" : "2460",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeNullStartCollapseExpected", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityNullHighUnitsWithinPerExpected", " : " ]
             }, {
-              "r" : "2018",
+              "r" : "2461",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "2044",
+                "r" : "2470",
                 "s" : [ {
-                  "r" : "2019",
-                  "value" : [ "Interval[", "null", ", " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2036",
+                  "r" : "2467",
                   "s" : [ {
-                    "r" : "2020",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "10", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "value" : [ "ToQuantity", "(" ]
+                  }, {
+                    "r" : "2462",
+                    "s" : [ {
+                      "value" : [ "'1 \\'m\\''" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "2469",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -208091,360 +239177,462 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2051",
+          "localId" : "2477",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2052",
+            "localId" : "2478",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2053",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2479",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "2018",
+          "localId" : "2461",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2048",
+            "localId" : "2474",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2049",
+              "localId" : "2475",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2050",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2476",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
             "type" : "Interval",
-            "localId" : "2044",
+            "localId" : "2470",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2046",
+              "localId" : "2472",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2047",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2473",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "2045",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2019",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "DateTime",
-              "localId" : "2036",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "ToQuantity",
+              "localId" : "2467",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2037",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2038",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2039",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2040",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2041",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2042",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2043",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2468",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2020",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2021",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2022",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "10",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2023",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2024",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
-                "annotation" : [ ]
-              },
-              "second" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "2025",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "localId" : "2462",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "1 'm'",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2026",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2471",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2469",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2056",
-        "name" : "DateTimeNullEndCollapse",
+        "localId" : "2482",
+        "name" : "QuantityIntervalListWithNulls",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2056",
+            "r" : "2482",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeNullEndCollapse", ": " ]
+              "value" : [ "", "define ", "QuantityIntervalListWithNulls", ": " ]
             }, {
-              "r" : "2068",
+              "r" : "2483",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "2057",
+                "r" : "2496",
                 "s" : [ {
-                  "value" : [ "{ " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2058",
+                  "r" : "2488",
                   "s" : [ {
-                    "value" : [ "DateTime1_10Interval" ]
+                    "r" : "2484",
+                    "value" : [ "ToQuantity", "(", "4", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2061",
+                  "r" : "2494",
                   "s" : [ {
-                    "value" : [ "DateTime5_NullInterval" ]
+                    "r" : "2490",
+                    "value" : [ "ToQuantity", "(", "8", ")" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "2506",
+                "s" : [ {
+                  "r" : "2499",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "2504",
+                  "s" : [ {
+                    "r" : "2500",
+                    "value" : [ "ToQuantity", "(", "2", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "2522",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2514",
+                  "s" : [ {
+                    "r" : "2510",
+                    "value" : [ "ToQuantity", "(", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2520",
+                  "s" : [ {
+                    "r" : "2516",
+                    "value" : [ "ToQuantity", "(", "4", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "2532",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2529",
+                  "s" : [ {
+                    "r" : "2525",
+                    "value" : [ "ToQuantity", "(", "7", ")" ]
+                  } ]
+                }, {
+                  "r" : "2531",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2076",
+          "localId" : "2539",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2077",
+            "localId" : "2540",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2078",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2541",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "2068",
+          "type" : "List",
+          "localId" : "2483",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2073",
+            "localId" : "2536",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2074",
+              "localId" : "2537",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2075",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2538",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "2069",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "2496",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "elementType" : {
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2070",
+              "localId" : "2497",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2071",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2498",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "2488",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2489",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2484",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2494",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2495",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2490",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "8",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "2072",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "List",
-            "localId" : "2057",
+            "type" : "Interval",
+            "localId" : "2506",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "2064",
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2508",
               "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2065",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2066",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2509",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
               }
             },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "2058",
-              "name" : "DateTime1_10Interval",
+            "low" : {
+              "type" : "As",
+              "localId" : "2507",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2059",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2060",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2499",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "2061",
-              "name" : "DateTime5_NullInterval",
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2504",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2062",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2063",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2505",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2500",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
               }
-            } ]
+            }
           }, {
-            "type" : "Null",
-            "localId" : "2067",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
+            "type" : "Interval",
+            "localId" : "2522",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2523",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2524",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "2514",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2515",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2510",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2520",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2521",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2516",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2532",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2534",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2535",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "2529",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2530",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2525",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "7",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2533",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2531",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
           } ]
         }
       }, {
-        "localId" : "2081",
-        "name" : "DateTimeNullEndCollapseNoOverlap",
+        "localId" : "2544",
+        "name" : "CollapseQuantityIntervalListWithNulls",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2081",
+            "r" : "2544",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeNullEndCollapseNoOverlap", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNulls", ": " ]
             }, {
-              "r" : "2093",
+              "r" : "2550",
               "s" : [ {
                 "value" : [ "collapse " ]
               }, {
-                "r" : "2082",
+                "r" : "2545",
                 "s" : [ {
-                  "value" : [ "{ " ]
-                }, {
-                  "r" : "2083",
-                  "s" : [ {
-                    "value" : [ "DateTime1_2Interval" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2086",
-                  "s" : [ {
-                    "value" : [ "DateTime5_NullInterval" ]
-                  } ]
-                }, {
-                  "value" : [ " }" ]
+                  "value" : [ "QuantityIntervalListWithNulls" ]
                 } ]
               } ]
             } ]
@@ -208452,148 +239640,110 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2101",
+          "localId" : "2558",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2102",
+            "localId" : "2559",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2103",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2560",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Collapse",
-          "localId" : "2093",
+          "localId" : "2550",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2098",
+            "localId" : "2555",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2099",
+              "localId" : "2556",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2100",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2557",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2094",
+            "localId" : "2551",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2095",
+              "localId" : "2552",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2096",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2553",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2097",
+            "localId" : "2554",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "List",
-            "localId" : "2082",
+            "type" : "ExpressionRef",
+            "localId" : "2545",
+            "name" : "QuantityIntervalListWithNulls",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2089",
+              "localId" : "2546",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2090",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2091",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "2083",
-              "name" : "DateTime1_2Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2084",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2085",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "2086",
-              "name" : "DateTime5_NullInterval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2087",
+                "localId" : "2547",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2088",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "2548",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
-            } ]
+            }
           }, {
             "type" : "Null",
-            "localId" : "2092",
+            "localId" : "2549",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2106",
-        "name" : "DateTimeNullEndCollapseNoOverlapExpected",
+        "localId" : "2563",
+        "name" : "CollapseQuantityIntervalListWithNullsExpected",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2106",
+            "r" : "2563",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeNullEndCollapseNoOverlapExpected", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNullsExpected", ": " ]
             }, {
-              "r" : "2107",
+              "r" : "2564",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "2108",
-                "s" : [ {
-                  "value" : [ "DateTime1_2Interval" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "2111",
+                "r" : "2567",
                 "s" : [ {
-                  "value" : [ "DateTime5_NullInterval" ]
+                  "r" : "2565",
+                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
                 } ]
               }, {
                 "value" : [ " }" ]
@@ -208603,842 +239753,936 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2117",
+          "localId" : "2573",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2118",
+            "localId" : "2574",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2119",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2575",
+              "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "2107",
+          "localId" : "2564",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2114",
+            "localId" : "2570",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2115",
+              "localId" : "2571",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2116",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2572",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "2108",
-            "name" : "DateTime1_2Interval",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2109",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2110",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "ExpressionRef",
-            "localId" : "2111",
-            "name" : "DateTime5_NullInterval",
+            "type" : "Interval",
+            "localId" : "2567",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2112",
+              "localId" : "2568",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2113",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2569",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Null",
+              "localId" : "2565",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Null",
+              "localId" : "2566",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2122",
-        "name" : "DateTimeNullStartCollapseNoOverlap",
+        "localId" : "2578",
+        "name" : "QuantityIntervalListWithNullLowNoOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2122",
+            "r" : "2578",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeNullStartCollapseNoOverlap", ": " ]
+              "value" : [ "", "define ", "QuantityIntervalListWithNullLowNoOverlap", ": " ]
             }, {
-              "r" : "2134",
+              "r" : "2579",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "2123",
+                "r" : "2592",
                 "s" : [ {
-                  "value" : [ "{ " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2124",
+                  "r" : "2584",
                   "s" : [ {
-                    "value" : [ "DateTime9_10Interval" ]
+                    "r" : "2580",
+                    "value" : [ "ToQuantity", "(", "4", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2127",
+                  "r" : "2590",
                   "s" : [ {
-                    "value" : [ "DateTimeNull_5Interval" ]
+                    "r" : "2586",
+                    "value" : [ "ToQuantity", "(", "8", ")" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "2602",
+                "s" : [ {
+                  "r" : "2595",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "2600",
+                  "s" : [ {
+                    "r" : "2596",
+                    "value" : [ "ToQuantity", "(", "2", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
                 } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2142",
+          "localId" : "2609",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2143",
+            "localId" : "2610",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2144",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2611",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "2134",
+          "type" : "List",
+          "localId" : "2579",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2139",
+            "localId" : "2606",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2140",
+              "localId" : "2607",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2141",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2608",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "2135",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "2592",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "elementType" : {
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2136",
+              "localId" : "2593",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2137",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2594",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "2584",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2585",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2580",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2590",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2591",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2586",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "8",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "2138",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "List",
-            "localId" : "2123",
+            "type" : "Interval",
+            "localId" : "2602",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "2130",
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2604",
               "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2131",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2132",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2605",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
               }
             },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "2124",
-              "name" : "DateTime9_10Interval",
+            "low" : {
+              "type" : "As",
+              "localId" : "2603",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2125",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2126",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2595",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "2127",
-              "name" : "DateTimeNull_5Interval",
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2600",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2128",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2129",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2601",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2596",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
               }
-            } ]
-          }, {
-            "type" : "Null",
-            "localId" : "2133",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "2147",
-        "name" : "DateTimeNullStartCollapseNoOverlapExpected",
+        "localId" : "2614",
+        "name" : "CollapseQuantityIntervalListWithNullLowNoOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2147",
+            "r" : "2614",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeNullStartCollapseNoOverlapExpected", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNullLowNoOverlap", ": " ]
             }, {
-              "r" : "2148",
+              "r" : "2620",
               "s" : [ {
-                "value" : [ "{ " ]
-              }, {
-                "r" : "2149",
-                "s" : [ {
-                  "value" : [ "DateTimeNull_5Interval" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "collapse " ]
               }, {
-                "r" : "2152",
+                "r" : "2615",
                 "s" : [ {
-                  "value" : [ "DateTime9_10Interval" ]
+                  "value" : [ "QuantityIntervalListWithNullLowNoOverlap" ]
                 } ]
-              }, {
-                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2158",
+          "localId" : "2628",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2159",
+            "localId" : "2629",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2160",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2630",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "2148",
+          "type" : "Collapse",
+          "localId" : "2620",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2155",
+            "localId" : "2625",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2156",
+              "localId" : "2626",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2157",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2627",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "2149",
-            "name" : "DateTimeNull_5Interval",
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "2621",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2150",
+              "localId" : "2622",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2151",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2623",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "2624",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
             "type" : "ExpressionRef",
-            "localId" : "2152",
-            "name" : "DateTime9_10Interval",
+            "localId" : "2615",
+            "name" : "QuantityIntervalListWithNullLowNoOverlap",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2153",
+              "type" : "ListTypeSpecifier",
+              "localId" : "2616",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2154",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2617",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2618",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "annotation" : [ ]
+                }
               }
             }
+          }, {
+            "type" : "Null",
+            "localId" : "2619",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2163",
-        "name" : "DateTimeNullEndCollapseExpected",
+        "localId" : "2633",
+        "name" : "CollapseQuantityIntervalListWithNullLowNoOverlapExpected",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2163",
+            "r" : "2633",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeNullEndCollapseExpected", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNullLowNoOverlapExpected", ": " ]
             }, {
-              "r" : "2164",
+              "r" : "2634",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "2190",
+                "r" : "2642",
+                "s" : [ {
+                  "r" : "2635",
+                  "value" : [ "Interval[", "null", ", " ]
+                }, {
+                  "r" : "2640",
+                  "s" : [ {
+                    "r" : "2636",
+                    "value" : [ "ToQuantity", "(", "2", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "2658",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2181",
+                  "r" : "2650",
+                  "s" : [ {
+                    "r" : "2646",
+                    "value" : [ "ToQuantity", "(", "4", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2656",
                   "s" : [ {
-                    "r" : "2165",
-                    "value" : [ "DateTime", "(", "2012", ", ", "1", ", ", "1", ", ", "0", ", ", "0", ", ", "0", ", ", "0", ")" ]
+                    "r" : "2652",
+                    "value" : [ "ToQuantity", "(", "8", ")" ]
                   } ]
                 }, {
-                  "r" : "2189",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ "]" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "value" : [ "}" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2197",
+          "localId" : "2664",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2198",
+            "localId" : "2665",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2199",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2666",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "2164",
+          "localId" : "2634",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2194",
+            "localId" : "2661",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2195",
+              "localId" : "2662",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2196",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2663",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "element" : [ {
             "type" : "Interval",
-            "localId" : "2190",
+            "localId" : "2642",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2192",
+              "localId" : "2644",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2193",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2645",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2181",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "2643",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2182",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2183",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2184",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2185",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2186",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2187",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2635",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2640",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2188",
+                "localId" : "2641",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2165",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2012",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2166",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2167",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              },
-              "hour" : {
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "2168",
+                "localId" : "2636",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "2",
                 "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2169",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2658",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2659",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2660",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2170",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "2650",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2651",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              },
-              "millisecond" : {
+              } ],
+              "operand" : {
                 "type" : "Literal",
-                "localId" : "2171",
+                "localId" : "2646",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "0",
+                "value" : "4",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "As",
-              "localId" : "2191",
-              "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "ToQuantity",
+              "localId" : "2656",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "signature" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2657",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
               "operand" : {
-                "type" : "Null",
-                "localId" : "2189",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "type" : "Literal",
+                "localId" : "2652",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "8",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2202",
-        "name" : "DateTimeNullStartEndCollapse",
+        "localId" : "2669",
+        "name" : "QuantityIntervalListWithNullHighNoOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2202",
+            "r" : "2669",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeNullStartEndCollapse", ": " ]
+              "value" : [ "", "define ", "QuantityIntervalListWithNullHighNoOverlap", ": " ]
             }, {
-              "r" : "2217",
+              "r" : "2670",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "{ " ]
               }, {
-                "r" : "2203",
+                "r" : "2678",
                 "s" : [ {
-                  "value" : [ "{ " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2204",
+                  "r" : "2675",
                   "s" : [ {
-                    "value" : [ "DateTimeNull_5Interval" ]
+                    "r" : "2671",
+                    "value" : [ "ToQuantity", "(", "4", ")" ]
                   } ]
                 }, {
-                  "value" : [ ", " ]
+                  "r" : "2677",
+                  "value" : [ ", ", "null", "]" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "2694",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2207",
+                  "r" : "2686",
                   "s" : [ {
-                    "value" : [ "DateTime1_10Interval" ]
+                    "r" : "2682",
+                    "value" : [ "ToQuantity", "(", "1", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2210",
+                  "r" : "2692",
                   "s" : [ {
-                    "value" : [ "DateTime5_NullInterval" ]
+                    "r" : "2688",
+                    "value" : [ "ToQuantity", "(", "2", ")" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ "]" ]
                 } ]
+              }, {
+                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2225",
+          "localId" : "2700",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2226",
+            "localId" : "2701",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2227",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2702",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "2217",
+          "type" : "List",
+          "localId" : "2670",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2222",
+            "localId" : "2697",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2223",
+              "localId" : "2698",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2224",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2699",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "2218",
+          "element" : [ {
+            "type" : "Interval",
+            "localId" : "2678",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
-            "elementType" : {
+            "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2219",
+              "localId" : "2680",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2220",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2681",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "2675",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2676",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2671",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2679",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2677",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "2221",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "List",
-            "localId" : "2203",
+            "type" : "Interval",
+            "localId" : "2694",
+            "lowClosed" : true,
+            "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "2213",
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2695",
               "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2214",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2215",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2696",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ]
               }
             },
-            "element" : [ {
-              "type" : "ExpressionRef",
-              "localId" : "2204",
-              "name" : "DateTimeNull_5Interval",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2205",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2206",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "2207",
-              "name" : "DateTime1_10Interval",
+            "low" : {
+              "type" : "ToQuantity",
+              "localId" : "2686",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2208",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2209",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2687",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2682",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
+                "annotation" : [ ]
               }
-            }, {
-              "type" : "ExpressionRef",
-              "localId" : "2210",
-              "name" : "DateTime5_NullInterval",
+            },
+            "high" : {
+              "type" : "ToQuantity",
+              "localId" : "2692",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2211",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2212",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2693",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "operand" : {
+                "type" : "Literal",
+                "localId" : "2688",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
               }
-            } ]
-          }, {
-            "type" : "Null",
-            "localId" : "2216",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
+            }
           } ]
         }
       }, {
-        "localId" : "2230",
-        "name" : "DateTimeNullStartEndCollapseExpected",
+        "localId" : "2705",
+        "name" : "CollapseQuantityIntervalListWithNullHighNoOverlap",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2230",
+            "r" : "2705",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeNullStartEndCollapseExpected", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNullHighNoOverlap", ": " ]
             }, {
-              "r" : "2231",
+              "r" : "2711",
               "s" : [ {
-                "value" : [ "{ " ]
+                "value" : [ "collapse " ]
               }, {
-                "r" : "2234",
+                "r" : "2706",
                 "s" : [ {
-                  "r" : "2232",
-                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
+                  "value" : [ "QuantityIntervalListWithNullHighNoOverlap" ]
                 } ]
-              }, {
-                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2240",
+          "localId" : "2719",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2241",
+            "localId" : "2720",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2242",
-              "name" : "{urn:hl7-org:elm-types:r1}Any",
+              "localId" : "2721",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "2231",
+          "type" : "Collapse",
+          "localId" : "2711",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2237",
+            "localId" : "2716",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2238",
+              "localId" : "2717",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2239",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "2718",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "2234",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "2712",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2235",
+              "localId" : "2713",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2236",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "2714",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Null",
-              "localId" : "2232",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Null",
-              "localId" : "2233",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
             }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "2715",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "ExpressionRef",
+            "localId" : "2706",
+            "name" : "QuantityIntervalListWithNullHighNoOverlap",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "2707",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2708",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2709",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          }, {
+            "type" : "Null",
+            "localId" : "2710",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2245",
-        "name" : "QuantityMeterNullLowIntervalList",
+        "localId" : "2724",
+        "name" : "CollapseQuantityIntervalListWithNullHighNoOverlapExpected",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2245",
+            "r" : "2724",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityMeterNullLowIntervalList", ": " ]
+              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNullHighNoOverlapExpected", ": " ]
             }, {
-              "r" : "2246",
+              "r" : "2725",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "2255",
+                "r" : "2738",
                 "s" : [ {
-                  "r" : "2247",
-                  "value" : [ "Interval[", "null", ", " ]
+                  "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2253",
+                  "r" : "2730",
                   "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "2248",
-                    "s" : [ {
-                      "value" : [ "'1.995 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "2726",
+                    "value" : [ "ToQuantity", "(", "1", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2736",
+                  "s" : [ {
+                    "r" : "2732",
+                    "value" : [ "ToQuantity", "(", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -209446,55 +240690,36 @@ module.exports['Collapse'] = {
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "2273",
+                "r" : "2748",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2264",
-                  "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "2259",
-                    "s" : [ {
-                      "value" : [ "'2 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2271",
+                  "r" : "2745",
                   "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "2266",
-                    "s" : [ {
-                      "value" : [ "'3 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "2741",
+                    "value" : [ "ToQuantity", "(", "4", ")" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "2747",
+                  "value" : [ ", ", "null", "]" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "value" : [ "}" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2279",
+          "localId" : "2755",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2280",
+            "localId" : "2756",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2281",
+              "localId" : "2757",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
@@ -209502,19 +240727,19 @@ module.exports['Collapse'] = {
         },
         "expression" : {
           "type" : "List",
-          "localId" : "2246",
+          "localId" : "2725",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2276",
+            "localId" : "2752",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2277",
+              "localId" : "2753",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2278",
+                "localId" : "2754",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
@@ -209522,2168 +240747,2976 @@ module.exports['Collapse'] = {
           },
           "element" : [ {
             "type" : "Interval",
-            "localId" : "2255",
+            "localId" : "2738",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2257",
+              "localId" : "2739",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2258",
+                "localId" : "2740",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "As",
-              "localId" : "2256",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "ToQuantity",
+              "localId" : "2730",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "signature" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2731",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
               "operand" : {
-                "type" : "Null",
-                "localId" : "2247",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "type" : "Literal",
+                "localId" : "2726",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "1",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "ToQuantity",
-              "localId" : "2253",
+              "localId" : "2736",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2254",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "2737",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "2248",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "1.995 'm'",
+                "localId" : "2732",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2273",
+            "localId" : "2748",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2274",
+              "localId" : "2750",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2275",
+                "localId" : "2751",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "ToQuantity",
-              "localId" : "2264",
+              "localId" : "2745",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2265",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "2746",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "2259",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "2 'm'",
+                "localId" : "2741",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
             },
             "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2271",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "As",
+              "localId" : "2749",
+              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2272",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
-                "annotation" : [ ]
-              } ],
+              "signature" : [ ],
               "operand" : {
-                "type" : "Literal",
-                "localId" : "2266",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "3 'm'",
+                "type" : "Null",
+                "localId" : "2747",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* DateIntervalExpand
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define ClosedSinglePerDay: expand { Interval[@2018-01-01, @2018-01-03] } per day
+define ClosedSinglePerWeek: expand { Interval[@2018-01-01, @2018-01-21] } per week
+define ClosedSinglePerMonth: expand { Interval[@2018-01-01, @2018-03-31] } per month
+define ClosedSinglePerMonthTrunc: expand { Interval[@2018-01-01, @2018-04-29] } per month
+define ClosedSinglePerYear: expand { Interval[@2016-01-01, @2018-12-31] } per year
+define ClosedSinglePerYearTrunc: expand { Interval[@2016-01-01, @2019-12-30] } per year
+
+define MidBoundariesPerDay: expand { Interval[@2017-12-30, @2018-01-01] } per day
+define MidBoundariesPerMonth: expand { Interval[@2017-11-14, @2018-01-18] } per month
+define MidBoundariesPerYear: expand { Interval[@2016-04-06, @2018-04-06] } per year
+
+define NullInList: expand { Interval[@2018-01-01, @2018-01-03], null } per day
+define Overlapping: expand { Interval[@2018-01-01, @2018-01-03], Interval[@2018-01-02, @2018-01-04] } per day
+define NonOverlapping: expand { Interval[@2018-01-01, @2018-01-03], Interval[@2018-01-08, @2018-01-08] } per day
+
+define NoPerDefaultDay: expand { Interval[@2018-01-01, @2018-01-03] }
+define NoPerDefaultMonth: expand { Interval[@2018-01, @2018-03] }
+define NoPerDefaultYear: expand { Interval[@2016, @2018] }
+define NoPerDefaultMonthWithMismatch: expand { Interval[@2016, @2018-03] }
+
+define OpenStart: expand { Interval(@2018-01-01, @2018-01-03] } per day
+define OpenEnd: expand { Interval[@2018-01-01, @2018-01-03) } per day
+define OpenBoth: expand { Interval(@2018-01-01, @2018-01-03) } per day
+
+define MismatchPrecision: expand { Interval[@2018-01-01, @2018-03] } per month
+define MismatchPrecisionResultLongerThanInput: expand { Interval[@2018-01, @2018-02-28] } per month
+
+define EmptyList: List<Interval<Date>>{}
+define NullOpen: expand { Interval[null, @2018-01-03] } per day
+define NullClose: expand { Interval[@2018-01-01, null] } per day
+define NullBoth: expand { Interval[null, null] } per day
+define MonthDayPer: expand { Interval[@2018-01, @2018-03] } per day
+define YearMonthPer: expand { Interval[@2016, @2018] } per month
+define YearDayPer: expand { Interval[@2016, @2018] } per day
+define BadPerMinute: expand { Interval[@2018-01-01, @2018-01-04] } per minute
+define BadPerGram: expand { Interval[@2018-01-01, @2018-01-04] } per 1 'g'
+*/
+
+module.exports['DateIntervalExpand'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "1144",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "2284",
-        "name" : "CollapseQuantityNullLowUnitsWithinPer",
+        "localId" : "214",
+        "name" : "ClosedSinglePerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2284",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityNullLowUnitsWithinPer", ": " ]
+              "value" : [ "", "define ", "ClosedSinglePerDay", ": " ]
             }, {
-              "r" : "2297",
+              "r" : "234",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2285",
+                "r" : "215",
                 "s" : [ {
-                  "value" : [ "QuantityMeterNullLowIntervalList" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "226",
+                  "s" : [ {
+                    "r" : "220",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", "]" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per " ]
+                "value" : [ " per ", "day" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "242",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "243",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "244",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Expand",
+          "localId" : "234",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "239",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "240",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "241",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "235",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "236",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "237",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "238",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "215",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "229",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "230",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "231",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "226",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "227",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "228",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "220",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "217",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "218",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "219",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "225",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "222",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "223",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "224",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "233",
+            "value" : 1.0,
+            "unit" : "day",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "247",
+        "name" : "ClosedSinglePerWeek",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "247",
+            "s" : [ {
+              "value" : [ "", "define ", "ClosedSinglePerWeek", ": " ]
+            }, {
+              "r" : "267",
+              "s" : [ {
+                "value" : [ "expand " ]
               }, {
-                "r" : "2295",
+                "r" : "248",
                 "s" : [ {
-                  "value" : [ "ToQuantity", "(" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "2290",
+                  "r" : "259",
                   "s" : [ {
-                    "value" : [ "'1 \\'cm\\''" ]
+                    "r" : "253",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-21", "]" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "week" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2305",
+          "localId" : "275",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2306",
+            "localId" : "276",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2307",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "277",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "2297",
+          "type" : "Expand",
+          "localId" : "267",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2302",
+            "localId" : "272",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2303",
+              "localId" : "273",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2304",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "274",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2298",
+            "localId" : "268",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2299",
+              "localId" : "269",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2300",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "270",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2301",
+            "localId" : "271",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "2285",
-            "name" : "QuantityMeterNullLowIntervalList",
+            "type" : "List",
+            "localId" : "248",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2286",
+              "localId" : "262",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2287",
+                "localId" : "263",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2288",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "264",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "259",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "260",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "261",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "253",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "250",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "251",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "252",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "258",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "255",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "256",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "257",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "21",
                   "annotation" : [ ]
                 }
               }
-            }
+            } ]
           }, {
-            "type" : "ToQuantity",
-            "localId" : "2295",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2296",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "2290",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "1 'cm'",
-              "annotation" : [ ]
-            }
+            "type" : "Quantity",
+            "localId" : "266",
+            "value" : 1.0,
+            "unit" : "week",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2310",
-        "name" : "CollapseQuantityNullLowUnitsWithinPerExpected",
+        "localId" : "280",
+        "name" : "ClosedSinglePerMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2310",
+            "r" : "280",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityNullLowUnitsWithinPerExpected", " : " ]
+              "value" : [ "", "define ", "ClosedSinglePerMonth", ": " ]
             }, {
-              "r" : "2311",
+              "r" : "300",
               "s" : [ {
-                "value" : [ "{ " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2320",
+                "r" : "281",
                 "s" : [ {
-                  "r" : "2312",
-                  "value" : [ "Interval[", "null", ", " ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "2318",
+                  "r" : "292",
                   "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "2313",
-                    "s" : [ {
-                      "value" : [ "'3 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "286",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-03-31", "]" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2327",
+          "localId" : "308",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2328",
+            "localId" : "309",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2329",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "310",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "2311",
+          "type" : "Expand",
+          "localId" : "300",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2324",
+            "localId" : "305",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2325",
+              "localId" : "306",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2326",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "307",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "2320",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "301",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2322",
+              "localId" : "302",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2323",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "303",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "2321",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "304",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "281",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "295",
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2312",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "296",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "297",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
               }
             },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2318",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "292",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2319",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2313",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "3 'm'",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "293",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "294",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "286",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "283",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "284",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "285",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "291",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "288",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "289",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "290",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "31",
+                  "annotation" : [ ]
+                }
               }
-            }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "299",
+            "value" : 1.0,
+            "unit" : "month",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2332",
-        "name" : "QuantityMeterNullHighIntervalList",
+        "localId" : "313",
+        "name" : "ClosedSinglePerMonthTrunc",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2332",
+            "r" : "313",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityMeterNullHighIntervalList", ": " ]
+              "value" : [ "", "define ", "ClosedSinglePerMonthTrunc", ": " ]
             }, {
-              "r" : "2333",
+              "r" : "333",
               "s" : [ {
-                "value" : [ "{ " ]
-              }, {
-                "r" : "2348",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2339",
-                  "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "2334",
-                    "s" : [ {
-                      "value" : [ "'1 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
-                  } ]
-                }, {
-                  "value" : [ "," ]
-                }, {
-                  "r" : "2346",
-                  "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "2341",
-                    "s" : [ {
-                      "value" : [ "'1.995 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2359",
+                "r" : "314",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "2356",
+                  "r" : "325",
                   "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "2351",
-                    "s" : [ {
-                      "value" : [ "'2 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "319",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-04-29", "]" ]
                   } ]
                 }, {
-                  "r" : "2358",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2366",
+          "localId" : "341",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2367",
+            "localId" : "342",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2368",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "343",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "2333",
+          "type" : "Expand",
+          "localId" : "333",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2363",
+            "localId" : "338",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2364",
+              "localId" : "339",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2365",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "340",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "2348",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "334",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2349",
+              "localId" : "335",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2350",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2339",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2340",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2334",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "1 'm'",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2346",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2347",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2341",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "1.995 'm'",
+                "localId" : "336",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "2359",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "NamedTypeSpecifier",
+            "localId" : "337",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "314",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2361",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2362",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2356",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "ListTypeSpecifier",
+              "localId" : "328",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2357",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2351",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "2 'm'",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "329",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "330",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
               }
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "2360",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "325",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2358",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "326",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "327",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "319",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "316",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "317",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "318",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "324",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "321",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "322",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "323",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "29",
+                  "annotation" : [ ]
+                }
               }
-            }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "332",
+            "value" : 1.0,
+            "unit" : "month",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2371",
-        "name" : "CollapseQuantityNullHighUnitsWithinPer",
+        "localId" : "346",
+        "name" : "ClosedSinglePerYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2371",
+            "r" : "346",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityNullHighUnitsWithinPer", ": " ]
+              "value" : [ "", "define ", "ClosedSinglePerYear", ": " ]
             }, {
-              "r" : "2384",
+              "r" : "366",
               "s" : [ {
-                "value" : [ "collapse " ]
-              }, {
-                "r" : "2372",
-                "s" : [ {
-                  "value" : [ "QuantityMeterNullHighIntervalList" ]
-                } ]
-              }, {
-                "value" : [ " per " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2382",
+                "r" : "347",
                 "s" : [ {
-                  "value" : [ "ToQuantity", "(" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "2377",
+                  "r" : "358",
                   "s" : [ {
-                    "value" : [ "'1 \\'cm\\''" ]
+                    "r" : "352",
+                    "value" : [ "Interval[", "@2016-01-01", ", ", "@2018-12-31", "]" ]
                   } ]
                 }, {
-                  "value" : [ ")" ]
+                  "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2392",
+          "localId" : "374",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2393",
+            "localId" : "375",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2394",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "376",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "2384",
+          "type" : "Expand",
+          "localId" : "366",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2389",
+            "localId" : "371",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2390",
+              "localId" : "372",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2391",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "373",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2385",
+            "localId" : "367",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2386",
+              "localId" : "368",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2387",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "369",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2388",
+            "localId" : "370",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "2372",
-            "name" : "QuantityMeterNullHighIntervalList",
+            "type" : "List",
+            "localId" : "347",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2373",
+              "localId" : "361",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2374",
+                "localId" : "362",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2375",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "363",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
-            }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "358",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "359",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "360",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "352",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "349",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2016",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "350",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "351",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "357",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "354",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "355",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "12",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "356",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "31",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
           }, {
-            "type" : "ToQuantity",
-            "localId" : "2382",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ],
-            "signature" : [ {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2383",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
-              "annotation" : [ ]
-            } ],
-            "operand" : {
-              "type" : "Literal",
-              "localId" : "2377",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "1 'cm'",
-              "annotation" : [ ]
-            }
+            "type" : "Quantity",
+            "localId" : "365",
+            "value" : 1.0,
+            "unit" : "year",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2397",
-        "name" : "CollapseQuantityNullHighUnitsWithinPerExpected",
+        "localId" : "379",
+        "name" : "ClosedSinglePerYearTrunc",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2397",
+            "r" : "379",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityNullHighUnitsWithinPerExpected", " : " ]
+              "value" : [ "", "define ", "ClosedSinglePerYearTrunc", ": " ]
             }, {
-              "r" : "2398",
+              "r" : "399",
               "s" : [ {
-                "value" : [ "{ " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2407",
+                "r" : "380",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "2404",
+                  "r" : "391",
                   "s" : [ {
-                    "value" : [ "ToQuantity", "(" ]
-                  }, {
-                    "r" : "2399",
-                    "s" : [ {
-                      "value" : [ "'1 \\'m\\''" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "385",
+                    "value" : [ "Interval[", "@2016-01-01", ", ", "@2019-12-30", "]" ]
                   } ]
                 }, {
-                  "r" : "2406",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2414",
+          "localId" : "407",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2415",
+            "localId" : "408",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2416",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "409",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "2398",
+          "type" : "Expand",
+          "localId" : "399",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2411",
+            "localId" : "404",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2412",
+              "localId" : "405",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2413",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "406",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "2407",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "400",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2409",
+              "localId" : "401",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2410",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "402",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2404",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "403",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "380",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "394",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2405",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2399",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "1 'm'",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "395",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "396",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
               }
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "2408",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "391",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2406",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "392",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "393",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "385",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "382",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2016",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "383",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "384",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "390",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "387",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2019",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "388",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "12",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "389",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "30",
+                  "annotation" : [ ]
+                }
               }
-            }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "398",
+            "value" : 1.0,
+            "unit" : "year",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2419",
-        "name" : "QuantityIntervalListWithNulls",
+        "localId" : "412",
+        "name" : "MidBoundariesPerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2419",
+            "r" : "412",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalListWithNulls", ": " ]
+              "value" : [ "", "define ", "MidBoundariesPerDay", ": " ]
             }, {
-              "r" : "2420",
+              "r" : "432",
               "s" : [ {
-                "value" : [ "{ " ]
-              }, {
-                "r" : "2433",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2425",
-                  "s" : [ {
-                    "r" : "2421",
-                    "value" : [ "ToQuantity", "(", "4", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2431",
-                  "s" : [ {
-                    "r" : "2427",
-                    "value" : [ "ToQuantity", "(", "8", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "2443",
-                "s" : [ {
-                  "r" : "2436",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "2441",
-                  "s" : [ {
-                    "r" : "2437",
-                    "value" : [ "ToQuantity", "(", "2", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "2459",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2451",
-                  "s" : [ {
-                    "r" : "2447",
-                    "value" : [ "ToQuantity", "(", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2457",
-                  "s" : [ {
-                    "r" : "2453",
-                    "value" : [ "ToQuantity", "(", "4", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2469",
+                "r" : "413",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "2466",
+                  "r" : "424",
                   "s" : [ {
-                    "r" : "2462",
-                    "value" : [ "ToQuantity", "(", "7", ")" ]
+                    "r" : "418",
+                    "value" : [ "Interval[", "@2017-12-30", ", ", "@2018-01-01", "]" ]
                   } ]
                 }, {
-                  "r" : "2468",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2476",
+          "localId" : "440",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2477",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "2478",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ]
-            }
-          }
-        },
-        "expression" : {
-          "type" : "List",
-          "localId" : "2420",
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "ListTypeSpecifier",
-            "localId" : "2473",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2474",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2475",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            }
-          },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "2433",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2434",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2435",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2425",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2426",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2421",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2431",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2432",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2427",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "8",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "Interval",
-            "localId" : "2443",
-            "lowClosed" : true,
-            "highClosed" : true,
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2445",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2446",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "2444",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2436",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2441",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2442",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2437",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              }
+            "localId" : "441",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "442",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
             }
-          }, {
-            "type" : "Interval",
-            "localId" : "2459",
-            "lowClosed" : true,
-            "highClosed" : true,
+          }
+        },
+        "expression" : {
+          "type" : "Expand",
+          "localId" : "432",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "437",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2460",
+              "localId" : "438",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2461",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2451",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2452",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2447",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2457",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2458",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2453",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
+                "localId" : "439",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
-          }, {
-            "type" : "Interval",
-            "localId" : "2469",
-            "lowClosed" : true,
-            "highClosed" : true,
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "433",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2471",
+              "localId" : "434",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2472",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "435",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2466",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "436",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "413",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "427",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2467",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2462",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "7",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "428",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "429",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
               }
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "2470",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "424",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2468",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "425",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "426",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "418",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "415",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2017",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "416",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "12",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "417",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "30",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "423",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "420",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "421",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "422",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
               }
-            }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "431",
+            "value" : 1.0,
+            "unit" : "day",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2481",
-        "name" : "CollapseQuantityIntervalListWithNulls",
+        "localId" : "445",
+        "name" : "MidBoundariesPerMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2481",
+            "r" : "445",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNulls", ": " ]
+              "value" : [ "", "define ", "MidBoundariesPerMonth", ": " ]
             }, {
-              "r" : "2487",
+              "r" : "465",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2482",
+                "r" : "446",
                 "s" : [ {
-                  "value" : [ "QuantityIntervalListWithNulls" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "457",
+                  "s" : [ {
+                    "r" : "451",
+                    "value" : [ "Interval[", "@2017-11-14", ", ", "@2018-01-18", "]" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2495",
+          "localId" : "473",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2496",
+            "localId" : "474",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2497",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "475",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "2487",
+          "type" : "Expand",
+          "localId" : "465",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2492",
+            "localId" : "470",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2493",
+              "localId" : "471",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2494",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "472",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2488",
+            "localId" : "466",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2489",
+              "localId" : "467",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2490",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "468",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2491",
+            "localId" : "469",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "2482",
-            "name" : "QuantityIntervalListWithNulls",
+            "type" : "List",
+            "localId" : "446",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2483",
+              "localId" : "460",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2484",
+                "localId" : "461",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2485",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "462",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
-            }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "457",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "458",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "459",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "451",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "448",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2017",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "449",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "11",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "450",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "14",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "456",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "453",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "454",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "455",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "18",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
           }, {
-            "type" : "Null",
-            "localId" : "2486",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "464",
+            "value" : 1.0,
+            "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2500",
-        "name" : "CollapseQuantityIntervalListWithNullsExpected",
+        "localId" : "478",
+        "name" : "MidBoundariesPerYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2500",
+            "r" : "478",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNullsExpected", ": " ]
+              "value" : [ "", "define ", "MidBoundariesPerYear", ": " ]
             }, {
-              "r" : "2501",
+              "r" : "498",
               "s" : [ {
-                "value" : [ "{ " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2504",
+                "r" : "479",
                 "s" : [ {
-                  "r" : "2502",
-                  "value" : [ "Interval[", "null", ", ", "null", "]" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "490",
+                  "s" : [ {
+                    "r" : "484",
+                    "value" : [ "Interval[", "@2016-04-06", ", ", "@2018-04-06", "]" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2510",
+          "localId" : "506",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2511",
+            "localId" : "507",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2512",
-              "name" : "{urn:hl7-org:elm-types:r1}Any",
+              "localId" : "508",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "2501",
+          "type" : "Expand",
+          "localId" : "498",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2507",
+            "localId" : "503",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2508",
+              "localId" : "504",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2509",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "505",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "2504",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "499",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2505",
+              "localId" : "500",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2506",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "501",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
-            },
-            "low" : {
-              "type" : "Null",
-              "localId" : "2502",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "high" : {
-              "type" : "Null",
-              "localId" : "2503",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
             }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "502",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "479",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "493",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "494",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "495",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "490",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "491",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "492",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "484",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "481",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2016",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "482",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "483",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "6",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "489",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "486",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "487",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "488",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "6",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "497",
+            "value" : 1.0,
+            "unit" : "year",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2515",
-        "name" : "QuantityIntervalListWithNullLowNoOverlap",
+        "localId" : "511",
+        "name" : "NullInList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2515",
+            "r" : "511",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalListWithNullLowNoOverlap", ": " ]
+              "value" : [ "", "define ", "NullInList", ": " ]
             }, {
-              "r" : "2516",
+              "r" : "535",
               "s" : [ {
-                "value" : [ "{ " ]
-              }, {
-                "r" : "2529",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2521",
-                  "s" : [ {
-                    "r" : "2517",
-                    "value" : [ "ToQuantity", "(", "4", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2527",
-                  "s" : [ {
-                    "r" : "2523",
-                    "value" : [ "ToQuantity", "(", "8", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2539",
+                "r" : "512",
                 "s" : [ {
-                  "r" : "2532",
-                  "value" : [ "Interval[", "null", ", " ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "2537",
+                  "r" : "523",
                   "s" : [ {
-                    "r" : "2533",
-                    "value" : [ "ToQuantity", "(", "2", ")" ]
+                    "r" : "517",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", "]" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "r" : "526",
+                  "value" : [ ", ", "null", " }" ]
                 } ]
               }, {
-                "value" : [ " }" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2546",
+          "localId" : "543",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2547",
+            "localId" : "544",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2548",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "545",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "2516",
+          "type" : "Expand",
+          "localId" : "535",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2543",
+            "localId" : "540",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2544",
+              "localId" : "541",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2545",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "542",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "2529",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "536",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2530",
+              "localId" : "537",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2531",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2521",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2522",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2517",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2527",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2528",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2523",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "8",
+                "localId" : "538",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "2539",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "NamedTypeSpecifier",
+            "localId" : "539",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "512",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2541",
+              "type" : "ListTypeSpecifier",
+              "localId" : "530",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2542",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "531",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "532",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
               }
             },
-            "low" : {
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "523",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "524",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "525",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "517",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "514",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "515",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "516",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "522",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "519",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "520",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "521",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
               "type" : "As",
-              "localId" : "2540",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "527",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2532",
+                "localId" : "526",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
+              },
+              "asTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "528",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "529",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
               }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2537",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2538",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2533",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
-              }
-            }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "534",
+            "value" : 1.0,
+            "unit" : "day",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2551",
-        "name" : "CollapseQuantityIntervalListWithNullLowNoOverlap",
+        "localId" : "548",
+        "name" : "Overlapping",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2551",
+            "r" : "548",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNullLowNoOverlap", ": " ]
+              "value" : [ "", "define ", "Overlapping", ": " ]
             }, {
-              "r" : "2557",
+              "r" : "581",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2552",
+                "r" : "549",
                 "s" : [ {
-                  "value" : [ "QuantityIntervalListWithNullLowNoOverlap" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "560",
+                  "s" : [ {
+                    "r" : "554",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", "]" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "573",
+                  "s" : [ {
+                    "r" : "567",
+                    "value" : [ "Interval[", "@2018-01-02", ", ", "@2018-01-04", "]" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2565",
+          "localId" : "589",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2566",
+            "localId" : "590",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2567",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "591",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "2557",
+          "type" : "Expand",
+          "localId" : "581",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2562",
+            "localId" : "586",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2563",
+              "localId" : "587",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2564",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "588",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2558",
+            "localId" : "582",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2559",
+              "localId" : "583",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2560",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "584",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2561",
+            "localId" : "585",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "2552",
-            "name" : "QuantityIntervalListWithNullLowNoOverlap",
+            "type" : "List",
+            "localId" : "549",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2553",
+              "localId" : "576",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2554",
+                "localId" : "577",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2555",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "578",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
-            }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "560",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "561",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "562",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "554",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "551",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "552",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "553",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "559",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "556",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "557",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "558",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "573",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "574",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "575",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "567",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "564",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "565",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "566",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "572",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "569",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "570",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "571",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
           }, {
-            "type" : "Null",
-            "localId" : "2556",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "580",
+            "value" : 1.0,
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2570",
-        "name" : "CollapseQuantityIntervalListWithNullLowNoOverlapExpected",
+        "localId" : "594",
+        "name" : "NonOverlapping",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "2570",
-            "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNullLowNoOverlapExpected", ": " ]
-            }, {
-              "r" : "2571",
-              "s" : [ {
-                "value" : [ "{ " ]
-              }, {
-                "r" : "2579",
-                "s" : [ {
-                  "r" : "2572",
-                  "value" : [ "Interval[", "null", ", " ]
-                }, {
-                  "r" : "2577",
-                  "s" : [ {
-                    "r" : "2573",
-                    "value" : [ "ToQuantity", "(", "2", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "594",
+            "s" : [ {
+              "value" : [ "", "define ", "NonOverlapping", ": " ]
+            }, {
+              "r" : "627",
+              "s" : [ {
+                "value" : [ "expand " ]
               }, {
-                "r" : "2595",
+                "r" : "595",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "2587",
+                  "r" : "606",
                   "s" : [ {
-                    "r" : "2583",
-                    "value" : [ "ToQuantity", "(", "4", ")" ]
+                    "r" : "600",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", "]" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2593",
+                  "r" : "619",
                   "s" : [ {
-                    "r" : "2589",
-                    "value" : [ "ToQuantity", "(", "8", ")" ]
+                    "r" : "613",
+                    "value" : [ "Interval[", "@2018-01-08", ", ", "@2018-01-08", "]" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ "}" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2601",
+          "localId" : "635",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2602",
+            "localId" : "636",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2603",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "637",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "2571",
+          "type" : "Expand",
+          "localId" : "627",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2598",
+            "localId" : "632",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2599",
+              "localId" : "633",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2600",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "634",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "2579",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "628",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2581",
+              "localId" : "629",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2582",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "As",
-              "localId" : "2580",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2572",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2577",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2578",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2573",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "localId" : "630",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "2595",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "NamedTypeSpecifier",
+            "localId" : "631",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "595",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2596",
+              "type" : "ListTypeSpecifier",
+              "localId" : "622",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2597",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "623",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "624",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
               }
             },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2587",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "606",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2588",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2583",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "607",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "608",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "600",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "597",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "598",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "599",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "605",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "602",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "603",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "604",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
               }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2593",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            }, {
+              "type" : "Interval",
+              "localId" : "619",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2594",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2589",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "8",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "620",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "621",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "613",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "610",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "611",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "612",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "8",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "618",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "615",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "616",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "617",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "8",
+                  "annotation" : [ ]
+                }
               }
-            }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "626",
+            "value" : 1.0,
+            "unit" : "day",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2606",
-        "name" : "QuantityIntervalListWithNullHighNoOverlap",
+        "localId" : "640",
+        "name" : "NoPerDefaultDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2606",
+            "r" : "640",
             "s" : [ {
-              "value" : [ "", "define ", "QuantityIntervalListWithNullHighNoOverlap", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultDay", ": " ]
             }, {
-              "r" : "2607",
+              "r" : "659",
               "s" : [ {
-                "value" : [ "{ " ]
-              }, {
-                "r" : "2615",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2612",
-                  "s" : [ {
-                    "r" : "2608",
-                    "value" : [ "ToQuantity", "(", "4", ")" ]
-                  } ]
-                }, {
-                  "r" : "2614",
-                  "value" : [ ", ", "null", "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2631",
+                "r" : "641",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2623",
-                  "s" : [ {
-                    "r" : "2619",
-                    "value" : [ "ToQuantity", "(", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "2629",
+                  "r" : "652",
                   "s" : [ {
-                    "r" : "2625",
-                    "value" : [ "ToQuantity", "(", "2", ")" ]
+                    "r" : "646",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", "]" ]
                   } ]
                 }, {
-                  "value" : [ "]" ]
+                  "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " }" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2637",
+          "localId" : "667",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2638",
+            "localId" : "668",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2639",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "669",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "2607",
+          "type" : "Expand",
+          "localId" : "659",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2634",
+            "localId" : "664",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2635",
+              "localId" : "665",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2636",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "666",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "2615",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "660",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2617",
+              "localId" : "661",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2618",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2612",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2613",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2608",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "As",
-              "localId" : "2616",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2614",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "662",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "2631",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "NamedTypeSpecifier",
+            "localId" : "663",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "641",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2632",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2633",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2623",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "ListTypeSpecifier",
+              "localId" : "655",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2624",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2619",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "656",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "657",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
               }
             },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2629",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "652",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2630",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2625",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "653",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "654",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "646",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "643",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "644",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "645",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "651",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "648",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "649",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "650",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
               }
-            }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "658",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2642",
-        "name" : "CollapseQuantityIntervalListWithNullHighNoOverlap",
+        "localId" : "672",
+        "name" : "NoPerDefaultMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2642",
+            "r" : "672",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNullHighNoOverlap", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultMonth", ": " ]
             }, {
-              "r" : "2648",
+              "r" : "689",
               "s" : [ {
-                "value" : [ "collapse " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2643",
+                "r" : "673",
                 "s" : [ {
-                  "value" : [ "QuantityIntervalListWithNullHighNoOverlap" ]
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "682",
+                  "s" : [ {
+                    "r" : "677",
+                    "value" : [ "Interval[", "@2018-01", ", ", "@2018-03", "]" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
                 } ]
               } ]
             } ]
@@ -211691,449 +243724,506 @@ module.exports['Collapse'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2656",
+          "localId" : "697",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2657",
+            "localId" : "698",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2658",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "699",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Collapse",
-          "localId" : "2648",
+          "type" : "Expand",
+          "localId" : "689",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2653",
+            "localId" : "694",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2654",
+              "localId" : "695",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2655",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "696",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2649",
+            "localId" : "690",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2650",
+              "localId" : "691",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2651",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "692",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2652",
+            "localId" : "693",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
-            "type" : "ExpressionRef",
-            "localId" : "2643",
-            "name" : "QuantityIntervalListWithNullHighNoOverlap",
+            "type" : "List",
+            "localId" : "673",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2644",
+              "localId" : "685",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2645",
+                "localId" : "686",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2646",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "687",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               }
-            }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "682",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "683",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "684",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "677",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "675",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "676",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "681",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "679",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "680",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
           }, {
             "type" : "Null",
-            "localId" : "2647",
+            "localId" : "688",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2661",
-        "name" : "CollapseQuantityIntervalListWithNullHighNoOverlapExpected",
+        "localId" : "702",
+        "name" : "NoPerDefaultYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2661",
+            "r" : "702",
             "s" : [ {
-              "value" : [ "", "define ", "CollapseQuantityIntervalListWithNullHighNoOverlapExpected", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultYear", ": " ]
             }, {
-              "r" : "2662",
+              "r" : "717",
               "s" : [ {
-                "value" : [ "{ " ]
-              }, {
-                "r" : "2675",
-                "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2667",
-                  "s" : [ {
-                    "r" : "2663",
-                    "value" : [ "ToQuantity", "(", "1", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2673",
-                  "s" : [ {
-                    "r" : "2669",
-                    "value" : [ "ToQuantity", "(", "2", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "2685",
+                "r" : "703",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "2682",
+                  "r" : "710",
                   "s" : [ {
-                    "r" : "2678",
-                    "value" : [ "ToQuantity", "(", "4", ")" ]
+                    "r" : "706",
+                    "value" : [ "Interval[", "@2016", ", ", "@2018", "]" ]
                   } ]
                 }, {
-                  "r" : "2684",
-                  "value" : [ ", ", "null", "]" ]
+                  "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ "}" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2692",
+          "localId" : "725",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2693",
+            "localId" : "726",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2694",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "727",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "2662",
+          "type" : "Expand",
+          "localId" : "717",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2689",
+            "localId" : "722",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2690",
+              "localId" : "723",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2691",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "724",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ {
-            "type" : "Interval",
-            "localId" : "2675",
-            "lowClosed" : true,
-            "highClosed" : true,
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "718",
             "annotation" : [ ],
-            "resultTypeSpecifier" : {
+            "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2676",
+              "localId" : "719",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2677",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2667",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2668",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2663",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "1",
-                "annotation" : [ ]
-              }
-            },
-            "high" : {
-              "type" : "ToQuantity",
-              "localId" : "2673",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2674",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2669",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2",
+                "localId" : "720",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
-            "type" : "Interval",
-            "localId" : "2685",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "type" : "NamedTypeSpecifier",
+            "localId" : "721",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "703",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2687",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2688",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "annotation" : [ ]
-              }
-            },
-            "low" : {
-              "type" : "ToQuantity",
-              "localId" : "2682",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "type" : "ListTypeSpecifier",
+              "localId" : "713",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2683",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              } ],
-              "operand" : {
-                "type" : "Literal",
-                "localId" : "2678",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "4",
-                "annotation" : [ ]
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "714",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "715",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
               }
             },
-            "high" : {
-              "type" : "As",
-              "localId" : "2686",
-              "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "710",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2684",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "711",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "712",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "706",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "705",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2016",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "709",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "708",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                }
               }
-            }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "716",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* DateIntervalExpand
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define ClosedSinglePerDay: expand { Interval[@2018-01-01, @2018-01-03] } per day
-define ClosedSinglePerWeek: expand { Interval[@2018-01-01, @2018-01-21] } per week
-define ClosedSinglePerMonth: expand { Interval[@2018-01-01, @2018-03-31] } per month
-define ClosedSinglePerMonthTrunc: expand { Interval[@2018-01-01, @2018-04-29] } per month
-define ClosedSinglePerYear: expand { Interval[@2016-01-01, @2018-12-31] } per year
-define ClosedSinglePerYearTrunc: expand { Interval[@2016-01-01, @2019-12-30] } per year
-
-define MidBoundariesPerDay: expand { Interval[@2017-12-30, @2018-01-01] } per day
-define MidBoundariesPerMonth: expand { Interval[@2017-11-14, @2018-01-18] } per month
-define MidBoundariesPerYear: expand { Interval[@2016-04-06, @2018-04-06] } per year
-
-define NullInList: expand { Interval[@2018-01-01, @2018-01-03], null } per day
-define Overlapping: expand { Interval[@2018-01-01, @2018-01-03], Interval[@2018-01-02, @2018-01-04] } per day
-define NonOverlapping: expand { Interval[@2018-01-01, @2018-01-03], Interval[@2018-01-08, @2018-01-08] } per day
-
-define NoPerDefaultDay: expand { Interval[@2018-01-01, @2018-01-03] }
-define NoPerDefaultMonth: expand { Interval[@2018-01, @2018-03] }
-define NoPerDefaultYear: expand { Interval[@2016, @2018] }
-define NoPerDefaultMonthWithMismatch: expand { Interval[@2016, @2018-03] }
-
-define OpenStart: expand { Interval(@2018-01-01, @2018-01-03] } per day
-define OpenEnd: expand { Interval[@2018-01-01, @2018-01-03) } per day
-define OpenBoth: expand { Interval(@2018-01-01, @2018-01-03) } per day
-
-define MismatchPrecision: expand { Interval[@2018-01-01, @2018-03] } per month
-define MismatchPrecisionResultLongerThanInput: expand { Interval[@2018-01, @2018-02-28] } per month
-
-define EmptyList: List<Interval<Date>>{}
-define NullOpen: expand { Interval[null, @2018-01-03] } per day
-define NullClose: expand { Interval[@2018-01-01, null] } per day
-define NullBoth: expand { Interval[null, null] } per day
-define MonthDayPer: expand { Interval[@2018-01, @2018-03] } per day
-define YearMonthPer: expand { Interval[@2016, @2018] } per month
-define YearDayPer: expand { Interval[@2016, @2018] } per day
-define BadPerMinute: expand { Interval[@2018-01-01, @2018-01-04] } per minute
-define BadPerGram: expand { Interval[@2018-01-01, @2018-01-04] } per 1 'g'
-*/
-
-module.exports['DateIntervalExpand'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "1144",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "730",
+        "name" : "NoPerDefaultMonthWithMismatch",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "730",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "NoPerDefaultMonthWithMismatch", ": " ]
             }, {
+              "r" : "746",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "expand " ]
+              }, {
+                "r" : "731",
+                "s" : [ {
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "739",
+                  "s" : [ {
+                    "r" : "734",
+                    "value" : [ "Interval[", "@2016", ", ", "@2018-03", "]" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "754",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "755",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "756",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }
           }
+        },
+        "expression" : {
+          "type" : "Expand",
+          "localId" : "746",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "751",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "752",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "753",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "747",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "748",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "749",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "750",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "731",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "742",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "743",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "744",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "739",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "740",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "741",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Date",
+                "localId" : "734",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "733",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2016",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Date",
+                "localId" : "738",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "736",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "737",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Null",
+            "localId" : "745",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "214",
-        "name" : "ClosedSinglePerDay",
+        "localId" : "759",
+        "name" : "OpenStart",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "759",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSinglePerDay", ": " ]
+              "value" : [ "", "define ", "OpenStart", ": " ]
             }, {
-              "r" : "234",
+              "r" : "779",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "215",
+                "r" : "760",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "226",
+                  "r" : "771",
                   "s" : [ {
-                    "r" : "220",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", "]" ]
+                    "r" : "765",
+                    "value" : [ "Interval(", "@2018-01-01", ", ", "@2018-01-03", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -212146,15 +244236,15 @@ module.exports['DateIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "242",
+          "localId" : "787",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "243",
+            "localId" : "788",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "244",
+              "localId" : "789",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -212162,19 +244252,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "234",
+          "localId" : "779",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "239",
+            "localId" : "784",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "240",
+              "localId" : "785",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "241",
+                "localId" : "786",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -212182,40 +244272,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "235",
+            "localId" : "780",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "236",
+              "localId" : "781",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "237",
+                "localId" : "782",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "238",
+            "localId" : "783",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "215",
+            "localId" : "760",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "229",
+              "localId" : "774",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "230",
+                "localId" : "775",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "231",
+                  "localId" : "776",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -212223,44 +244313,44 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "226",
-              "lowClosed" : true,
+              "localId" : "771",
+              "lowClosed" : false,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "227",
+                "localId" : "772",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "228",
+                  "localId" : "773",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Date",
-                "localId" : "220",
+                "localId" : "765",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "217",
+                  "localId" : "762",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "218",
+                  "localId" : "763",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "219",
+                  "localId" : "764",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
@@ -212268,27 +244358,27 @@ module.exports['DateIntervalExpand'] = {
               },
               "high" : {
                 "type" : "Date",
-                "localId" : "225",
+                "localId" : "770",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "222",
+                  "localId" : "767",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "223",
+                  "localId" : "768",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "224",
+                  "localId" : "769",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
                   "annotation" : [ ]
@@ -212297,58 +244387,58 @@ module.exports['DateIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "233",
+            "localId" : "778",
             "value" : 1.0,
             "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "247",
-        "name" : "ClosedSinglePerWeek",
+        "localId" : "792",
+        "name" : "OpenEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "247",
+            "r" : "792",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSinglePerWeek", ": " ]
+              "value" : [ "", "define ", "OpenEnd", ": " ]
             }, {
-              "r" : "267",
+              "r" : "812",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "248",
+                "r" : "793",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "259",
+                  "r" : "804",
                   "s" : [ {
-                    "r" : "253",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-21", "]" ]
+                    "r" : "798",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "week" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "275",
+          "localId" : "820",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "276",
+            "localId" : "821",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "277",
+              "localId" : "822",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -212356,19 +244446,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "267",
+          "localId" : "812",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "272",
+            "localId" : "817",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "273",
+              "localId" : "818",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "274",
+                "localId" : "819",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -212376,40 +244466,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "268",
+            "localId" : "813",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "269",
+              "localId" : "814",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "270",
+                "localId" : "815",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "271",
+            "localId" : "816",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "248",
+            "localId" : "793",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "262",
+              "localId" : "807",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "263",
+                "localId" : "808",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "264",
+                  "localId" : "809",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -212417,44 +244507,44 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "259",
+              "localId" : "804",
               "lowClosed" : true,
-              "highClosed" : true,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "260",
+                "localId" : "805",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "261",
+                  "localId" : "806",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Date",
-                "localId" : "253",
+                "localId" : "798",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "250",
+                  "localId" : "795",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "251",
+                  "localId" : "796",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "252",
+                  "localId" : "797",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
@@ -212462,87 +244552,87 @@ module.exports['DateIntervalExpand'] = {
               },
               "high" : {
                 "type" : "Date",
-                "localId" : "258",
+                "localId" : "803",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "255",
+                  "localId" : "800",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "256",
+                  "localId" : "801",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "257",
+                  "localId" : "802",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "21",
+                  "value" : "3",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "266",
+            "localId" : "811",
             "value" : 1.0,
-            "unit" : "week",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "280",
-        "name" : "ClosedSinglePerMonth",
+        "localId" : "825",
+        "name" : "OpenBoth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "280",
+            "r" : "825",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSinglePerMonth", ": " ]
+              "value" : [ "", "define ", "OpenBoth", ": " ]
             }, {
-              "r" : "300",
+              "r" : "845",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "281",
+                "r" : "826",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "292",
+                  "r" : "837",
                   "s" : [ {
-                    "r" : "286",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-03-31", "]" ]
+                    "r" : "831",
+                    "value" : [ "Interval(", "@2018-01-01", ", ", "@2018-01-03", ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "308",
+          "localId" : "853",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "309",
+            "localId" : "854",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "310",
+              "localId" : "855",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -212550,19 +244640,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "300",
+          "localId" : "845",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "305",
+            "localId" : "850",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "306",
+              "localId" : "851",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "307",
+                "localId" : "852",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -212570,40 +244660,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "301",
+            "localId" : "846",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "302",
+              "localId" : "847",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "303",
+                "localId" : "848",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "304",
+            "localId" : "849",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "281",
+            "localId" : "826",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "295",
+              "localId" : "840",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "296",
+                "localId" : "841",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "297",
+                  "localId" : "842",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -212611,44 +244701,44 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "292",
-              "lowClosed" : true,
-              "highClosed" : true,
+              "localId" : "837",
+              "lowClosed" : false,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "293",
+                "localId" : "838",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "294",
+                  "localId" : "839",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Date",
-                "localId" : "286",
+                "localId" : "831",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "283",
+                  "localId" : "828",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "284",
+                  "localId" : "829",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "285",
+                  "localId" : "830",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
@@ -212656,66 +244746,66 @@ module.exports['DateIntervalExpand'] = {
               },
               "high" : {
                 "type" : "Date",
-                "localId" : "291",
+                "localId" : "836",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "288",
+                  "localId" : "833",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "289",
+                  "localId" : "834",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "290",
+                  "localId" : "835",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "31",
+                  "value" : "3",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "299",
+            "localId" : "844",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "313",
-        "name" : "ClosedSinglePerMonthTrunc",
+        "localId" : "858",
+        "name" : "MismatchPrecision",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "313",
+            "r" : "858",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSinglePerMonthTrunc", ": " ]
+              "value" : [ "", "define ", "MismatchPrecision", ": " ]
             }, {
-              "r" : "333",
+              "r" : "877",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "314",
+                "r" : "859",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "325",
+                  "r" : "869",
                   "s" : [ {
-                    "r" : "319",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-04-29", "]" ]
+                    "r" : "864",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-03", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -212728,15 +244818,15 @@ module.exports['DateIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "341",
+          "localId" : "885",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "342",
+            "localId" : "886",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "343",
+              "localId" : "887",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -212744,19 +244834,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "333",
+          "localId" : "877",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "338",
+            "localId" : "882",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "339",
+              "localId" : "883",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "340",
+                "localId" : "884",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -212764,40 +244854,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "334",
+            "localId" : "878",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "335",
+              "localId" : "879",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "336",
+                "localId" : "880",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "337",
+            "localId" : "881",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "314",
+            "localId" : "859",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "328",
+              "localId" : "872",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "329",
+                "localId" : "873",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "330",
+                  "localId" : "874",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -212805,44 +244895,44 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "325",
+              "localId" : "869",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "326",
+                "localId" : "870",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "327",
+                  "localId" : "871",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Date",
-                "localId" : "319",
+                "localId" : "864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "316",
+                  "localId" : "861",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "317",
+                  "localId" : "862",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "318",
+                  "localId" : "863",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
@@ -212850,87 +244940,80 @@ module.exports['DateIntervalExpand'] = {
               },
               "high" : {
                 "type" : "Date",
-                "localId" : "324",
+                "localId" : "868",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "321",
+                  "localId" : "866",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "322",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "323",
+                  "localId" : "867",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "29",
+                  "value" : "3",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "332",
+            "localId" : "876",
             "value" : 1.0,
             "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "346",
-        "name" : "ClosedSinglePerYear",
+        "localId" : "890",
+        "name" : "MismatchPrecisionResultLongerThanInput",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "346",
+            "r" : "890",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSinglePerYear", ": " ]
+              "value" : [ "", "define ", "MismatchPrecisionResultLongerThanInput", ": " ]
             }, {
-              "r" : "366",
+              "r" : "909",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "347",
+                "r" : "891",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "358",
+                  "r" : "901",
                   "s" : [ {
-                    "r" : "352",
-                    "value" : [ "Interval[", "@2016-01-01", ", ", "@2018-12-31", "]" ]
+                    "r" : "895",
+                    "value" : [ "Interval[", "@2018-01", ", ", "@2018-02-28", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "year" ]
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "374",
+          "localId" : "917",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "375",
+            "localId" : "918",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "376",
+              "localId" : "919",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -212938,19 +245021,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "366",
+          "localId" : "909",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "371",
+            "localId" : "914",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "372",
+              "localId" : "915",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "373",
+                "localId" : "916",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -212958,40 +245041,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "367",
+            "localId" : "910",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "368",
+              "localId" : "911",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "369",
+                "localId" : "912",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "370",
+            "localId" : "913",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "347",
+            "localId" : "891",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "361",
+              "localId" : "904",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "362",
+                "localId" : "905",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "363",
+                  "localId" : "906",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -212999,44 +245082,37 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "358",
+              "localId" : "901",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "359",
+                "localId" : "902",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "360",
+                  "localId" : "903",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Date",
-                "localId" : "352",
+                "localId" : "895",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "349",
+                  "localId" : "893",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                  "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "350",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "351",
+                  "localId" : "894",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
@@ -213044,87 +245120,159 @@ module.exports['DateIntervalExpand'] = {
               },
               "high" : {
                 "type" : "Date",
-                "localId" : "357",
+                "localId" : "900",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "354",
+                  "localId" : "897",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "355",
+                  "localId" : "898",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "12",
+                  "value" : "2",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "356",
+                  "localId" : "899",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "31",
+                  "value" : "28",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "365",
+            "localId" : "908",
             "value" : 1.0,
-            "unit" : "year",
+            "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "379",
-        "name" : "ClosedSinglePerYearTrunc",
+        "localId" : "922",
+        "name" : "EmptyList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "379",
+            "r" : "922",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSinglePerYearTrunc", ": " ]
+              "value" : [ "", "define ", "EmptyList", ": " ]
             }, {
-              "r" : "399",
+              "r" : "927",
+              "s" : [ {
+                "value" : [ "List<" ]
+              }, {
+                "r" : "923",
+                "s" : [ {
+                  "value" : [ "Interval<" ]
+                }, {
+                  "r" : "924",
+                  "s" : [ {
+                    "value" : [ "Date" ]
+                  } ]
+                }, {
+                  "value" : [ ">" ]
+                } ]
+              }, {
+                "value" : [ ">{}" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "932",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "933",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "934",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "927",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "929",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "930",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "931",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "element" : [ ]
+        }
+      }, {
+        "localId" : "937",
+        "name" : "NullOpen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "937",
+            "s" : [ {
+              "value" : [ "", "define ", "NullOpen", ": " ]
+            }, {
+              "r" : "954",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "380",
+                "r" : "938",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "391",
+                  "r" : "945",
                   "s" : [ {
-                    "r" : "385",
-                    "value" : [ "Interval[", "@2016-01-01", ", ", "@2019-12-30", "]" ]
+                    "r" : "939",
+                    "value" : [ "Interval[", "null", ", ", "@2018-01-03", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "year" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "407",
+          "localId" : "962",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "408",
+            "localId" : "963",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "409",
+              "localId" : "964",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -213132,19 +245280,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "399",
+          "localId" : "954",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "404",
+            "localId" : "959",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "405",
+              "localId" : "960",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "406",
+                "localId" : "961",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -213152,40 +245300,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "400",
+            "localId" : "955",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "401",
+              "localId" : "956",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "402",
+                "localId" : "957",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "403",
+            "localId" : "958",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "380",
+            "localId" : "938",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "394",
+              "localId" : "949",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "395",
+                "localId" : "950",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "396",
+                  "localId" : "951",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -213193,111 +245341,425 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "391",
+              "localId" : "945",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "392",
+                "localId" : "947",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "393",
+                  "localId" : "948",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
+                "type" : "As",
+                "localId" : "946",
+                "asType" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "operand" : {
+                  "type" : "Null",
+                  "localId" : "939",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
                 "type" : "Date",
-                "localId" : "385",
+                "localId" : "944",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "382",
+                  "localId" : "941",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                  "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "383",
+                  "localId" : "942",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "384",
+                  "localId" : "943",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "953",
+            "value" : 1.0,
+            "unit" : "day",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "967",
+        "name" : "NullClose",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "967",
+            "s" : [ {
+              "value" : [ "", "define ", "NullClose", ": " ]
+            }, {
+              "r" : "984",
+              "s" : [ {
+                "value" : [ "expand " ]
+              }, {
+                "r" : "968",
+                "s" : [ {
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "975",
+                  "s" : [ {
+                    "r" : "973",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "null", "]" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
+                } ]
+              }, {
+                "value" : [ " per ", "day" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "992",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "993",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "994",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Expand",
+          "localId" : "984",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "989",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "990",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "991",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "985",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "986",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "987",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "988",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "968",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "979",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "980",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "981",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "975",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "977",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "978",
+                  "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
-              "high" : {
+              "low" : {
                 "type" : "Date",
-                "localId" : "390",
+                "localId" : "973",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "387",
+                  "localId" : "970",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2019",
+                  "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "388",
+                  "localId" : "971",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "12",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "389",
+                  "localId" : "972",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "30",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "As",
+                "localId" : "976",
+                "asType" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "operand" : {
+                  "type" : "Null",
+                  "localId" : "974",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "398",
+            "localId" : "983",
             "value" : 1.0,
-            "unit" : "year",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "412",
-        "name" : "MidBoundariesPerDay",
+        "localId" : "997",
+        "name" : "NullBoth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "412",
+            "r" : "997",
             "s" : [ {
-              "value" : [ "", "define ", "MidBoundariesPerDay", ": " ]
+              "value" : [ "", "define ", "NullBoth", ": " ]
+            }, {
+              "r" : "1009",
+              "s" : [ {
+                "value" : [ "expand " ]
+              }, {
+                "r" : "998",
+                "s" : [ {
+                  "value" : [ "{ " ]
+                }, {
+                  "r" : "1001",
+                  "s" : [ {
+                    "r" : "999",
+                    "value" : [ "Interval[", "null", ", ", "null", "]" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
+                } ]
+              }, {
+                "value" : [ " per ", "day" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "1017",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "1018",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "1019",
+              "name" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          }
+        },
+        "expression" : {
+          "type" : "Expand",
+          "localId" : "1009",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1014",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1015",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1016",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "1010",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "1011",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "1012",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "1013",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "998",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "1004",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1005",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1006",
+                  "name" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "1001",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "1002",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1003",
+                  "name" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Null",
+                "localId" : "999",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Null",
+                "localId" : "1000",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "1008",
+            "value" : 1.0,
+            "unit" : "day",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "1022",
+        "name" : "MonthDayPer",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "1022",
+            "s" : [ {
+              "value" : [ "", "define ", "MonthDayPer", ": " ]
             }, {
-              "r" : "432",
+              "r" : "1040",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "413",
+                "r" : "1023",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "424",
+                  "r" : "1032",
                   "s" : [ {
-                    "r" : "418",
-                    "value" : [ "Interval[", "@2017-12-30", ", ", "@2018-01-01", "]" ]
+                    "r" : "1027",
+                    "value" : [ "Interval[", "@2018-01", ", ", "@2018-03", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -213310,15 +245772,15 @@ module.exports['DateIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "440",
+          "localId" : "1048",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "441",
+            "localId" : "1049",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "442",
+              "localId" : "1050",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -213326,19 +245788,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "432",
+          "localId" : "1040",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "437",
+            "localId" : "1045",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "438",
+              "localId" : "1046",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "439",
+                "localId" : "1047",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -213346,40 +245808,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "433",
+            "localId" : "1041",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "434",
+              "localId" : "1042",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "435",
+                "localId" : "1043",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "436",
+            "localId" : "1044",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "413",
+            "localId" : "1023",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "427",
+              "localId" : "1035",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "428",
+                "localId" : "1036",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "429",
+                  "localId" : "1037",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -213387,111 +245849,97 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "424",
+              "localId" : "1032",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "425",
+                "localId" : "1033",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "426",
+                  "localId" : "1034",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Date",
-                "localId" : "418",
+                "localId" : "1027",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "415",
+                  "localId" : "1025",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2017",
+                  "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "416",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "12",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "417",
+                  "localId" : "1026",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "30",
+                  "value" : "1",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "Date",
-                "localId" : "423",
+                "localId" : "1031",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "420",
+                  "localId" : "1029",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "421",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "422",
+                  "localId" : "1030",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "3",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "431",
+            "localId" : "1039",
             "value" : 1.0,
             "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "445",
-        "name" : "MidBoundariesPerMonth",
+        "localId" : "1053",
+        "name" : "YearMonthPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "445",
+            "r" : "1053",
             "s" : [ {
-              "value" : [ "", "define ", "MidBoundariesPerMonth", ": " ]
+              "value" : [ "", "define ", "YearMonthPer", ": " ]
             }, {
-              "r" : "465",
+              "r" : "1069",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "446",
+                "r" : "1054",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "457",
+                  "r" : "1061",
                   "s" : [ {
-                    "r" : "451",
-                    "value" : [ "Interval[", "@2017-11-14", ", ", "@2018-01-18", "]" ]
+                    "r" : "1057",
+                    "value" : [ "Interval[", "@2016", ", ", "@2018", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -213504,15 +245952,15 @@ module.exports['DateIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "473",
+          "localId" : "1077",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "474",
+            "localId" : "1078",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "475",
+              "localId" : "1079",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -213520,19 +245968,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "465",
+          "localId" : "1069",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "470",
+            "localId" : "1074",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "471",
+              "localId" : "1075",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "472",
+                "localId" : "1076",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -213540,40 +245988,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "466",
+            "localId" : "1070",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "467",
+              "localId" : "1071",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "468",
+                "localId" : "1072",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "469",
+            "localId" : "1073",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "446",
+            "localId" : "1054",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "460",
+              "localId" : "1064",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "461",
+                "localId" : "1065",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "462",
+                  "localId" : "1066",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -213581,132 +246029,104 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "457",
+              "localId" : "1061",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "458",
+                "localId" : "1062",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "459",
+                  "localId" : "1063",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Date",
-                "localId" : "451",
+                "localId" : "1057",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "448",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2017",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "449",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "11",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "450",
+                  "localId" : "1056",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "14",
+                  "value" : "2016",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "Date",
-                "localId" : "456",
+                "localId" : "1060",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "453",
+                  "localId" : "1059",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "454",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "455",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "18",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "464",
+            "localId" : "1068",
             "value" : 1.0,
             "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "478",
-        "name" : "MidBoundariesPerYear",
+        "localId" : "1082",
+        "name" : "YearDayPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "478",
+            "r" : "1082",
             "s" : [ {
-              "value" : [ "", "define ", "MidBoundariesPerYear", ": " ]
+              "value" : [ "", "define ", "YearDayPer", ": " ]
             }, {
-              "r" : "498",
+              "r" : "1098",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "479",
+                "r" : "1083",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "490",
+                  "r" : "1090",
                   "s" : [ {
-                    "r" : "484",
-                    "value" : [ "Interval[", "@2016-04-06", ", ", "@2018-04-06", "]" ]
+                    "r" : "1086",
+                    "value" : [ "Interval[", "@2016", ", ", "@2018", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "year" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "506",
+          "localId" : "1106",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "507",
+            "localId" : "1107",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "508",
+              "localId" : "1108",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -213714,19 +246134,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "498",
+          "localId" : "1098",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "503",
+            "localId" : "1103",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "504",
+              "localId" : "1104",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "505",
+                "localId" : "1105",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -213734,40 +246154,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "499",
+            "localId" : "1099",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "500",
+              "localId" : "1100",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "501",
+                "localId" : "1101",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "502",
+            "localId" : "1102",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "479",
+            "localId" : "1083",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "493",
+              "localId" : "1093",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "494",
+                "localId" : "1094",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "495",
+                  "localId" : "1095",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -213775,133 +246195,104 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "490",
+              "localId" : "1090",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "491",
+                "localId" : "1091",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "492",
+                  "localId" : "1092",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Date",
-                "localId" : "484",
+                "localId" : "1086",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "481",
+                  "localId" : "1085",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2016",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "482",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "483",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "6",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "Date",
-                "localId" : "489",
+                "localId" : "1089",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "486",
+                  "localId" : "1088",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "487",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "488",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "6",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "497",
+            "localId" : "1097",
             "value" : 1.0,
-            "unit" : "year",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "511",
-        "name" : "NullInList",
+        "localId" : "1111",
+        "name" : "BadPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "511",
+            "r" : "1111",
             "s" : [ {
-              "value" : [ "", "define ", "NullInList", ": " ]
+              "value" : [ "", "define ", "BadPerMinute", ": " ]
             }, {
-              "r" : "535",
+              "r" : "1131",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "512",
+                "r" : "1112",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "523",
+                  "r" : "1123",
                   "s" : [ {
-                    "r" : "517",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", "]" ]
+                    "r" : "1117",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-04", "]" ]
                   } ]
                 }, {
-                  "r" : "526",
-                  "value" : [ ", ", "null", " }" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "543",
+          "localId" : "1139",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "544",
+            "localId" : "1140",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "545",
+              "localId" : "1141",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -213909,19 +246300,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "535",
+          "localId" : "1131",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "540",
+            "localId" : "1136",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "541",
+              "localId" : "1137",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "542",
+                "localId" : "1138",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -213929,40 +246320,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "536",
+            "localId" : "1132",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "537",
+              "localId" : "1133",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "538",
+                "localId" : "1134",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "539",
+            "localId" : "1135",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "512",
+            "localId" : "1112",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "530",
+              "localId" : "1126",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "531",
+                "localId" : "1127",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "532",
+                  "localId" : "1128",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -213970,44 +246361,44 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "523",
+              "localId" : "1123",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "524",
+                "localId" : "1124",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "525",
+                  "localId" : "1125",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Date",
-                "localId" : "517",
+                "localId" : "1117",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "514",
+                  "localId" : "1114",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "515",
+                  "localId" : "1115",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "516",
+                  "localId" : "1116",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
@@ -214015,117 +246406,92 @@ module.exports['DateIntervalExpand'] = {
               },
               "high" : {
                 "type" : "Date",
-                "localId" : "522",
+                "localId" : "1122",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "519",
+                  "localId" : "1119",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "520",
+                  "localId" : "1120",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "521",
+                  "localId" : "1121",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "As",
-              "localId" : "527",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "526",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              },
-              "asTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "528",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "529",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "value" : "4",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "534",
+            "localId" : "1130",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "548",
-        "name" : "Overlapping",
+        "localId" : "1144",
+        "name" : "BadPerGram",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "548",
+            "r" : "1144",
             "s" : [ {
-              "value" : [ "", "define ", "Overlapping", ": " ]
+              "value" : [ "", "define ", "BadPerGram", ": " ]
             }, {
-              "r" : "581",
+              "r" : "1164",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "549",
+                "r" : "1145",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "560",
-                  "s" : [ {
-                    "r" : "554",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", "]" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "573",
+                  "r" : "1156",
                   "s" : [ {
-                    "r" : "567",
-                    "value" : [ "Interval[", "@2018-01-02", ", ", "@2018-01-04", "]" ]
+                    "r" : "1150",
+                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-04", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "1163",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "589",
+          "localId" : "1172",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "590",
+            "localId" : "1173",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "591",
+              "localId" : "1174",
               "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
@@ -214133,19 +246499,19 @@ module.exports['DateIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "581",
+          "localId" : "1164",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "586",
+            "localId" : "1169",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "587",
+              "localId" : "1170",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "588",
+                "localId" : "1171",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
@@ -214153,40 +246519,40 @@ module.exports['DateIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "582",
+            "localId" : "1165",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "583",
+              "localId" : "1166",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "584",
+                "localId" : "1167",
                 "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "585",
+            "localId" : "1168",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "549",
+            "localId" : "1145",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "576",
+              "localId" : "1159",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "577",
+                "localId" : "1160",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "578",
+                  "localId" : "1161",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
@@ -214194,145 +246560,72 @@ module.exports['DateIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "560",
+              "localId" : "1156",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "561",
+                "localId" : "1157",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "562",
+                  "localId" : "1158",
                   "name" : "{urn:hl7-org:elm-types:r1}Date",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Date",
-                "localId" : "554",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "551",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "552",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "553",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "Date",
-                "localId" : "559",
+                "localId" : "1150",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "556",
+                  "localId" : "1147",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "557",
+                  "localId" : "1148",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "558",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "Interval",
-              "localId" : "573",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "574",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "575",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ]
-                }
-              },
-              "low" : {
-                "type" : "Date",
-                "localId" : "567",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "564",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "565",
+                  "localId" : "1149",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "566",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "Date",
-                "localId" : "572",
+                "localId" : "1155",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "569",
+                  "localId" : "1152",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "570",
+                  "localId" : "1153",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "571",
+                  "localId" : "1154",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "4",
                   "annotation" : [ ]
@@ -214341,2399 +246634,3082 @@ module.exports['DateIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "580",
-            "value" : 1.0,
-            "unit" : "day",
+            "localId" : "1163",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* DateTimeIntervalExpand
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define MsPrecPerYear: expand { Interval[@2016-01-01T00:00:00.000+00:00, @2018-01-01T00:00:00.000+00:00] } per year
+define MsPrecPerMonth: expand { Interval[@2018-01-01T00:00:00.000+00:00, @2018-03-01T00:00:00.000+00:00] } per month
+define MsPrecPerWeek: expand { Interval[@2018-01-01T00:00:00.000+00:00, @2018-01-21T00:00:00.000+00:00] } per week
+define MsPrecPerDay: expand { Interval[@2018-01-01T00:00:00.000+00:00, @2018-01-03T00:00:00.000+00:00] } per day
+define MsPrecPerHour: expand { Interval[@2018-01-01T01:00:00.000+00:00, @2018-01-01T03:00:00.000+00:00] } per hour
+define MsPrecPerMinute: expand { Interval[@2018-01-01T01:00:00.000+00:00, @2018-01-01T01:02:00.000+00:00] } per minute
+define MsPrecPerSecond: expand { Interval[@2018-01-01T01:00:00.000+00:00, @2018-01-01T01:00:02.000+00:00] } per second
+define MsPrecPerMillisecond: expand { Interval[@2018-01-01T01:00:00.000+00:00, @2018-01-01T01:00:00.001+00:00] } per millisecond
+
+define SecPrecPerYear: expand { Interval[@2016-01-01T00:00:00+00:00, @2018-01-01T00:00:00+00:00] } per year
+define SecPrecPerMonth: expand { Interval[@2018-01-01T00:00:00+00:00, @2018-03-01T00:00:00+00:00] } per month
+define SecPrecPerWeek: expand { Interval[@2018-01-01T00:00:00+00:00, @2018-01-21T00:00:00+00:00] } per week
+define SecPrecPerDay: expand { Interval[@2018-01-01T00:00:00+00:00, @2018-01-03T00:00:00+00:00] } per day
+define SecPrecPerHour: expand { Interval[@2018-01-01T01:00:00+00:00, @2018-01-01T03:00:00+00:00] } per hour
+define SecPrecPerMinute: expand { Interval[@2018-01-01T01:00:00+00:00, @2018-01-01T01:02:00+00:00] } per minute
+define SecPrecPerSecond: expand { Interval[@2018-01-01T01:00:00+00:00, @2018-01-01T01:00:01+00:00] } per second
+define SecPrecPerMillisecond: expand { Interval[@2018-01-01T01:00:00+00:00, @2018-01-01T01:00:00+00:00] } per millisecond
+
+define MinPrecPerYear: expand { Interval[@2016-01-01T00:00+00:00, @2018-01-01T00:00+00:00] } per year
+define MinPrecPerMonth: expand { Interval[@2018-01-01T00:00+00:00, @2018-03-01T00:00+00:00] } per month
+define MinPrecPerWeek: expand { Interval[@2018-01-01T00:00+00:00, @2018-01-21T00:00+00:00] } per week
+define MinPrecPerDay: expand { Interval[@2018-01-01T00:00+00:00, @2018-01-03T00:00+00:00] } per day
+define MinPrecPerHour: expand { Interval[@2018-01-01T01:00+00:00, @2018-01-01T03:00+00:00] } per hour
+define MinPrecPerMinute: expand { Interval[@2018-01-01T01:00+00:00, @2018-01-01T01:01+00:00] } per minute
+define MinPrecPerSecond: expand { Interval[@2018-01-01T01:00+00:00, @2018-01-01T01:00+00:00] } per second
+define MinPrecPerMillisecond: expand { Interval[@2018-01-01T01:00+00:00, @2018-01-01T01:00+00:00] } per millisecond
+
+define HourPrecPerYear: expand { Interval[@2016-01-01T00+00:00, @2018-01-01T00+00:00] } per year
+define HourPrecPerMonth: expand { Interval[@2018-01-01T00+00:00, @2018-03-01T00+00:00] } per month
+define HourPrecPerWeek: expand { Interval[@2018-01-01T00+00:00, @2018-01-21T00+00:00] } per week
+define HourPrecPerDay: expand { Interval[@2018-01-01T00+00:00, @2018-01-03T00+00:00] } per day
+define HourPrecPerHour: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T02+00:00] } per hour
+define HourPrecPerMinute: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T01+00:00] } per minute
+define HourPrecPerSecond: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T01+00:00] } per second
+define HourPrecPerMillisecond: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T01+00:00] } per millisecond
+
+define DayPrecPerYear: expand { Interval[DateTime(2016,01,01), DateTime(2018,01,01)] } per year
+define DayPrecPerMonth: expand { Interval[DateTime(2018,01,01), DateTime(2018,03,01)] } per month
+define DayPrecPerWeek: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,14)] } per week
+define DayPrecPerDay: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,02)] } per day
+define DayPrecPerHour: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,01)] } per hour
+define DayPrecPerMinute: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,01)] } per minute
+define DayPrecPerSecond: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,01)] } per second
+define DayPrecPerMillisecond: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,01)] } per millisecond
+
+define MonthPrecPerYear: expand { Interval[DateTime(2016,01), DateTime(2018,01)] } per year
+define MonthPrecPerMonth: expand { Interval[DateTime(2018,01), DateTime(2018,02)] } per month
+define MonthPrecPerWeek: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per week
+define MonthPrecPerDay: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per day
+define MonthPrecPerHour: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per hour
+define MonthPrecPerMinute: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per minute
+define MonthPrecPerSecond: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per second
+define MonthPrecPerMillisecond: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per millisecond
+
+define YearPrecPerYear: expand { Interval[DateTime(2016), DateTime(2018)] } per year
+define YearPrecPerMonth: expand { Interval[DateTime(2018), DateTime(2018)] } per month
+define YearPrecPerWeek: expand { Interval[DateTime(2018), DateTime(2018)] } per week
+define YearPrecPerDay: expand { Interval[DateTime(2018), DateTime(2018)] } per day
+define YearPrecPerHour: expand { Interval[DateTime(2018), DateTime(2018)] } per hour
+define YearPrecPerMinute: expand { Interval[DateTime(2018), DateTime(2018)] } per minute
+define YearPrecPerSecond: expand { Interval[DateTime(2018), DateTime(2018)] } per second
+define YearPrecPerMillisecond: expand { Interval[DateTime(2018), DateTime(2018)] } per millisecond
+
+define NullInList: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T01+00:00], null } per hour
+define Overlapping: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T03+00:00], Interval[@2018-01-01T02+00:00, @2018-01-01T04+00:00] } per hour
+define NonOverlapping: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T02+00:00], Interval[@2018-01-01T05+00:00, @2018-01-01T05+00:00] } per hour
+
+define NoPerDefaultMS: expand { Interval[@2018-01-01T01:00:00.000+00:00, @2018-01-01T01:00:00.001+00:00] }
+define NoPerDefaultSec: expand { Interval[@2018-01-01T01:00:00+00:00, @2018-01-01T01:00:01+00:00] }
+define NoPerDefaultMin: expand { Interval[@2018-01-01T01:00+00:00, @2018-01-01T01:01+00:00] }
+define NoPerDefaultHour: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T01+00:00] }
+define NoPerDefaultDay: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,01)] }
+define NoPerDefaultMonth: expand { Interval[DateTime(2018,01), DateTime(2018,01)]  }
+define NoPerDefaultYear: expand { Interval[DateTime(2018), DateTime(2018)]  }
+
+define OpenStart: expand { Interval(@2018-01-01T01+00:00, @2018-01-03T01+00:00] } per day
+define OpenEnd: expand { Interval[@2018-01-01T01+00:00, @2018-01-03T01+00:00) } per day
+define OpenBoth: expand { Interval(@2018-01-01T01+00:00, @2018-01-03T01+00:00) } per day
+
+define MismatchPrecision: expand { Interval[@2012-01-01T12:00+00:00, @2012-01-02T12:00:00+00:00] } per day
+define MismatchPrecisionResultLongerThanInput: expand { Interval[@2012-01-01T13:00:00+00:00, @2012-01-02T12:59+00:00] } per day
+
+define EmptyList: List<Interval<Date>>{}
+define NullOpen: expand { Interval[null, @2018-01-03T01+00:00] } per day
+define NullClose: expand { Interval[@2018-01-01T01+00:00, null] } per day
+define NullBoth: expand { Interval[null, null] } per day
+define BadPerGram: expand { Interval[@2018-01-01T01+00:00, @2018-01-04T01+00:00] } per 1 'g'
+*/
+
+module.exports['DateTimeIntervalExpand'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "3104",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "594",
-        "name" : "NonOverlapping",
+        "localId" : "214",
+        "name" : "MsPrecPerYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "594",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "NonOverlapping", ": " ]
+              "value" : [ "", "define ", "MsPrecPerYear", ": " ]
             }, {
-              "r" : "627",
+              "r" : "242",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "595",
+                "r" : "215",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "606",
-                  "s" : [ {
-                    "r" : "600",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", "]" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "619",
+                  "r" : "234",
                   "s" : [ {
-                    "r" : "613",
-                    "value" : [ "Interval[", "@2018-01-08", ", ", "@2018-01-08", "]" ]
+                    "r" : "216",
+                    "value" : [ "Interval[", "@2016-01-01T00:00:00.000+00:00", ", ", "@2018-01-01T00:00:00.000+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "635",
+          "localId" : "250",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "636",
+            "localId" : "251",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "637",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "252",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "627",
+          "localId" : "242",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "632",
+            "localId" : "247",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "633",
+              "localId" : "248",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "634",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "249",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "628",
+            "localId" : "243",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "629",
+              "localId" : "244",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "630",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "245",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "631",
+            "localId" : "246",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "595",
+            "localId" : "215",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "622",
+              "localId" : "237",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "623",
+                "localId" : "238",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "624",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "239",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "606",
+              "localId" : "234",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "607",
+                "localId" : "235",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "608",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "236",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "600",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "216",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "597",
+                  "localId" : "217",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "2016",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "598",
+                  "localId" : "218",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "599",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "Date",
-                "localId" : "605",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "602",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "603",
+                  "localId" : "219",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "604",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "Interval",
-              "localId" : "619",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "620",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "621",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
-                  "annotation" : [ ]
-                }
-              },
-              "low" : {
-                "type" : "Date",
-                "localId" : "613",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "610",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "611",
+                  "localId" : "220",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "612",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "8",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "Date",
-                "localId" : "618",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "615",
+                  "localId" : "221",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "month" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "616",
+                  "localId" : "222",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "day" : {
+                "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "617",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "8",
-                  "annotation" : [ ]
-                }
-              }
-            } ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "626",
-            "value" : 1.0,
-            "unit" : "day",
-            "annotation" : [ ]
-          } ]
-        }
-      }, {
-        "localId" : "640",
-        "name" : "NoPerDefaultDay",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "640",
-            "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultDay", ": " ]
-            }, {
-              "r" : "659",
-              "s" : [ {
-                "value" : [ "expand " ]
-              }, {
-                "r" : "641",
-                "s" : [ {
-                  "value" : [ "{ " ]
-                }, {
-                  "r" : "652",
-                  "s" : [ {
-                    "r" : "646",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", "]" ]
-                  } ]
-                }, {
-                  "value" : [ " }" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "ListTypeSpecifier",
-          "localId" : "667",
-          "annotation" : [ ],
-          "elementType" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "668",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "669",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ]
-            }
-          }
-        },
-        "expression" : {
-          "type" : "Expand",
-          "localId" : "659",
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "ListTypeSpecifier",
-            "localId" : "664",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "665",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "666",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ]
-              }
-            }
-          },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "660",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "661",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "662",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "663",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "List",
-            "localId" : "641",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "655",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "656",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "657",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "223",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
                   "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "Interval",
-              "localId" : "652",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "653",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "654",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "224",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
-              "low" : {
-                "type" : "Date",
-                "localId" : "646",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "225",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "643",
+                  "localId" : "226",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "644",
+                  "localId" : "227",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "645",
+                  "localId" : "228",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "Date",
-                "localId" : "651",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
+                },
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "648",
+                  "localId" : "229",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "month" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "649",
+                  "localId" : "230",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "day" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "650",
+                  "localId" : "231",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "232",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "233",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "658",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "241",
+            "value" : 1.0,
+            "unit" : "year",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "672",
-        "name" : "NoPerDefaultMonth",
+        "localId" : "255",
+        "name" : "MsPrecPerMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "672",
+            "r" : "255",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultMonth", ": " ]
+              "value" : [ "", "define ", "MsPrecPerMonth", ": " ]
             }, {
-              "r" : "689",
+              "r" : "283",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "673",
+                "r" : "256",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "682",
+                  "r" : "275",
                   "s" : [ {
-                    "r" : "677",
-                    "value" : [ "Interval[", "@2018-01", ", ", "@2018-03", "]" ]
+                    "r" : "257",
+                    "value" : [ "Interval[", "@2018-01-01T00:00:00.000+00:00", ", ", "@2018-03-01T00:00:00.000+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "697",
+          "localId" : "291",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "698",
+            "localId" : "292",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "699",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "293",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "689",
+          "localId" : "283",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "694",
+            "localId" : "288",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "695",
+              "localId" : "289",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "696",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "290",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "690",
+            "localId" : "284",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "691",
+              "localId" : "285",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "692",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "286",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "693",
+            "localId" : "287",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "673",
+            "localId" : "256",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "685",
+              "localId" : "278",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "686",
+                "localId" : "279",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "687",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "280",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "682",
+              "localId" : "275",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "683",
+                "localId" : "276",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "684",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "277",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "677",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "257",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "675",
+                  "localId" : "258",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "676",
+                  "localId" : "259",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "260",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "261",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "262",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "263",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "264",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "265",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "681",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "266",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "679",
+                  "localId" : "267",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "680",
+                  "localId" : "268",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
                   "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "269",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "270",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "271",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "272",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "273",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "274",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "688",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "282",
+            "value" : 1.0,
+            "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "702",
-        "name" : "NoPerDefaultYear",
+        "localId" : "296",
+        "name" : "MsPrecPerWeek",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "702",
+            "r" : "296",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultYear", ": " ]
+              "value" : [ "", "define ", "MsPrecPerWeek", ": " ]
             }, {
-              "r" : "717",
+              "r" : "324",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "703",
+                "r" : "297",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "710",
+                  "r" : "316",
                   "s" : [ {
-                    "r" : "706",
-                    "value" : [ "Interval[", "@2016", ", ", "@2018", "]" ]
+                    "r" : "298",
+                    "value" : [ "Interval[", "@2018-01-01T00:00:00.000+00:00", ", ", "@2018-01-21T00:00:00.000+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "week" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "725",
+          "localId" : "332",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "726",
+            "localId" : "333",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "727",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "334",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "717",
+          "localId" : "324",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "722",
+            "localId" : "329",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "723",
+              "localId" : "330",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "724",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "331",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "718",
+            "localId" : "325",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "719",
+              "localId" : "326",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "720",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "327",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "721",
+            "localId" : "328",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "703",
+            "localId" : "297",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "713",
+              "localId" : "319",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "714",
+                "localId" : "320",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "715",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "321",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "710",
+              "localId" : "316",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "711",
+                "localId" : "317",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "712",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "318",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "706",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "298",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "705",
+                  "localId" : "299",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "300",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "301",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "302",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "303",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "304",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "305",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "306",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "709",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "307",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "708",
+                  "localId" : "308",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "309",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "310",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "21",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "311",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "312",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "313",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "314",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "315",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "716",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "323",
+            "value" : 1.0,
+            "unit" : "week",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "730",
-        "name" : "NoPerDefaultMonthWithMismatch",
+        "localId" : "337",
+        "name" : "MsPrecPerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "730",
+            "r" : "337",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultMonthWithMismatch", ": " ]
+              "value" : [ "", "define ", "MsPrecPerDay", ": " ]
             }, {
-              "r" : "746",
+              "r" : "365",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "731",
+                "r" : "338",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "739",
+                  "r" : "357",
                   "s" : [ {
-                    "r" : "734",
-                    "value" : [ "Interval[", "@2016", ", ", "@2018-03", "]" ]
+                    "r" : "339",
+                    "value" : [ "Interval[", "@2018-01-01T00:00:00.000+00:00", ", ", "@2018-01-03T00:00:00.000+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "754",
+          "localId" : "373",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "755",
+            "localId" : "374",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "756",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "375",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "746",
+          "localId" : "365",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "751",
+            "localId" : "370",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "752",
+              "localId" : "371",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "753",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "372",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "747",
+            "localId" : "366",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "748",
+              "localId" : "367",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "749",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "750",
+            "localId" : "369",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "731",
+            "localId" : "338",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "742",
+              "localId" : "360",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "743",
+                "localId" : "361",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "744",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "362",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "739",
+              "localId" : "357",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "740",
+                "localId" : "358",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "741",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "359",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "734",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "339",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "733",
+                  "localId" : "340",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "341",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "342",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "343",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "344",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "345",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "346",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "347",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "738",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "348",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "736",
+                  "localId" : "349",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "737",
+                  "localId" : "350",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "351",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
                   "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "352",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "353",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "354",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "355",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "356",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "745",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "364",
+            "value" : 1.0,
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "759",
-        "name" : "OpenStart",
+        "localId" : "378",
+        "name" : "MsPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "759",
+            "r" : "378",
             "s" : [ {
-              "value" : [ "", "define ", "OpenStart", ": " ]
+              "value" : [ "", "define ", "MsPrecPerHour", ": " ]
             }, {
-              "r" : "779",
+              "r" : "406",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "760",
+                "r" : "379",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "771",
+                  "r" : "398",
                   "s" : [ {
-                    "r" : "765",
-                    "value" : [ "Interval(", "@2018-01-01", ", ", "@2018-01-03", "]" ]
+                    "r" : "380",
+                    "value" : [ "Interval[", "@2018-01-01T01:00:00.000+00:00", ", ", "@2018-01-01T03:00:00.000+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "787",
+          "localId" : "414",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "788",
+            "localId" : "415",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "789",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "416",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "779",
+          "localId" : "406",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "784",
+            "localId" : "411",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "785",
+              "localId" : "412",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "786",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "413",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "780",
+            "localId" : "407",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "781",
+              "localId" : "408",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "782",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "409",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "783",
+            "localId" : "410",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "760",
+            "localId" : "379",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "774",
+              "localId" : "401",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "775",
+                "localId" : "402",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "776",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "403",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "771",
-              "lowClosed" : false,
+              "localId" : "398",
+              "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "772",
+                "localId" : "399",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "773",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "400",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "765",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "380",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "762",
+                  "localId" : "381",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "763",
+                  "localId" : "382",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "764",
+                  "localId" : "383",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "384",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "385",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "386",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "387",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "388",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "770",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "389",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "767",
+                  "localId" : "390",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "768",
+                  "localId" : "391",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "769",
+                  "localId" : "392",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "393",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
                   "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "394",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "395",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "396",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "397",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "778",
+            "localId" : "405",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "792",
-        "name" : "OpenEnd",
+        "localId" : "419",
+        "name" : "MsPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "792",
+            "r" : "419",
             "s" : [ {
-              "value" : [ "", "define ", "OpenEnd", ": " ]
+              "value" : [ "", "define ", "MsPrecPerMinute", ": " ]
             }, {
-              "r" : "812",
+              "r" : "447",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "793",
+                "r" : "420",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "804",
+                  "r" : "439",
                   "s" : [ {
-                    "r" : "798",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-03", ")" ]
+                    "r" : "421",
+                    "value" : [ "Interval[", "@2018-01-01T01:00:00.000+00:00", ", ", "@2018-01-01T01:02:00.000+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "820",
+          "localId" : "455",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "821",
+            "localId" : "456",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "822",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "457",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "812",
+          "localId" : "447",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "817",
+            "localId" : "452",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "818",
+              "localId" : "453",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "819",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "454",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "813",
+            "localId" : "448",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "814",
+              "localId" : "449",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "815",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "450",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "816",
+            "localId" : "451",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "793",
+            "localId" : "420",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "807",
+              "localId" : "442",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "808",
+                "localId" : "443",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "809",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "444",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "804",
+              "localId" : "439",
               "lowClosed" : true,
-              "highClosed" : false,
+              "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "805",
+                "localId" : "440",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "806",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "441",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "798",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "421",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "795",
+                  "localId" : "422",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "796",
+                  "localId" : "423",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "797",
+                  "localId" : "424",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "425",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "426",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "427",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "428",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "429",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "803",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "430",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "800",
+                  "localId" : "431",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "801",
+                  "localId" : "432",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "802",
+                  "localId" : "433",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "434",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "435",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "436",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "437",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "438",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "811",
+            "localId" : "446",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "825",
-        "name" : "OpenBoth",
+        "localId" : "460",
+        "name" : "MsPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "825",
+            "r" : "460",
             "s" : [ {
-              "value" : [ "", "define ", "OpenBoth", ": " ]
+              "value" : [ "", "define ", "MsPrecPerSecond", ": " ]
             }, {
-              "r" : "845",
+              "r" : "488",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "826",
+                "r" : "461",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "837",
+                  "r" : "480",
                   "s" : [ {
-                    "r" : "831",
-                    "value" : [ "Interval(", "@2018-01-01", ", ", "@2018-01-03", ")" ]
+                    "r" : "462",
+                    "value" : [ "Interval[", "@2018-01-01T01:00:00.000+00:00", ", ", "@2018-01-01T01:00:02.000+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "853",
+          "localId" : "496",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "854",
+            "localId" : "497",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "855",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "498",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "845",
+          "localId" : "488",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "850",
+            "localId" : "493",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "851",
+              "localId" : "494",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "852",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "495",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "846",
+            "localId" : "489",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "847",
+              "localId" : "490",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "848",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "491",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "849",
+            "localId" : "492",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "826",
+            "localId" : "461",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "840",
+              "localId" : "483",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "841",
+                "localId" : "484",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "842",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "485",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "837",
-              "lowClosed" : false,
-              "highClosed" : false,
+              "localId" : "480",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "838",
+                "localId" : "481",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "839",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "482",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "831",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "462",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "828",
+                  "localId" : "463",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "829",
+                  "localId" : "464",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "830",
+                  "localId" : "465",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "466",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "467",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "468",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "469",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "470",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "836",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "471",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "833",
+                  "localId" : "472",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "834",
+                  "localId" : "473",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "835",
+                  "localId" : "474",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "475",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "476",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "477",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "478",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "479",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "844",
+            "localId" : "487",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "858",
-        "name" : "MismatchPrecision",
+        "localId" : "501",
+        "name" : "MsPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "858",
+            "r" : "501",
             "s" : [ {
-              "value" : [ "", "define ", "MismatchPrecision", ": " ]
+              "value" : [ "", "define ", "MsPrecPerMillisecond", ": " ]
             }, {
-              "r" : "877",
+              "r" : "529",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "859",
+                "r" : "502",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "869",
+                  "r" : "521",
                   "s" : [ {
-                    "r" : "864",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-03", "]" ]
+                    "r" : "503",
+                    "value" : [ "Interval[", "@2018-01-01T01:00:00.000+00:00", ", ", "@2018-01-01T01:00:00.001+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "885",
+          "localId" : "537",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "886",
+            "localId" : "538",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "887",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "539",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "877",
+          "localId" : "529",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "882",
+            "localId" : "534",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "883",
+              "localId" : "535",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "884",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "536",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "878",
+            "localId" : "530",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "879",
+              "localId" : "531",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "880",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "532",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "881",
+            "localId" : "533",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "859",
+            "localId" : "502",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "872",
+              "localId" : "524",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "873",
+                "localId" : "525",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "874",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "526",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "869",
+              "localId" : "521",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "870",
+                "localId" : "522",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "871",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "523",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "864",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "503",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "861",
+                  "localId" : "504",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "862",
+                  "localId" : "505",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "863",
+                  "localId" : "506",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "507",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "508",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "509",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "510",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "511",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "868",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "512",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "866",
+                  "localId" : "513",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "867",
+                  "localId" : "514",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "515",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "516",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "517",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "518",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "519",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "520",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "876",
+            "localId" : "528",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "890",
-        "name" : "MismatchPrecisionResultLongerThanInput",
+        "localId" : "542",
+        "name" : "SecPrecPerYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "890",
+            "r" : "542",
             "s" : [ {
-              "value" : [ "", "define ", "MismatchPrecisionResultLongerThanInput", ": " ]
+              "value" : [ "", "define ", "SecPrecPerYear", ": " ]
             }, {
-              "r" : "909",
+              "r" : "568",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "891",
+                "r" : "543",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "901",
+                  "r" : "560",
                   "s" : [ {
-                    "r" : "895",
-                    "value" : [ "Interval[", "@2018-01", ", ", "@2018-02-28", "]" ]
+                    "r" : "544",
+                    "value" : [ "Interval[", "@2016-01-01T00:00:00+00:00", ", ", "@2018-01-01T00:00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "917",
+          "localId" : "576",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "918",
+            "localId" : "577",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "919",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "578",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "909",
+          "localId" : "568",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "914",
+            "localId" : "573",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "915",
+              "localId" : "574",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "916",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "575",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "910",
+            "localId" : "569",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "911",
+              "localId" : "570",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "912",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "571",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "913",
+            "localId" : "572",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "891",
+            "localId" : "543",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "904",
+              "localId" : "563",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "905",
+                "localId" : "564",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "906",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "565",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "901",
+              "localId" : "560",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "902",
+                "localId" : "561",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "903",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "562",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "895",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "544",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "893",
+                  "localId" : "545",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "2016",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "894",
+                  "localId" : "546",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "547",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "548",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "549",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "550",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "551",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "900",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "552",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "897",
+                  "localId" : "553",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "898",
+                  "localId" : "554",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "899",
+                  "localId" : "555",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "28",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "556",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "557",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "558",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "559",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "908",
+            "localId" : "567",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "year",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "922",
-        "name" : "EmptyList",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "922",
-            "s" : [ {
-              "value" : [ "", "define ", "EmptyList", ": " ]
-            }, {
-              "r" : "927",
-              "s" : [ {
-                "value" : [ "List<" ]
-              }, {
-                "r" : "923",
-                "s" : [ {
-                  "value" : [ "Interval<" ]
-                }, {
-                  "r" : "924",
-                  "s" : [ {
-                    "value" : [ "Date" ]
-                  } ]
-                }, {
-                  "value" : [ ">" ]
-                } ]
-              }, {
-                "value" : [ ">{}" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "ListTypeSpecifier",
-          "localId" : "932",
-          "annotation" : [ ],
-          "elementType" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "933",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "934",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
-              "annotation" : [ ]
-            }
-          }
-        },
-        "expression" : {
-          "type" : "List",
-          "localId" : "927",
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "ListTypeSpecifier",
-            "localId" : "929",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "930",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "931",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
-                "annotation" : [ ]
-              }
-            }
-          },
-          "element" : [ ]
-        }
-      }, {
-        "localId" : "937",
-        "name" : "NullOpen",
+        "localId" : "581",
+        "name" : "SecPrecPerMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "937",
+            "r" : "581",
             "s" : [ {
-              "value" : [ "", "define ", "NullOpen", ": " ]
+              "value" : [ "", "define ", "SecPrecPerMonth", ": " ]
             }, {
-              "r" : "954",
+              "r" : "607",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "938",
+                "r" : "582",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "945",
+                  "r" : "599",
                   "s" : [ {
-                    "r" : "939",
-                    "value" : [ "Interval[", "null", ", ", "@2018-01-03", "]" ]
+                    "r" : "583",
+                    "value" : [ "Interval[", "@2018-01-01T00:00:00+00:00", ", ", "@2018-03-01T00:00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "962",
+          "localId" : "615",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "963",
+            "localId" : "616",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "964",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "617",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "954",
+          "localId" : "607",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "959",
+            "localId" : "612",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "960",
+              "localId" : "613",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "961",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "614",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "955",
+            "localId" : "608",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "956",
+              "localId" : "609",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "957",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "610",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "958",
+            "localId" : "611",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "938",
+            "localId" : "582",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "949",
+              "localId" : "602",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "950",
+                "localId" : "603",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "951",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "604",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "945",
+              "localId" : "599",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "947",
+                "localId" : "600",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "948",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "601",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "As",
-                "localId" : "946",
-                "asType" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "583",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "operand" : {
-                  "type" : "Null",
-                  "localId" : "939",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "584",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "585",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "586",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "587",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "588",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "589",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "590",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "944",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "591",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "941",
+                  "localId" : "592",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "942",
+                  "localId" : "593",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "3",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "943",
+                  "localId" : "594",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "595",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "596",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "597",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "598",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "953",
+            "localId" : "606",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "967",
-        "name" : "NullClose",
+        "localId" : "620",
+        "name" : "SecPrecPerWeek",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "967",
+            "r" : "620",
             "s" : [ {
-              "value" : [ "", "define ", "NullClose", ": " ]
+              "value" : [ "", "define ", "SecPrecPerWeek", ": " ]
             }, {
-              "r" : "984",
+              "r" : "646",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "968",
+                "r" : "621",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "975",
+                  "r" : "638",
                   "s" : [ {
-                    "r" : "973",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "null", "]" ]
+                    "r" : "622",
+                    "value" : [ "Interval[", "@2018-01-01T00:00:00+00:00", ", ", "@2018-01-21T00:00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "week" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "992",
+          "localId" : "654",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "993",
+            "localId" : "655",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "994",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "656",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "984",
+          "localId" : "646",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "989",
+            "localId" : "651",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "990",
+              "localId" : "652",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "991",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "653",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "985",
+            "localId" : "647",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "986",
+              "localId" : "648",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "987",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "649",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "988",
+            "localId" : "650",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "968",
+            "localId" : "621",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "979",
+              "localId" : "641",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "980",
+                "localId" : "642",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "981",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "643",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "975",
+              "localId" : "638",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "977",
+                "localId" : "639",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "978",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "640",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "973",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "622",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "970",
+                  "localId" : "623",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "971",
+                  "localId" : "624",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "972",
+                  "localId" : "625",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "626",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "627",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "628",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "629",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "As",
-                "localId" : "976",
-                "asType" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "630",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "operand" : {
-                  "type" : "Null",
-                  "localId" : "974",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "631",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "632",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "633",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "21",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "634",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "635",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "636",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "637",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "983",
+            "localId" : "645",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "week",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "997",
-        "name" : "NullBoth",
+        "localId" : "659",
+        "name" : "SecPrecPerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "997",
+            "r" : "659",
             "s" : [ {
-              "value" : [ "", "define ", "NullBoth", ": " ]
+              "value" : [ "", "define ", "SecPrecPerDay", ": " ]
             }, {
-              "r" : "1009",
+              "r" : "685",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "998",
+                "r" : "660",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1001",
+                  "r" : "677",
                   "s" : [ {
-                    "r" : "999",
-                    "value" : [ "Interval[", "null", ", ", "null", "]" ]
+                    "r" : "661",
+                    "value" : [ "Interval[", "@2018-01-01T00:00:00+00:00", ", ", "@2018-01-03T00:00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -216746,1253 +249722,1501 @@ module.exports['DateIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1017",
+          "localId" : "693",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1018",
+            "localId" : "694",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1019",
-              "name" : "{urn:hl7-org:elm-types:r1}Any",
+              "localId" : "695",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1009",
+          "localId" : "685",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1014",
+            "localId" : "690",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1015",
+              "localId" : "691",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1016",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "692",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1010",
+            "localId" : "686",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1011",
+              "localId" : "687",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1012",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "688",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1013",
+            "localId" : "689",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "998",
+            "localId" : "660",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1004",
+              "localId" : "680",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1005",
+                "localId" : "681",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1006",
-                  "name" : "{urn:hl7-org:elm-types:r1}Any",
+                  "localId" : "682",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1001",
+              "localId" : "677",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1002",
+                "localId" : "678",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1003",
-                  "name" : "{urn:hl7-org:elm-types:r1}Any",
+                  "localId" : "679",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "661",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "662",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "663",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "664",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "665",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "666",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "667",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "668",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "669",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "670",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "671",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "672",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "673",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "674",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "675",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "676",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
-              },
-              "low" : {
-                "type" : "Null",
-                "localId" : "999",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              },
-              "high" : {
-                "type" : "Null",
-                "localId" : "1000",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1008",
+            "localId" : "684",
             "value" : 1.0,
             "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1022",
-        "name" : "MonthDayPer",
+        "localId" : "698",
+        "name" : "SecPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1022",
+            "r" : "698",
             "s" : [ {
-              "value" : [ "", "define ", "MonthDayPer", ": " ]
+              "value" : [ "", "define ", "SecPrecPerHour", ": " ]
             }, {
-              "r" : "1040",
+              "r" : "724",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1023",
+                "r" : "699",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1032",
+                  "r" : "716",
                   "s" : [ {
-                    "r" : "1027",
-                    "value" : [ "Interval[", "@2018-01", ", ", "@2018-03", "]" ]
+                    "r" : "700",
+                    "value" : [ "Interval[", "@2018-01-01T01:00:00+00:00", ", ", "@2018-01-01T03:00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1048",
+          "localId" : "732",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1049",
+            "localId" : "733",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1050",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "734",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1040",
+          "localId" : "724",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1045",
+            "localId" : "729",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1046",
+              "localId" : "730",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1047",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "731",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1041",
+            "localId" : "725",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1042",
+              "localId" : "726",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1043",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "727",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1044",
+            "localId" : "728",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1023",
+            "localId" : "699",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1035",
+              "localId" : "719",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1036",
+                "localId" : "720",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1037",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "721",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1032",
+              "localId" : "716",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1033",
+                "localId" : "717",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1034",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "718",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "1027",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "700",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1025",
+                  "localId" : "701",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1026",
+                  "localId" : "702",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "703",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "704",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "705",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "706",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "707",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "1031",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "708",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1029",
+                  "localId" : "709",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1030",
+                  "localId" : "710",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "711",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "712",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
                   "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "713",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "714",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "715",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1039",
+            "localId" : "723",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1053",
-        "name" : "YearMonthPer",
+        "localId" : "737",
+        "name" : "SecPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1053",
+            "r" : "737",
             "s" : [ {
-              "value" : [ "", "define ", "YearMonthPer", ": " ]
+              "value" : [ "", "define ", "SecPrecPerMinute", ": " ]
             }, {
-              "r" : "1069",
+              "r" : "763",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1054",
+                "r" : "738",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1061",
+                  "r" : "755",
                   "s" : [ {
-                    "r" : "1057",
-                    "value" : [ "Interval[", "@2016", ", ", "@2018", "]" ]
+                    "r" : "739",
+                    "value" : [ "Interval[", "@2018-01-01T01:00:00+00:00", ", ", "@2018-01-01T01:02:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1077",
+          "localId" : "771",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1078",
+            "localId" : "772",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1079",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "773",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1069",
+          "localId" : "763",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1074",
+            "localId" : "768",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1075",
+              "localId" : "769",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1076",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "770",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1070",
+            "localId" : "764",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1071",
+              "localId" : "765",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1072",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "766",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1073",
+            "localId" : "767",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1054",
+            "localId" : "738",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1064",
+              "localId" : "758",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1065",
+                "localId" : "759",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1066",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "760",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1061",
+              "localId" : "755",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1062",
+                "localId" : "756",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1063",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "757",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "1057",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "739",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1056",
+                  "localId" : "740",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "741",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "742",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "743",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "744",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "745",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "746",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "1060",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "747",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1059",
+                  "localId" : "748",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "749",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "750",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "751",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "752",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "753",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "754",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1068",
+            "localId" : "762",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1082",
-        "name" : "YearDayPer",
+        "localId" : "776",
+        "name" : "SecPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1082",
+            "r" : "776",
             "s" : [ {
-              "value" : [ "", "define ", "YearDayPer", ": " ]
+              "value" : [ "", "define ", "SecPrecPerSecond", ": " ]
             }, {
-              "r" : "1098",
+              "r" : "802",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1083",
+                "r" : "777",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1090",
+                  "r" : "794",
                   "s" : [ {
-                    "r" : "1086",
-                    "value" : [ "Interval[", "@2016", ", ", "@2018", "]" ]
+                    "r" : "778",
+                    "value" : [ "Interval[", "@2018-01-01T01:00:00+00:00", ", ", "@2018-01-01T01:00:01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1106",
+          "localId" : "810",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1107",
+            "localId" : "811",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1108",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "812",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1098",
+          "localId" : "802",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1103",
+            "localId" : "807",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1104",
+              "localId" : "808",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1105",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "809",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1099",
+            "localId" : "803",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1100",
+              "localId" : "804",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1101",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "805",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1102",
+            "localId" : "806",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1083",
+            "localId" : "777",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1093",
+              "localId" : "797",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1094",
+                "localId" : "798",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1095",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "799",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1090",
+              "localId" : "794",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1091",
+                "localId" : "795",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1092",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "796",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "1086",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "778",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1085",
+                  "localId" : "779",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "780",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "781",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "782",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "783",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "784",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "785",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "1089",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "786",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1088",
+                  "localId" : "787",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "788",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "789",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "790",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "791",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "792",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "793",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1097",
+            "localId" : "801",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1111",
-        "name" : "BadPerMinute",
+        "localId" : "815",
+        "name" : "SecPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1111",
+            "r" : "815",
             "s" : [ {
-              "value" : [ "", "define ", "BadPerMinute", ": " ]
+              "value" : [ "", "define ", "SecPrecPerMillisecond", ": " ]
             }, {
-              "r" : "1131",
+              "r" : "841",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1112",
+                "r" : "816",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1123",
+                  "r" : "833",
                   "s" : [ {
-                    "r" : "1117",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-04", "]" ]
+                    "r" : "817",
+                    "value" : [ "Interval[", "@2018-01-01T01:00:00+00:00", ", ", "@2018-01-01T01:00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1139",
+          "localId" : "849",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1140",
+            "localId" : "850",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1141",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "851",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1131",
+          "localId" : "841",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1136",
+            "localId" : "846",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1137",
+              "localId" : "847",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1138",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "848",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1132",
+            "localId" : "842",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1133",
+              "localId" : "843",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1134",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "844",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1135",
+            "localId" : "845",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1112",
+            "localId" : "816",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1126",
+              "localId" : "836",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1127",
+                "localId" : "837",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1128",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "838",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1123",
+              "localId" : "833",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1124",
+                "localId" : "834",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1125",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "835",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "1117",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "817",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1114",
+                  "localId" : "818",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1115",
+                  "localId" : "819",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1116",
+                  "localId" : "820",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "821",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "822",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "823",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "824",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "1122",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "825",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1119",
+                  "localId" : "826",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1120",
+                  "localId" : "827",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1121",
+                  "localId" : "828",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "829",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "830",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "831",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "832",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1130",
+            "localId" : "840",
             "value" : 1.0,
-            "unit" : "minute",
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1144",
-        "name" : "BadPerGram",
+        "localId" : "854",
+        "name" : "MinPrecPerYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1144",
+            "r" : "854",
             "s" : [ {
-              "value" : [ "", "define ", "BadPerGram", ": " ]
+              "value" : [ "", "define ", "MinPrecPerYear", ": " ]
             }, {
-              "r" : "1164",
+              "r" : "878",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1145",
+                "r" : "855",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1156",
+                  "r" : "870",
                   "s" : [ {
-                    "r" : "1150",
-                    "value" : [ "Interval[", "@2018-01-01", ", ", "@2018-01-04", "]" ]
+                    "r" : "856",
+                    "value" : [ "Interval[", "@2016-01-01T00:00+00:00", ", ", "@2018-01-01T00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per " ]
-              }, {
-                "r" : "1163",
-                "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
-                } ]
+                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1172",
+          "localId" : "886",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1173",
+            "localId" : "887",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1174",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "888",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1164",
+          "localId" : "878",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1169",
+            "localId" : "883",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1170",
+              "localId" : "884",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1171",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "885",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1165",
+            "localId" : "879",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1166",
+              "localId" : "880",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1167",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "881",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1168",
+            "localId" : "882",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1145",
+            "localId" : "855",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1159",
+              "localId" : "873",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1160",
+                "localId" : "874",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1161",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "875",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1156",
+              "localId" : "870",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1157",
+                "localId" : "871",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1158",
-                  "name" : "{urn:hl7-org:elm-types:r1}Date",
+                  "localId" : "872",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Date",
-                "localId" : "1150",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "856",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1147",
+                  "localId" : "857",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "2016",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1148",
+                  "localId" : "858",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1149",
+                  "localId" : "859",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "860",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "861",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "862",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Date",
-                "localId" : "1155",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date",
+                "type" : "DateTime",
+                "localId" : "863",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1152",
+                  "localId" : "864",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1153",
+                  "localId" : "865",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1154",
+                  "localId" : "866",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "867",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "868",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "869",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1163",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "g",
+            "localId" : "877",
+            "value" : 1.0,
+            "unit" : "year",
             "annotation" : [ ]
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* DateTimeIntervalExpand
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define MsPrecPerYear: expand { Interval[@2016-01-01T00:00:00.000+00:00, @2018-01-01T00:00:00.000+00:00] } per year
-define MsPrecPerMonth: expand { Interval[@2018-01-01T00:00:00.000+00:00, @2018-03-01T00:00:00.000+00:00] } per month
-define MsPrecPerWeek: expand { Interval[@2018-01-01T00:00:00.000+00:00, @2018-01-21T00:00:00.000+00:00] } per week
-define MsPrecPerDay: expand { Interval[@2018-01-01T00:00:00.000+00:00, @2018-01-03T00:00:00.000+00:00] } per day
-define MsPrecPerHour: expand { Interval[@2018-01-01T01:00:00.000+00:00, @2018-01-01T03:00:00.000+00:00] } per hour
-define MsPrecPerMinute: expand { Interval[@2018-01-01T01:00:00.000+00:00, @2018-01-01T01:02:00.000+00:00] } per minute
-define MsPrecPerSecond: expand { Interval[@2018-01-01T01:00:00.000+00:00, @2018-01-01T01:00:02.000+00:00] } per second
-define MsPrecPerMillisecond: expand { Interval[@2018-01-01T01:00:00.000+00:00, @2018-01-01T01:00:00.001+00:00] } per millisecond
-
-define SecPrecPerYear: expand { Interval[@2016-01-01T00:00:00+00:00, @2018-01-01T00:00:00+00:00] } per year
-define SecPrecPerMonth: expand { Interval[@2018-01-01T00:00:00+00:00, @2018-03-01T00:00:00+00:00] } per month
-define SecPrecPerWeek: expand { Interval[@2018-01-01T00:00:00+00:00, @2018-01-21T00:00:00+00:00] } per week
-define SecPrecPerDay: expand { Interval[@2018-01-01T00:00:00+00:00, @2018-01-03T00:00:00+00:00] } per day
-define SecPrecPerHour: expand { Interval[@2018-01-01T01:00:00+00:00, @2018-01-01T03:00:00+00:00] } per hour
-define SecPrecPerMinute: expand { Interval[@2018-01-01T01:00:00+00:00, @2018-01-01T01:02:00+00:00] } per minute
-define SecPrecPerSecond: expand { Interval[@2018-01-01T01:00:00+00:00, @2018-01-01T01:00:01+00:00] } per second
-define SecPrecPerMillisecond: expand { Interval[@2018-01-01T01:00:00+00:00, @2018-01-01T01:00:00+00:00] } per millisecond
-
-define MinPrecPerYear: expand { Interval[@2016-01-01T00:00+00:00, @2018-01-01T00:00+00:00] } per year
-define MinPrecPerMonth: expand { Interval[@2018-01-01T00:00+00:00, @2018-03-01T00:00+00:00] } per month
-define MinPrecPerWeek: expand { Interval[@2018-01-01T00:00+00:00, @2018-01-21T00:00+00:00] } per week
-define MinPrecPerDay: expand { Interval[@2018-01-01T00:00+00:00, @2018-01-03T00:00+00:00] } per day
-define MinPrecPerHour: expand { Interval[@2018-01-01T01:00+00:00, @2018-01-01T03:00+00:00] } per hour
-define MinPrecPerMinute: expand { Interval[@2018-01-01T01:00+00:00, @2018-01-01T01:01+00:00] } per minute
-define MinPrecPerSecond: expand { Interval[@2018-01-01T01:00+00:00, @2018-01-01T01:00+00:00] } per second
-define MinPrecPerMillisecond: expand { Interval[@2018-01-01T01:00+00:00, @2018-01-01T01:00+00:00] } per millisecond
-
-define HourPrecPerYear: expand { Interval[@2016-01-01T00+00:00, @2018-01-01T00+00:00] } per year
-define HourPrecPerMonth: expand { Interval[@2018-01-01T00+00:00, @2018-03-01T00+00:00] } per month
-define HourPrecPerWeek: expand { Interval[@2018-01-01T00+00:00, @2018-01-21T00+00:00] } per week
-define HourPrecPerDay: expand { Interval[@2018-01-01T00+00:00, @2018-01-03T00+00:00] } per day
-define HourPrecPerHour: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T02+00:00] } per hour
-define HourPrecPerMinute: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T01+00:00] } per minute
-define HourPrecPerSecond: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T01+00:00] } per second
-define HourPrecPerMillisecond: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T01+00:00] } per millisecond
-
-define DayPrecPerYear: expand { Interval[DateTime(2016,01,01), DateTime(2018,01,01)] } per year
-define DayPrecPerMonth: expand { Interval[DateTime(2018,01,01), DateTime(2018,03,01)] } per month
-define DayPrecPerWeek: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,14)] } per week
-define DayPrecPerDay: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,02)] } per day
-define DayPrecPerHour: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,01)] } per hour
-define DayPrecPerMinute: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,01)] } per minute
-define DayPrecPerSecond: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,01)] } per second
-define DayPrecPerMillisecond: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,01)] } per millisecond
-
-define MonthPrecPerYear: expand { Interval[DateTime(2016,01), DateTime(2018,01)] } per year
-define MonthPrecPerMonth: expand { Interval[DateTime(2018,01), DateTime(2018,02)] } per month
-define MonthPrecPerWeek: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per week
-define MonthPrecPerDay: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per day
-define MonthPrecPerHour: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per hour
-define MonthPrecPerMinute: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per minute
-define MonthPrecPerSecond: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per second
-define MonthPrecPerMillisecond: expand { Interval[DateTime(2018,01), DateTime(2018,01)] } per millisecond
-
-define YearPrecPerYear: expand { Interval[DateTime(2016), DateTime(2018)] } per year
-define YearPrecPerMonth: expand { Interval[DateTime(2018), DateTime(2018)] } per month
-define YearPrecPerWeek: expand { Interval[DateTime(2018), DateTime(2018)] } per week
-define YearPrecPerDay: expand { Interval[DateTime(2018), DateTime(2018)] } per day
-define YearPrecPerHour: expand { Interval[DateTime(2018), DateTime(2018)] } per hour
-define YearPrecPerMinute: expand { Interval[DateTime(2018), DateTime(2018)] } per minute
-define YearPrecPerSecond: expand { Interval[DateTime(2018), DateTime(2018)] } per second
-define YearPrecPerMillisecond: expand { Interval[DateTime(2018), DateTime(2018)] } per millisecond
-
-define NullInList: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T01+00:00], null } per hour
-define Overlapping: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T03+00:00], Interval[@2018-01-01T02+00:00, @2018-01-01T04+00:00] } per hour
-define NonOverlapping: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T02+00:00], Interval[@2018-01-01T05+00:00, @2018-01-01T05+00:00] } per hour
-
-define NoPerDefaultMS: expand { Interval[@2018-01-01T01:00:00.000+00:00, @2018-01-01T01:00:00.001+00:00] }
-define NoPerDefaultSec: expand { Interval[@2018-01-01T01:00:00+00:00, @2018-01-01T01:00:01+00:00] }
-define NoPerDefaultMin: expand { Interval[@2018-01-01T01:00+00:00, @2018-01-01T01:01+00:00] }
-define NoPerDefaultHour: expand { Interval[@2018-01-01T01+00:00, @2018-01-01T01+00:00] }
-define NoPerDefaultDay: expand { Interval[DateTime(2018,01,01), DateTime(2018,01,01)] }
-define NoPerDefaultMonth: expand { Interval[DateTime(2018,01), DateTime(2018,01)]  }
-define NoPerDefaultYear: expand { Interval[DateTime(2018), DateTime(2018)]  }
-
-define OpenStart: expand { Interval(@2018-01-01T01+00:00, @2018-01-03T01+00:00] } per day
-define OpenEnd: expand { Interval[@2018-01-01T01+00:00, @2018-01-03T01+00:00) } per day
-define OpenBoth: expand { Interval(@2018-01-01T01+00:00, @2018-01-03T01+00:00) } per day
-
-define MismatchPrecision: expand { Interval[@2012-01-01T12:00+00:00, @2012-01-02T12:00:00+00:00] } per day
-define MismatchPrecisionResultLongerThanInput: expand { Interval[@2012-01-01T13:00:00+00:00, @2012-01-02T12:59+00:00] } per day
-
-define EmptyList: List<Interval<Date>>{}
-define NullOpen: expand { Interval[null, @2018-01-03T01+00:00] } per day
-define NullClose: expand { Interval[@2018-01-01T01+00:00, null] } per day
-define NullBoth: expand { Interval[null, null] } per day
-define BadPerGram: expand { Interval[@2018-01-01T01+00:00, @2018-01-04T01+00:00] } per 1 'g'
-*/
-
-module.exports['DateTimeIntervalExpand'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "3104",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
-      }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "206",
-            "s" : [ {
-              "value" : [ "", "using " ]
-            }, {
-              "s" : [ {
-                "value" : [ "Simple" ]
-              } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
-            } ]
-          }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
-          "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
-            "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
-        }
       }, {
-        "localId" : "214",
-        "name" : "MsPrecPerYear",
+        "localId" : "891",
+        "name" : "MinPrecPerMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "891",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerYear", ": " ]
+              "value" : [ "", "define ", "MinPrecPerMonth", ": " ]
             }, {
-              "r" : "242",
+              "r" : "915",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "215",
+                "r" : "892",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "234",
+                  "r" : "907",
                   "s" : [ {
-                    "r" : "216",
-                    "value" : [ "Interval[", "@2016-01-01T00:00:00.000+00:00", ", ", "@2018-01-01T00:00:00.000+00:00", "]" ]
+                    "r" : "893",
+                    "value" : [ "Interval[", "@2018-01-01T00:00+00:00", ", ", "@2018-03-01T00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "year" ]
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "250",
+          "localId" : "923",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "251",
+            "localId" : "924",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "252",
+              "localId" : "925",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -218000,19 +251224,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "242",
+          "localId" : "915",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "247",
+            "localId" : "920",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "248",
+              "localId" : "921",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "249",
+                "localId" : "922",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -218020,40 +251244,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "243",
+            "localId" : "916",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "244",
+              "localId" : "917",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "245",
+                "localId" : "918",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "246",
+            "localId" : "919",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "215",
+            "localId" : "892",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "237",
+              "localId" : "910",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "238",
+                "localId" : "911",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "239",
+                  "localId" : "912",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -218061,79 +251285,65 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "234",
+              "localId" : "907",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "235",
+                "localId" : "908",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "236",
+                  "localId" : "909",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "216",
+                "localId" : "893",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "217",
+                  "localId" : "894",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                  "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "218",
+                  "localId" : "895",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "219",
+                  "localId" : "896",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "220",
+                  "localId" : "897",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "221",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "222",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "223",
+                  "localId" : "898",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "224",
+                  "localId" : "899",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -218141,62 +251351,48 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "225",
+                "localId" : "900",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "226",
+                  "localId" : "901",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "227",
+                  "localId" : "902",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "3",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "228",
+                  "localId" : "903",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "229",
+                  "localId" : "904",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "230",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "231",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "232",
+                  "localId" : "905",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "233",
+                  "localId" : "906",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -218205,58 +251401,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "241",
+            "localId" : "914",
             "value" : 1.0,
-            "unit" : "year",
+            "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "255",
-        "name" : "MsPrecPerMonth",
+        "localId" : "928",
+        "name" : "MinPrecPerWeek",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "255",
+            "r" : "928",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerMonth", ": " ]
+              "value" : [ "", "define ", "MinPrecPerWeek", ": " ]
             }, {
-              "r" : "283",
+              "r" : "952",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "256",
+                "r" : "929",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "275",
+                  "r" : "944",
                   "s" : [ {
-                    "r" : "257",
-                    "value" : [ "Interval[", "@2018-01-01T00:00:00.000+00:00", ", ", "@2018-03-01T00:00:00.000+00:00", "]" ]
+                    "r" : "930",
+                    "value" : [ "Interval[", "@2018-01-01T00:00+00:00", ", ", "@2018-01-21T00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "week" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "291",
+          "localId" : "960",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "292",
+            "localId" : "961",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "293",
+              "localId" : "962",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -218264,19 +251460,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "283",
+          "localId" : "952",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "288",
+            "localId" : "957",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "289",
+              "localId" : "958",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "290",
+                "localId" : "959",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -218284,40 +251480,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "284",
+            "localId" : "953",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "285",
+              "localId" : "954",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "286",
+                "localId" : "955",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "287",
+            "localId" : "956",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "256",
+            "localId" : "929",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "278",
+              "localId" : "947",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "279",
+                "localId" : "948",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "280",
+                  "localId" : "949",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -218325,79 +251521,65 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "275",
+              "localId" : "944",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "276",
+                "localId" : "945",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "277",
+                  "localId" : "946",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "257",
+                "localId" : "930",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "258",
+                  "localId" : "931",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "259",
+                  "localId" : "932",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "260",
+                  "localId" : "933",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "261",
+                  "localId" : "934",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "262",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "263",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "264",
+                  "localId" : "935",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "265",
+                  "localId" : "936",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -218405,62 +251587,48 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "266",
+                "localId" : "937",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "267",
+                  "localId" : "938",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "268",
+                  "localId" : "939",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "269",
+                  "localId" : "940",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "21",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "270",
+                  "localId" : "941",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "271",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "272",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "273",
+                  "localId" : "942",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "274",
+                  "localId" : "943",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -218469,58 +251637,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "282",
+            "localId" : "951",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "week",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "296",
-        "name" : "MsPrecPerWeek",
+        "localId" : "965",
+        "name" : "MinPrecPerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "296",
+            "r" : "965",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerWeek", ": " ]
+              "value" : [ "", "define ", "MinPrecPerDay", ": " ]
             }, {
-              "r" : "324",
+              "r" : "989",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "297",
+                "r" : "966",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "316",
+                  "r" : "981",
                   "s" : [ {
-                    "r" : "298",
-                    "value" : [ "Interval[", "@2018-01-01T00:00:00.000+00:00", ", ", "@2018-01-21T00:00:00.000+00:00", "]" ]
+                    "r" : "967",
+                    "value" : [ "Interval[", "@2018-01-01T00:00+00:00", ", ", "@2018-01-03T00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "week" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "332",
+          "localId" : "997",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "333",
+            "localId" : "998",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "334",
+              "localId" : "999",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -218528,19 +251696,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "324",
+          "localId" : "989",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "329",
+            "localId" : "994",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "330",
+              "localId" : "995",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "331",
+                "localId" : "996",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -218548,40 +251716,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "325",
+            "localId" : "990",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "326",
+              "localId" : "991",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "327",
+                "localId" : "992",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "328",
+            "localId" : "993",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "297",
+            "localId" : "966",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "319",
+              "localId" : "984",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "320",
+                "localId" : "985",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "321",
+                  "localId" : "986",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -218589,79 +251757,65 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "316",
+              "localId" : "981",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "317",
+                "localId" : "982",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "318",
+                  "localId" : "983",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "298",
+                "localId" : "967",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "299",
+                  "localId" : "968",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "300",
+                  "localId" : "969",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "301",
+                  "localId" : "970",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "302",
+                  "localId" : "971",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "303",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "304",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "305",
+                  "localId" : "972",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "306",
+                  "localId" : "973",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -218669,62 +251823,48 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "307",
+                "localId" : "974",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "308",
+                  "localId" : "975",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "309",
+                  "localId" : "976",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "310",
+                  "localId" : "977",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "21",
+                  "value" : "3",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "311",
+                  "localId" : "978",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "312",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "313",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "314",
+                  "localId" : "979",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "315",
+                  "localId" : "980",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -218733,58 +251873,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "323",
+            "localId" : "988",
             "value" : 1.0,
-            "unit" : "week",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "337",
-        "name" : "MsPrecPerDay",
+        "localId" : "1002",
+        "name" : "MinPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "337",
+            "r" : "1002",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerDay", ": " ]
+              "value" : [ "", "define ", "MinPrecPerHour", ": " ]
             }, {
-              "r" : "365",
+              "r" : "1026",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "338",
+                "r" : "1003",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "357",
+                  "r" : "1018",
                   "s" : [ {
-                    "r" : "339",
-                    "value" : [ "Interval[", "@2018-01-01T00:00:00.000+00:00", ", ", "@2018-01-03T00:00:00.000+00:00", "]" ]
+                    "r" : "1004",
+                    "value" : [ "Interval[", "@2018-01-01T01:00+00:00", ", ", "@2018-01-01T03:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "373",
+          "localId" : "1034",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "374",
+            "localId" : "1035",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "375",
+              "localId" : "1036",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -218792,19 +251932,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "365",
+          "localId" : "1026",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "370",
+            "localId" : "1031",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "371",
+              "localId" : "1032",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "372",
+                "localId" : "1033",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -218812,40 +251952,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "366",
+            "localId" : "1027",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "367",
+              "localId" : "1028",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "368",
+                "localId" : "1029",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "369",
+            "localId" : "1030",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "338",
+            "localId" : "1003",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "360",
+              "localId" : "1021",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "361",
+                "localId" : "1022",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "362",
+                  "localId" : "1023",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -218853,79 +251993,65 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "357",
+              "localId" : "1018",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "358",
+                "localId" : "1019",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "359",
+                  "localId" : "1020",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "339",
+                "localId" : "1004",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "340",
+                  "localId" : "1005",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "341",
+                  "localId" : "1006",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "342",
+                  "localId" : "1007",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "343",
+                  "localId" : "1008",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "344",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "345",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "346",
+                  "localId" : "1009",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "347",
+                  "localId" : "1010",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -218933,62 +252059,48 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "348",
+                "localId" : "1011",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "349",
+                  "localId" : "1012",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "350",
+                  "localId" : "1013",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "351",
+                  "localId" : "1014",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "352",
+                  "localId" : "1015",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "3",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "353",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "354",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "355",
+                  "localId" : "1016",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "356",
+                  "localId" : "1017",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -218997,58 +252109,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "364",
+            "localId" : "1025",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "378",
-        "name" : "MsPrecPerHour",
+        "localId" : "1039",
+        "name" : "MinPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "378",
+            "r" : "1039",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerHour", ": " ]
+              "value" : [ "", "define ", "MinPrecPerMinute", ": " ]
             }, {
-              "r" : "406",
+              "r" : "1063",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "379",
+                "r" : "1040",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "398",
+                  "r" : "1055",
                   "s" : [ {
-                    "r" : "380",
-                    "value" : [ "Interval[", "@2018-01-01T01:00:00.000+00:00", ", ", "@2018-01-01T03:00:00.000+00:00", "]" ]
+                    "r" : "1041",
+                    "value" : [ "Interval[", "@2018-01-01T01:00+00:00", ", ", "@2018-01-01T01:01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "414",
+          "localId" : "1071",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "415",
+            "localId" : "1072",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "416",
+              "localId" : "1073",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -219056,19 +252168,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "406",
+          "localId" : "1063",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "411",
+            "localId" : "1068",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "412",
+              "localId" : "1069",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "413",
+                "localId" : "1070",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -219076,40 +252188,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "407",
+            "localId" : "1064",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "408",
+              "localId" : "1065",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "409",
+                "localId" : "1066",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "410",
+            "localId" : "1067",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "379",
+            "localId" : "1040",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "401",
+              "localId" : "1058",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "402",
+                "localId" : "1059",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "403",
+                  "localId" : "1060",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -219117,79 +252229,65 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "398",
+              "localId" : "1055",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "399",
+                "localId" : "1056",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "400",
+                  "localId" : "1057",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "380",
+                "localId" : "1041",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "381",
+                  "localId" : "1042",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "382",
+                  "localId" : "1043",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "383",
+                  "localId" : "1044",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "384",
+                  "localId" : "1045",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "385",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "386",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "387",
+                  "localId" : "1046",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "388",
+                  "localId" : "1047",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -219197,62 +252295,48 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "389",
+                "localId" : "1048",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "390",
+                  "localId" : "1049",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "391",
+                  "localId" : "1050",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "392",
+                  "localId" : "1051",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "393",
+                  "localId" : "1052",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "394",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "395",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "396",
+                  "localId" : "1053",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "397",
+                  "localId" : "1054",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -219261,58 +252345,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "405",
+            "localId" : "1062",
             "value" : 1.0,
-            "unit" : "hour",
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "419",
-        "name" : "MsPrecPerMinute",
+        "localId" : "1076",
+        "name" : "MinPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "419",
+            "r" : "1076",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "MinPrecPerSecond", ": " ]
             }, {
-              "r" : "447",
+              "r" : "1100",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "420",
+                "r" : "1077",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "439",
+                  "r" : "1092",
                   "s" : [ {
-                    "r" : "421",
-                    "value" : [ "Interval[", "@2018-01-01T01:00:00.000+00:00", ", ", "@2018-01-01T01:02:00.000+00:00", "]" ]
+                    "r" : "1078",
+                    "value" : [ "Interval[", "@2018-01-01T01:00+00:00", ", ", "@2018-01-01T01:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "455",
+          "localId" : "1108",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "456",
+            "localId" : "1109",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "457",
+              "localId" : "1110",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -219320,19 +252404,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "447",
+          "localId" : "1100",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "452",
+            "localId" : "1105",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "453",
+              "localId" : "1106",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "454",
+                "localId" : "1107",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -219340,40 +252424,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "448",
+            "localId" : "1101",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "449",
+              "localId" : "1102",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "450",
+                "localId" : "1103",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "451",
+            "localId" : "1104",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "420",
+            "localId" : "1077",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "442",
+              "localId" : "1095",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "443",
+                "localId" : "1096",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "444",
+                  "localId" : "1097",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -219381,79 +252465,65 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "439",
+              "localId" : "1092",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "440",
+                "localId" : "1093",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "441",
+                  "localId" : "1094",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "421",
+                "localId" : "1078",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "422",
+                  "localId" : "1079",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "423",
+                  "localId" : "1080",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "424",
+                  "localId" : "1081",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "425",
+                  "localId" : "1082",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "426",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "427",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "428",
+                  "localId" : "1083",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "429",
+                  "localId" : "1084",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -219461,62 +252531,48 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "430",
+                "localId" : "1085",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "431",
+                  "localId" : "1086",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "432",
+                  "localId" : "1087",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "433",
+                  "localId" : "1088",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "434",
+                  "localId" : "1089",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "435",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "436",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "437",
+                  "localId" : "1090",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "438",
+                  "localId" : "1091",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -219525,58 +252581,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "446",
+            "localId" : "1099",
             "value" : 1.0,
-            "unit" : "minute",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "460",
-        "name" : "MsPrecPerSecond",
+        "localId" : "1113",
+        "name" : "MinPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "460",
+            "r" : "1113",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerSecond", ": " ]
+              "value" : [ "", "define ", "MinPrecPerMillisecond", ": " ]
             }, {
-              "r" : "488",
+              "r" : "1137",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "461",
+                "r" : "1114",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "480",
+                  "r" : "1129",
                   "s" : [ {
-                    "r" : "462",
-                    "value" : [ "Interval[", "@2018-01-01T01:00:00.000+00:00", ", ", "@2018-01-01T01:00:02.000+00:00", "]" ]
+                    "r" : "1115",
+                    "value" : [ "Interval[", "@2018-01-01T01:00+00:00", ", ", "@2018-01-01T01:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "second" ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "496",
+          "localId" : "1145",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "497",
+            "localId" : "1146",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "498",
+              "localId" : "1147",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -219584,19 +252640,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "488",
+          "localId" : "1137",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "493",
+            "localId" : "1142",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "494",
+              "localId" : "1143",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "495",
+                "localId" : "1144",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -219604,40 +252660,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "489",
+            "localId" : "1138",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "490",
+              "localId" : "1139",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "491",
+                "localId" : "1140",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "492",
+            "localId" : "1141",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "461",
+            "localId" : "1114",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "483",
+              "localId" : "1132",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "484",
+                "localId" : "1133",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "485",
+                  "localId" : "1134",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -219645,79 +252701,65 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "480",
+              "localId" : "1129",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "481",
+                "localId" : "1130",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "482",
+                  "localId" : "1131",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "462",
+                "localId" : "1115",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "463",
+                  "localId" : "1116",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "464",
+                  "localId" : "1117",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "465",
+                  "localId" : "1118",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "466",
+                  "localId" : "1119",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "467",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "468",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "469",
+                  "localId" : "1120",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "470",
+                  "localId" : "1121",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -219725,62 +252767,48 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "471",
+                "localId" : "1122",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "472",
+                  "localId" : "1123",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "473",
+                  "localId" : "1124",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "474",
+                  "localId" : "1125",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "475",
+                  "localId" : "1126",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "476",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "477",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "478",
+                  "localId" : "1127",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "479",
+                  "localId" : "1128",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -219789,58 +252817,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "487",
+            "localId" : "1136",
             "value" : 1.0,
-            "unit" : "second",
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "501",
-        "name" : "MsPrecPerMillisecond",
+        "localId" : "1150",
+        "name" : "HourPrecPerYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "501",
+            "r" : "1150",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "HourPrecPerYear", ": " ]
             }, {
-              "r" : "529",
+              "r" : "1172",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "502",
+                "r" : "1151",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "521",
+                  "r" : "1164",
                   "s" : [ {
-                    "r" : "503",
-                    "value" : [ "Interval[", "@2018-01-01T01:00:00.000+00:00", ", ", "@2018-01-01T01:00:00.001+00:00", "]" ]
+                    "r" : "1152",
+                    "value" : [ "Interval[", "@2016-01-01T00+00:00", ", ", "@2018-01-01T00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "millisecond" ]
+                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "537",
+          "localId" : "1180",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "538",
+            "localId" : "1181",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "539",
+              "localId" : "1182",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -219848,19 +252876,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "529",
+          "localId" : "1172",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "534",
+            "localId" : "1177",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "535",
+              "localId" : "1178",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "536",
+                "localId" : "1179",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -219868,40 +252896,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "530",
+            "localId" : "1173",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "531",
+              "localId" : "1174",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "532",
+                "localId" : "1175",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "533",
+            "localId" : "1176",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "502",
+            "localId" : "1151",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "524",
+              "localId" : "1167",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "525",
+                "localId" : "1168",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "526",
+                  "localId" : "1169",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -219909,79 +252937,58 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "521",
+              "localId" : "1164",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "522",
+                "localId" : "1165",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "523",
+                  "localId" : "1166",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "503",
+                "localId" : "1152",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "504",
+                  "localId" : "1153",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "2016",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "505",
+                  "localId" : "1154",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "506",
+                  "localId" : "1155",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "507",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "508",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "509",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "510",
+                  "localId" : "1156",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "511",
+                  "localId" : "1157",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -219989,62 +252996,41 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "512",
+                "localId" : "1158",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "513",
+                  "localId" : "1159",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "514",
+                  "localId" : "1160",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "515",
+                  "localId" : "1161",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "516",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "517",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "518",
+                  "localId" : "1162",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "519",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "520",
+                  "localId" : "1163",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -220053,58 +253039,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "528",
+            "localId" : "1171",
             "value" : 1.0,
-            "unit" : "millisecond",
+            "unit" : "year",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "542",
-        "name" : "SecPrecPerYear",
+        "localId" : "1185",
+        "name" : "HourPrecPerMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "542",
+            "r" : "1185",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerYear", ": " ]
+              "value" : [ "", "define ", "HourPrecPerMonth", ": " ]
             }, {
-              "r" : "568",
+              "r" : "1207",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "543",
+                "r" : "1186",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "560",
+                  "r" : "1199",
                   "s" : [ {
-                    "r" : "544",
-                    "value" : [ "Interval[", "@2016-01-01T00:00:00+00:00", ", ", "@2018-01-01T00:00:00+00:00", "]" ]
+                    "r" : "1187",
+                    "value" : [ "Interval[", "@2018-01-01T00+00:00", ", ", "@2018-03-01T00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "year" ]
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "576",
+          "localId" : "1215",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "577",
+            "localId" : "1216",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "578",
+              "localId" : "1217",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -220112,19 +253098,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "568",
+          "localId" : "1207",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "573",
+            "localId" : "1212",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "574",
+              "localId" : "1213",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "575",
+                "localId" : "1214",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -220132,40 +253118,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "569",
+            "localId" : "1208",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "570",
+              "localId" : "1209",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "571",
+                "localId" : "1210",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "572",
+            "localId" : "1211",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "543",
+            "localId" : "1186",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "563",
+              "localId" : "1202",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "564",
+                "localId" : "1203",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "565",
+                  "localId" : "1204",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -220173,72 +253159,58 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "560",
+              "localId" : "1199",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "561",
+                "localId" : "1200",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "562",
+                  "localId" : "1201",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "544",
+                "localId" : "1187",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "545",
+                  "localId" : "1188",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                  "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "546",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "547",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "548",
+                  "localId" : "1189",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
-                "minute" : {
+                "day" : {
                   "type" : "Literal",
-                  "localId" : "549",
+                  "localId" : "1190",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
-                "second" : {
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "550",
+                  "localId" : "1191",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "551",
+                  "localId" : "1192",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -220246,55 +253218,41 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "552",
+                "localId" : "1193",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "553",
+                  "localId" : "1194",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "554",
+                  "localId" : "1195",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "3",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "555",
+                  "localId" : "1196",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "556",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "557",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "558",
+                  "localId" : "1197",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "559",
+                  "localId" : "1198",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -220303,58 +253261,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "567",
+            "localId" : "1206",
             "value" : 1.0,
-            "unit" : "year",
+            "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "581",
-        "name" : "SecPrecPerMonth",
+        "localId" : "1220",
+        "name" : "HourPrecPerWeek",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "581",
+            "r" : "1220",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerMonth", ": " ]
+              "value" : [ "", "define ", "HourPrecPerWeek", ": " ]
             }, {
-              "r" : "607",
+              "r" : "1242",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "582",
+                "r" : "1221",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "599",
+                  "r" : "1234",
                   "s" : [ {
-                    "r" : "583",
-                    "value" : [ "Interval[", "@2018-01-01T00:00:00+00:00", ", ", "@2018-03-01T00:00:00+00:00", "]" ]
+                    "r" : "1222",
+                    "value" : [ "Interval[", "@2018-01-01T00+00:00", ", ", "@2018-01-21T00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "week" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "615",
+          "localId" : "1250",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "616",
+            "localId" : "1251",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "617",
+              "localId" : "1252",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -220362,19 +253320,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "607",
+          "localId" : "1242",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "612",
+            "localId" : "1247",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "613",
+              "localId" : "1248",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "614",
+                "localId" : "1249",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -220382,40 +253340,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "608",
+            "localId" : "1243",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "609",
+              "localId" : "1244",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "610",
+                "localId" : "1245",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "611",
+            "localId" : "1246",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "582",
+            "localId" : "1221",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "602",
+              "localId" : "1237",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "603",
+                "localId" : "1238",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "604",
+                  "localId" : "1239",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -220423,72 +253381,58 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "599",
+              "localId" : "1234",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "600",
+                "localId" : "1235",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "601",
+                  "localId" : "1236",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "583",
+                "localId" : "1222",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "584",
+                  "localId" : "1223",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "585",
+                  "localId" : "1224",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "586",
+                  "localId" : "1225",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "587",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "588",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "589",
+                  "localId" : "1226",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "590",
+                  "localId" : "1227",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -220496,55 +253440,41 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "591",
+                "localId" : "1228",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "592",
+                  "localId" : "1229",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "593",
+                  "localId" : "1230",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "594",
+                  "localId" : "1231",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "21",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "595",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "596",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "597",
+                  "localId" : "1232",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "598",
+                  "localId" : "1233",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -220553,58 +253483,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "606",
+            "localId" : "1241",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "week",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "620",
-        "name" : "SecPrecPerWeek",
+        "localId" : "1255",
+        "name" : "HourPrecPerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "620",
+            "r" : "1255",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerWeek", ": " ]
+              "value" : [ "", "define ", "HourPrecPerDay", ": " ]
             }, {
-              "r" : "646",
+              "r" : "1277",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "621",
+                "r" : "1256",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "638",
+                  "r" : "1269",
                   "s" : [ {
-                    "r" : "622",
-                    "value" : [ "Interval[", "@2018-01-01T00:00:00+00:00", ", ", "@2018-01-21T00:00:00+00:00", "]" ]
+                    "r" : "1257",
+                    "value" : [ "Interval[", "@2018-01-01T00+00:00", ", ", "@2018-01-03T00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "week" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "654",
+          "localId" : "1285",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "655",
+            "localId" : "1286",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "656",
+              "localId" : "1287",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -220612,19 +253542,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "646",
+          "localId" : "1277",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "651",
+            "localId" : "1282",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "652",
+              "localId" : "1283",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "653",
+                "localId" : "1284",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -220632,40 +253562,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "647",
+            "localId" : "1278",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "648",
+              "localId" : "1279",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "649",
+                "localId" : "1280",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "650",
+            "localId" : "1281",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "621",
+            "localId" : "1256",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "641",
+              "localId" : "1272",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "642",
+                "localId" : "1273",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "643",
+                  "localId" : "1274",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -220673,72 +253603,58 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "638",
+              "localId" : "1269",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "639",
+                "localId" : "1270",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "640",
+                  "localId" : "1271",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "622",
+                "localId" : "1257",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "623",
+                  "localId" : "1258",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "624",
+                  "localId" : "1259",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "625",
+                  "localId" : "1260",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "626",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "627",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "628",
+                  "localId" : "1261",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "629",
+                  "localId" : "1262",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -220746,55 +253662,41 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "630",
+                "localId" : "1263",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "631",
+                  "localId" : "1264",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "632",
+                  "localId" : "1265",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "633",
+                  "localId" : "1266",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "21",
+                  "value" : "3",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "634",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "635",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "636",
+                  "localId" : "1267",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "637",
+                  "localId" : "1268",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -220803,58 +253705,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "645",
+            "localId" : "1276",
             "value" : 1.0,
-            "unit" : "week",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "659",
-        "name" : "SecPrecPerDay",
+        "localId" : "1290",
+        "name" : "HourPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "659",
+            "r" : "1290",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerDay", ": " ]
+              "value" : [ "", "define ", "HourPrecPerHour", ": " ]
             }, {
-              "r" : "685",
+              "r" : "1312",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "660",
+                "r" : "1291",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "677",
+                  "r" : "1304",
                   "s" : [ {
-                    "r" : "661",
-                    "value" : [ "Interval[", "@2018-01-01T00:00:00+00:00", ", ", "@2018-01-03T00:00:00+00:00", "]" ]
+                    "r" : "1292",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T02+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "693",
+          "localId" : "1320",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "694",
+            "localId" : "1321",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "695",
+              "localId" : "1322",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -220862,19 +253764,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "685",
+          "localId" : "1312",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "690",
+            "localId" : "1317",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "691",
+              "localId" : "1318",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "692",
+                "localId" : "1319",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -220882,40 +253784,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "686",
+            "localId" : "1313",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "687",
+              "localId" : "1314",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "688",
+                "localId" : "1315",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "689",
+            "localId" : "1316",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "660",
+            "localId" : "1291",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "680",
+              "localId" : "1307",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "681",
+                "localId" : "1308",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "682",
+                  "localId" : "1309",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -220923,72 +253825,58 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "677",
+              "localId" : "1304",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "678",
+                "localId" : "1305",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "679",
+                  "localId" : "1306",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "661",
+                "localId" : "1292",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "662",
+                  "localId" : "1293",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "663",
+                  "localId" : "1294",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "664",
+                  "localId" : "1295",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "665",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "666",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "667",
+                  "localId" : "1296",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "668",
+                  "localId" : "1297",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -220996,55 +253884,41 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "669",
+                "localId" : "1298",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "670",
+                  "localId" : "1299",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "671",
+                  "localId" : "1300",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "672",
+                  "localId" : "1301",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "673",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "674",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "675",
+                  "localId" : "1302",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "2",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "676",
+                  "localId" : "1303",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -221053,58 +253927,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "684",
+            "localId" : "1311",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "698",
-        "name" : "SecPrecPerHour",
+        "localId" : "1325",
+        "name" : "HourPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "698",
+            "r" : "1325",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerHour", ": " ]
+              "value" : [ "", "define ", "HourPrecPerMinute", ": " ]
             }, {
-              "r" : "724",
+              "r" : "1347",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "699",
+                "r" : "1326",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "716",
+                  "r" : "1339",
                   "s" : [ {
-                    "r" : "700",
-                    "value" : [ "Interval[", "@2018-01-01T01:00:00+00:00", ", ", "@2018-01-01T03:00:00+00:00", "]" ]
+                    "r" : "1327",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "732",
+          "localId" : "1355",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "733",
+            "localId" : "1356",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "734",
+              "localId" : "1357",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -221112,19 +253986,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "724",
+          "localId" : "1347",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "729",
+            "localId" : "1352",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "730",
+              "localId" : "1353",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "731",
+                "localId" : "1354",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -221132,40 +254006,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "725",
+            "localId" : "1348",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "726",
+              "localId" : "1349",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "727",
+                "localId" : "1350",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "728",
+            "localId" : "1351",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "699",
+            "localId" : "1326",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "719",
+              "localId" : "1342",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "720",
+                "localId" : "1343",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "721",
+                  "localId" : "1344",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -221173,72 +254047,58 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "716",
+              "localId" : "1339",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "717",
+                "localId" : "1340",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "718",
+                  "localId" : "1341",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "700",
+                "localId" : "1327",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "701",
+                  "localId" : "1328",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "702",
+                  "localId" : "1329",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "703",
+                  "localId" : "1330",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "704",
+                  "localId" : "1331",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "705",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "706",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "707",
+                  "localId" : "1332",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -221246,55 +254106,41 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "708",
+                "localId" : "1333",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "709",
+                  "localId" : "1334",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "710",
+                  "localId" : "1335",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "711",
+                  "localId" : "1336",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "712",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "713",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "714",
+                  "localId" : "1337",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "715",
+                  "localId" : "1338",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -221303,58 +254149,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "723",
+            "localId" : "1346",
             "value" : 1.0,
-            "unit" : "hour",
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "737",
-        "name" : "SecPrecPerMinute",
+        "localId" : "1360",
+        "name" : "HourPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "737",
+            "r" : "1360",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "HourPrecPerSecond", ": " ]
             }, {
-              "r" : "763",
+              "r" : "1382",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "738",
+                "r" : "1361",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "755",
+                  "r" : "1374",
                   "s" : [ {
-                    "r" : "739",
-                    "value" : [ "Interval[", "@2018-01-01T01:00:00+00:00", ", ", "@2018-01-01T01:02:00+00:00", "]" ]
+                    "r" : "1362",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "771",
+          "localId" : "1390",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "772",
+            "localId" : "1391",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "773",
+              "localId" : "1392",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -221362,19 +254208,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "763",
+          "localId" : "1382",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "768",
+            "localId" : "1387",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "769",
+              "localId" : "1388",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "770",
+                "localId" : "1389",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -221382,40 +254228,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "764",
+            "localId" : "1383",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "765",
+              "localId" : "1384",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
+                "localId" : "1385",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "767",
+            "localId" : "1386",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "738",
+            "localId" : "1361",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "758",
+              "localId" : "1377",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "759",
+                "localId" : "1378",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "760",
+                  "localId" : "1379",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -221423,72 +254269,58 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "755",
+              "localId" : "1374",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "756",
+                "localId" : "1375",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "757",
+                  "localId" : "1376",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "739",
+                "localId" : "1362",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "740",
+                  "localId" : "1363",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "741",
+                  "localId" : "1364",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "742",
+                  "localId" : "1365",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "743",
+                  "localId" : "1366",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "744",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "745",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "746",
+                  "localId" : "1367",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -221496,55 +254328,41 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "747",
+                "localId" : "1368",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "748",
+                  "localId" : "1369",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "749",
+                  "localId" : "1370",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "750",
+                  "localId" : "1371",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "751",
+                  "localId" : "1372",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "752",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "753",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "754",
+                  "localId" : "1373",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -221553,58 +254371,58 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "762",
+            "localId" : "1381",
             "value" : 1.0,
-            "unit" : "minute",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "776",
-        "name" : "SecPrecPerSecond",
+        "localId" : "1395",
+        "name" : "HourPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "776",
+            "r" : "1395",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerSecond", ": " ]
+              "value" : [ "", "define ", "HourPrecPerMillisecond", ": " ]
             }, {
-              "r" : "802",
+              "r" : "1417",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "777",
+                "r" : "1396",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "794",
+                  "r" : "1409",
                   "s" : [ {
-                    "r" : "778",
-                    "value" : [ "Interval[", "@2018-01-01T01:00:00+00:00", ", ", "@2018-01-01T01:00:01+00:00", "]" ]
+                    "r" : "1397",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "second" ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "810",
+          "localId" : "1425",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "811",
+            "localId" : "1426",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "812",
+              "localId" : "1427",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -221612,19 +254430,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "802",
+          "localId" : "1417",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "807",
+            "localId" : "1422",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "808",
+              "localId" : "1423",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "809",
+                "localId" : "1424",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -221632,40 +254450,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "803",
+            "localId" : "1418",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "804",
+              "localId" : "1419",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "805",
+                "localId" : "1420",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "806",
+            "localId" : "1421",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "777",
+            "localId" : "1396",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "797",
+              "localId" : "1412",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "798",
+                "localId" : "1413",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "799",
+                  "localId" : "1414",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -221673,72 +254491,58 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "794",
+              "localId" : "1409",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "795",
+                "localId" : "1410",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "796",
+                  "localId" : "1411",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "778",
+                "localId" : "1397",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "779",
+                  "localId" : "1398",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "780",
+                  "localId" : "1399",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "781",
+                  "localId" : "1400",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "782",
+                  "localId" : "1401",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "783",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "784",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "785",
+                  "localId" : "1402",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -221746,55 +254550,41 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "786",
+                "localId" : "1403",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "787",
+                  "localId" : "1404",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "788",
+                  "localId" : "1405",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "789",
+                  "localId" : "1406",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "790",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "791",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "792",
+                  "localId" : "1407",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "793",
+                  "localId" : "1408",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -221803,58 +254593,73 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "801",
+            "localId" : "1416",
             "value" : 1.0,
-            "unit" : "second",
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "815",
-        "name" : "SecPrecPerMillisecond",
+        "localId" : "1430",
+        "name" : "DayPrecPerYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "815",
+            "r" : "1430",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "DayPrecPerYear", ": " ]
             }, {
-              "r" : "841",
+              "r" : "1464",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "816",
+                "r" : "1431",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "833",
+                  "r" : "1456",
                   "s" : [ {
-                    "r" : "817",
-                    "value" : [ "Interval[", "@2018-01-01T01:00:00+00:00", ", ", "@2018-01-01T01:00:00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1440",
+                    "s" : [ {
+                      "r" : "1432",
+                      "value" : [ "DateTime", "(", "2016", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1452",
+                    "s" : [ {
+                      "r" : "1444",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "millisecond" ]
+                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "849",
+          "localId" : "1472",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "850",
+            "localId" : "1473",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "851",
+              "localId" : "1474",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -221862,19 +254667,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "841",
+          "localId" : "1464",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "846",
+            "localId" : "1469",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "847",
+              "localId" : "1470",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "848",
+                "localId" : "1471",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -221882,40 +254687,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "842",
+            "localId" : "1465",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "843",
+              "localId" : "1466",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "844",
+                "localId" : "1467",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "845",
+            "localId" : "1468",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "816",
+            "localId" : "1431",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "836",
+              "localId" : "1459",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "837",
+                "localId" : "1460",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "838",
+                  "localId" : "1461",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -221923,188 +254728,183 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "833",
+              "localId" : "1456",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "834",
+                "localId" : "1457",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "835",
+                  "localId" : "1458",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "817",
+                "localId" : "1440",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "818",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1441",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "819",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1442",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "820",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1443",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
-                },
-                "hour" : {
+                } ],
+                "year" : {
                   "type" : "Literal",
-                  "localId" : "821",
+                  "localId" : "1432",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "2016",
                   "annotation" : [ ]
                 },
-                "minute" : {
+                "month" : {
                   "type" : "Literal",
-                  "localId" : "822",
+                  "localId" : "1433",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
-                "second" : {
+                "day" : {
                   "type" : "Literal",
-                  "localId" : "823",
+                  "localId" : "1434",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "824",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "825",
+                "localId" : "1452",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1453",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1454",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1455",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "826",
+                  "localId" : "1444",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "827",
+                  "localId" : "1445",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "828",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "829",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "830",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "831",
+                  "localId" : "1446",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "832",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "840",
+            "localId" : "1463",
             "value" : 1.0,
-            "unit" : "millisecond",
+            "unit" : "year",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "854",
-        "name" : "MinPrecPerYear",
+        "localId" : "1477",
+        "name" : "DayPrecPerMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "854",
+            "r" : "1477",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerYear", ": " ]
+              "value" : [ "", "define ", "DayPrecPerMonth", ": " ]
             }, {
-              "r" : "878",
+              "r" : "1511",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "855",
+                "r" : "1478",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "870",
+                  "r" : "1503",
                   "s" : [ {
-                    "r" : "856",
-                    "value" : [ "Interval[", "@2016-01-01T00:00+00:00", ", ", "@2018-01-01T00:00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1487",
+                    "s" : [ {
+                      "r" : "1479",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1499",
+                    "s" : [ {
+                      "r" : "1491",
+                      "value" : [ "DateTime", "(", "2018", ",", "03", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "year" ]
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "886",
+          "localId" : "1519",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "887",
+            "localId" : "1520",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "888",
+              "localId" : "1521",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -222112,19 +254912,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "878",
+          "localId" : "1511",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "883",
+            "localId" : "1516",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "884",
+              "localId" : "1517",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "885",
+                "localId" : "1518",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -222132,40 +254932,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "879",
+            "localId" : "1512",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "880",
+              "localId" : "1513",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "881",
+                "localId" : "1514",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "882",
+            "localId" : "1515",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "855",
+            "localId" : "1478",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "873",
+              "localId" : "1506",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "874",
+                "localId" : "1507",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "875",
+                  "localId" : "1508",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -222173,174 +254973,183 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "870",
+              "localId" : "1503",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "871",
+                "localId" : "1504",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "872",
+                  "localId" : "1505",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "856",
+                "localId" : "1487",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "857",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1488",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "858",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1489",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1490",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
-                },
-                "day" : {
+                } ],
+                "year" : {
                   "type" : "Literal",
-                  "localId" : "859",
+                  "localId" : "1479",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "2018",
                   "annotation" : [ ]
                 },
-                "hour" : {
+                "month" : {
                   "type" : "Literal",
-                  "localId" : "860",
+                  "localId" : "1480",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
-                "minute" : {
+                "day" : {
                   "type" : "Literal",
-                  "localId" : "861",
+                  "localId" : "1481",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "862",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "863",
+                "localId" : "1499",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1500",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1501",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1502",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "864",
+                  "localId" : "1491",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "865",
+                  "localId" : "1492",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "03",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "866",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "867",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "868",
+                  "localId" : "1493",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "869",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "877",
+            "localId" : "1510",
             "value" : 1.0,
-            "unit" : "year",
+            "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "891",
-        "name" : "MinPrecPerMonth",
+        "localId" : "1524",
+        "name" : "DayPrecPerWeek",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "891",
+            "r" : "1524",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerMonth", ": " ]
+              "value" : [ "", "define ", "DayPrecPerWeek", ": " ]
             }, {
-              "r" : "915",
+              "r" : "1558",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "892",
+                "r" : "1525",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "907",
+                  "r" : "1550",
                   "s" : [ {
-                    "r" : "893",
-                    "value" : [ "Interval[", "@2018-01-01T00:00+00:00", ", ", "@2018-03-01T00:00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1534",
+                    "s" : [ {
+                      "r" : "1526",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1546",
+                    "s" : [ {
+                      "r" : "1538",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "14", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "week" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "923",
+          "localId" : "1566",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "924",
+            "localId" : "1567",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "925",
+              "localId" : "1568",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -222348,19 +255157,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "915",
+          "localId" : "1558",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "920",
+            "localId" : "1563",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "921",
+              "localId" : "1564",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "922",
+                "localId" : "1565",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -222368,40 +255177,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "916",
+            "localId" : "1559",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "917",
+              "localId" : "1560",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "918",
+                "localId" : "1561",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "919",
+            "localId" : "1562",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "892",
+            "localId" : "1525",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "910",
+              "localId" : "1553",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "911",
+                "localId" : "1554",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "912",
+                  "localId" : "1555",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -222409,174 +255218,183 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "907",
+              "localId" : "1550",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "908",
+                "localId" : "1551",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "909",
+                  "localId" : "1552",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "893",
+                "localId" : "1534",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1535",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1536",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1537",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "894",
+                  "localId" : "1526",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "895",
+                  "localId" : "1527",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "896",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "897",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "898",
+                  "localId" : "1528",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "899",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "900",
+                "localId" : "1546",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1547",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1548",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1549",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "901",
+                  "localId" : "1538",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "902",
+                  "localId" : "1539",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "903",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "904",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "905",
+                  "localId" : "1540",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "906",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "14",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "914",
+            "localId" : "1557",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "week",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "928",
-        "name" : "MinPrecPerWeek",
+        "localId" : "1571",
+        "name" : "DayPrecPerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "928",
+            "r" : "1571",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerWeek", ": " ]
+              "value" : [ "", "define ", "DayPrecPerDay", ": " ]
             }, {
-              "r" : "952",
+              "r" : "1605",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "929",
+                "r" : "1572",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "944",
+                  "r" : "1597",
                   "s" : [ {
-                    "r" : "930",
-                    "value" : [ "Interval[", "@2018-01-01T00:00+00:00", ", ", "@2018-01-21T00:00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1581",
+                    "s" : [ {
+                      "r" : "1573",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1593",
+                    "s" : [ {
+                      "r" : "1585",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "02", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "week" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "960",
+          "localId" : "1613",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "961",
+            "localId" : "1614",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "962",
+              "localId" : "1615",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -222584,19 +255402,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "952",
+          "localId" : "1605",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "957",
+            "localId" : "1610",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "958",
+              "localId" : "1611",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "959",
+                "localId" : "1612",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -222604,40 +255422,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "953",
+            "localId" : "1606",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "954",
+              "localId" : "1607",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "955",
+                "localId" : "1608",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "956",
+            "localId" : "1609",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "929",
+            "localId" : "1572",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "947",
+              "localId" : "1600",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "948",
+                "localId" : "1601",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "949",
+                  "localId" : "1602",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -222645,174 +255463,183 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "944",
+              "localId" : "1597",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "945",
+                "localId" : "1598",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "946",
+                  "localId" : "1599",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "930",
+                "localId" : "1581",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1582",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1583",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1584",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "931",
+                  "localId" : "1573",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "932",
+                  "localId" : "1574",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "933",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "934",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "935",
+                  "localId" : "1575",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "936",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "937",
+                "localId" : "1593",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1594",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1595",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1596",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "938",
+                  "localId" : "1585",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "939",
+                  "localId" : "1586",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "940",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "21",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "941",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "942",
+                  "localId" : "1587",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "943",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "02",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "951",
+            "localId" : "1604",
             "value" : 1.0,
-            "unit" : "week",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "965",
-        "name" : "MinPrecPerDay",
+        "localId" : "1618",
+        "name" : "DayPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "965",
+            "r" : "1618",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerDay", ": " ]
+              "value" : [ "", "define ", "DayPrecPerHour", ": " ]
             }, {
-              "r" : "989",
+              "r" : "1652",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "966",
+                "r" : "1619",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "981",
+                  "r" : "1644",
                   "s" : [ {
-                    "r" : "967",
-                    "value" : [ "Interval[", "@2018-01-01T00:00+00:00", ", ", "@2018-01-03T00:00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1628",
+                    "s" : [ {
+                      "r" : "1620",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1640",
+                    "s" : [ {
+                      "r" : "1632",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "997",
+          "localId" : "1660",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "998",
+            "localId" : "1661",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "999",
+              "localId" : "1662",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -222820,19 +255647,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "989",
+          "localId" : "1652",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "994",
+            "localId" : "1657",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "995",
+              "localId" : "1658",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "996",
+                "localId" : "1659",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -222840,40 +255667,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "990",
+            "localId" : "1653",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "991",
+              "localId" : "1654",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "992",
+                "localId" : "1655",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "993",
+            "localId" : "1656",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "966",
+            "localId" : "1619",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "984",
+              "localId" : "1647",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "985",
+                "localId" : "1648",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "986",
+                  "localId" : "1649",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -222881,174 +255708,183 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "981",
+              "localId" : "1644",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "982",
+                "localId" : "1645",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "983",
+                  "localId" : "1646",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "967",
+                "localId" : "1628",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1629",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1630",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1631",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "968",
+                  "localId" : "1620",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "969",
+                  "localId" : "1621",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "970",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "971",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "972",
+                  "localId" : "1622",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "973",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "974",
+                "localId" : "1640",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1641",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1642",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1643",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "975",
+                  "localId" : "1632",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "976",
+                  "localId" : "1633",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "977",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "978",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "979",
+                  "localId" : "1634",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "980",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "988",
+            "localId" : "1651",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1002",
-        "name" : "MinPrecPerHour",
+        "localId" : "1665",
+        "name" : "DayPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1002",
+            "r" : "1665",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerHour", ": " ]
+              "value" : [ "", "define ", "DayPrecPerMinute", ": " ]
             }, {
-              "r" : "1026",
+              "r" : "1699",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1003",
+                "r" : "1666",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1018",
+                  "r" : "1691",
                   "s" : [ {
-                    "r" : "1004",
-                    "value" : [ "Interval[", "@2018-01-01T01:00+00:00", ", ", "@2018-01-01T03:00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1675",
+                    "s" : [ {
+                      "r" : "1667",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1687",
+                    "s" : [ {
+                      "r" : "1679",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1034",
+          "localId" : "1707",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1035",
+            "localId" : "1708",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1036",
+              "localId" : "1709",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -223056,19 +255892,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1026",
+          "localId" : "1699",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1031",
+            "localId" : "1704",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1032",
+              "localId" : "1705",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1033",
+                "localId" : "1706",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -223076,40 +255912,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1027",
+            "localId" : "1700",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1028",
+              "localId" : "1701",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1029",
+                "localId" : "1702",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1030",
+            "localId" : "1703",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1003",
+            "localId" : "1666",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1021",
+              "localId" : "1694",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1022",
+                "localId" : "1695",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1023",
+                  "localId" : "1696",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -223117,174 +255953,183 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1018",
+              "localId" : "1691",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1019",
+                "localId" : "1692",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1020",
+                  "localId" : "1693",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1004",
+                "localId" : "1675",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1676",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1677",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1678",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1005",
+                  "localId" : "1667",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1006",
+                  "localId" : "1668",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1007",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1008",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1009",
+                  "localId" : "1669",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1010",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1011",
+                "localId" : "1687",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1688",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1689",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1690",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1012",
+                  "localId" : "1679",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1013",
+                  "localId" : "1680",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1014",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1015",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1016",
+                  "localId" : "1681",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1017",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1025",
+            "localId" : "1698",
             "value" : 1.0,
-            "unit" : "hour",
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1039",
-        "name" : "MinPrecPerMinute",
+        "localId" : "1712",
+        "name" : "DayPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1039",
+            "r" : "1712",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "DayPrecPerSecond", ": " ]
             }, {
-              "r" : "1063",
+              "r" : "1746",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1040",
+                "r" : "1713",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1055",
+                  "r" : "1738",
                   "s" : [ {
-                    "r" : "1041",
-                    "value" : [ "Interval[", "@2018-01-01T01:00+00:00", ", ", "@2018-01-01T01:01+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1722",
+                    "s" : [ {
+                      "r" : "1714",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1734",
+                    "s" : [ {
+                      "r" : "1726",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1071",
+          "localId" : "1754",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1072",
+            "localId" : "1755",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1073",
+              "localId" : "1756",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -223292,19 +256137,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1063",
+          "localId" : "1746",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1068",
+            "localId" : "1751",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1069",
+              "localId" : "1752",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1070",
+                "localId" : "1753",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -223312,40 +256157,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1064",
+            "localId" : "1747",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1065",
+              "localId" : "1748",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1066",
+                "localId" : "1749",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1067",
+            "localId" : "1750",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1040",
+            "localId" : "1713",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1058",
+              "localId" : "1741",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1059",
+                "localId" : "1742",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1060",
+                  "localId" : "1743",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -223353,174 +256198,183 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1055",
+              "localId" : "1738",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1056",
+                "localId" : "1739",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1057",
+                  "localId" : "1740",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1041",
+                "localId" : "1722",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1723",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1724",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1725",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1042",
+                  "localId" : "1714",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1043",
+                  "localId" : "1715",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1044",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1045",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1046",
+                  "localId" : "1716",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1047",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1048",
+                "localId" : "1734",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1735",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1736",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1737",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1049",
+                  "localId" : "1726",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1050",
+                  "localId" : "1727",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1051",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1052",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1053",
+                  "localId" : "1728",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1054",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1062",
+            "localId" : "1745",
             "value" : 1.0,
-            "unit" : "minute",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1076",
-        "name" : "MinPrecPerSecond",
+        "localId" : "1759",
+        "name" : "DayPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1076",
+            "r" : "1759",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerSecond", ": " ]
+              "value" : [ "", "define ", "DayPrecPerMillisecond", ": " ]
             }, {
-              "r" : "1100",
+              "r" : "1793",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1077",
+                "r" : "1760",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1092",
+                  "r" : "1785",
                   "s" : [ {
-                    "r" : "1078",
-                    "value" : [ "Interval[", "@2018-01-01T01:00+00:00", ", ", "@2018-01-01T01:00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1769",
+                    "s" : [ {
+                      "r" : "1761",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1781",
+                    "s" : [ {
+                      "r" : "1773",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "second" ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1108",
+          "localId" : "1801",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1109",
+            "localId" : "1802",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1110",
+              "localId" : "1803",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -223528,19 +256382,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1100",
+          "localId" : "1793",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1105",
+            "localId" : "1798",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1106",
+              "localId" : "1799",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1107",
+                "localId" : "1800",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -223548,40 +256402,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1101",
+            "localId" : "1794",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1102",
+              "localId" : "1795",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1103",
+                "localId" : "1796",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1104",
+            "localId" : "1797",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1077",
+            "localId" : "1760",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1095",
+              "localId" : "1788",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1096",
+                "localId" : "1789",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1097",
+                  "localId" : "1790",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -223589,174 +256443,183 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1092",
+              "localId" : "1785",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1093",
+                "localId" : "1786",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1094",
+                  "localId" : "1787",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1078",
+                "localId" : "1769",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1770",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1771",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1772",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1079",
+                  "localId" : "1761",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1080",
+                  "localId" : "1762",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1081",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1082",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1083",
+                  "localId" : "1763",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1084",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1085",
+                "localId" : "1781",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1782",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1783",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1784",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1086",
+                  "localId" : "1773",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1087",
+                  "localId" : "1774",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "01",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1088",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1089",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1090",
+                  "localId" : "1775",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1091",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1099",
+            "localId" : "1792",
             "value" : 1.0,
-            "unit" : "second",
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1113",
-        "name" : "MinPrecPerMillisecond",
+        "localId" : "1806",
+        "name" : "MonthPrecPerYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1113",
+            "r" : "1806",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "MonthPrecPerYear", ": " ]
             }, {
-              "r" : "1137",
+              "r" : "1834",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1114",
+                "r" : "1807",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1129",
+                  "r" : "1826",
                   "s" : [ {
-                    "r" : "1115",
-                    "value" : [ "Interval[", "@2018-01-01T01:00+00:00", ", ", "@2018-01-01T01:00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1814",
+                    "s" : [ {
+                      "r" : "1808",
+                      "value" : [ "DateTime", "(", "2016", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1823",
+                    "s" : [ {
+                      "r" : "1817",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "millisecond" ]
+                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1145",
+          "localId" : "1842",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1146",
+            "localId" : "1843",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1147",
+              "localId" : "1844",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -223764,19 +256627,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1137",
+          "localId" : "1834",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1142",
+            "localId" : "1839",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1143",
+              "localId" : "1840",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1144",
+                "localId" : "1841",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -223784,40 +256647,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1138",
+            "localId" : "1835",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1139",
+              "localId" : "1836",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1140",
+                "localId" : "1837",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1141",
+            "localId" : "1838",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1114",
+            "localId" : "1807",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1132",
+              "localId" : "1829",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1133",
+                "localId" : "1830",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1134",
+                  "localId" : "1831",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -223825,174 +256688,157 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1129",
+              "localId" : "1826",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1130",
+                "localId" : "1827",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1131",
+                  "localId" : "1828",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1115",
+                "localId" : "1814",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1116",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1117",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1815",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1118",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1816",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
-                },
-                "hour" : {
+                } ],
+                "year" : {
                   "type" : "Literal",
-                  "localId" : "1119",
+                  "localId" : "1808",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "2016",
                   "annotation" : [ ]
                 },
-                "minute" : {
+                "month" : {
                   "type" : "Literal",
-                  "localId" : "1120",
+                  "localId" : "1809",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1121",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1122",
+                "localId" : "1823",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1824",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1825",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1123",
+                  "localId" : "1817",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1124",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1125",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1126",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "1127",
+                  "localId" : "1818",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1128",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1136",
+            "localId" : "1833",
             "value" : 1.0,
-            "unit" : "millisecond",
+            "unit" : "year",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1150",
-        "name" : "HourPrecPerYear",
+        "localId" : "1847",
+        "name" : "MonthPrecPerMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1150",
+            "r" : "1847",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerYear", ": " ]
+              "value" : [ "", "define ", "MonthPrecPerMonth", ": " ]
             }, {
-              "r" : "1172",
+              "r" : "1875",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1151",
+                "r" : "1848",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1164",
+                  "r" : "1867",
                   "s" : [ {
-                    "r" : "1152",
-                    "value" : [ "Interval[", "@2016-01-01T00+00:00", ", ", "@2018-01-01T00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1855",
+                    "s" : [ {
+                      "r" : "1849",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1864",
+                    "s" : [ {
+                      "r" : "1858",
+                      "value" : [ "DateTime", "(", "2018", ",", "02", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "year" ]
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1180",
+          "localId" : "1883",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1181",
+            "localId" : "1884",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1182",
+              "localId" : "1885",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -224000,19 +256846,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1172",
+          "localId" : "1875",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1177",
+            "localId" : "1880",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1178",
+              "localId" : "1881",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1179",
+                "localId" : "1882",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -224020,40 +256866,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1173",
+            "localId" : "1876",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1174",
+              "localId" : "1877",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1175",
+                "localId" : "1878",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1176",
+            "localId" : "1879",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1151",
+            "localId" : "1848",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1167",
+              "localId" : "1870",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1168",
+                "localId" : "1871",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1169",
+                  "localId" : "1872",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -224061,160 +256907,157 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1164",
+              "localId" : "1867",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1165",
+                "localId" : "1868",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1166",
+                  "localId" : "1869",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1152",
+                "localId" : "1855",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1153",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1856",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1154",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1857",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
-                },
-                "day" : {
+                } ],
+                "year" : {
                   "type" : "Literal",
-                  "localId" : "1155",
+                  "localId" : "1849",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "2018",
                   "annotation" : [ ]
                 },
-                "hour" : {
+                "month" : {
                   "type" : "Literal",
-                  "localId" : "1156",
+                  "localId" : "1850",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1157",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1158",
+                "localId" : "1864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1865",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1866",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1159",
+                  "localId" : "1858",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1160",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1161",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1162",
+                  "localId" : "1859",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1163",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "02",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1171",
+            "localId" : "1874",
             "value" : 1.0,
-            "unit" : "year",
+            "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1185",
-        "name" : "HourPrecPerMonth",
+        "localId" : "1888",
+        "name" : "MonthPrecPerWeek",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1185",
+            "r" : "1888",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerMonth", ": " ]
+              "value" : [ "", "define ", "MonthPrecPerWeek", ": " ]
             }, {
-              "r" : "1207",
+              "r" : "1916",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1186",
+                "r" : "1889",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1199",
+                  "r" : "1908",
                   "s" : [ {
-                    "r" : "1187",
-                    "value" : [ "Interval[", "@2018-01-01T00+00:00", ", ", "@2018-03-01T00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1896",
+                    "s" : [ {
+                      "r" : "1890",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1905",
+                    "s" : [ {
+                      "r" : "1899",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "week" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1215",
+          "localId" : "1924",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1216",
+            "localId" : "1925",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1217",
+              "localId" : "1926",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -224222,19 +257065,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1207",
+          "localId" : "1916",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1212",
+            "localId" : "1921",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1213",
+              "localId" : "1922",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1214",
+                "localId" : "1923",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -224242,40 +257085,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1208",
+            "localId" : "1917",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1209",
+              "localId" : "1918",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1210",
+                "localId" : "1919",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1211",
+            "localId" : "1920",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1186",
+            "localId" : "1889",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1202",
+              "localId" : "1911",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1203",
+                "localId" : "1912",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1204",
+                  "localId" : "1913",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -224283,160 +257126,157 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1199",
+              "localId" : "1908",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1200",
+                "localId" : "1909",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1201",
+                  "localId" : "1910",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1187",
+                "localId" : "1896",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1897",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1898",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1188",
+                  "localId" : "1890",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1189",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1190",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1191",
+                  "localId" : "1891",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1192",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1193",
+                "localId" : "1905",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1906",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1907",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1194",
+                  "localId" : "1899",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1195",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1196",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1197",
+                  "localId" : "1900",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1198",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1206",
+            "localId" : "1915",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "week",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1220",
-        "name" : "HourPrecPerWeek",
+        "localId" : "1929",
+        "name" : "MonthPrecPerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1220",
+            "r" : "1929",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerWeek", ": " ]
+              "value" : [ "", "define ", "MonthPrecPerDay", ": " ]
             }, {
-              "r" : "1242",
+              "r" : "1957",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1221",
+                "r" : "1930",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1234",
+                  "r" : "1949",
                   "s" : [ {
-                    "r" : "1222",
-                    "value" : [ "Interval[", "@2018-01-01T00+00:00", ", ", "@2018-01-21T00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1937",
+                    "s" : [ {
+                      "r" : "1931",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1946",
+                    "s" : [ {
+                      "r" : "1940",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "week" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1250",
+          "localId" : "1965",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1251",
+            "localId" : "1966",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1252",
+              "localId" : "1967",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -224444,19 +257284,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1242",
+          "localId" : "1957",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1247",
+            "localId" : "1962",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1248",
+              "localId" : "1963",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1249",
+                "localId" : "1964",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -224464,40 +257304,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1243",
+            "localId" : "1958",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1244",
+              "localId" : "1959",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1245",
+                "localId" : "1960",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1246",
+            "localId" : "1961",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1221",
+            "localId" : "1930",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1237",
+              "localId" : "1952",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1238",
+                "localId" : "1953",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1239",
+                  "localId" : "1954",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -224505,160 +257345,157 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1234",
+              "localId" : "1949",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1235",
+                "localId" : "1950",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1236",
+                  "localId" : "1951",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1222",
+                "localId" : "1937",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1938",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1939",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1223",
+                  "localId" : "1931",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1224",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1225",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1226",
+                  "localId" : "1932",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1227",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1228",
+                "localId" : "1946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1947",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1948",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1229",
+                  "localId" : "1940",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1230",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1231",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "21",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1232",
+                  "localId" : "1941",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1233",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1241",
+            "localId" : "1956",
             "value" : 1.0,
-            "unit" : "week",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1255",
-        "name" : "HourPrecPerDay",
+        "localId" : "1970",
+        "name" : "MonthPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1255",
+            "r" : "1970",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerDay", ": " ]
+              "value" : [ "", "define ", "MonthPrecPerHour", ": " ]
             }, {
-              "r" : "1277",
+              "r" : "1998",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1256",
+                "r" : "1971",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1269",
+                  "r" : "1990",
                   "s" : [ {
-                    "r" : "1257",
-                    "value" : [ "Interval[", "@2018-01-01T00+00:00", ", ", "@2018-01-03T00+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "1978",
+                    "s" : [ {
+                      "r" : "1972",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "1987",
+                    "s" : [ {
+                      "r" : "1981",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1285",
+          "localId" : "2006",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1286",
+            "localId" : "2007",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1287",
+              "localId" : "2008",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -224666,19 +257503,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1277",
+          "localId" : "1998",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1282",
+            "localId" : "2003",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1283",
+              "localId" : "2004",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1284",
+                "localId" : "2005",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -224686,40 +257523,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1278",
+            "localId" : "1999",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1279",
+              "localId" : "2000",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1280",
+                "localId" : "2001",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1281",
+            "localId" : "2002",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1256",
+            "localId" : "1971",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1272",
+              "localId" : "1993",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1273",
+                "localId" : "1994",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1274",
+                  "localId" : "1995",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -224727,160 +257564,157 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1269",
+              "localId" : "1990",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1270",
+                "localId" : "1991",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1271",
+                  "localId" : "1992",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1257",
+                "localId" : "1978",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1979",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1980",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1258",
+                  "localId" : "1972",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1259",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1260",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1261",
+                  "localId" : "1973",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1262",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1263",
+                "localId" : "1987",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1988",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "1989",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1264",
+                  "localId" : "1981",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1265",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1266",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1267",
+                  "localId" : "1982",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1268",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1276",
+            "localId" : "1997",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1290",
-        "name" : "HourPrecPerHour",
+        "localId" : "2011",
+        "name" : "MonthPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1290",
+            "r" : "2011",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerHour", ": " ]
+              "value" : [ "", "define ", "MonthPrecPerMinute", ": " ]
             }, {
-              "r" : "1312",
+              "r" : "2039",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1291",
+                "r" : "2012",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1304",
+                  "r" : "2031",
                   "s" : [ {
-                    "r" : "1292",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T02+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "2019",
+                    "s" : [ {
+                      "r" : "2013",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "2028",
+                    "s" : [ {
+                      "r" : "2022",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1320",
+          "localId" : "2047",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1321",
+            "localId" : "2048",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1322",
+              "localId" : "2049",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -224888,19 +257722,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1312",
+          "localId" : "2039",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1317",
+            "localId" : "2044",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1318",
+              "localId" : "2045",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1319",
+                "localId" : "2046",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -224908,40 +257742,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1313",
+            "localId" : "2040",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1314",
+              "localId" : "2041",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1315",
+                "localId" : "2042",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1316",
+            "localId" : "2043",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1291",
+            "localId" : "2012",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1307",
+              "localId" : "2034",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1308",
+                "localId" : "2035",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1309",
+                  "localId" : "2036",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -224949,160 +257783,157 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1304",
+              "localId" : "2031",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1305",
+                "localId" : "2032",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1306",
+                  "localId" : "2033",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1292",
+                "localId" : "2019",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2020",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2021",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1293",
+                  "localId" : "2013",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1294",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1295",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1296",
+                  "localId" : "2014",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1297",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1298",
+                "localId" : "2028",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2029",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2030",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1299",
+                  "localId" : "2022",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1300",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1301",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1302",
+                  "localId" : "2023",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1303",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1311",
+            "localId" : "2038",
             "value" : 1.0,
-            "unit" : "hour",
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1325",
-        "name" : "HourPrecPerMinute",
+        "localId" : "2052",
+        "name" : "MonthPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1325",
+            "r" : "2052",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "MonthPrecPerSecond", ": " ]
             }, {
-              "r" : "1347",
+              "r" : "2080",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1326",
+                "r" : "2053",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1339",
+                  "r" : "2072",
                   "s" : [ {
-                    "r" : "1327",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T01+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "2060",
+                    "s" : [ {
+                      "r" : "2054",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "2069",
+                    "s" : [ {
+                      "r" : "2063",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1355",
+          "localId" : "2088",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1356",
+            "localId" : "2089",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1357",
+              "localId" : "2090",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -225110,19 +257941,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1347",
+          "localId" : "2080",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1352",
+            "localId" : "2085",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1353",
+              "localId" : "2086",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1354",
+                "localId" : "2087",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -225130,40 +257961,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1348",
+            "localId" : "2081",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1349",
+              "localId" : "2082",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1350",
+                "localId" : "2083",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1351",
+            "localId" : "2084",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1326",
+            "localId" : "2053",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1342",
+              "localId" : "2075",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1343",
+                "localId" : "2076",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1344",
+                  "localId" : "2077",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -225171,160 +258002,157 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1339",
+              "localId" : "2072",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1340",
+                "localId" : "2073",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1341",
+                  "localId" : "2074",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1327",
+                "localId" : "2060",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2061",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2062",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1328",
+                  "localId" : "2054",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1329",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1330",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1331",
+                  "localId" : "2055",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1332",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1333",
+                "localId" : "2069",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2070",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2071",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1334",
+                  "localId" : "2063",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1335",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1336",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1337",
+                  "localId" : "2064",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1338",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1346",
+            "localId" : "2079",
             "value" : 1.0,
-            "unit" : "minute",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1360",
-        "name" : "HourPrecPerSecond",
+        "localId" : "2093",
+        "name" : "MonthPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1360",
+            "r" : "2093",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerSecond", ": " ]
+              "value" : [ "", "define ", "MonthPrecPerMillisecond", ": " ]
             }, {
-              "r" : "1382",
+              "r" : "2121",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1361",
+                "r" : "2094",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1374",
+                  "r" : "2113",
                   "s" : [ {
-                    "r" : "1362",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T01+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "2101",
+                    "s" : [ {
+                      "r" : "2095",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "2110",
+                    "s" : [ {
+                      "r" : "2104",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "second" ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1390",
+          "localId" : "2129",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1391",
+            "localId" : "2130",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1392",
+              "localId" : "2131",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -225332,19 +258160,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1382",
+          "localId" : "2121",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1387",
+            "localId" : "2126",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1388",
+              "localId" : "2127",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1389",
+                "localId" : "2128",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -225352,40 +258180,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1383",
+            "localId" : "2122",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1384",
+              "localId" : "2123",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1385",
+                "localId" : "2124",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1386",
+            "localId" : "2125",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1361",
+            "localId" : "2094",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1377",
+              "localId" : "2116",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1378",
+                "localId" : "2117",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1379",
+                  "localId" : "2118",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -225393,160 +258221,157 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1374",
+              "localId" : "2113",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1375",
+                "localId" : "2114",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1376",
+                  "localId" : "2115",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1362",
+                "localId" : "2101",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2102",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2103",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1363",
+                  "localId" : "2095",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1364",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1365",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1366",
+                  "localId" : "2096",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1367",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1368",
+                "localId" : "2110",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2111",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2112",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1369",
+                  "localId" : "2104",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1370",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1371",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1372",
+                  "localId" : "2105",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1373",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "01",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1381",
+            "localId" : "2120",
             "value" : 1.0,
-            "unit" : "second",
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1395",
-        "name" : "HourPrecPerMillisecond",
+        "localId" : "2134",
+        "name" : "YearPrecPerYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1395",
+            "r" : "2134",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "YearPrecPerYear", ": " ]
             }, {
-              "r" : "1417",
+              "r" : "2156",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1396",
+                "r" : "2135",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1409",
+                  "r" : "2148",
                   "s" : [ {
-                    "r" : "1397",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T01+00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "2140",
+                    "s" : [ {
+                      "r" : "2136",
+                      "value" : [ "DateTime", "(", "2016", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "2146",
+                    "s" : [ {
+                      "r" : "2142",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "millisecond" ]
+                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1425",
+          "localId" : "2164",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1426",
+            "localId" : "2165",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1427",
+              "localId" : "2166",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -225554,19 +258379,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1417",
+          "localId" : "2156",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1422",
+            "localId" : "2161",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1423",
+              "localId" : "2162",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1424",
+                "localId" : "2163",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -225574,40 +258399,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1418",
+            "localId" : "2157",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1419",
+              "localId" : "2158",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1420",
+                "localId" : "2159",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1421",
+            "localId" : "2160",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1396",
+            "localId" : "2135",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1412",
+              "localId" : "2151",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1413",
+                "localId" : "2152",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1414",
+                  "localId" : "2153",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -225615,151 +258440,107 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1409",
+              "localId" : "2148",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1410",
+                "localId" : "2149",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1411",
+                  "localId" : "2150",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1397",
+                "localId" : "2140",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "1398",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1399",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1400",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2141",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
-                },
-                "hour" : {
+                } ],
+                "year" : {
                   "type" : "Literal",
-                  "localId" : "1401",
+                  "localId" : "2136",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1402",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "2016",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1403",
+                "localId" : "2146",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ ],
+                "signature" : [ {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2147",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1404",
+                  "localId" : "2142",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1405",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1406",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "1407",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "1408",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1416",
+            "localId" : "2155",
             "value" : 1.0,
-            "unit" : "millisecond",
+            "unit" : "year",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1430",
-        "name" : "DayPrecPerYear",
+        "localId" : "2169",
+        "name" : "YearPrecPerMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1430",
+            "r" : "2169",
             "s" : [ {
-              "value" : [ "", "define ", "DayPrecPerYear", ": " ]
+              "value" : [ "", "define ", "YearPrecPerMonth", ": " ]
             }, {
-              "r" : "1464",
+              "r" : "2191",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1431",
+                "r" : "2170",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1456",
+                  "r" : "2183",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "1440",
+                    "r" : "2175",
                     "s" : [ {
-                      "r" : "1432",
-                      "value" : [ "DateTime", "(", "2016", ",", "01", ",", "01", ")" ]
+                      "r" : "2171",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "1452",
+                    "r" : "2181",
                     "s" : [ {
-                      "r" : "1444",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                      "r" : "2177",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -225768,22 +258549,22 @@ module.exports['DateTimeIntervalExpand'] = {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "year" ]
+                "value" : [ " per ", "month" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1472",
+          "localId" : "2199",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1473",
+            "localId" : "2200",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1474",
+              "localId" : "2201",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -225791,19 +258572,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1464",
+          "localId" : "2191",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1469",
+            "localId" : "2196",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1470",
+              "localId" : "2197",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1471",
+                "localId" : "2198",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -225811,40 +258592,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1465",
+            "localId" : "2192",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1466",
+              "localId" : "2193",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1467",
+                "localId" : "2194",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1468",
+            "localId" : "2195",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1431",
+            "localId" : "2170",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1459",
+              "localId" : "2186",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1460",
+                "localId" : "2187",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1461",
+                  "localId" : "2188",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -225852,159 +258633,107 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1456",
+              "localId" : "2183",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1457",
+                "localId" : "2184",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1458",
+                  "localId" : "2185",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1440",
+                "localId" : "2175",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1441",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1442",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1443",
+                  "localId" : "2176",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1432",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1433",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1434",
+                  "localId" : "2171",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "2018",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1452",
+                "localId" : "2181",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1453",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1454",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1455",
+                  "localId" : "2182",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1444",
+                  "localId" : "2177",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1445",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1446",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1463",
+            "localId" : "2190",
             "value" : 1.0,
-            "unit" : "year",
+            "unit" : "month",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1477",
-        "name" : "DayPrecPerMonth",
+        "localId" : "2204",
+        "name" : "YearPrecPerWeek",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1477",
+            "r" : "2204",
             "s" : [ {
-              "value" : [ "", "define ", "DayPrecPerMonth", ": " ]
+              "value" : [ "", "define ", "YearPrecPerWeek", ": " ]
             }, {
-              "r" : "1511",
+              "r" : "2226",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1478",
+                "r" : "2205",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1503",
+                  "r" : "2218",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "1487",
+                    "r" : "2210",
                     "s" : [ {
-                      "r" : "1479",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                      "r" : "2206",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "1499",
+                    "r" : "2216",
                     "s" : [ {
-                      "r" : "1491",
-                      "value" : [ "DateTime", "(", "2018", ",", "03", ",", "01", ")" ]
+                      "r" : "2212",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -226013,22 +258742,22 @@ module.exports['DateTimeIntervalExpand'] = {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "week" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1519",
+          "localId" : "2234",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1520",
+            "localId" : "2235",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1521",
+              "localId" : "2236",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -226036,19 +258765,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1511",
+          "localId" : "2226",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1516",
+            "localId" : "2231",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1517",
+              "localId" : "2232",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1518",
+                "localId" : "2233",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -226056,40 +258785,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1512",
+            "localId" : "2227",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1513",
+              "localId" : "2228",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1514",
+                "localId" : "2229",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1515",
+            "localId" : "2230",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1478",
+            "localId" : "2205",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1506",
+              "localId" : "2221",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1507",
+                "localId" : "2222",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1508",
+                  "localId" : "2223",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -226097,159 +258826,107 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1503",
+              "localId" : "2218",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1504",
+                "localId" : "2219",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1505",
+                  "localId" : "2220",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1487",
+                "localId" : "2210",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1488",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1489",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1490",
+                  "localId" : "2211",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1479",
+                  "localId" : "2206",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1480",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1481",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1499",
+                "localId" : "2216",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1500",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1501",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1502",
+                  "localId" : "2217",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1491",
+                  "localId" : "2212",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1492",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "03",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1493",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1510",
+            "localId" : "2225",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "week",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1524",
-        "name" : "DayPrecPerWeek",
+        "localId" : "2239",
+        "name" : "YearPrecPerDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1524",
+            "r" : "2239",
             "s" : [ {
-              "value" : [ "", "define ", "DayPrecPerWeek", ": " ]
+              "value" : [ "", "define ", "YearPrecPerDay", ": " ]
             }, {
-              "r" : "1558",
+              "r" : "2261",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1525",
+                "r" : "2240",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1550",
+                  "r" : "2253",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "1534",
+                    "r" : "2245",
                     "s" : [ {
-                      "r" : "1526",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                      "r" : "2241",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "1546",
+                    "r" : "2251",
                     "s" : [ {
-                      "r" : "1538",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "14", ")" ]
+                      "r" : "2247",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -226258,22 +258935,22 @@ module.exports['DateTimeIntervalExpand'] = {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "week" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1566",
+          "localId" : "2269",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1567",
+            "localId" : "2270",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1568",
+              "localId" : "2271",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -226281,19 +258958,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1558",
+          "localId" : "2261",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1563",
+            "localId" : "2266",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1564",
+              "localId" : "2267",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1565",
+                "localId" : "2268",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -226301,40 +258978,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1559",
+            "localId" : "2262",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1560",
+              "localId" : "2263",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1561",
+                "localId" : "2264",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1562",
+            "localId" : "2265",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1525",
+            "localId" : "2240",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1553",
+              "localId" : "2256",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1554",
+                "localId" : "2257",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1555",
+                  "localId" : "2258",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -226342,159 +259019,107 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1550",
+              "localId" : "2253",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1551",
+                "localId" : "2254",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1552",
+                  "localId" : "2255",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1534",
+                "localId" : "2245",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1535",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1536",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1537",
+                  "localId" : "2246",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1526",
+                  "localId" : "2241",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1527",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1528",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1546",
+                "localId" : "2251",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1547",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1548",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1549",
+                  "localId" : "2252",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1538",
+                  "localId" : "2247",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1539",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1540",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "14",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1557",
+            "localId" : "2260",
             "value" : 1.0,
-            "unit" : "week",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1571",
-        "name" : "DayPrecPerDay",
+        "localId" : "2274",
+        "name" : "YearPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1571",
+            "r" : "2274",
             "s" : [ {
-              "value" : [ "", "define ", "DayPrecPerDay", ": " ]
+              "value" : [ "", "define ", "YearPrecPerHour", ": " ]
             }, {
-              "r" : "1605",
+              "r" : "2296",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1572",
+                "r" : "2275",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1597",
+                  "r" : "2288",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "1581",
+                    "r" : "2280",
                     "s" : [ {
-                      "r" : "1573",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                      "r" : "2276",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "1593",
+                    "r" : "2286",
                     "s" : [ {
-                      "r" : "1585",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "02", ")" ]
+                      "r" : "2282",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -226503,22 +259128,22 @@ module.exports['DateTimeIntervalExpand'] = {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1613",
+          "localId" : "2304",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1614",
+            "localId" : "2305",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1615",
+              "localId" : "2306",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -226526,19 +259151,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1605",
+          "localId" : "2296",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1610",
+            "localId" : "2301",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1611",
+              "localId" : "2302",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1612",
+                "localId" : "2303",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -226546,40 +259171,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1606",
+            "localId" : "2297",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1607",
+              "localId" : "2298",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1608",
+                "localId" : "2299",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1609",
+            "localId" : "2300",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1572",
+            "localId" : "2275",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1600",
+              "localId" : "2291",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1601",
+                "localId" : "2292",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1602",
+                  "localId" : "2293",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -226587,159 +259212,107 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1597",
+              "localId" : "2288",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1598",
+                "localId" : "2289",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1599",
+                  "localId" : "2290",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1581",
+                "localId" : "2280",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1582",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1583",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1584",
+                  "localId" : "2281",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1573",
+                  "localId" : "2276",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1574",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1575",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1593",
+                "localId" : "2286",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1594",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1595",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1596",
+                  "localId" : "2287",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1585",
+                  "localId" : "2282",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1586",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1587",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "02",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1604",
+            "localId" : "2295",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1618",
-        "name" : "DayPrecPerHour",
+        "localId" : "2309",
+        "name" : "YearPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1618",
+            "r" : "2309",
             "s" : [ {
-              "value" : [ "", "define ", "DayPrecPerHour", ": " ]
+              "value" : [ "", "define ", "YearPrecPerMinute", ": " ]
             }, {
-              "r" : "1652",
+              "r" : "2331",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1619",
+                "r" : "2310",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1644",
+                  "r" : "2323",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "1628",
+                    "r" : "2315",
                     "s" : [ {
-                      "r" : "1620",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                      "r" : "2311",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "1640",
+                    "r" : "2321",
                     "s" : [ {
-                      "r" : "1632",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                      "r" : "2317",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -226748,22 +259321,22 @@ module.exports['DateTimeIntervalExpand'] = {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1660",
+          "localId" : "2339",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1661",
+            "localId" : "2340",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1662",
+              "localId" : "2341",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -226771,19 +259344,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1652",
+          "localId" : "2331",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1657",
+            "localId" : "2336",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1658",
+              "localId" : "2337",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1659",
+                "localId" : "2338",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -226791,40 +259364,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1653",
+            "localId" : "2332",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1654",
+              "localId" : "2333",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1655",
+                "localId" : "2334",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1656",
+            "localId" : "2335",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1619",
+            "localId" : "2310",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1647",
+              "localId" : "2326",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1648",
+                "localId" : "2327",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1649",
+                  "localId" : "2328",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -226832,159 +259405,107 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1644",
+              "localId" : "2323",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1645",
+                "localId" : "2324",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1646",
+                  "localId" : "2325",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1628",
+                "localId" : "2315",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1629",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1630",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1631",
+                  "localId" : "2316",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1620",
+                  "localId" : "2311",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1621",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1622",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1640",
+                "localId" : "2321",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1641",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1642",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1643",
+                  "localId" : "2322",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1632",
+                  "localId" : "2317",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1633",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1634",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1651",
+            "localId" : "2330",
             "value" : 1.0,
-            "unit" : "hour",
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1665",
-        "name" : "DayPrecPerMinute",
+        "localId" : "2344",
+        "name" : "YearPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1665",
+            "r" : "2344",
             "s" : [ {
-              "value" : [ "", "define ", "DayPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "YearPrecPerSecond", ": " ]
             }, {
-              "r" : "1699",
+              "r" : "2366",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1666",
+                "r" : "2345",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1691",
+                  "r" : "2358",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "1675",
+                    "r" : "2350",
                     "s" : [ {
-                      "r" : "1667",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                      "r" : "2346",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "1687",
+                    "r" : "2356",
                     "s" : [ {
-                      "r" : "1679",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                      "r" : "2352",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -226993,22 +259514,22 @@ module.exports['DateTimeIntervalExpand'] = {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1707",
+          "localId" : "2374",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1708",
+            "localId" : "2375",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1709",
+              "localId" : "2376",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -227016,19 +259537,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1699",
+          "localId" : "2366",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1704",
+            "localId" : "2371",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1705",
+              "localId" : "2372",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1706",
+                "localId" : "2373",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -227036,40 +259557,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1700",
+            "localId" : "2367",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1701",
+              "localId" : "2368",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1702",
+                "localId" : "2369",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1703",
+            "localId" : "2370",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1666",
+            "localId" : "2345",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1694",
+              "localId" : "2361",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1695",
+                "localId" : "2362",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1696",
+                  "localId" : "2363",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -227077,159 +259598,107 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1691",
+              "localId" : "2358",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1692",
+                "localId" : "2359",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1693",
+                  "localId" : "2360",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1675",
+                "localId" : "2350",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1676",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1677",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1678",
+                  "localId" : "2351",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1667",
+                  "localId" : "2346",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1668",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1669",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1687",
+                "localId" : "2356",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1688",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1689",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1690",
+                  "localId" : "2357",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1679",
+                  "localId" : "2352",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1680",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1681",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1698",
+            "localId" : "2365",
             "value" : 1.0,
-            "unit" : "minute",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1712",
-        "name" : "DayPrecPerSecond",
+        "localId" : "2379",
+        "name" : "YearPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1712",
+            "r" : "2379",
             "s" : [ {
-              "value" : [ "", "define ", "DayPrecPerSecond", ": " ]
+              "value" : [ "", "define ", "YearPrecPerMillisecond", ": " ]
             }, {
-              "r" : "1746",
+              "r" : "2401",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1713",
+                "r" : "2380",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1738",
+                  "r" : "2393",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "1722",
+                    "r" : "2385",
                     "s" : [ {
-                      "r" : "1714",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                      "r" : "2381",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "1734",
+                    "r" : "2391",
                     "s" : [ {
-                      "r" : "1726",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
+                      "r" : "2387",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -227238,22 +259707,22 @@ module.exports['DateTimeIntervalExpand'] = {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "second" ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1754",
+          "localId" : "2409",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1755",
+            "localId" : "2410",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1756",
+              "localId" : "2411",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -227261,19 +259730,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1746",
+          "localId" : "2401",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1751",
+            "localId" : "2406",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1752",
+              "localId" : "2407",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1753",
+                "localId" : "2408",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -227281,40 +259750,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1747",
+            "localId" : "2402",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1748",
+              "localId" : "2403",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1749",
+                "localId" : "2404",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1750",
+            "localId" : "2405",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1713",
+            "localId" : "2380",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1741",
+              "localId" : "2396",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1742",
+                "localId" : "2397",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1743",
+                  "localId" : "2398",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -227322,183 +259791,117 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1738",
+              "localId" : "2393",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1739",
+                "localId" : "2394",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1740",
+                  "localId" : "2395",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1722",
+                "localId" : "2385",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1723",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1724",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1725",
+                  "localId" : "2386",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1714",
+                  "localId" : "2381",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1715",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1716",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1734",
+                "localId" : "2391",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1735",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1736",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1737",
+                  "localId" : "2392",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1726",
+                  "localId" : "2387",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "1727",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "1728",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1745",
+            "localId" : "2400",
             "value" : 1.0,
-            "unit" : "second",
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1759",
-        "name" : "DayPrecPerMillisecond",
+        "localId" : "2414",
+        "name" : "NullInList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1759",
+            "r" : "2414",
             "s" : [ {
-              "value" : [ "", "define ", "DayPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "NullInList", ": " ]
             }, {
-              "r" : "1793",
+              "r" : "2440",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1760",
+                "r" : "2415",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1785",
+                  "r" : "2428",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "1769",
-                    "s" : [ {
-                      "r" : "1761",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "1781",
-                    "s" : [ {
-                      "r" : "1773",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2416",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T01+00:00", "]" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "r" : "2431",
+                  "value" : [ ", ", "null", " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "millisecond" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1801",
+          "localId" : "2448",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1802",
+            "localId" : "2449",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1803",
+              "localId" : "2450",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -227506,19 +259909,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1793",
+          "localId" : "2440",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1798",
+            "localId" : "2445",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1799",
+              "localId" : "2446",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1800",
+                "localId" : "2447",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -227526,40 +259929,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1794",
+            "localId" : "2441",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1795",
+              "localId" : "2442",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1796",
+                "localId" : "2443",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1797",
+            "localId" : "2444",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1760",
+            "localId" : "2415",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1788",
+              "localId" : "2435",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1789",
+                "localId" : "2436",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1790",
+                  "localId" : "2437",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -227567,183 +259970,190 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1785",
+              "localId" : "2428",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1786",
+                "localId" : "2429",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1787",
+                  "localId" : "2430",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1769",
+                "localId" : "2416",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1770",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1771",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1772",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1761",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2417",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1762",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2418",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1763",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2419",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2420",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2421",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1781",
+                "localId" : "2422",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1782",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1783",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1784",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1773",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2423",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1774",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2424",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "1775",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2425",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2426",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2427",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "As",
+              "localId" : "2432",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2431",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              },
+              "asTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2433",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2434",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1792",
+            "localId" : "2439",
             "value" : 1.0,
-            "unit" : "millisecond",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1806",
-        "name" : "MonthPrecPerYear",
+        "localId" : "2453",
+        "name" : "Overlapping",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1806",
+            "r" : "2453",
             "s" : [ {
-              "value" : [ "", "define ", "MonthPrecPerYear", ": " ]
+              "value" : [ "", "define ", "Overlapping", ": " ]
             }, {
-              "r" : "1834",
+              "r" : "2490",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1807",
+                "r" : "2454",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1826",
+                  "r" : "2467",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "1814",
-                    "s" : [ {
-                      "r" : "1808",
-                      "value" : [ "DateTime", "(", "2016", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "1823",
-                    "s" : [ {
-                      "r" : "1817",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2455",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T03+00:00", "]" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2482",
+                  "s" : [ {
+                    "r" : "2470",
+                    "value" : [ "Interval[", "@2018-01-01T02+00:00", ", ", "@2018-01-01T04+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "year" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1842",
+          "localId" : "2498",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1843",
+            "localId" : "2499",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1844",
+              "localId" : "2500",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -227751,19 +260161,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1834",
+          "localId" : "2490",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1839",
+            "localId" : "2495",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1840",
+              "localId" : "2496",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1841",
+                "localId" : "2497",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -227771,40 +260181,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1835",
+            "localId" : "2491",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1836",
+              "localId" : "2492",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1837",
+                "localId" : "2493",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1838",
+            "localId" : "2494",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1807",
+            "localId" : "2454",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1829",
+              "localId" : "2485",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1830",
+                "localId" : "2486",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1831",
+                  "localId" : "2487",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -227812,157 +260222,269 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1826",
+              "localId" : "2467",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1827",
+                "localId" : "2468",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1828",
+                  "localId" : "2469",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1814",
+                "localId" : "2455",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1815",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1816",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1808",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2456",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                  "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1809",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2457",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2458",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2459",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2460",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1823",
+                "localId" : "2461",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1824",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "2462",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
                   "annotation" : [ ]
-                }, {
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2463",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2464",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2465",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2466",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "2482",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2483",
+                "annotation" : [ ],
+                "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1825",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2484",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
-                } ],
+                }
+              },
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "2470",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1817",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2471",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1818",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2472",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2473",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2474",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2475",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "2476",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "2477",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2478",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2479",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2480",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "4",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2481",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1833",
+            "localId" : "2489",
             "value" : 1.0,
-            "unit" : "year",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1847",
-        "name" : "MonthPrecPerMonth",
+        "localId" : "2503",
+        "name" : "NonOverlapping",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1847",
+            "r" : "2503",
             "s" : [ {
-              "value" : [ "", "define ", "MonthPrecPerMonth", ": " ]
+              "value" : [ "", "define ", "NonOverlapping", ": " ]
             }, {
-              "r" : "1875",
+              "r" : "2540",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1848",
+                "r" : "2504",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1867",
+                  "r" : "2517",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "1855",
-                    "s" : [ {
-                      "r" : "1849",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "1864",
-                    "s" : [ {
-                      "r" : "1858",
-                      "value" : [ "DateTime", "(", "2018", ",", "02", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2505",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T02+00:00", "]" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2532",
+                  "s" : [ {
+                    "r" : "2520",
+                    "value" : [ "Interval[", "@2018-01-01T05+00:00", ", ", "@2018-01-01T05+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1883",
+          "localId" : "2548",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1884",
+            "localId" : "2549",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1885",
+              "localId" : "2550",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -227970,19 +260492,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1875",
+          "localId" : "2540",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1880",
+            "localId" : "2545",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1881",
+              "localId" : "2546",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1882",
+                "localId" : "2547",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -227990,40 +260512,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1876",
+            "localId" : "2541",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1877",
+              "localId" : "2542",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1878",
+                "localId" : "2543",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1879",
+            "localId" : "2544",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1848",
+            "localId" : "2504",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1870",
+              "localId" : "2535",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1871",
+                "localId" : "2536",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1872",
+                  "localId" : "2537",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -228031,157 +260553,259 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1867",
+              "localId" : "2517",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1868",
+                "localId" : "2518",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1869",
+                  "localId" : "2519",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1855",
+                "localId" : "2505",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1856",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1857",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1849",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2506",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1850",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2507",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2508",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2509",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2510",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1864",
+                "localId" : "2511",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1865",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "2512",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
                   "annotation" : [ ]
-                }, {
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2513",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2514",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2515",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2516",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
+                }
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "2532",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "2533",
+                "annotation" : [ ],
+                "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1866",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2534",
+                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
-                } ],
+                }
+              },
+              "low" : {
+                "type" : "DateTime",
+                "localId" : "2520",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1858",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2521",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1859",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2522",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "02",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2523",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2524",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2525",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "DateTime",
+                "localId" : "2526",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "year" : {
+                  "type" : "Literal",
+                  "localId" : "2527",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2018",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2528",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2529",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2530",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "5",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2531",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "1874",
+            "localId" : "2539",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1888",
-        "name" : "MonthPrecPerWeek",
+        "localId" : "2553",
+        "name" : "NoPerDefaultMS",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1888",
+            "r" : "2553",
             "s" : [ {
-              "value" : [ "", "define ", "MonthPrecPerWeek", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultMS", ": " ]
             }, {
-              "r" : "1916",
+              "r" : "2580",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1889",
+                "r" : "2554",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1908",
+                  "r" : "2573",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "1896",
-                    "s" : [ {
-                      "r" : "1890",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "1905",
-                    "s" : [ {
-                      "r" : "1899",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2555",
+                    "value" : [ "Interval[", "@2018-01-01T01:00:00.000+00:00", ", ", "@2018-01-01T01:00:00.001+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " per ", "week" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1924",
+          "localId" : "2588",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1925",
+            "localId" : "2589",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1926",
+              "localId" : "2590",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -228189,19 +260813,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1916",
+          "localId" : "2580",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1921",
+            "localId" : "2585",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1922",
+              "localId" : "2586",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1923",
+                "localId" : "2587",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -228209,40 +260833,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1917",
+            "localId" : "2581",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1918",
+              "localId" : "2582",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1919",
+                "localId" : "2583",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1920",
+            "localId" : "2584",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1889",
+            "localId" : "2554",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1911",
+              "localId" : "2576",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1912",
+                "localId" : "2577",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1913",
+                  "localId" : "2578",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -228250,157 +260874,199 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1908",
+              "localId" : "2573",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1909",
+                "localId" : "2574",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1910",
+                  "localId" : "2575",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1896",
+                "localId" : "2555",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1897",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1898",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1890",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2556",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1891",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2557",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2558",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2559",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "2560",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "2561",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "2562",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2563",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1905",
+                "localId" : "2564",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1906",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1907",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1899",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2565",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1900",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2566",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2567",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2568",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "2569",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "2570",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "millisecond" : {
+                  "type" : "Literal",
+                  "localId" : "2571",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2572",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "1915",
-            "value" : 1.0,
-            "unit" : "week",
+            "type" : "Null",
+            "localId" : "2579",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1929",
-        "name" : "MonthPrecPerDay",
+        "localId" : "2593",
+        "name" : "NoPerDefaultSec",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1929",
+            "r" : "2593",
             "s" : [ {
-              "value" : [ "", "define ", "MonthPrecPerDay", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultSec", ": " ]
             }, {
-              "r" : "1957",
+              "r" : "2618",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1930",
+                "r" : "2594",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1949",
+                  "r" : "2611",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "1937",
-                    "s" : [ {
-                      "r" : "1931",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "1946",
-                    "s" : [ {
-                      "r" : "1940",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2595",
+                    "value" : [ "Interval[", "@2018-01-01T01:00:00+00:00", ", ", "@2018-01-01T01:00:01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "1965",
+          "localId" : "2626",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "1966",
+            "localId" : "2627",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "1967",
+              "localId" : "2628",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -228408,19 +261074,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1957",
+          "localId" : "2618",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "1962",
+            "localId" : "2623",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1963",
+              "localId" : "2624",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1964",
+                "localId" : "2625",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -228428,40 +261094,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1958",
+            "localId" : "2619",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "1959",
+              "localId" : "2620",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "1960",
+                "localId" : "2621",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "1961",
+            "localId" : "2622",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1930",
+            "localId" : "2594",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1952",
+              "localId" : "2614",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1953",
+                "localId" : "2615",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1954",
+                  "localId" : "2616",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -228469,157 +261135,185 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1949",
+              "localId" : "2611",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1950",
+                "localId" : "2612",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1951",
+                  "localId" : "2613",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1937",
+                "localId" : "2595",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1938",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1939",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1931",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2596",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1932",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2597",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2598",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2599",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "2600",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "2601",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2602",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1946",
+                "localId" : "2603",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1947",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1948",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1940",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2604",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1941",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2605",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2606",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2607",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "2608",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "2609",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2610",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "1956",
-            "value" : 1.0,
-            "unit" : "day",
+            "type" : "Null",
+            "localId" : "2617",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "1970",
-        "name" : "MonthPrecPerHour",
+        "localId" : "2631",
+        "name" : "NoPerDefaultMin",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "1970",
+            "r" : "2631",
             "s" : [ {
-              "value" : [ "", "define ", "MonthPrecPerHour", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultMin", ": " ]
             }, {
-              "r" : "1998",
+              "r" : "2654",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "1971",
+                "r" : "2632",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "1990",
+                  "r" : "2647",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "1978",
-                    "s" : [ {
-                      "r" : "1972",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "1987",
-                    "s" : [ {
-                      "r" : "1981",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2633",
+                    "value" : [ "Interval[", "@2018-01-01T01:00+00:00", ", ", "@2018-01-01T01:01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2006",
+          "localId" : "2662",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2007",
+            "localId" : "2663",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2008",
+              "localId" : "2664",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -228627,19 +261321,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "1998",
+          "localId" : "2654",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2003",
+            "localId" : "2659",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2004",
+              "localId" : "2660",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2005",
+                "localId" : "2661",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -228647,40 +261341,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "1999",
+            "localId" : "2655",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2000",
+              "localId" : "2656",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2001",
+                "localId" : "2657",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2002",
+            "localId" : "2658",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "1971",
+            "localId" : "2632",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "1993",
+              "localId" : "2650",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1994",
+                "localId" : "2651",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1995",
+                  "localId" : "2652",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -228688,157 +261382,171 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "1990",
+              "localId" : "2647",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "1991",
+                "localId" : "2648",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "1992",
+                  "localId" : "2649",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "1978",
+                "localId" : "2633",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1979",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1980",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1972",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2634",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1973",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2635",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2636",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2637",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "2638",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2639",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "1987",
+                "localId" : "2640",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1988",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "1989",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "1981",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2641",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "1982",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2642",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2643",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2644",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "2645",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2646",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "1997",
-            "value" : 1.0,
-            "unit" : "hour",
+            "type" : "Null",
+            "localId" : "2653",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2011",
-        "name" : "MonthPrecPerMinute",
+        "localId" : "2667",
+        "name" : "NoPerDefaultHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2011",
+            "r" : "2667",
             "s" : [ {
-              "value" : [ "", "define ", "MonthPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultHour", ": " ]
             }, {
-              "r" : "2039",
+              "r" : "2688",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2012",
+                "r" : "2668",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2031",
+                  "r" : "2681",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2019",
-                    "s" : [ {
-                      "r" : "2013",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2028",
-                    "s" : [ {
-                      "r" : "2022",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2669",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2047",
+          "localId" : "2696",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2048",
+            "localId" : "2697",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2049",
+              "localId" : "2698",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -228846,19 +261554,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2039",
+          "localId" : "2688",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2044",
+            "localId" : "2693",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2045",
+              "localId" : "2694",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2046",
+                "localId" : "2695",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -228866,40 +261574,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2040",
+            "localId" : "2689",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2041",
+              "localId" : "2690",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2042",
+                "localId" : "2691",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2043",
+            "localId" : "2692",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2012",
+            "localId" : "2668",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2034",
+              "localId" : "2684",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2035",
+                "localId" : "2685",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2036",
+                  "localId" : "2686",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -228907,133 +261615,150 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2031",
+              "localId" : "2681",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2032",
+                "localId" : "2682",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2033",
+                  "localId" : "2683",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2019",
+                "localId" : "2669",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2020",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2021",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2013",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2670",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "2014",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2671",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2672",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2673",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2674",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2028",
+                "localId" : "2675",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2029",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2030",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2022",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2676",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "2023",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2677",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2678",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2679",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2680",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "2038",
-            "value" : 1.0,
-            "unit" : "minute",
+            "type" : "Null",
+            "localId" : "2687",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2052",
-        "name" : "MonthPrecPerSecond",
+        "localId" : "2701",
+        "name" : "NoPerDefaultDay",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2052",
+            "r" : "2701",
             "s" : [ {
-              "value" : [ "", "define ", "MonthPrecPerSecond", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultDay", ": " ]
             }, {
-              "r" : "2080",
+              "r" : "2734",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2053",
+                "r" : "2702",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2072",
+                  "r" : "2727",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "2060",
+                    "r" : "2711",
                     "s" : [ {
-                      "r" : "2054",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                      "r" : "2703",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "2069",
+                    "r" : "2723",
                     "s" : [ {
-                      "r" : "2063",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
+                      "r" : "2715",
+                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -229041,23 +261766,21 @@ module.exports['DateTimeIntervalExpand'] = {
                 }, {
                   "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2088",
+          "localId" : "2742",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2089",
+            "localId" : "2743",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2090",
+              "localId" : "2744",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -229065,19 +261788,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2080",
+          "localId" : "2734",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2085",
+            "localId" : "2739",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2086",
+              "localId" : "2740",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2087",
+                "localId" : "2741",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -229085,40 +261808,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2081",
+            "localId" : "2735",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2082",
+              "localId" : "2736",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2083",
+                "localId" : "2737",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2084",
+            "localId" : "2738",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2053",
+            "localId" : "2702",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2075",
+              "localId" : "2730",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2076",
+                "localId" : "2731",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2077",
+                  "localId" : "2732",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -229126,40 +261849,45 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2072",
+              "localId" : "2727",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2073",
+                "localId" : "2728",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2074",
+                  "localId" : "2729",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2060",
+                "localId" : "2711",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2061",
+                  "localId" : "2712",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2062",
+                  "localId" : "2713",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2714",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2054",
+                  "localId" : "2703",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
@@ -229167,7 +261895,15 @@ module.exports['DateTimeIntervalExpand'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "2055",
+                  "localId" : "2704",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "01",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2705",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "01",
@@ -229176,23 +261912,28 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2069",
+                "localId" : "2723",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2070",
+                  "localId" : "2724",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }, {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "2725",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2071",
+                  "localId" : "2726",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2063",
+                  "localId" : "2715",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
@@ -229200,7 +261941,15 @@ module.exports['DateTimeIntervalExpand'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "2064",
+                  "localId" : "2716",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "01",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2717",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "01",
@@ -229209,74 +261958,71 @@ module.exports['DateTimeIntervalExpand'] = {
               }
             } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "2079",
-            "value" : 1.0,
-            "unit" : "second",
+            "type" : "Null",
+            "localId" : "2733",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2093",
-        "name" : "MonthPrecPerMillisecond",
+        "localId" : "2747",
+        "name" : "NoPerDefaultMonth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2093",
+            "r" : "2747",
             "s" : [ {
-              "value" : [ "", "define ", "MonthPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultMonth", ": " ]
             }, {
-              "r" : "2121",
+              "r" : "2774",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2094",
+                "r" : "2748",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2113",
+                  "r" : "2767",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "2101",
+                    "r" : "2755",
                     "s" : [ {
-                      "r" : "2095",
+                      "r" : "2749",
                       "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "2110",
+                    "r" : "2764",
                     "s" : [ {
-                      "r" : "2104",
+                      "r" : "2758",
                       "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ "  }" ]
                 } ]
-              }, {
-                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2129",
+          "localId" : "2782",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2130",
+            "localId" : "2783",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2131",
+              "localId" : "2784",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -229284,19 +262030,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2121",
+          "localId" : "2774",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2126",
+            "localId" : "2779",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2127",
+              "localId" : "2780",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2128",
+                "localId" : "2781",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -229304,40 +262050,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2122",
+            "localId" : "2775",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2123",
+              "localId" : "2776",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2124",
+                "localId" : "2777",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2125",
+            "localId" : "2778",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2094",
+            "localId" : "2748",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2116",
+              "localId" : "2770",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2117",
+                "localId" : "2771",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2118",
+                  "localId" : "2772",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -229345,40 +262091,40 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2113",
+              "localId" : "2767",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2114",
+                "localId" : "2768",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2115",
+                  "localId" : "2769",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2101",
+                "localId" : "2755",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2102",
+                  "localId" : "2756",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2103",
+                  "localId" : "2757",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2095",
+                  "localId" : "2749",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
@@ -229386,7 +262132,7 @@ module.exports['DateTimeIntervalExpand'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "2096",
+                  "localId" : "2750",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "01",
@@ -229395,23 +262141,23 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2110",
+                "localId" : "2764",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2111",
+                  "localId" : "2765",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }, {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2112",
+                  "localId" : "2766",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2104",
+                  "localId" : "2758",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
@@ -229419,7 +262165,7 @@ module.exports['DateTimeIntervalExpand'] = {
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "2105",
+                  "localId" : "2759",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "01",
@@ -229428,74 +262174,71 @@ module.exports['DateTimeIntervalExpand'] = {
               }
             } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "2120",
-            "value" : 1.0,
-            "unit" : "millisecond",
+            "type" : "Null",
+            "localId" : "2773",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2134",
-        "name" : "YearPrecPerYear",
+        "localId" : "2787",
+        "name" : "NoPerDefaultYear",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2134",
+            "r" : "2787",
             "s" : [ {
-              "value" : [ "", "define ", "YearPrecPerYear", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultYear", ": " ]
             }, {
-              "r" : "2156",
+              "r" : "2808",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2135",
+                "r" : "2788",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2148",
+                  "r" : "2801",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "2140",
+                    "r" : "2793",
                     "s" : [ {
-                      "r" : "2136",
-                      "value" : [ "DateTime", "(", "2016", ")" ]
+                      "r" : "2789",
+                      "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "2146",
+                    "r" : "2799",
                     "s" : [ {
-                      "r" : "2142",
+                      "r" : "2795",
                       "value" : [ "DateTime", "(", "2018", ")" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ "  }" ]
                 } ]
-              }, {
-                "value" : [ " per ", "year" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2164",
+          "localId" : "2816",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2165",
+            "localId" : "2817",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2166",
+              "localId" : "2818",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -229503,19 +262246,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2156",
+          "localId" : "2808",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2161",
+            "localId" : "2813",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2162",
+              "localId" : "2814",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2163",
+                "localId" : "2815",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -229523,40 +262266,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2157",
+            "localId" : "2809",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2158",
+              "localId" : "2810",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2159",
+                "localId" : "2811",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2160",
+            "localId" : "2812",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2135",
+            "localId" : "2788",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2151",
+              "localId" : "2804",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2152",
+                "localId" : "2805",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2153",
+                  "localId" : "2806",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -229564,55 +262307,55 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2148",
+              "localId" : "2801",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2149",
+                "localId" : "2802",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2150",
+                  "localId" : "2803",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2140",
+                "localId" : "2793",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2141",
+                  "localId" : "2794",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2136",
+                  "localId" : "2789",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2016",
+                  "value" : "2018",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2146",
+                "localId" : "2799",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2147",
+                  "localId" : "2800",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 } ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2142",
+                  "localId" : "2795",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
@@ -229621,74 +262364,58 @@ module.exports['DateTimeIntervalExpand'] = {
               }
             } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "2155",
-            "value" : 1.0,
-            "unit" : "year",
+            "type" : "Null",
+            "localId" : "2807",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2169",
-        "name" : "YearPrecPerMonth",
+        "localId" : "2821",
+        "name" : "OpenStart",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2169",
+            "r" : "2821",
             "s" : [ {
-              "value" : [ "", "define ", "YearPrecPerMonth", ": " ]
+              "value" : [ "", "define ", "OpenStart", ": " ]
             }, {
-              "r" : "2191",
+              "r" : "2843",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2170",
+                "r" : "2822",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2183",
+                  "r" : "2835",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2175",
-                    "s" : [ {
-                      "r" : "2171",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2181",
-                    "s" : [ {
-                      "r" : "2177",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2823",
+                    "value" : [ "Interval(", "@2018-01-01T01+00:00", ", ", "@2018-01-03T01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "month" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2199",
+          "localId" : "2851",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2200",
+            "localId" : "2852",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2201",
+              "localId" : "2853",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -229696,19 +262423,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2191",
+          "localId" : "2843",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2196",
+            "localId" : "2848",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2197",
+              "localId" : "2849",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2198",
+                "localId" : "2850",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -229716,40 +262443,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2192",
+            "localId" : "2844",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2193",
+              "localId" : "2845",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2194",
+                "localId" : "2846",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2195",
+            "localId" : "2847",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2170",
+            "localId" : "2822",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2186",
+              "localId" : "2838",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2187",
+                "localId" : "2839",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2188",
+                  "localId" : "2840",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -229757,131 +262484,160 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2183",
-              "lowClosed" : true,
+              "localId" : "2835",
+              "lowClosed" : false,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2184",
+                "localId" : "2836",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2185",
+                  "localId" : "2837",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2175",
+                "localId" : "2823",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2176",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2171",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2824",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2825",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2826",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2827",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2828",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2181",
+                "localId" : "2829",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2182",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2177",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2830",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2831",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2832",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2833",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2834",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2190",
+            "localId" : "2842",
             "value" : 1.0,
-            "unit" : "month",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2204",
-        "name" : "YearPrecPerWeek",
+        "localId" : "2856",
+        "name" : "OpenEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2204",
+            "r" : "2856",
             "s" : [ {
-              "value" : [ "", "define ", "YearPrecPerWeek", ": " ]
+              "value" : [ "", "define ", "OpenEnd", ": " ]
             }, {
-              "r" : "2226",
+              "r" : "2878",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2205",
+                "r" : "2857",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2218",
+                  "r" : "2870",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2210",
-                    "s" : [ {
-                      "r" : "2206",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2216",
-                    "s" : [ {
-                      "r" : "2212",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2858",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-03T01+00:00", ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "week" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2234",
+          "localId" : "2886",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2235",
+            "localId" : "2887",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2236",
+              "localId" : "2888",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -229889,19 +262645,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2226",
+          "localId" : "2878",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2231",
+            "localId" : "2883",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2232",
+              "localId" : "2884",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2233",
+                "localId" : "2885",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -229909,40 +262665,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2227",
+            "localId" : "2879",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2228",
+              "localId" : "2880",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2229",
+                "localId" : "2881",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2230",
+            "localId" : "2882",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2205",
+            "localId" : "2857",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2221",
+              "localId" : "2873",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2222",
+                "localId" : "2874",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2223",
+                  "localId" : "2875",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -229950,110 +262706,139 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2218",
+              "localId" : "2870",
               "lowClosed" : true,
-              "highClosed" : true,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2219",
+                "localId" : "2871",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2220",
+                  "localId" : "2872",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2210",
+                "localId" : "2858",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2211",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2206",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2859",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2860",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2861",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2862",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2863",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2216",
+                "localId" : "2864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2217",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2212",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2865",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2866",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2867",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2868",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2869",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2225",
+            "localId" : "2877",
             "value" : 1.0,
-            "unit" : "week",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2239",
-        "name" : "YearPrecPerDay",
+        "localId" : "2891",
+        "name" : "OpenBoth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2239",
+            "r" : "2891",
             "s" : [ {
-              "value" : [ "", "define ", "YearPrecPerDay", ": " ]
+              "value" : [ "", "define ", "OpenBoth", ": " ]
             }, {
-              "r" : "2261",
+              "r" : "2913",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2240",
+                "r" : "2892",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2253",
+                  "r" : "2905",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2245",
-                    "s" : [ {
-                      "r" : "2241",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2251",
-                    "s" : [ {
-                      "r" : "2247",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2893",
+                    "value" : [ "Interval(", "@2018-01-01T01+00:00", ", ", "@2018-01-03T01+00:00", ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -230066,15 +262851,15 @@ module.exports['DateTimeIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2269",
+          "localId" : "2921",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2270",
+            "localId" : "2922",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2271",
+              "localId" : "2923",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -230082,19 +262867,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2261",
+          "localId" : "2913",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2266",
+            "localId" : "2918",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2267",
+              "localId" : "2919",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2268",
+                "localId" : "2920",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -230102,40 +262887,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2262",
+            "localId" : "2914",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2263",
+              "localId" : "2915",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2264",
+                "localId" : "2916",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2265",
+            "localId" : "2917",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2240",
+            "localId" : "2892",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2256",
+              "localId" : "2908",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2257",
+                "localId" : "2909",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2258",
+                  "localId" : "2910",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -230143,131 +262928,160 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2253",
-              "lowClosed" : true,
-              "highClosed" : true,
+              "localId" : "2905",
+              "lowClosed" : false,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2254",
+                "localId" : "2906",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2255",
+                  "localId" : "2907",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2245",
+                "localId" : "2893",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2246",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2241",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2894",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2895",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2896",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2897",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2898",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2251",
+                "localId" : "2899",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2252",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2247",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2900",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2901",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2902",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2903",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2904",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2260",
+            "localId" : "2912",
             "value" : 1.0,
             "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2274",
-        "name" : "YearPrecPerHour",
+        "localId" : "2926",
+        "name" : "MismatchPrecision",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2274",
+            "r" : "2926",
             "s" : [ {
-              "value" : [ "", "define ", "YearPrecPerHour", ": " ]
+              "value" : [ "", "define ", "MismatchPrecision", ": " ]
             }, {
-              "r" : "2296",
+              "r" : "2951",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2275",
+                "r" : "2927",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2288",
+                  "r" : "2943",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2280",
-                    "s" : [ {
-                      "r" : "2276",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2286",
-                    "s" : [ {
-                      "r" : "2282",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2928",
+                    "value" : [ "Interval[", "@2012-01-01T12:00+00:00", ", ", "@2012-01-02T12:00:00+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2304",
+          "localId" : "2959",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2305",
+            "localId" : "2960",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2306",
+              "localId" : "2961",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -230275,19 +263089,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2296",
+          "localId" : "2951",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2301",
+            "localId" : "2956",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2302",
+              "localId" : "2957",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2303",
+                "localId" : "2958",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -230295,40 +263109,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2297",
+            "localId" : "2952",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2298",
+              "localId" : "2953",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2299",
+                "localId" : "2954",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2300",
+            "localId" : "2955",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2275",
+            "localId" : "2927",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2291",
+              "localId" : "2946",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2292",
+                "localId" : "2947",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2293",
+                  "localId" : "2948",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -230336,131 +263150,181 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2288",
+              "localId" : "2943",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2289",
+                "localId" : "2944",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2290",
+                  "localId" : "2945",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2280",
+                "localId" : "2928",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2281",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2276",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2929",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2930",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2931",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2932",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "12",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "2933",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2934",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2286",
+                "localId" : "2935",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2287",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2282",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2936",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2937",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2938",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2939",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "12",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "2940",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "2941",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2942",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2295",
+            "localId" : "2950",
             "value" : 1.0,
-            "unit" : "hour",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2309",
-        "name" : "YearPrecPerMinute",
+        "localId" : "2964",
+        "name" : "MismatchPrecisionResultLongerThanInput",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2309",
+            "r" : "2964",
             "s" : [ {
-              "value" : [ "", "define ", "YearPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "MismatchPrecisionResultLongerThanInput", ": " ]
             }, {
-              "r" : "2331",
+              "r" : "2989",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2310",
+                "r" : "2965",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2323",
+                  "r" : "2981",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2315",
-                    "s" : [ {
-                      "r" : "2311",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2321",
-                    "s" : [ {
-                      "r" : "2317",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "2966",
+                    "value" : [ "Interval[", "@2012-01-01T13:00:00+00:00", ", ", "@2012-01-02T12:59+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2339",
+          "localId" : "2997",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2340",
+            "localId" : "2998",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2341",
+              "localId" : "2999",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -230468,19 +263332,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2331",
+          "localId" : "2989",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2336",
+            "localId" : "2994",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2337",
+              "localId" : "2995",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2338",
+                "localId" : "2996",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -230488,40 +263352,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2332",
+            "localId" : "2990",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2333",
+              "localId" : "2991",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2334",
+                "localId" : "2992",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2335",
+            "localId" : "2993",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2310",
+            "localId" : "2965",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2326",
+              "localId" : "2984",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2327",
+                "localId" : "2985",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2328",
+                  "localId" : "2986",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -230529,324 +263393,253 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2323",
+              "localId" : "2981",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2324",
+                "localId" : "2982",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2325",
+                  "localId" : "2983",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2315",
+                "localId" : "2966",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2316",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2311",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2967",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2968",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2969",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2970",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "13",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "2971",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "2972",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2973",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2321",
+                "localId" : "2974",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2322",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2317",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "2975",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "2012",
+                  "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "2976",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "2977",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "2978",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "12",
+                  "annotation" : [ ]
+                },
+                "minute" : {
+                  "type" : "Literal",
+                  "localId" : "2979",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "59",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "2980",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2330",
+            "localId" : "2988",
             "value" : 1.0,
-            "unit" : "minute",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2344",
-        "name" : "YearPrecPerSecond",
+        "localId" : "3002",
+        "name" : "EmptyList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2344",
+            "r" : "3002",
             "s" : [ {
-              "value" : [ "", "define ", "YearPrecPerSecond", ": " ]
+              "value" : [ "", "define ", "EmptyList", ": " ]
             }, {
-              "r" : "2366",
+              "r" : "3007",
               "s" : [ {
-                "value" : [ "expand " ]
+                "value" : [ "List<" ]
               }, {
-                "r" : "2345",
+                "r" : "3003",
                 "s" : [ {
-                  "value" : [ "{ " ]
+                  "value" : [ "Interval<" ]
                 }, {
-                  "r" : "2358",
+                  "r" : "3004",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2350",
-                    "s" : [ {
-                      "r" : "2346",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2356",
-                    "s" : [ {
-                      "r" : "2352",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "value" : [ "Date" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ ">" ]
                 } ]
               }, {
-                "value" : [ " per ", "second" ]
+                "value" : [ ">{}" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2374",
+          "localId" : "3012",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2375",
+            "localId" : "3013",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2376",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "3014",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "Expand",
-          "localId" : "2366",
+          "type" : "List",
+          "localId" : "3007",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2371",
+            "localId" : "3009",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2372",
+              "localId" : "3010",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2373",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "3011",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
                 "annotation" : [ ]
               }
             }
           },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "2367",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "2368",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2369",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "2370",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "List",
-            "localId" : "2345",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "2361",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2362",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2363",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "Interval",
-              "localId" : "2358",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2359",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2360",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              },
-              "low" : {
-                "type" : "DateTime",
-                "localId" : "2350",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2351",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2346",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "DateTime",
-                "localId" : "2356",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2357",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2352",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                }
-              }
-            } ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "2365",
-            "value" : 1.0,
-            "unit" : "second",
-            "annotation" : [ ]
-          } ]
+          "element" : [ ]
         }
       }, {
-        "localId" : "2379",
-        "name" : "YearPrecPerMillisecond",
+        "localId" : "3017",
+        "name" : "NullOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2379",
+            "r" : "3017",
             "s" : [ {
-              "value" : [ "", "define ", "YearPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "NullOpen", ": " ]
             }, {
-              "r" : "2401",
+              "r" : "3035",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2380",
+                "r" : "3018",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2393",
+                  "r" : "3026",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2385",
-                    "s" : [ {
-                      "r" : "2381",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2391",
-                    "s" : [ {
-                      "r" : "2387",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "3019",
+                    "value" : [ "Interval[", "null", ", ", "@2018-01-03T01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "millisecond" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2409",
+          "localId" : "3043",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2410",
+            "localId" : "3044",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2411",
+              "localId" : "3045",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -230854,19 +263647,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2401",
+          "localId" : "3035",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2406",
+            "localId" : "3040",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2407",
+              "localId" : "3041",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2408",
+                "localId" : "3042",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -230874,40 +263667,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2402",
+            "localId" : "3036",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2403",
+              "localId" : "3037",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2404",
+                "localId" : "3038",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2405",
+            "localId" : "3039",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2380",
+            "localId" : "3018",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2396",
+              "localId" : "3030",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2397",
+                "localId" : "3031",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2398",
+                  "localId" : "3032",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -230915,117 +263708,131 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2393",
+              "localId" : "3026",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2394",
+                "localId" : "3028",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2395",
+                  "localId" : "3029",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2385",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "As",
+                "localId" : "3027",
+                "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2386",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2381",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                "signature" : [ ],
+                "operand" : {
+                  "type" : "Null",
+                  "localId" : "3019",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2391",
+                "localId" : "3020",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2392",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
+                "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2387",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "3021",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
+                },
+                "month" : {
+                  "type" : "Literal",
+                  "localId" : "3022",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "day" : {
+                  "type" : "Literal",
+                  "localId" : "3023",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                },
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "3024",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                },
+                "timezoneOffset" : {
+                  "type" : "Literal",
+                  "localId" : "3025",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
+                  "value" : "0.0",
+                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2400",
+            "localId" : "3034",
             "value" : 1.0,
-            "unit" : "millisecond",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2414",
-        "name" : "NullInList",
+        "localId" : "3048",
+        "name" : "NullClose",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2414",
+            "r" : "3048",
             "s" : [ {
-              "value" : [ "", "define ", "NullInList", ": " ]
+              "value" : [ "", "define ", "NullClose", ": " ]
             }, {
-              "r" : "2440",
+              "r" : "3066",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2415",
+                "r" : "3049",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2428",
+                  "r" : "3057",
                   "s" : [ {
-                    "r" : "2416",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T01+00:00", "]" ]
+                    "r" : "3050",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "null", "]" ]
                   } ]
                 }, {
-                  "r" : "2431",
-                  "value" : [ ", ", "null", " }" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2448",
+          "localId" : "3074",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2449",
+            "localId" : "3075",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2450",
+              "localId" : "3076",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -231033,19 +263840,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2440",
+          "localId" : "3066",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2445",
+            "localId" : "3071",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2446",
+              "localId" : "3072",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2447",
+                "localId" : "3073",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -231053,40 +263860,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2441",
+            "localId" : "3067",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2442",
+              "localId" : "3068",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2443",
+                "localId" : "3069",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2444",
+            "localId" : "3070",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2415",
+            "localId" : "3049",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2435",
+              "localId" : "3061",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2436",
+                "localId" : "3062",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2437",
+                  "localId" : "3063",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -231094,521 +263901,286 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2428",
+              "localId" : "3057",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2429",
+                "localId" : "3059",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2430",
+                  "localId" : "3060",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2416",
+                "localId" : "3050",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2417",
+                  "localId" : "3051",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "2418",
+                  "localId" : "3052",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "2419",
+                  "localId" : "3053",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2420",
+                  "localId" : "3054",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "2421",
+                  "localId" : "3055",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2422",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "As",
+                "localId" : "3058",
+                "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2423",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2424",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2425",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "2426",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2427",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "As",
-              "localId" : "2432",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "2431",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              },
-              "asTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2433",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2434",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "operand" : {
+                  "type" : "Null",
+                  "localId" : "3056",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2439",
+            "localId" : "3065",
             "value" : 1.0,
-            "unit" : "hour",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2453",
-        "name" : "Overlapping",
+        "localId" : "3079",
+        "name" : "NullBoth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2453",
+            "r" : "3079",
             "s" : [ {
-              "value" : [ "", "define ", "Overlapping", ": " ]
+              "value" : [ "", "define ", "NullBoth", ": " ]
             }, {
-              "r" : "2490",
+              "r" : "3091",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2454",
+                "r" : "3080",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2467",
-                  "s" : [ {
-                    "r" : "2455",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T03+00:00", "]" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2482",
+                  "r" : "3083",
                   "s" : [ {
-                    "r" : "2470",
-                    "value" : [ "Interval[", "@2018-01-01T02+00:00", ", ", "@2018-01-01T04+00:00", "]" ]
+                    "r" : "3081",
+                    "value" : [ "Interval[", "null", ", ", "null", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per ", "day" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2498",
+          "localId" : "3099",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2499",
+            "localId" : "3100",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2500",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "3101",
+              "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2490",
+          "localId" : "3091",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2495",
+            "localId" : "3096",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2496",
+              "localId" : "3097",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2497",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "3098",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2491",
+            "localId" : "3092",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2492",
+              "localId" : "3093",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2493",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "3094",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2494",
+            "localId" : "3095",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2454",
+            "localId" : "3080",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2485",
+              "localId" : "3086",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2486",
+                "localId" : "3087",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2487",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "3088",
+                  "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2467",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2468",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2469",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              },
-              "low" : {
-                "type" : "DateTime",
-                "localId" : "2455",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2456",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2457",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2458",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "2459",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2460",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "DateTime",
-                "localId" : "2461",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2462",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2463",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2464",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "2465",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2466",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "Interval",
-              "localId" : "2482",
+              "localId" : "3083",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2483",
+                "localId" : "3084",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2484",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "3085",
+                  "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2470",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2471",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2472",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2473",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "2474",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2475",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
-                }
+                "type" : "Null",
+                "localId" : "3081",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2476",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2477",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2478",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2479",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "2480",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2481",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
-                }
+                "type" : "Null",
+                "localId" : "3082",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2489",
+            "localId" : "3090",
             "value" : 1.0,
-            "unit" : "hour",
+            "unit" : "day",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2503",
-        "name" : "NonOverlapping",
+        "localId" : "3104",
+        "name" : "BadPerGram",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2503",
+            "r" : "3104",
             "s" : [ {
-              "value" : [ "", "define ", "NonOverlapping", ": " ]
+              "value" : [ "", "define ", "BadPerGram", ": " ]
             }, {
-              "r" : "2540",
+              "r" : "3126",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2504",
+                "r" : "3105",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2517",
-                  "s" : [ {
-                    "r" : "2505",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T02+00:00", "]" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2532",
+                  "r" : "3118",
                   "s" : [ {
-                    "r" : "2520",
-                    "value" : [ "Interval[", "@2018-01-01T05+00:00", ", ", "@2018-01-01T05+00:00", "]" ]
+                    "r" : "3106",
+                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-04T01+00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "3125",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2548",
+          "localId" : "3134",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2549",
+            "localId" : "3135",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2550",
+              "localId" : "3136",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
@@ -231616,19 +264188,19 @@ module.exports['DateTimeIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2540",
+          "localId" : "3126",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2545",
+            "localId" : "3131",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2546",
+              "localId" : "3132",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2547",
+                "localId" : "3133",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
@@ -231636,40 +264208,40 @@ module.exports['DateTimeIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2541",
+            "localId" : "3127",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2542",
+              "localId" : "3128",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2543",
+                "localId" : "3129",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2544",
+            "localId" : "3130",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2504",
+            "localId" : "3105",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2535",
+              "localId" : "3121",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2536",
+                "localId" : "3122",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2537",
+                  "localId" : "3123",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
@@ -231677,58 +264249,58 @@ module.exports['DateTimeIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2517",
+              "localId" : "3118",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2518",
+                "localId" : "3119",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2519",
+                  "localId" : "3120",
                   "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "DateTime",
-                "localId" : "2505",
+                "localId" : "3106",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2506",
+                  "localId" : "3107",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "2507",
+                  "localId" : "3108",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "2508",
+                  "localId" : "3109",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2509",
+                  "localId" : "3110",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "2510",
+                  "localId" : "3111",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -231736,142 +264308,41 @@ module.exports['DateTimeIntervalExpand'] = {
               },
               "high" : {
                 "type" : "DateTime",
-                "localId" : "2511",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2512",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2513",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2514",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "2515",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2516",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
-                }
-              }
-            }, {
-              "type" : "Interval",
-              "localId" : "2532",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "2533",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2534",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
-                  "annotation" : [ ]
-                }
-              },
-              "low" : {
-                "type" : "DateTime",
-                "localId" : "2520",
+                "localId" : "3112",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "year" : {
                   "type" : "Literal",
-                  "localId" : "2521",
+                  "localId" : "3113",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2018",
                   "annotation" : [ ]
                 },
                 "month" : {
                   "type" : "Literal",
-                  "localId" : "2522",
+                  "localId" : "3114",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "day" : {
                   "type" : "Literal",
-                  "localId" : "2523",
+                  "localId" : "3115",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "4",
                   "annotation" : [ ]
                 },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2524",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2525",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "DateTime",
-                "localId" : "2526",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2527",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2528",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2529",
+                  "localId" : "3116",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "2530",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "5",
-                  "annotation" : [ ]
-                },
                 "timezoneOffset" : {
                   "type" : "Literal",
-                  "localId" : "2531",
+                  "localId" : "3117",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
                   "value" : "0.0",
                   "annotation" : [ ]
@@ -231880,3605 +264351,3283 @@ module.exports['DateTimeIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2539",
-            "value" : 1.0,
-            "unit" : "hour",
+            "localId" : "3125",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* TimeIntervalExpand
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define MsPrecPerHour: expand { Interval[@T01:00:00.000, @T03:00:00.000] } per hour
+define MsPrecPerMinute: expand { Interval[@T01:00:00.000, @T01:02:00.000] } per minute
+define MsPrecPerSecond: expand { Interval[@T01:00:00.000, @T01:00:02.000] } per second
+define MsPrecPerMillisecond: expand { Interval[@T01:00:00.000, @T01:00:00.001] } per millisecond
+
+define SecPrecPerHour: expand { Interval[@T01:00:00, @T03:00:00] } per hour
+define SecPrecPerMinute: expand { Interval[@T01:00:00, @T01:02:00] } per minute
+define SecPrecPerSecond: expand { Interval[@T01:00:00, @T01:00:01] } per second
+define SecPrecPerMillisecond: expand { Interval[@T01:00:00, @T01:00:00] } per millisecond
+
+define MinPrecPerHour: expand { Interval[@T01:00, @T03:00] } per hour
+define MinPrecPerMinute: expand { Interval[@T01:00, @T01:01] } per minute
+define MinPrecPerSecond: expand { Interval[@T01:00, @T01:00] } per second
+define MinPrecPerMillisecond: expand { Interval[@T01:00, @T01:00] } per millisecond
+define MinPrecPerMinuteEmpty: expand { Interval[@T10, @T10] } per minute
+
+define HourPrecPerHour: expand { Interval[@T01, @T02] } per hour
+define HourPrecPerMinute: expand { Interval[@T01, @T01] } per minute
+define HourPrecPerSecond: expand { Interval[@T01, @T01] } per second
+define HourPrecPerMillisecond: expand { Interval[@T01, @T01] } per millisecond
+*/
+
+module.exports['TimeIntervalExpand'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "694",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
       }, {
-        "localId" : "2553",
-        "name" : "NoPerDefaultMS",
+        "localId" : "214",
+        "name" : "MsPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2553",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultMS", ": " ]
+              "value" : [ "", "define ", "MsPrecPerHour", ": " ]
             }, {
-              "r" : "2580",
+              "r" : "234",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2554",
+                "r" : "215",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2573",
+                  "r" : "226",
                   "s" : [ {
-                    "r" : "2555",
-                    "value" : [ "Interval[", "@2018-01-01T01:00:00.000+00:00", ", ", "@2018-01-01T01:00:00.001+00:00", "]" ]
+                    "r" : "216",
+                    "value" : [ "Interval[", "@T01:00:00.000", ", ", "@T03:00:00.000", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2588",
+          "localId" : "242",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2589",
+            "localId" : "243",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2590",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "244",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2580",
+          "localId" : "234",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2585",
+            "localId" : "239",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2586",
+              "localId" : "240",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2587",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "241",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2581",
+            "localId" : "235",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2582",
+              "localId" : "236",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2583",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "237",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2584",
+            "localId" : "238",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2554",
+            "localId" : "215",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2576",
+              "localId" : "229",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2577",
+                "localId" : "230",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2578",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "231",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2573",
+              "localId" : "226",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2574",
+                "localId" : "227",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2575",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "228",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2555",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "216",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2556",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2557",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2558",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2559",
+                  "localId" : "217",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "2560",
+                  "localId" : "218",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "second" : {
                   "type" : "Literal",
-                  "localId" : "2561",
+                  "localId" : "219",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "2562",
+                  "localId" : "220",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2563",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2564",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "221",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2565",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2566",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2567",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2568",
+                  "localId" : "222",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "3",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "2569",
+                  "localId" : "223",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "second" : {
                   "type" : "Literal",
-                  "localId" : "2570",
+                  "localId" : "224",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "2571",
+                  "localId" : "225",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2572",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "2579",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "233",
+            "value" : 1.0,
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2593",
-        "name" : "NoPerDefaultSec",
+        "localId" : "247",
+        "name" : "MsPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2593",
+            "r" : "247",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultSec", ": " ]
+              "value" : [ "", "define ", "MsPrecPerMinute", ": " ]
             }, {
-              "r" : "2618",
+              "r" : "267",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2594",
+                "r" : "248",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2611",
+                  "r" : "259",
                   "s" : [ {
-                    "r" : "2595",
-                    "value" : [ "Interval[", "@2018-01-01T01:00:00+00:00", ", ", "@2018-01-01T01:00:01+00:00", "]" ]
+                    "r" : "249",
+                    "value" : [ "Interval[", "@T01:00:00.000", ", ", "@T01:02:00.000", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2626",
+          "localId" : "275",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2627",
+            "localId" : "276",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2628",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "277",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2618",
+          "localId" : "267",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2623",
+            "localId" : "272",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2624",
+              "localId" : "273",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2625",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "274",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2619",
+            "localId" : "268",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2620",
+              "localId" : "269",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2621",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "270",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2622",
+            "localId" : "271",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2594",
+            "localId" : "248",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2614",
+              "localId" : "262",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2615",
+                "localId" : "263",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2616",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "264",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2611",
+              "localId" : "259",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2612",
+                "localId" : "260",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2613",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "261",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2595",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "249",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2596",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2597",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2598",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2599",
+                  "localId" : "250",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "2600",
+                  "localId" : "251",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
                 "second" : {
                   "type" : "Literal",
-                  "localId" : "2601",
+                  "localId" : "252",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
                 },
-                "timezoneOffset" : {
+                "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "2602",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "localId" : "253",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2603",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "254",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2604",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2605",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2606",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2607",
+                  "localId" : "255",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "2608",
+                  "localId" : "256",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                  "value" : "2",
                   "annotation" : [ ]
                 },
                 "second" : {
                   "type" : "Literal",
-                  "localId" : "2609",
+                  "localId" : "257",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "timezoneOffset" : {
+                "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "2610",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "localId" : "258",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "2617",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "266",
+            "value" : 1.0,
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2631",
-        "name" : "NoPerDefaultMin",
+        "localId" : "280",
+        "name" : "MsPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2631",
+            "r" : "280",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultMin", ": " ]
+              "value" : [ "", "define ", "MsPrecPerSecond", ": " ]
             }, {
-              "r" : "2654",
+              "r" : "300",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2632",
+                "r" : "281",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2647",
+                  "r" : "292",
                   "s" : [ {
-                    "r" : "2633",
-                    "value" : [ "Interval[", "@2018-01-01T01:00+00:00", ", ", "@2018-01-01T01:01+00:00", "]" ]
+                    "r" : "282",
+                    "value" : [ "Interval[", "@T01:00:00.000", ", ", "@T01:00:02.000", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2662",
+          "localId" : "308",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2663",
+            "localId" : "309",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2664",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "310",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2654",
+          "localId" : "300",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2659",
+            "localId" : "305",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2660",
+              "localId" : "306",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2661",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "307",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2655",
+            "localId" : "301",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2656",
+              "localId" : "302",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2657",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "303",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2658",
+            "localId" : "304",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2632",
+            "localId" : "281",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2650",
+              "localId" : "295",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2651",
+                "localId" : "296",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2652",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "297",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2647",
+              "localId" : "292",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2648",
+                "localId" : "293",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2649",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "294",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2633",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "282",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2634",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "2635",
+                  "localId" : "283",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "day" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2636",
+                  "localId" : "284",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "hour" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "2637",
+                  "localId" : "285",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "minute" : {
+                "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "2638",
+                  "localId" : "286",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2639",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2640",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "287",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2641",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "2642",
+                  "localId" : "288",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "day" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2643",
+                  "localId" : "289",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "hour" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "2644",
+                  "localId" : "290",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "2",
                   "annotation" : [ ]
                 },
-                "minute" : {
+                "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "2645",
+                  "localId" : "291",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2646",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "2653",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "299",
+            "value" : 1.0,
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2667",
-        "name" : "NoPerDefaultHour",
+        "localId" : "313",
+        "name" : "MsPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2667",
+            "r" : "313",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultHour", ": " ]
+              "value" : [ "", "define ", "MsPrecPerMillisecond", ": " ]
             }, {
-              "r" : "2688",
+              "r" : "333",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2668",
+                "r" : "314",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2681",
+                  "r" : "325",
                   "s" : [ {
-                    "r" : "2669",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-01T01+00:00", "]" ]
+                    "r" : "315",
+                    "value" : [ "Interval[", "@T01:00:00.000", ", ", "@T01:00:00.001", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2696",
+          "localId" : "341",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2697",
+            "localId" : "342",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2698",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "343",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2688",
+          "localId" : "333",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2693",
+            "localId" : "338",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2694",
+              "localId" : "339",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2695",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "340",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2689",
+            "localId" : "334",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2690",
+              "localId" : "335",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2691",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "336",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2692",
+            "localId" : "337",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2668",
+            "localId" : "314",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2684",
+              "localId" : "328",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2685",
+                "localId" : "329",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2686",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "330",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2681",
+              "localId" : "325",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2682",
+                "localId" : "326",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2683",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "327",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2669",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "315",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2670",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "2671",
+                  "localId" : "316",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "day" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2672",
+                  "localId" : "317",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "hour" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "2673",
+                  "localId" : "318",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "timezoneOffset" : {
+                "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "2674",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "localId" : "319",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2675",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "320",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "2676",
+                  "localId" : "321",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
-                "month" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2677",
+                  "localId" : "322",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "day" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "2678",
+                  "localId" : "323",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "hour" : {
+                "millisecond" : {
                   "type" : "Literal",
-                  "localId" : "2679",
+                  "localId" : "324",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2680",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "2687",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "332",
+            "value" : 1.0,
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2701",
-        "name" : "NoPerDefaultDay",
+        "localId" : "346",
+        "name" : "SecPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2701",
+            "r" : "346",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultDay", ": " ]
+              "value" : [ "", "define ", "SecPrecPerHour", ": " ]
             }, {
-              "r" : "2734",
+              "r" : "364",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2702",
+                "r" : "347",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2727",
+                  "r" : "356",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2711",
-                    "s" : [ {
-                      "r" : "2703",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2723",
-                    "s" : [ {
-                      "r" : "2715",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "348",
+                    "value" : [ "Interval[", "@T01:00:00", ", ", "@T03:00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2742",
+          "localId" : "372",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2743",
+            "localId" : "373",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2744",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "374",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2734",
+          "localId" : "364",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2739",
+            "localId" : "369",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2740",
+              "localId" : "370",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2741",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "371",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2735",
+            "localId" : "365",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2736",
+              "localId" : "366",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2737",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "367",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2738",
+            "localId" : "368",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2702",
+            "localId" : "347",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2730",
+              "localId" : "359",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2731",
+                "localId" : "360",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2732",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "361",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2727",
+              "localId" : "356",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2728",
+                "localId" : "357",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2729",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "358",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2711",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "348",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2712",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2713",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2714",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
+                "signature" : [ ],
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "2703",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "349",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
-                "month" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2704",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "350",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "day" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "2705",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "351",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2723",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "352",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2724",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2725",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2726",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                } ],
-                "year" : {
+                "signature" : [ ],
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "2715",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "353",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "3",
                   "annotation" : [ ]
                 },
-                "month" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2716",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "354",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "day" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "2717",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "355",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "2733",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "363",
+            "value" : 1.0,
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2747",
-        "name" : "NoPerDefaultMonth",
+        "localId" : "377",
+        "name" : "SecPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2747",
+            "r" : "377",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultMonth", ": " ]
+              "value" : [ "", "define ", "SecPrecPerMinute", ": " ]
             }, {
-              "r" : "2774",
+              "r" : "395",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2748",
+                "r" : "378",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2767",
+                  "r" : "387",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2755",
-                    "s" : [ {
-                      "r" : "2749",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2764",
-                    "s" : [ {
-                      "r" : "2758",
-                      "value" : [ "DateTime", "(", "2018", ",", "01", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "379",
+                    "value" : [ "Interval[", "@T01:00:00", ", ", "@T01:02:00", "]" ]
                   } ]
                 }, {
-                  "value" : [ "  }" ]
+                  "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2782",
+          "localId" : "403",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2783",
+            "localId" : "404",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2784",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "405",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2774",
+          "localId" : "395",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2779",
+            "localId" : "400",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2780",
+              "localId" : "401",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2781",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "402",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2775",
+            "localId" : "396",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2776",
+              "localId" : "397",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2777",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "398",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2778",
+            "localId" : "399",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2748",
+            "localId" : "378",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2770",
+              "localId" : "390",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2771",
+                "localId" : "391",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2772",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "392",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2767",
+              "localId" : "387",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2768",
+                "localId" : "388",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2769",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "389",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2755",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "379",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2756",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2757",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "signature" : [ ],
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "380",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
                   "annotation" : [ ]
-                } ],
-                "year" : {
+                },
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2749",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "381",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "month" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "2750",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "382",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2764",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "383",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2765",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }, {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2766",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "signature" : [ ],
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "384",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
                   "annotation" : [ ]
-                } ],
-                "year" : {
+                },
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2758",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "385",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "2",
                   "annotation" : [ ]
                 },
-                "month" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "2759",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "386",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "01",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "2773",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "394",
+            "value" : 1.0,
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2787",
-        "name" : "NoPerDefaultYear",
+        "localId" : "408",
+        "name" : "SecPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2787",
+            "r" : "408",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultYear", ": " ]
+              "value" : [ "", "define ", "SecPrecPerSecond", ": " ]
             }, {
-              "r" : "2808",
+              "r" : "426",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2788",
+                "r" : "409",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2801",
+                  "r" : "418",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "2793",
-                    "s" : [ {
-                      "r" : "2789",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "2799",
-                    "s" : [ {
-                      "r" : "2795",
-                      "value" : [ "DateTime", "(", "2018", ")" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "410",
+                    "value" : [ "Interval[", "@T01:00:00", ", ", "@T01:00:01", "]" ]
                   } ]
                 }, {
-                  "value" : [ "  }" ]
+                  "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2816",
+          "localId" : "434",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2817",
+            "localId" : "435",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2818",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "436",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2808",
+          "localId" : "426",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2813",
+            "localId" : "431",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2814",
+              "localId" : "432",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2815",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "433",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2809",
+            "localId" : "427",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2810",
+              "localId" : "428",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2811",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "429",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2812",
+            "localId" : "430",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2788",
+            "localId" : "409",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2804",
+              "localId" : "421",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2805",
+                "localId" : "422",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2806",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "423",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2801",
+              "localId" : "418",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2802",
+                "localId" : "419",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2803",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "420",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2793",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "410",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2794",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "signature" : [ ],
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "411",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
                   "annotation" : [ ]
-                } ],
-                "year" : {
+                },
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2789",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "412",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "413",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2799",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "414",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
-                "signature" : [ {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "2800",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "signature" : [ ],
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "415",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
                   "annotation" : [ ]
-                } ],
-                "year" : {
+                },
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2795",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "localId" : "416",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
+                  "value" : "0",
+                  "annotation" : [ ]
+                },
+                "second" : {
+                  "type" : "Literal",
+                  "localId" : "417",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "2807",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "type" : "Quantity",
+            "localId" : "425",
+            "value" : 1.0,
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2821",
-        "name" : "OpenStart",
+        "localId" : "439",
+        "name" : "SecPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2821",
+            "r" : "439",
             "s" : [ {
-              "value" : [ "", "define ", "OpenStart", ": " ]
+              "value" : [ "", "define ", "SecPrecPerMillisecond", ": " ]
             }, {
-              "r" : "2843",
+              "r" : "457",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2822",
+                "r" : "440",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2835",
+                  "r" : "449",
                   "s" : [ {
-                    "r" : "2823",
-                    "value" : [ "Interval(", "@2018-01-01T01+00:00", ", ", "@2018-01-03T01+00:00", "]" ]
+                    "r" : "441",
+                    "value" : [ "Interval[", "@T01:00:00", ", ", "@T01:00:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2851",
+          "localId" : "465",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2852",
+            "localId" : "466",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2853",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "467",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2843",
+          "localId" : "457",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2848",
+            "localId" : "462",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2849",
+              "localId" : "463",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2850",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "464",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2844",
+            "localId" : "458",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2845",
+              "localId" : "459",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2846",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "460",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2847",
+            "localId" : "461",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2822",
+            "localId" : "440",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2838",
+              "localId" : "452",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2839",
+                "localId" : "453",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2840",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "454",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2835",
-              "lowClosed" : false,
+              "localId" : "449",
+              "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2836",
+                "localId" : "450",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2837",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "451",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2823",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "441",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2824",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "2825",
+                  "localId" : "442",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "day" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2826",
+                  "localId" : "443",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "hour" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "2827",
+                  "localId" : "444",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2828",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2829",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "445",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2830",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "2831",
+                  "localId" : "446",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "day" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2832",
+                  "localId" : "447",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "0",
                   "annotation" : [ ]
                 },
-                "hour" : {
+                "second" : {
                   "type" : "Literal",
-                  "localId" : "2833",
+                  "localId" : "448",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2834",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2842",
+            "localId" : "456",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2856",
-        "name" : "OpenEnd",
+        "localId" : "470",
+        "name" : "MinPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2856",
+            "r" : "470",
             "s" : [ {
-              "value" : [ "", "define ", "OpenEnd", ": " ]
+              "value" : [ "", "define ", "MinPrecPerHour", ": " ]
             }, {
-              "r" : "2878",
+              "r" : "486",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2857",
+                "r" : "471",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2870",
+                  "r" : "478",
                   "s" : [ {
-                    "r" : "2858",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-03T01+00:00", ")" ]
+                    "r" : "472",
+                    "value" : [ "Interval[", "@T01:00", ", ", "@T03:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2886",
+          "localId" : "494",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2887",
+            "localId" : "495",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2888",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "496",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2878",
+          "localId" : "486",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2883",
+            "localId" : "491",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2884",
+              "localId" : "492",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2885",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "493",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2879",
+            "localId" : "487",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2880",
+              "localId" : "488",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2881",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "489",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2882",
+            "localId" : "490",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2857",
+            "localId" : "471",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2873",
+              "localId" : "481",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2874",
+                "localId" : "482",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2875",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "483",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2870",
+              "localId" : "478",
               "lowClosed" : true,
-              "highClosed" : false,
+              "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2871",
+                "localId" : "479",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2872",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "480",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2858",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "472",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2859",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2860",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2861",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2862",
+                  "localId" : "473",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "timezoneOffset" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2863",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "localId" : "474",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2864",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "475",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2865",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2866",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "2867",
+                  "localId" : "476",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
                   "annotation" : [ ]
                 },
-                "hour" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2868",
+                  "localId" : "477",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2869",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2877",
+            "localId" : "485",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2891",
-        "name" : "OpenBoth",
+        "localId" : "499",
+        "name" : "MinPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2891",
+            "r" : "499",
             "s" : [ {
-              "value" : [ "", "define ", "OpenBoth", ": " ]
+              "value" : [ "", "define ", "MinPrecPerMinute", ": " ]
             }, {
-              "r" : "2913",
+              "r" : "515",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2892",
+                "r" : "500",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2905",
+                  "r" : "507",
                   "s" : [ {
-                    "r" : "2893",
-                    "value" : [ "Interval(", "@2018-01-01T01+00:00", ", ", "@2018-01-03T01+00:00", ")" ]
+                    "r" : "501",
+                    "value" : [ "Interval[", "@T01:00", ", ", "@T01:01", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2921",
+          "localId" : "523",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2922",
+            "localId" : "524",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2923",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "525",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2913",
+          "localId" : "515",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2918",
+            "localId" : "520",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2919",
+              "localId" : "521",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2920",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "522",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2914",
+            "localId" : "516",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2915",
+              "localId" : "517",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2916",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "518",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2917",
+            "localId" : "519",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2892",
+            "localId" : "500",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2908",
+              "localId" : "510",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2909",
+                "localId" : "511",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2910",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "512",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2905",
-              "lowClosed" : false,
-              "highClosed" : false,
+              "localId" : "507",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2906",
+                "localId" : "508",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2907",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "509",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2893",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "501",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2894",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2895",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2896",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2897",
+                  "localId" : "502",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "timezoneOffset" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2898",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "localId" : "503",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2899",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "504",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2900",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
+                "hour" : {
                   "type" : "Literal",
-                  "localId" : "2901",
+                  "localId" : "505",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2902",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
-                "hour" : {
+                "minute" : {
                   "type" : "Literal",
-                  "localId" : "2903",
+                  "localId" : "506",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2904",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2912",
+            "localId" : "514",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2926",
-        "name" : "MismatchPrecision",
+        "localId" : "528",
+        "name" : "MinPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2926",
+            "r" : "528",
             "s" : [ {
-              "value" : [ "", "define ", "MismatchPrecision", ": " ]
+              "value" : [ "", "define ", "MinPrecPerSecond", ": " ]
             }, {
-              "r" : "2951",
+              "r" : "544",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2927",
+                "r" : "529",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2943",
+                  "r" : "536",
                   "s" : [ {
-                    "r" : "2928",
-                    "value" : [ "Interval[", "@2012-01-01T12:00+00:00", ", ", "@2012-01-02T12:00:00+00:00", "]" ]
+                    "r" : "530",
+                    "value" : [ "Interval[", "@T01:00", ", ", "@T01:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2959",
+          "localId" : "552",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2960",
+            "localId" : "553",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2961",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "554",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2951",
+          "localId" : "544",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2956",
+            "localId" : "549",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2957",
+              "localId" : "550",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2958",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "551",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2952",
+            "localId" : "545",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2953",
+              "localId" : "546",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2954",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "547",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2955",
+            "localId" : "548",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2927",
+            "localId" : "529",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2946",
+              "localId" : "539",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2947",
+                "localId" : "540",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2948",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "541",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2943",
+              "localId" : "536",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2944",
+                "localId" : "537",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2945",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "538",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2928",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "530",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2929",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2930",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2931",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2932",
+                  "localId" : "531",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "12",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "2933",
+                  "localId" : "532",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2934",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2935",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "533",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2936",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2937",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2938",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2939",
+                  "localId" : "534",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "12",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "2940",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "2941",
+                  "localId" : "535",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2942",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2950",
+            "localId" : "543",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "2964",
-        "name" : "MismatchPrecisionResultLongerThanInput",
+        "localId" : "557",
+        "name" : "MinPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2964",
+            "r" : "557",
             "s" : [ {
-              "value" : [ "", "define ", "MismatchPrecisionResultLongerThanInput", ": " ]
+              "value" : [ "", "define ", "MinPrecPerMillisecond", ": " ]
             }, {
-              "r" : "2989",
+              "r" : "573",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "2965",
+                "r" : "558",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "2981",
+                  "r" : "565",
                   "s" : [ {
-                    "r" : "2966",
-                    "value" : [ "Interval[", "@2012-01-01T13:00:00+00:00", ", ", "@2012-01-02T12:59+00:00", "]" ]
+                    "r" : "559",
+                    "value" : [ "Interval[", "@T01:00", ", ", "@T01:00", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "2997",
+          "localId" : "581",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2998",
+            "localId" : "582",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2999",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "583",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "2989",
+          "localId" : "573",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "2994",
+            "localId" : "578",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2995",
+              "localId" : "579",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2996",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "580",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "2990",
+            "localId" : "574",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2991",
+              "localId" : "575",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2992",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "576",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "2993",
+            "localId" : "577",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "2965",
+            "localId" : "558",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "2984",
+              "localId" : "568",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2985",
+                "localId" : "569",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2986",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "570",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "2981",
+              "localId" : "565",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "2982",
+                "localId" : "566",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "2983",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "567",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "2966",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "559",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2967",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2968",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2969",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2970",
+                  "localId" : "560",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "13",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "2971",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "2972",
+                  "localId" : "561",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "0",
                   "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2973",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "2974",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "562",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "2975",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2012",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "2976",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "2977",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "2978",
+                  "localId" : "563",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "12",
+                  "value" : "1",
                   "annotation" : [ ]
                 },
                 "minute" : {
                   "type" : "Literal",
-                  "localId" : "2979",
+                  "localId" : "564",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "59",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "2980",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "0",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "2988",
+            "localId" : "572",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "3002",
-        "name" : "EmptyList",
+        "localId" : "586",
+        "name" : "MinPrecPerMinuteEmpty",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "3002",
+            "r" : "586",
             "s" : [ {
-              "value" : [ "", "define ", "EmptyList", ": " ]
+              "value" : [ "", "define ", "MinPrecPerMinuteEmpty", ": " ]
             }, {
-              "r" : "3007",
+              "r" : "600",
               "s" : [ {
-                "value" : [ "List<" ]
+                "value" : [ "expand " ]
               }, {
-                "r" : "3003",
+                "r" : "587",
                 "s" : [ {
-                  "value" : [ "Interval<" ]
+                  "value" : [ "{ " ]
                 }, {
-                  "r" : "3004",
+                  "r" : "592",
                   "s" : [ {
-                    "value" : [ "Date" ]
+                    "r" : "588",
+                    "value" : [ "Interval[", "@T10", ", ", "@T10", "]" ]
                   } ]
                 }, {
-                  "value" : [ ">" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ ">{}" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "3012",
+          "localId" : "608",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "3013",
+            "localId" : "609",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "3014",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "610",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
-          "type" : "List",
-          "localId" : "3007",
+          "type" : "Expand",
+          "localId" : "600",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "3009",
+            "localId" : "605",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "3010",
+              "localId" : "606",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "3011",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "607",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
-          "element" : [ ]
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "601",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "602",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "603",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "604",
+            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "587",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "595",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "596",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "597",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "annotation" : [ ]
+                }
+              }
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "592",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "593",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "594",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Time",
+                "localId" : "588",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "589",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "10",
+                  "annotation" : [ ]
+                }
+              },
+              "high" : {
+                "type" : "Time",
+                "localId" : "590",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "591",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "10",
+                  "annotation" : [ ]
+                }
+              }
+            } ]
+          }, {
+            "type" : "Quantity",
+            "localId" : "599",
+            "value" : 1.0,
+            "unit" : "minute",
+            "annotation" : [ ]
+          } ]
         }
       }, {
-        "localId" : "3017",
-        "name" : "NullOpen",
+        "localId" : "613",
+        "name" : "HourPrecPerHour",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "3017",
+            "r" : "613",
             "s" : [ {
-              "value" : [ "", "define ", "NullOpen", ": " ]
+              "value" : [ "", "define ", "HourPrecPerHour", ": " ]
             }, {
-              "r" : "3035",
+              "r" : "627",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "3018",
+                "r" : "614",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "3026",
+                  "r" : "619",
                   "s" : [ {
-                    "r" : "3019",
-                    "value" : [ "Interval[", "null", ", ", "@2018-01-03T01+00:00", "]" ]
+                    "r" : "615",
+                    "value" : [ "Interval[", "@T01", ", ", "@T02", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "hour" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "3043",
+          "localId" : "635",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "3044",
+            "localId" : "636",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "3045",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "637",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "3035",
+          "localId" : "627",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "3040",
+            "localId" : "632",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "3041",
+              "localId" : "633",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "3042",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "634",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "3036",
+            "localId" : "628",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "3037",
+              "localId" : "629",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "3038",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "630",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "3039",
+            "localId" : "631",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "3018",
+            "localId" : "614",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "3030",
+              "localId" : "622",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "3031",
+                "localId" : "623",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "3032",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "624",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "3026",
+              "localId" : "619",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "3028",
+                "localId" : "620",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "3029",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "621",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "As",
-                "localId" : "3027",
-                "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "615",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "operand" : {
-                  "type" : "Null",
-                  "localId" : "3019",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "616",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "3020",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "617",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "3021",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "3022",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "3023",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "3024",
+                  "localId" : "618",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "3025",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
+                  "value" : "2",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "3034",
+            "localId" : "626",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "hour",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "3048",
-        "name" : "NullClose",
+        "localId" : "640",
+        "name" : "HourPrecPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "3048",
+            "r" : "640",
             "s" : [ {
-              "value" : [ "", "define ", "NullClose", ": " ]
+              "value" : [ "", "define ", "HourPrecPerMinute", ": " ]
             }, {
-              "r" : "3066",
+              "r" : "654",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "3049",
+                "r" : "641",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "3057",
+                  "r" : "646",
                   "s" : [ {
-                    "r" : "3050",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "null", "]" ]
+                    "r" : "642",
+                    "value" : [ "Interval[", "@T01", ", ", "@T01", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "minute" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "3074",
+          "localId" : "662",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "3075",
+            "localId" : "663",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "3076",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "664",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "3066",
+          "localId" : "654",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "3071",
+            "localId" : "659",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "3072",
+              "localId" : "660",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "3073",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "661",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "3067",
+            "localId" : "655",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "3068",
+              "localId" : "656",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "3069",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "657",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "3070",
+            "localId" : "658",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "3049",
+            "localId" : "641",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "3061",
+              "localId" : "649",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "3062",
+                "localId" : "650",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "3063",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "651",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "3057",
+              "localId" : "646",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "3059",
+                "localId" : "647",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "3060",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "648",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "3050",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "642",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "3051",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "3052",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "3053",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "3054",
+                  "localId" : "643",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "3055",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "As",
-                "localId" : "3058",
-                "asType" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "644",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "operand" : {
-                  "type" : "Null",
-                  "localId" : "3056",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "645",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "3065",
+            "localId" : "653",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "3079",
-        "name" : "NullBoth",
+        "localId" : "667",
+        "name" : "HourPrecPerSecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "3079",
+            "r" : "667",
             "s" : [ {
-              "value" : [ "", "define ", "NullBoth", ": " ]
+              "value" : [ "", "define ", "HourPrecPerSecond", ": " ]
             }, {
-              "r" : "3091",
+              "r" : "681",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "3080",
+                "r" : "668",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "3083",
+                  "r" : "673",
                   "s" : [ {
-                    "r" : "3081",
-                    "value" : [ "Interval[", "null", ", ", "null", "]" ]
+                    "r" : "669",
+                    "value" : [ "Interval[", "@T01", ", ", "@T01", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "day" ]
+                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "3099",
+          "localId" : "689",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "3100",
+            "localId" : "690",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "3101",
-              "name" : "{urn:hl7-org:elm-types:r1}Any",
+              "localId" : "691",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "3091",
+          "localId" : "681",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "3096",
+            "localId" : "686",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "3097",
+              "localId" : "687",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "3098",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "688",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "3092",
+            "localId" : "682",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "3093",
+              "localId" : "683",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "3094",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "684",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "3095",
+            "localId" : "685",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "3080",
+            "localId" : "668",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "3086",
+              "localId" : "676",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "3087",
+                "localId" : "677",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "3088",
-                  "name" : "{urn:hl7-org:elm-types:r1}Any",
+                  "localId" : "678",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "3083",
+              "localId" : "673",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "3084",
+                "localId" : "674",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "3085",
-                  "name" : "{urn:hl7-org:elm-types:r1}Any",
+                  "localId" : "675",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Null",
-                "localId" : "3081",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+                "type" : "Time",
+                "localId" : "669",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "670",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
               },
               "high" : {
-                "type" : "Null",
-                "localId" : "3082",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
+                "type" : "Time",
+                "localId" : "671",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "hour" : {
+                  "type" : "Literal",
+                  "localId" : "672",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "3090",
+            "localId" : "680",
             "value" : 1.0,
-            "unit" : "day",
+            "unit" : "second",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "3104",
-        "name" : "BadPerGram",
+        "localId" : "694",
+        "name" : "HourPrecPerMillisecond",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "3104",
+            "r" : "694",
             "s" : [ {
-              "value" : [ "", "define ", "BadPerGram", ": " ]
+              "value" : [ "", "define ", "HourPrecPerMillisecond", ": " ]
             }, {
-              "r" : "3126",
+              "r" : "708",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "3105",
+                "r" : "695",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "3118",
+                  "r" : "700",
                   "s" : [ {
-                    "r" : "3106",
-                    "value" : [ "Interval[", "@2018-01-01T01+00:00", ", ", "@2018-01-04T01+00:00", "]" ]
+                    "r" : "696",
+                    "value" : [ "Interval[", "@T01", ", ", "@T01", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per " ]
-              }, {
-                "r" : "3125",
-                "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
-                } ]
+                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "3134",
+          "localId" : "716",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "3135",
+            "localId" : "717",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "3136",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "718",
+              "name" : "{urn:hl7-org:elm-types:r1}Time",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "3126",
+          "localId" : "708",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "3131",
+            "localId" : "713",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "3132",
+              "localId" : "714",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "3133",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "715",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "3127",
+            "localId" : "709",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "3128",
+              "localId" : "710",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "3129",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "711",
+                "name" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "3130",
+            "localId" : "712",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "3105",
+            "localId" : "695",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "3121",
+              "localId" : "703",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "3122",
+                "localId" : "704",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "3123",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "705",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "3118",
+              "localId" : "700",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "3119",
+                "localId" : "701",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "3120",
-                  "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                  "localId" : "702",
+                  "name" : "{urn:hl7-org:elm-types:r1}Time",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "DateTime",
-                "localId" : "3106",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "696",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "3107",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "3108",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "3109",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "3110",
+                  "localId" : "697",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "3111",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "DateTime",
-                "localId" : "3112",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "type" : "Time",
+                "localId" : "698",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
                 "annotation" : [ ],
                 "signature" : [ ],
-                "year" : {
-                  "type" : "Literal",
-                  "localId" : "3113",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2018",
-                  "annotation" : [ ]
-                },
-                "month" : {
-                  "type" : "Literal",
-                  "localId" : "3114",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "day" : {
-                  "type" : "Literal",
-                  "localId" : "3115",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "4",
-                  "annotation" : [ ]
-                },
                 "hour" : {
                   "type" : "Literal",
-                  "localId" : "3116",
+                  "localId" : "699",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
-                },
-                "timezoneOffset" : {
-                  "type" : "Literal",
-                  "localId" : "3117",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
-                  "value" : "0.0",
-                  "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "3125",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "g",
+            "localId" : "707",
+            "value" : 1.0,
+            "unit" : "millisecond",
             "annotation" : [ ]
           } ]
         }
@@ -235487,33 +267636,40 @@ module.exports['DateTimeIntervalExpand'] = {
   }
 }
 
-/* TimeIntervalExpand
+/* QuantityIntervalExpand
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define MsPrecPerHour: expand { Interval[@T01:00:00.000, @T03:00:00.000] } per hour
-define MsPrecPerMinute: expand { Interval[@T01:00:00.000, @T01:02:00.000] } per minute
-define MsPrecPerSecond: expand { Interval[@T01:00:00.000, @T01:00:02.000] } per second
-define MsPrecPerMillisecond: expand { Interval[@T01:00:00.000, @T01:00:00.001] } per millisecond
+define ClosedSingleGPerG: expand { Interval[2 'g', 4 'g'] } per 1 'g'
+define ClosedSingleGPerGDecimal: expand { Interval[2.1 'g', 4.1 'g'] } per 1 'g'
+define ClosedSingleGPerMG: expand { Interval[2 'g', 2.003 'g'] } per 1 'mg'
+define ClosedSingleMGPerGTrunc: expand { Interval[2999 'mg', 4200 'mg'] } per 1 'g'
+define ClosedSingleMGPerMGTrunc: expand { Interval[2000 'mg', 4500 'mg'] } per 800 'mg'
+define ClosedSingleMGPerMGDecimal: expand { Interval[2000.01 'mg', 4500 'mg'] } per 800 'mg'
 
-define SecPrecPerHour: expand { Interval[@T01:00:00, @T03:00:00] } per hour
-define SecPrecPerMinute: expand { Interval[@T01:00:00, @T01:02:00] } per minute
-define SecPrecPerSecond: expand { Interval[@T01:00:00, @T01:00:01] } per second
-define SecPrecPerMillisecond: expand { Interval[@T01:00:00, @T01:00:00] } per millisecond
+define NullInList: expand { Interval[2 'g', 4 'g'], null } per 1 'g'
+define Overlapping: expand { Interval[2 'g', 4 'g'], Interval[3 'g', 5 'g'] } per 1 'g'
+define NonOverlapping: expand { Interval[2 'g', 4 'g'], Interval[6 'g', 6 'g'] } per 1 'g'
 
-define MinPrecPerHour: expand { Interval[@T01:00, @T03:00] } per hour
-define MinPrecPerMinute: expand { Interval[@T01:00, @T01:01] } per minute
-define MinPrecPerSecond: expand { Interval[@T01:00, @T01:00] } per second
-define MinPrecPerMillisecond: expand { Interval[@T01:00, @T01:00] } per millisecond
-define MinPrecPerMinuteEmpty: expand { Interval[@T10, @T10] } per minute
+define NoPerDefaultM: expand { Interval[2 'm', 400 'cm'] }
+define NoPerDefaultG: expand { Interval[2 'g', 4 'g'] }
 
-define HourPrecPerHour: expand { Interval[@T01, @T02] } per hour
-define HourPrecPerMinute: expand { Interval[@T01, @T01] } per minute
-define HourPrecPerSecond: expand { Interval[@T01, @T01] } per second
-define HourPrecPerMillisecond: expand { Interval[@T01, @T01] } per millisecond
+define OpenStart: expand { Interval(2 'g', 4 'g'] } per 1 'g'
+define OpenEnd: expand { Interval[2 'g', 4 'g') } per 1 'g'
+define OpenBoth: expand { Interval(2 'g', 4 'g') } per 1 'g'
+define OpenBothDecimal: expand { Interval(2.1 'g', 4.1 'g') } per 1 'g'
+define OpenBothDecimalTrunc: expand { Interval(2.1 'g', 4.101 'g') } per 1 'g'
+
+define EmptyList: List<Interval<Date>>{}
+define PerTooBig: expand { Interval[2 'g', 4 'g'], null } per 5 'g'
+define NullOpen: expand { Interval[null, 4 'g'] } per 1 'g'
+define NullClose: expand { Interval[2 'g', null] } per 1 'g'
+define NullBoth: expand { Interval[null, null] } per 1 'g'
+define BadPerMinute: expand { Interval(2 'g', 4 'g'] } per 1 minute
+define BadPerGram: expand { Interval(2 'km', 4 'km'] }  per 1 'g'
 */
 
-module.exports['TimeIntervalExpand'] = {
+module.exports['QuantityIntervalExpand'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -235525,7 +267681,7 @@ module.exports['TimeIntervalExpand'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "694",
+        "r" : "772",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -235599,7 +267755,7 @@ module.exports['TimeIntervalExpand'] = {
         }
       }, {
         "localId" : "214",
-        "name" : "MsPrecPerHour",
+        "name" : "ClosedSingleGPerG",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -235608,9 +267764,9 @@ module.exports['TimeIntervalExpand'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerHour", ": " ]
+              "value" : [ "", "define ", "ClosedSingleGPerG", ": " ]
             }, {
-              "r" : "234",
+              "r" : "226",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
@@ -235618,74 +267774,92 @@ module.exports['TimeIntervalExpand'] = {
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "226",
+                  "r" : "218",
                   "s" : [ {
+                    "value" : [ "Interval[" ]
+                  }, {
                     "r" : "216",
-                    "value" : [ "Interval[", "@T01:00:00.000", ", ", "@T03:00:00.000", "]" ]
+                    "s" : [ {
+                      "value" : [ "2 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "217",
+                    "s" : [ {
+                      "value" : [ "4 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "225",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "242",
+          "localId" : "234",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "243",
+            "localId" : "235",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "244",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "236",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "234",
+          "localId" : "226",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "239",
+            "localId" : "231",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "240",
+              "localId" : "232",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "241",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "233",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "235",
+            "localId" : "227",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "236",
+              "localId" : "228",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "237",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "229",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "238",
+            "localId" : "230",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
@@ -235695,3221 +267869,2876 @@ module.exports['TimeIntervalExpand'] = {
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "229",
+              "localId" : "221",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "230",
+                "localId" : "222",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "231",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "223",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "226",
+              "localId" : "218",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "227",
+                "localId" : "219",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "228",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "220",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
+                "type" : "Quantity",
                 "localId" : "216",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "217",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "218",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "219",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "220",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "221",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "222",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "223",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "224",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "225",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "217",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "233",
-            "value" : 1.0,
-            "unit" : "hour",
+            "localId" : "225",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "247",
-        "name" : "MsPrecPerMinute",
+        "localId" : "239",
+        "name" : "ClosedSingleGPerGDecimal",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "247",
+            "r" : "239",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "ClosedSingleGPerGDecimal", ": " ]
             }, {
-              "r" : "267",
+              "r" : "251",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "248",
+                "r" : "240",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "259",
+                  "r" : "243",
                   "s" : [ {
-                    "r" : "249",
-                    "value" : [ "Interval[", "@T01:00:00.000", ", ", "@T01:02:00.000", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "241",
+                    "s" : [ {
+                      "value" : [ "2.1 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "242",
+                    "s" : [ {
+                      "value" : [ "4.1 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
-              } ]
-            } ]
-          }
-        } ],
-        "resultTypeSpecifier" : {
-          "type" : "ListTypeSpecifier",
-          "localId" : "275",
-          "annotation" : [ ],
-          "elementType" : {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "276",
-            "annotation" : [ ],
-            "pointType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "277",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
-              "annotation" : [ ]
-            }
-          }
-        },
-        "expression" : {
-          "type" : "Expand",
-          "localId" : "267",
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "ListTypeSpecifier",
-            "localId" : "272",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "273",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "274",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ]
-              }
-            }
-          },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "268",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "269",
-              "annotation" : [ ],
-              "pointType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "270",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ]
-              }
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "271",
-            "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "annotation" : [ ]
-          } ],
-          "operand" : [ {
-            "type" : "List",
-            "localId" : "248",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "262",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "263",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "264",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "Interval",
-              "localId" : "259",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "260",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "261",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              },
-              "low" : {
-                "type" : "Time",
-                "localId" : "249",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "250",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "251",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "252",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "253",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "Time",
-                "localId" : "254",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "255",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "256",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "257",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "258",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
-              }
-            } ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "266",
-            "value" : 1.0,
-            "unit" : "minute",
-            "annotation" : [ ]
-          } ]
-        }
-      }, {
-        "localId" : "280",
-        "name" : "MsPrecPerSecond",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "280",
-            "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerSecond", ": " ]
-            }, {
-              "r" : "300",
-              "s" : [ {
-                "value" : [ "expand " ]
+                "value" : [ " per " ]
               }, {
-                "r" : "281",
+                "r" : "250",
                 "s" : [ {
-                  "value" : [ "{ " ]
-                }, {
-                  "r" : "292",
-                  "s" : [ {
-                    "r" : "282",
-                    "value" : [ "Interval[", "@T01:00:00.000", ", ", "@T01:00:02.000", "]" ]
-                  } ]
-                }, {
-                  "value" : [ " }" ]
+                  "value" : [ "1 ", "'g'" ]
                 } ]
-              }, {
-                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "308",
+          "localId" : "259",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "309",
+            "localId" : "260",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "310",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "300",
+          "localId" : "251",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "305",
+            "localId" : "256",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "306",
+              "localId" : "257",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "307",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "258",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "301",
+            "localId" : "252",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "302",
+              "localId" : "253",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "303",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "254",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "304",
+            "localId" : "255",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "281",
+            "localId" : "240",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "295",
+              "localId" : "246",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "296",
+                "localId" : "247",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "297",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "248",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "292",
+              "localId" : "243",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "293",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "294",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
-                  "annotation" : [ ]
-                }
-              },
-              "low" : {
-                "type" : "Time",
-                "localId" : "282",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "283",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "284",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "285",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "286",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
-              },
-              "high" : {
-                "type" : "Time",
-                "localId" : "287",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "288",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "289",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "290",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "291",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                "localId" : "244",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "245",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
+              },
+              "low" : {
+                "type" : "Quantity",
+                "localId" : "241",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2.1,
+                "unit" : "g",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "242",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4.1,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "299",
-            "value" : 1.0,
-            "unit" : "second",
+            "localId" : "250",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "313",
-        "name" : "MsPrecPerMillisecond",
+        "localId" : "264",
+        "name" : "ClosedSingleGPerMG",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "313",
+            "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "MsPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "ClosedSingleGPerMG", ": " ]
             }, {
-              "r" : "333",
+              "r" : "276",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "314",
+                "r" : "265",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "325",
+                  "r" : "268",
                   "s" : [ {
-                    "r" : "315",
-                    "value" : [ "Interval[", "@T01:00:00.000", ", ", "@T01:00:00.001", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "266",
+                    "s" : [ {
+                      "value" : [ "2 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "267",
+                    "s" : [ {
+                      "value" : [ "2.003 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "millisecond" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "275",
+                "s" : [ {
+                  "value" : [ "1 ", "'mg'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "341",
+          "localId" : "284",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "342",
+            "localId" : "285",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "343",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "286",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "333",
+          "localId" : "276",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "338",
+            "localId" : "281",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "339",
+              "localId" : "282",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "340",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "283",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "334",
+            "localId" : "277",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "335",
+              "localId" : "278",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "336",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "279",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "337",
+            "localId" : "280",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "314",
+            "localId" : "265",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "328",
+              "localId" : "271",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "329",
+                "localId" : "272",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "330",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "273",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "325",
+              "localId" : "268",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "326",
+                "localId" : "269",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "327",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "270",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "315",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "316",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "317",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "318",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "319",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "266",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "320",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "321",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "322",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "323",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "millisecond" : {
-                  "type" : "Literal",
-                  "localId" : "324",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "267",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2.003,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "332",
-            "value" : 1.0,
-            "unit" : "millisecond",
+            "localId" : "275",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "mg",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "346",
-        "name" : "SecPrecPerHour",
+        "localId" : "289",
+        "name" : "ClosedSingleMGPerGTrunc",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "346",
+            "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerHour", ": " ]
+              "value" : [ "", "define ", "ClosedSingleMGPerGTrunc", ": " ]
             }, {
-              "r" : "364",
+              "r" : "301",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "347",
+                "r" : "290",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "356",
+                  "r" : "293",
                   "s" : [ {
-                    "r" : "348",
-                    "value" : [ "Interval[", "@T01:00:00", ", ", "@T03:00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "291",
+                    "s" : [ {
+                      "value" : [ "2999 ", "'mg'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "292",
+                    "s" : [ {
+                      "value" : [ "4200 ", "'mg'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "300",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "372",
+          "localId" : "309",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "373",
+            "localId" : "310",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "374",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "311",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "364",
+          "localId" : "301",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "369",
+            "localId" : "306",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "370",
+              "localId" : "307",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "371",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "308",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "365",
+            "localId" : "302",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "366",
+              "localId" : "303",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "367",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "304",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "368",
+            "localId" : "305",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "347",
+            "localId" : "290",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "359",
+              "localId" : "296",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "360",
+                "localId" : "297",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "361",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "298",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "356",
+              "localId" : "293",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "357",
+                "localId" : "294",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "358",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "295",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "348",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "349",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "350",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "351",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "291",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2999,
+                "unit" : "mg",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "352",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "353",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "354",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "355",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "292",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4200,
+                "unit" : "mg",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "363",
-            "value" : 1.0,
-            "unit" : "hour",
+            "localId" : "300",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "377",
-        "name" : "SecPrecPerMinute",
+        "localId" : "314",
+        "name" : "ClosedSingleMGPerMGTrunc",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "377",
+            "r" : "314",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "ClosedSingleMGPerMGTrunc", ": " ]
             }, {
-              "r" : "395",
+              "r" : "326",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "378",
+                "r" : "315",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "387",
+                  "r" : "318",
                   "s" : [ {
-                    "r" : "379",
-                    "value" : [ "Interval[", "@T01:00:00", ", ", "@T01:02:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "316",
+                    "s" : [ {
+                      "value" : [ "2000 ", "'mg'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "317",
+                    "s" : [ {
+                      "value" : [ "4500 ", "'mg'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "325",
+                "s" : [ {
+                  "value" : [ "800 ", "'mg'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "403",
+          "localId" : "334",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "404",
+            "localId" : "335",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "405",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "336",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "395",
+          "localId" : "326",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "400",
+            "localId" : "331",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "401",
+              "localId" : "332",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "402",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "333",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "396",
+            "localId" : "327",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "397",
+              "localId" : "328",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "398",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "329",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "399",
+            "localId" : "330",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "378",
+            "localId" : "315",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "390",
+              "localId" : "321",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "391",
+                "localId" : "322",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "392",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "323",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "387",
+              "localId" : "318",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "388",
+                "localId" : "319",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "389",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "320",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "379",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "380",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "381",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "382",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "316",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2000,
+                "unit" : "mg",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "383",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "384",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "385",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "386",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "317",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4500,
+                "unit" : "mg",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "394",
-            "value" : 1.0,
-            "unit" : "minute",
+            "localId" : "325",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 800,
+            "unit" : "mg",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "408",
-        "name" : "SecPrecPerSecond",
+        "localId" : "339",
+        "name" : "ClosedSingleMGPerMGDecimal",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "408",
+            "r" : "339",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerSecond", ": " ]
+              "value" : [ "", "define ", "ClosedSingleMGPerMGDecimal", ": " ]
             }, {
-              "r" : "426",
+              "r" : "351",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "409",
+                "r" : "340",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "418",
+                  "r" : "343",
                   "s" : [ {
-                    "r" : "410",
-                    "value" : [ "Interval[", "@T01:00:00", ", ", "@T01:00:01", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "341",
+                    "s" : [ {
+                      "value" : [ "2000.01 ", "'mg'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "342",
+                    "s" : [ {
+                      "value" : [ "4500 ", "'mg'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "second" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "350",
+                "s" : [ {
+                  "value" : [ "800 ", "'mg'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "434",
+          "localId" : "359",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "435",
+            "localId" : "360",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "436",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "361",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "426",
+          "localId" : "351",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "431",
+            "localId" : "356",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "432",
+              "localId" : "357",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "433",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "358",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "427",
+            "localId" : "352",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "428",
+              "localId" : "353",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "429",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "354",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "430",
+            "localId" : "355",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "409",
+            "localId" : "340",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "421",
+              "localId" : "346",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "422",
+                "localId" : "347",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "423",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "348",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "418",
+              "localId" : "343",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "419",
+                "localId" : "344",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "420",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "345",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "410",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "411",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "412",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "413",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "341",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2000.01,
+                "unit" : "mg",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "414",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "415",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "416",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "417",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "342",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4500,
+                "unit" : "mg",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "425",
-            "value" : 1.0,
-            "unit" : "second",
+            "localId" : "350",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 800,
+            "unit" : "mg",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "439",
-        "name" : "SecPrecPerMillisecond",
+        "localId" : "364",
+        "name" : "NullInList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "439",
+            "r" : "364",
             "s" : [ {
-              "value" : [ "", "define ", "SecPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "NullInList", ": " ]
             }, {
-              "r" : "457",
+              "r" : "380",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "440",
+                "r" : "365",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "449",
+                  "r" : "368",
                   "s" : [ {
-                    "r" : "441",
-                    "value" : [ "Interval[", "@T01:00:00", ", ", "@T01:00:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "366",
+                    "s" : [ {
+                      "value" : [ "2 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "367",
+                    "s" : [ {
+                      "value" : [ "4 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "r" : "371",
+                  "value" : [ ", ", "null", " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "millisecond" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "379",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "465",
+          "localId" : "388",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "466",
+            "localId" : "389",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "467",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "390",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "457",
+          "localId" : "380",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "462",
+            "localId" : "385",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "463",
+              "localId" : "386",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "464",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "387",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "458",
+            "localId" : "381",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "459",
+              "localId" : "382",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "460",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "383",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "461",
+            "localId" : "384",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "440",
+            "localId" : "365",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "452",
+              "localId" : "375",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "453",
+                "localId" : "376",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "454",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "377",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "449",
+              "localId" : "368",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "450",
+                "localId" : "369",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "451",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "370",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "441",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "442",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "443",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "444",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "366",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "445",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+                "type" : "Quantity",
+                "localId" : "367",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "g",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "As",
+              "localId" : "372",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "371",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              },
+              "asTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "373",
                 "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "446",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "447",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                },
-                "second" : {
-                  "type" : "Literal",
-                  "localId" : "448",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "374",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "456",
-            "value" : 1.0,
-            "unit" : "millisecond",
+            "localId" : "379",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "470",
-        "name" : "MinPrecPerHour",
+        "localId" : "393",
+        "name" : "Overlapping",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "470",
+            "r" : "393",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerHour", ": " ]
+              "value" : [ "", "define ", "Overlapping", ": " ]
             }, {
-              "r" : "486",
+              "r" : "410",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "471",
+                "r" : "394",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "478",
+                  "r" : "397",
                   "s" : [ {
-                    "r" : "472",
-                    "value" : [ "Interval[", "@T01:00", ", ", "@T03:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "395",
+                    "s" : [ {
+                      "value" : [ "2 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "396",
+                    "s" : [ {
+                      "value" : [ "4 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "402",
+                  "s" : [ {
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "400",
+                    "s" : [ {
+                      "value" : [ "3 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "401",
+                    "s" : [ {
+                      "value" : [ "5 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "409",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "494",
+          "localId" : "418",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "495",
+            "localId" : "419",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "496",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "420",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "486",
+          "localId" : "410",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "491",
+            "localId" : "415",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "492",
+              "localId" : "416",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "493",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "417",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "487",
+            "localId" : "411",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "488",
+              "localId" : "412",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "489",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "413",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "490",
+            "localId" : "414",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "471",
+            "localId" : "394",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "481",
+              "localId" : "405",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "482",
+                "localId" : "406",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "483",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "407",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "478",
+              "localId" : "397",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "479",
+                "localId" : "398",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "480",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "399",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "472",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "473",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "474",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "395",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "475",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+                "type" : "Quantity",
+                "localId" : "396",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "g",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "402",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "403",
                 "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "476",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "477",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "404",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
+              },
+              "low" : {
+                "type" : "Quantity",
+                "localId" : "400",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 3,
+                "unit" : "g",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "401",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 5,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
-          }, {
-            "type" : "Quantity",
-            "localId" : "485",
-            "value" : 1.0,
-            "unit" : "hour",
+          }, {
+            "type" : "Quantity",
+            "localId" : "409",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "499",
-        "name" : "MinPrecPerMinute",
+        "localId" : "423",
+        "name" : "NonOverlapping",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "499",
+            "r" : "423",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "NonOverlapping", ": " ]
             }, {
-              "r" : "515",
+              "r" : "440",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "500",
+                "r" : "424",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "507",
+                  "r" : "427",
                   "s" : [ {
-                    "r" : "501",
-                    "value" : [ "Interval[", "@T01:00", ", ", "@T01:01", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "425",
+                    "s" : [ {
+                      "value" : [ "2 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "426",
+                    "s" : [ {
+                      "value" : [ "4 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "432",
+                  "s" : [ {
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "430",
+                    "s" : [ {
+                      "value" : [ "6 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "431",
+                    "s" : [ {
+                      "value" : [ "6 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "439",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "523",
+          "localId" : "448",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "524",
+            "localId" : "449",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "525",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "450",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "515",
+          "localId" : "440",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "520",
+            "localId" : "445",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "521",
+              "localId" : "446",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "522",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "447",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "516",
+            "localId" : "441",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "517",
+              "localId" : "442",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "518",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "443",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "519",
+            "localId" : "444",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "500",
+            "localId" : "424",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "510",
+              "localId" : "435",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "511",
+                "localId" : "436",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "512",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "437",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "507",
+              "localId" : "427",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "508",
+                "localId" : "428",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "509",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "429",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "501",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "502",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "503",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "425",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "504",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
+                "type" : "Quantity",
+                "localId" : "426",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "g",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "432",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "433",
                 "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "505",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "506",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "434",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
+              },
+              "low" : {
+                "type" : "Quantity",
+                "localId" : "430",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 6,
+                "unit" : "g",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Quantity",
+                "localId" : "431",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 6,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "514",
-            "value" : 1.0,
-            "unit" : "minute",
+            "localId" : "439",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "528",
-        "name" : "MinPrecPerSecond",
+        "localId" : "453",
+        "name" : "NoPerDefaultM",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "528",
+            "r" : "453",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerSecond", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultM", ": " ]
             }, {
-              "r" : "544",
+              "r" : "464",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "529",
+                "r" : "454",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "536",
+                  "r" : "457",
                   "s" : [ {
-                    "r" : "530",
-                    "value" : [ "Interval[", "@T01:00", ", ", "@T01:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "455",
+                    "s" : [ {
+                      "value" : [ "2 ", "'m'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "456",
+                    "s" : [ {
+                      "value" : [ "400 ", "'cm'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " per ", "second" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "552",
+          "localId" : "472",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "553",
+            "localId" : "473",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "554",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "474",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "544",
+          "localId" : "464",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "549",
+            "localId" : "469",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "550",
+              "localId" : "470",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "551",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "471",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "545",
+            "localId" : "465",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "546",
+              "localId" : "466",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "547",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "467",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "548",
+            "localId" : "468",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "529",
+            "localId" : "454",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "539",
+              "localId" : "460",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "540",
+                "localId" : "461",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "541",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "462",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "536",
+              "localId" : "457",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "537",
+                "localId" : "458",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "538",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "459",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "530",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "531",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "532",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "455",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "m",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "533",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "534",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "535",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "456",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 400,
+                "unit" : "cm",
+                "annotation" : [ ]
               }
             } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "543",
-            "value" : 1.0,
-            "unit" : "second",
+            "type" : "Null",
+            "localId" : "463",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "557",
-        "name" : "MinPrecPerMillisecond",
+        "localId" : "477",
+        "name" : "NoPerDefaultG",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "557",
+            "r" : "477",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "NoPerDefaultG", ": " ]
             }, {
-              "r" : "573",
+              "r" : "488",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "558",
+                "r" : "478",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "565",
+                  "r" : "481",
                   "s" : [ {
-                    "r" : "559",
-                    "value" : [ "Interval[", "@T01:00", ", ", "@T01:00", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "479",
+                    "s" : [ {
+                      "value" : [ "2 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "480",
+                    "s" : [ {
+                      "value" : [ "4 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " per ", "millisecond" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "581",
+          "localId" : "496",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "582",
+            "localId" : "497",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "583",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "498",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "573",
+          "localId" : "488",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "578",
+            "localId" : "493",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "579",
+              "localId" : "494",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "580",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "495",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "574",
+            "localId" : "489",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "575",
+              "localId" : "490",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "576",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "491",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "577",
+            "localId" : "492",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "558",
+            "localId" : "478",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "568",
+              "localId" : "484",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "569",
+                "localId" : "485",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "570",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "486",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "565",
+              "localId" : "481",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "566",
+                "localId" : "482",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "567",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "483",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "559",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "560",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "561",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "479",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "562",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "563",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                },
-                "minute" : {
-                  "type" : "Literal",
-                  "localId" : "564",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "0",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "480",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "572",
-            "value" : 1.0,
-            "unit" : "millisecond",
+            "type" : "Null",
+            "localId" : "487",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "586",
-        "name" : "MinPrecPerMinuteEmpty",
+        "localId" : "501",
+        "name" : "OpenStart",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "586",
+            "r" : "501",
             "s" : [ {
-              "value" : [ "", "define ", "MinPrecPerMinuteEmpty", ": " ]
+              "value" : [ "", "define ", "OpenStart", ": " ]
             }, {
-              "r" : "600",
+              "r" : "513",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "587",
+                "r" : "502",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "592",
+                  "r" : "505",
                   "s" : [ {
-                    "r" : "588",
-                    "value" : [ "Interval[", "@T10", ", ", "@T10", "]" ]
+                    "value" : [ "Interval(" ]
+                  }, {
+                    "r" : "503",
+                    "s" : [ {
+                      "value" : [ "2 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "504",
+                    "s" : [ {
+                      "value" : [ "4 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "512",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "608",
+          "localId" : "521",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "609",
+            "localId" : "522",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "610",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "523",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "600",
+          "localId" : "513",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "605",
+            "localId" : "518",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "606",
+              "localId" : "519",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "607",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "520",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "601",
+            "localId" : "514",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "602",
+              "localId" : "515",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "603",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "516",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "604",
+            "localId" : "517",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "587",
+            "localId" : "502",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "595",
+              "localId" : "508",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "596",
+                "localId" : "509",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "597",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "510",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "592",
-              "lowClosed" : true,
+              "localId" : "505",
+              "lowClosed" : false,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "593",
+                "localId" : "506",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "594",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "507",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "588",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "589",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "10",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "503",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "590",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "591",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "10",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "504",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "599",
-            "value" : 1.0,
-            "unit" : "minute",
+            "localId" : "512",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "613",
-        "name" : "HourPrecPerHour",
+        "localId" : "526",
+        "name" : "OpenEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "613",
+            "r" : "526",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerHour", ": " ]
+              "value" : [ "", "define ", "OpenEnd", ": " ]
             }, {
-              "r" : "627",
+              "r" : "538",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "614",
+                "r" : "527",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "619",
+                  "r" : "530",
                   "s" : [ {
-                    "r" : "615",
-                    "value" : [ "Interval[", "@T01", ", ", "@T02", "]" ]
+                    "value" : [ "Interval[" ]
+                  }, {
+                    "r" : "528",
+                    "s" : [ {
+                      "value" : [ "2 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "529",
+                    "s" : [ {
+                      "value" : [ "4 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "hour" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "537",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "635",
+          "localId" : "546",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "636",
+            "localId" : "547",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "637",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "548",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "627",
+          "localId" : "538",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "632",
+            "localId" : "543",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "633",
+              "localId" : "544",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "634",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "545",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "628",
+            "localId" : "539",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "629",
+              "localId" : "540",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "630",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "541",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "631",
+            "localId" : "542",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "614",
+            "localId" : "527",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "622",
+              "localId" : "533",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "623",
+                "localId" : "534",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "624",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "535",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "619",
+              "localId" : "530",
               "lowClosed" : true,
-              "highClosed" : true,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "620",
+                "localId" : "531",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "621",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "532",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "615",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "616",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "528",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "617",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "618",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "529",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "626",
-            "value" : 1.0,
-            "unit" : "hour",
+            "localId" : "537",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "640",
-        "name" : "HourPrecPerMinute",
+        "localId" : "551",
+        "name" : "OpenBoth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "640",
+            "r" : "551",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerMinute", ": " ]
+              "value" : [ "", "define ", "OpenBoth", ": " ]
             }, {
-              "r" : "654",
+              "r" : "563",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "641",
+                "r" : "552",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "646",
+                  "r" : "555",
                   "s" : [ {
-                    "r" : "642",
-                    "value" : [ "Interval[", "@T01", ", ", "@T01", "]" ]
+                    "value" : [ "Interval(" ]
+                  }, {
+                    "r" : "553",
+                    "s" : [ {
+                      "value" : [ "2 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "554",
+                    "s" : [ {
+                      "value" : [ "4 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "minute" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "562",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "662",
+          "localId" : "571",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "663",
+            "localId" : "572",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "664",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "573",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "654",
+          "localId" : "563",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "659",
+            "localId" : "568",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "660",
+              "localId" : "569",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "661",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "570",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "655",
+            "localId" : "564",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "656",
+              "localId" : "565",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "657",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "566",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "658",
+            "localId" : "567",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "641",
+            "localId" : "552",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "649",
+              "localId" : "558",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "650",
+                "localId" : "559",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "651",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "560",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "646",
-              "lowClosed" : true,
-              "highClosed" : true,
+              "localId" : "555",
+              "lowClosed" : false,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "647",
+                "localId" : "556",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "648",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "557",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "642",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "643",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "553",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "644",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "645",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "554",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "653",
-            "value" : 1.0,
-            "unit" : "minute",
+            "localId" : "562",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "667",
-        "name" : "HourPrecPerSecond",
+        "localId" : "576",
+        "name" : "OpenBothDecimal",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "667",
+            "r" : "576",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerSecond", ": " ]
+              "value" : [ "", "define ", "OpenBothDecimal", ": " ]
             }, {
-              "r" : "681",
+              "r" : "588",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "668",
+                "r" : "577",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "673",
+                  "r" : "580",
                   "s" : [ {
-                    "r" : "669",
-                    "value" : [ "Interval[", "@T01", ", ", "@T01", "]" ]
+                    "value" : [ "Interval(" ]
+                  }, {
+                    "r" : "578",
+                    "s" : [ {
+                      "value" : [ "2.1 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "579",
+                    "s" : [ {
+                      "value" : [ "4.1 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per ", "second" ]
+                "value" : [ " per " ]
+              }, {
+                "r" : "587",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "689",
+          "localId" : "596",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "690",
+            "localId" : "597",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "691",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "598",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "681",
+          "localId" : "588",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "686",
+            "localId" : "593",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "687",
+              "localId" : "594",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "688",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "595",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "682",
+            "localId" : "589",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "683",
+              "localId" : "590",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "684",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "591",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "685",
+            "localId" : "592",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "668",
+            "localId" : "577",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "676",
+              "localId" : "583",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "677",
+                "localId" : "584",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "678",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "585",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "673",
-              "lowClosed" : true,
-              "highClosed" : true,
+              "localId" : "580",
+              "lowClosed" : false,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "674",
+                "localId" : "581",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "675",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "582",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "669",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "670",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "578",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2.1,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "671",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "672",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "579",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4.1,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "680",
-            "value" : 1.0,
-            "unit" : "second",
+            "localId" : "587",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "694",
-        "name" : "HourPrecPerMillisecond",
+        "localId" : "601",
+        "name" : "OpenBothDecimalTrunc",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "694",
+            "r" : "601",
             "s" : [ {
-              "value" : [ "", "define ", "HourPrecPerMillisecond", ": " ]
+              "value" : [ "", "define ", "OpenBothDecimalTrunc", ": " ]
             }, {
-              "r" : "708",
+              "r" : "613",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "695",
+                "r" : "602",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "700",
+                  "r" : "605",
                   "s" : [ {
-                    "r" : "696",
-                    "value" : [ "Interval[", "@T01", ", ", "@T01", "]" ]
+                    "value" : [ "Interval(" ]
+                  }, {
+                    "r" : "603",
+                    "s" : [ {
+                      "value" : [ "2.1 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "r" : "604",
+                    "s" : [ {
+                      "value" : [ "4.101 ", "'g'" ]
+                    } ]
+                  }, {
+                    "value" : [ ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " per ", "millisecond" ]
+              }, {
+                "value" : [ " per " ]
+              }, {
+                "r" : "612",
+                "s" : [ {
+                  "value" : [ "1 ", "'g'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "716",
+          "localId" : "621",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "717",
+            "localId" : "622",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "718",
-              "name" : "{urn:hl7-org:elm-types:r1}Time",
+              "localId" : "623",
+              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "708",
+          "localId" : "613",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "713",
+            "localId" : "618",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "714",
+              "localId" : "619",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "715",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "620",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "709",
+            "localId" : "614",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "710",
+              "localId" : "615",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "711",
-                "name" : "{urn:hl7-org:elm-types:r1}Time",
+                "localId" : "616",
+                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "712",
+            "localId" : "617",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "695",
+            "localId" : "602",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "703",
+              "localId" : "608",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "704",
+                "localId" : "609",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "705",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "610",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "700",
-              "lowClosed" : true,
-              "highClosed" : true,
+              "localId" : "605",
+              "lowClosed" : false,
+              "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "701",
+                "localId" : "606",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "702",
-                  "name" : "{urn:hl7-org:elm-types:r1}Time",
+                  "localId" : "607",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Time",
-                "localId" : "696",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "697",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "603",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 2.1,
+                "unit" : "g",
+                "annotation" : [ ]
               },
               "high" : {
-                "type" : "Time",
-                "localId" : "698",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
-                "annotation" : [ ],
-                "signature" : [ ],
-                "hour" : {
-                  "type" : "Literal",
-                  "localId" : "699",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
+                "type" : "Quantity",
+                "localId" : "604",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "value" : 4.101,
+                "unit" : "g",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "707",
-            "value" : 1.0,
-            "unit" : "millisecond",
+            "localId" : "612",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* QuantityIntervalExpand
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define ClosedSingleGPerG: expand { Interval[2 'g', 4 'g'] } per 1 'g'
-define ClosedSingleGPerGDecimal: expand { Interval[2.1 'g', 4.1 'g'] } per 1 'g'
-define ClosedSingleGPerMG: expand { Interval[2 'g', 2.003 'g'] } per 1 'mg'
-define ClosedSingleMGPerGTrunc: expand { Interval[2999 'mg', 4200 'mg'] } per 1 'g'
-define ClosedSingleMGPerMGTrunc: expand { Interval[2000 'mg', 4500 'mg'] } per 800 'mg'
-define ClosedSingleMGPerMGDecimal: expand { Interval[2000.01 'mg', 4500 'mg'] } per 800 'mg'
-
-define NullInList: expand { Interval[2 'g', 4 'g'], null } per 1 'g'
-define Overlapping: expand { Interval[2 'g', 4 'g'], Interval[3 'g', 5 'g'] } per 1 'g'
-define NonOverlapping: expand { Interval[2 'g', 4 'g'], Interval[6 'g', 6 'g'] } per 1 'g'
-
-define NoPerDefaultM: expand { Interval[2 'm', 400 'cm'] }
-define NoPerDefaultG: expand { Interval[2 'g', 4 'g'] }
-
-define OpenStart: expand { Interval(2 'g', 4 'g'] } per 1 'g'
-define OpenEnd: expand { Interval[2 'g', 4 'g') } per 1 'g'
-define OpenBoth: expand { Interval(2 'g', 4 'g') } per 1 'g'
-define OpenBothDecimal: expand { Interval(2.1 'g', 4.1 'g') } per 1 'g'
-define OpenBothDecimalTrunc: expand { Interval(2.1 'g', 4.101 'g') } per 1 'g'
-
-define EmptyList: List<Interval<Date>>{}
-define PerTooBig: expand { Interval[2 'g', 4 'g'], null } per 5 'g'
-define NullOpen: expand { Interval[null, 4 'g'] } per 1 'g'
-define NullClose: expand { Interval[2 'g', null] } per 1 'g'
-define NullBoth: expand { Interval[null, null] } per 1 'g'
-define BadPerMinute: expand { Interval(2 'g', 4 'g'] } per 1 minute
-define BadPerGram: expand { Interval(2 'km', 4 'km'] }  per 1 'g'
-*/
-
-module.exports['QuantityIntervalExpand'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "772",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "626",
+        "name" : "EmptyList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "626",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "EmptyList", ": " ]
             }, {
+              "r" : "631",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "value" : [ "List<" ]
+              }, {
+                "r" : "627",
+                "s" : [ {
+                  "value" : [ "Interval<" ]
+                }, {
+                  "r" : "628",
+                  "s" : [ {
+                    "value" : [ "Date" ]
+                  } ]
+                }, {
+                  "value" : [ ">" ]
+                } ]
+              }, {
+                "value" : [ ">{}" ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
-        "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "636",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "elementType" : {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "637",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "638",
+              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "annotation" : [ ]
+            }
           }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "631",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "633",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "634",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "635",
+                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "annotation" : [ ]
+              }
+            }
+          },
+          "element" : [ ]
         }
       }, {
-        "localId" : "214",
-        "name" : "ClosedSingleGPerG",
+        "localId" : "641",
+        "name" : "PerTooBig",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "641",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSingleGPerG", ": " ]
+              "value" : [ "", "define ", "PerTooBig", ": " ]
             }, {
-              "r" : "226",
+              "r" : "657",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "215",
+                "r" : "642",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "218",
+                  "r" : "645",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "216",
+                    "r" : "643",
                     "s" : [ {
                       "value" : [ "2 ", "'g'" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "217",
+                    "r" : "644",
                     "s" : [ {
                       "value" : [ "4 ", "'g'" ]
                     } ]
@@ -238917,14 +270746,15 @@ module.exports['QuantityIntervalExpand'] = {
                     "value" : [ "]" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "r" : "648",
+                  "value" : [ ", ", "null", " }" ]
                 } ]
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "225",
+                "r" : "656",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "5 ", "'g'" ]
                 } ]
               } ]
             } ]
@@ -238932,15 +270762,15 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "234",
+          "localId" : "665",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "235",
+            "localId" : "666",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "236",
+              "localId" : "667",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
@@ -238948,19 +270778,19 @@ module.exports['QuantityIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "226",
+          "localId" : "657",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "231",
+            "localId" : "662",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "232",
+              "localId" : "663",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "233",
+                "localId" : "664",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
@@ -238968,40 +270798,40 @@ module.exports['QuantityIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "227",
+            "localId" : "658",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "228",
+              "localId" : "659",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "229",
+                "localId" : "660",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "230",
+            "localId" : "661",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "215",
+            "localId" : "642",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "221",
+              "localId" : "652",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "222",
+                "localId" : "653",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "223",
+                  "localId" : "654",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
@@ -239009,24 +270839,24 @@ module.exports['QuantityIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "218",
+              "localId" : "645",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "219",
+                "localId" : "646",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "220",
+                  "localId" : "647",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Quantity",
-                "localId" : "216",
+                "localId" : "643",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "value" : 2,
                 "unit" : "g",
@@ -239034,57 +270864,73 @@ module.exports['QuantityIntervalExpand'] = {
               },
               "high" : {
                 "type" : "Quantity",
-                "localId" : "217",
+                "localId" : "644",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "value" : 4,
                 "unit" : "g",
                 "annotation" : [ ]
               }
+            }, {
+              "type" : "As",
+              "localId" : "649",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "648",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              },
+              "asTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "650",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "651",
+                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "annotation" : [ ]
+                }
+              }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "225",
+            "localId" : "656",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
+            "value" : 5,
             "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "239",
-        "name" : "ClosedSingleGPerGDecimal",
+        "localId" : "670",
+        "name" : "NullOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "239",
+            "r" : "670",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSingleGPerGDecimal", ": " ]
+              "value" : [ "", "define ", "NullOpen", ": " ]
             }, {
-              "r" : "251",
+              "r" : "683",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "240",
+                "r" : "671",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "243",
+                  "r" : "674",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "241",
-                    "s" : [ {
-                      "value" : [ "2.1 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
+                    "r" : "672",
+                    "value" : [ "Interval[", "null", ", " ]
                   }, {
-                    "r" : "242",
+                    "r" : "673",
                     "s" : [ {
-                      "value" : [ "4.1 ", "'g'" ]
+                      "value" : [ "4 ", "'g'" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -239095,7 +270941,7 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "250",
+                "r" : "682",
                 "s" : [ {
                   "value" : [ "1 ", "'g'" ]
                 } ]
@@ -239105,15 +270951,15 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "259",
+          "localId" : "691",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "260",
+            "localId" : "692",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "261",
+              "localId" : "693",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
@@ -239121,19 +270967,19 @@ module.exports['QuantityIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "251",
+          "localId" : "683",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "256",
+            "localId" : "688",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "257",
+              "localId" : "689",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "258",
+                "localId" : "690",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
@@ -239141,40 +270987,40 @@ module.exports['QuantityIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "252",
+            "localId" : "684",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "253",
+              "localId" : "685",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "254",
+                "localId" : "686",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "255",
+            "localId" : "687",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "240",
+            "localId" : "671",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "246",
+              "localId" : "678",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "247",
+                "localId" : "679",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "248",
+                  "localId" : "680",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
@@ -239182,41 +271028,46 @@ module.exports['QuantityIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "243",
+              "localId" : "674",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "244",
+                "localId" : "676",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "245",
+                  "localId" : "677",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "241",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2.1,
-                "unit" : "g",
-                "annotation" : [ ]
+                "type" : "As",
+                "localId" : "675",
+                "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "operand" : {
+                  "type" : "Null",
+                  "localId" : "672",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
               },
               "high" : {
                 "type" : "Quantity",
-                "localId" : "242",
+                "localId" : "673",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4.1,
+                "value" : 4,
                 "unit" : "g",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "250",
+            "localId" : "682",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
             "unit" : "g",
@@ -239224,43 +271075,37 @@ module.exports['QuantityIntervalExpand'] = {
           } ]
         }
       }, {
-        "localId" : "264",
-        "name" : "ClosedSingleGPerMG",
+        "localId" : "696",
+        "name" : "NullClose",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "696",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSingleGPerMG", ": " ]
+              "value" : [ "", "define ", "NullClose", ": " ]
             }, {
-              "r" : "276",
+              "r" : "709",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "265",
+                "r" : "697",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "268",
+                  "r" : "700",
                   "s" : [ {
                     "value" : [ "Interval[" ]
                   }, {
-                    "r" : "266",
+                    "r" : "698",
                     "s" : [ {
                       "value" : [ "2 ", "'g'" ]
                     } ]
                   }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "267",
-                    "s" : [ {
-                      "value" : [ "2.003 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "699",
+                    "value" : [ ", ", "null", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -239268,9 +271113,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "275",
+                "r" : "708",
                 "s" : [ {
-                  "value" : [ "1 ", "'mg'" ]
+                  "value" : [ "1 ", "'g'" ]
                 } ]
               } ]
             } ]
@@ -239278,15 +271123,15 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "284",
+          "localId" : "717",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "285",
+            "localId" : "718",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "286",
+              "localId" : "719",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
@@ -239294,19 +271139,19 @@ module.exports['QuantityIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "276",
+          "localId" : "709",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "281",
+            "localId" : "714",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "282",
+              "localId" : "715",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "283",
+                "localId" : "716",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
@@ -239314,40 +271159,40 @@ module.exports['QuantityIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "277",
+            "localId" : "710",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "278",
+              "localId" : "711",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "279",
+                "localId" : "712",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "280",
+            "localId" : "713",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "265",
+            "localId" : "697",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "271",
+              "localId" : "704",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "272",
+                "localId" : "705",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "273",
+                  "localId" : "706",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
@@ -239355,85 +271200,77 @@ module.exports['QuantityIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "268",
+              "localId" : "700",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "269",
+                "localId" : "702",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "270",
+                  "localId" : "703",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Quantity",
-                "localId" : "266",
+                "localId" : "698",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "value" : 2,
                 "unit" : "g",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "267",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2.003,
-                "unit" : "g",
-                "annotation" : [ ]
+                "type" : "As",
+                "localId" : "701",
+                "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "annotation" : [ ],
+                "signature" : [ ],
+                "operand" : {
+                  "type" : "Null",
+                  "localId" : "699",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "275",
+            "localId" : "708",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
-            "unit" : "mg",
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "289",
-        "name" : "ClosedSingleMGPerGTrunc",
+        "localId" : "722",
+        "name" : "NullBoth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "289",
+            "r" : "722",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSingleMGPerGTrunc", ": " ]
+              "value" : [ "", "define ", "NullBoth", ": " ]
             }, {
-              "r" : "301",
+              "r" : "734",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "290",
+                "r" : "723",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "293",
+                  "r" : "726",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "291",
-                    "s" : [ {
-                      "value" : [ "2999 ", "'mg'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "292",
-                    "s" : [ {
-                      "value" : [ "4200 ", "'mg'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "724",
+                    "value" : [ "Interval[", "null", ", ", "null", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -239441,7 +271278,7 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "300",
+                "r" : "733",
                 "s" : [ {
                   "value" : [ "1 ", "'g'" ]
                 } ]
@@ -239451,118 +271288,114 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "309",
+          "localId" : "742",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "310",
+            "localId" : "743",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "311",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "744",
+              "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "301",
+          "localId" : "734",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "306",
+            "localId" : "739",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "307",
+              "localId" : "740",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "308",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "741",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "302",
+            "localId" : "735",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "303",
+              "localId" : "736",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "304",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "737",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "305",
+            "localId" : "738",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "290",
+            "localId" : "723",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "296",
+              "localId" : "729",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "297",
+                "localId" : "730",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "298",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "731",
+                  "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "293",
+              "localId" : "726",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "294",
+                "localId" : "727",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "295",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "728",
+                  "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "291",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2999,
-                "unit" : "mg",
+                "type" : "Null",
+                "localId" : "724",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "292",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4200,
-                "unit" : "mg",
+                "type" : "Null",
+                "localId" : "725",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "300",
+            "localId" : "733",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
             "unit" : "g",
@@ -239570,40 +271403,40 @@ module.exports['QuantityIntervalExpand'] = {
           } ]
         }
       }, {
-        "localId" : "314",
-        "name" : "ClosedSingleMGPerMGTrunc",
+        "localId" : "747",
+        "name" : "BadPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "314",
+            "r" : "747",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSingleMGPerMGTrunc", ": " ]
+              "value" : [ "", "define ", "BadPerMinute", ": " ]
             }, {
-              "r" : "326",
+              "r" : "759",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "315",
+                "r" : "748",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "318",
+                  "r" : "751",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
+                    "value" : [ "Interval(" ]
                   }, {
-                    "r" : "316",
+                    "r" : "749",
                     "s" : [ {
-                      "value" : [ "2000 ", "'mg'" ]
+                      "value" : [ "2 ", "'g'" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "317",
+                    "r" : "750",
                     "s" : [ {
-                      "value" : [ "4500 ", "'mg'" ]
+                      "value" : [ "4 ", "'g'" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -239614,9 +271447,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "325",
+                "r" : "758",
                 "s" : [ {
-                  "value" : [ "800 ", "'mg'" ]
+                  "value" : [ "1 ", "minute" ]
                 } ]
               } ]
             } ]
@@ -239624,15 +271457,15 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "334",
+          "localId" : "767",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "335",
+            "localId" : "768",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "336",
+              "localId" : "769",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
@@ -239640,19 +271473,19 @@ module.exports['QuantityIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "326",
+          "localId" : "759",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "331",
+            "localId" : "764",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "332",
+              "localId" : "765",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "333",
+                "localId" : "766",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
@@ -239660,40 +271493,40 @@ module.exports['QuantityIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "327",
+            "localId" : "760",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "328",
+              "localId" : "761",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "329",
+                "localId" : "762",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "330",
+            "localId" : "763",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "315",
+            "localId" : "748",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "321",
+              "localId" : "754",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "322",
+                "localId" : "755",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "323",
+                  "localId" : "756",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
@@ -239701,82 +271534,82 @@ module.exports['QuantityIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "318",
-              "lowClosed" : true,
+              "localId" : "751",
+              "lowClosed" : false,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "319",
+                "localId" : "752",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "320",
+                  "localId" : "753",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Quantity",
-                "localId" : "316",
+                "localId" : "749",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2000,
-                "unit" : "mg",
+                "value" : 2,
+                "unit" : "g",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Quantity",
-                "localId" : "317",
+                "localId" : "750",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4500,
-                "unit" : "mg",
+                "value" : 4,
+                "unit" : "g",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "325",
+            "localId" : "758",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 800,
-            "unit" : "mg",
+            "value" : 1,
+            "unit" : "minute",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "339",
-        "name" : "ClosedSingleMGPerMGDecimal",
+        "localId" : "772",
+        "name" : "BadPerGram",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "339",
+            "r" : "772",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSingleMGPerMGDecimal", ": " ]
+              "value" : [ "", "define ", "BadPerGram", ": " ]
             }, {
-              "r" : "351",
+              "r" : "784",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "340",
+                "r" : "773",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "343",
+                  "r" : "776",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
+                    "value" : [ "Interval(" ]
                   }, {
-                    "r" : "341",
+                    "r" : "774",
                     "s" : [ {
-                      "value" : [ "2000.01 ", "'mg'" ]
+                      "value" : [ "2 ", "'km'" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
-                    "r" : "342",
+                    "r" : "775",
                     "s" : [ {
-                      "value" : [ "4500 ", "'mg'" ]
+                      "value" : [ "4 ", "'km'" ]
                     } ]
                   }, {
                     "value" : [ "]" ]
@@ -239785,11 +271618,11 @@ module.exports['QuantityIntervalExpand'] = {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ " per " ]
+                "value" : [ "  per " ]
               }, {
-                "r" : "350",
+                "r" : "783",
                 "s" : [ {
-                  "value" : [ "800 ", "'mg'" ]
+                  "value" : [ "1 ", "'g'" ]
                 } ]
               } ]
             } ]
@@ -239797,15 +271630,15 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "359",
+          "localId" : "792",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "360",
+            "localId" : "793",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "361",
+              "localId" : "794",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
@@ -239813,19 +271646,19 @@ module.exports['QuantityIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "351",
+          "localId" : "784",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "356",
+            "localId" : "789",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "357",
+              "localId" : "790",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "358",
+                "localId" : "791",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
@@ -239833,40 +271666,40 @@ module.exports['QuantityIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "352",
+            "localId" : "785",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "353",
+              "localId" : "786",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "354",
+                "localId" : "787",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "355",
+            "localId" : "788",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "340",
+            "localId" : "773",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "346",
+              "localId" : "779",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "347",
+                "localId" : "780",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "348",
+                  "localId" : "781",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
@@ -239874,96 +271707,199 @@ module.exports['QuantityIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "343",
-              "lowClosed" : true,
+              "localId" : "776",
+              "lowClosed" : false,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "344",
+                "localId" : "777",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "345",
+                  "localId" : "778",
                   "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Quantity",
-                "localId" : "341",
+                "localId" : "774",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2000.01,
-                "unit" : "mg",
+                "value" : 2,
+                "unit" : "km",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Quantity",
-                "localId" : "342",
+                "localId" : "775",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4500,
-                "unit" : "mg",
+                "value" : 4,
+                "unit" : "km",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "350",
+            "localId" : "783",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 800,
-            "unit" : "mg",
+            "value" : 1,
+            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
+      } ]
+    }
+  }
+}
+
+/* IntegerIntervalExpand
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define ClosedSinglePer1: expand { Interval[2, 4] } per 1 '1'
+define ClosedSinglePer3: expand { Interval[2, 10] } per 3 '1'
+define ClosedSinglePer3NoteTheWidth: expand { Interval[2, 4] } per 3 '1'
+
+define NullInList: expand { Interval[2, 4], null } per 1 '1'
+define Overlapping: expand { Interval[2, 4], Interval[3, 5] } per 1 '1'
+define NonOverlapping: expand { Interval[2, 4], Interval[6, 6] } per 1 '1'
+
+define NoPer: expand { Interval[2, 4] }
+
+define OpenStart: expand { Interval(2, 4] } per 1 '1'
+define OpenEnd: expand { Interval[2, 4) } per 1 '1'
+define OpenBoth: expand { Interval(2, 4) } per 1 '1'
+
+define EmptyList: List<Interval<Integer>>{}
+define PerTooBig: expand { Interval[2, 4], null } per 5 '1'
+define NullOpen: expand { Interval[null, 4] } per 1 '1'
+define NullClose: expand { Interval[2, null] } per 1 '1'
+define NullBoth: expand { Interval[null, null] } per 1 '1'
+define BadPerMinute: expand { Interval(2, 4] } per 1 minute
+
+define PerDecimalMorePrecise: expand { Interval[10, 10] } per 0.1
+*/
+
+module.exports['IntegerIntervalExpand'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "623",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
       }, {
-        "localId" : "364",
-        "name" : "NullInList",
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "name" : "ClosedSinglePer1",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "364",
+            "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "NullInList", ": " ]
+              "value" : [ "", "define ", "ClosedSinglePer1", ": " ]
             }, {
-              "r" : "380",
+              "r" : "226",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "365",
+                "r" : "215",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "368",
+                  "r" : "218",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "366",
-                    "s" : [ {
-                      "value" : [ "2 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "367",
-                    "s" : [ {
-                      "value" : [ "4 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "216",
+                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
                   } ]
                 }, {
-                  "r" : "371",
-                  "value" : [ ", ", "null", " }" ]
+                  "value" : [ " }" ]
                 } ]
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "379",
+                "r" : "225",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "1 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -239971,205 +271907,149 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "388",
+          "localId" : "234",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "389",
+            "localId" : "235",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "390",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "236",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "380",
+          "localId" : "226",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "385",
+            "localId" : "231",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "386",
+              "localId" : "232",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "387",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "233",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "381",
+            "localId" : "227",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "382",
+              "localId" : "228",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "383",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "229",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "384",
+            "localId" : "230",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "365",
+            "localId" : "215",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "375",
+              "localId" : "221",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "376",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "377",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                  "annotation" : [ ]
-                }
-              }
-            },
-            "element" : [ {
-              "type" : "Interval",
-              "localId" : "368",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "369",
+                "localId" : "222",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "370",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                  "annotation" : [ ]
-                }
-              },
-              "low" : {
-                "type" : "Quantity",
-                "localId" : "366",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "g",
-                "annotation" : [ ]
-              },
-              "high" : {
-                "type" : "Quantity",
-                "localId" : "367",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "g",
-                "annotation" : [ ]
+                  "localId" : "223",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
               }
-            }, {
-              "type" : "As",
-              "localId" : "372",
+            },
+            "element" : [ {
+              "type" : "Interval",
+              "localId" : "218",
+              "lowClosed" : true,
+              "highClosed" : true,
               "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "371",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              },
-              "asTypeSpecifier" : {
+              "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "373",
+                "localId" : "219",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "374",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "220",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
+              },
+              "low" : {
+                "type" : "Literal",
+                "localId" : "216",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Literal",
+                "localId" : "217",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "379",
+            "localId" : "225",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
-            "unit" : "g",
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "393",
-        "name" : "Overlapping",
+        "localId" : "239",
+        "name" : "ClosedSinglePer3",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "393",
+            "r" : "239",
             "s" : [ {
-              "value" : [ "", "define ", "Overlapping", ": " ]
+              "value" : [ "", "define ", "ClosedSinglePer3", ": " ]
             }, {
-              "r" : "410",
+              "r" : "251",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "394",
+                "r" : "240",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "397",
-                  "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "395",
-                    "s" : [ {
-                      "value" : [ "2 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "396",
-                    "s" : [ {
-                      "value" : [ "4 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "402",
+                  "r" : "243",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "400",
-                    "s" : [ {
-                      "value" : [ "3 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "401",
-                    "s" : [ {
-                      "value" : [ "5 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "241",
+                    "value" : [ "Interval[", "2", ", ", "10", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -240177,9 +272057,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "409",
+                "r" : "250",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "3 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -240187,216 +272067,149 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "418",
+          "localId" : "259",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "419",
+            "localId" : "260",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "420",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "261",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "410",
+          "localId" : "251",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "415",
+            "localId" : "256",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "416",
+              "localId" : "257",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "417",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "258",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "411",
+            "localId" : "252",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "412",
+              "localId" : "253",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "413",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "254",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "414",
+            "localId" : "255",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "394",
+            "localId" : "240",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "405",
+              "localId" : "246",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "406",
+                "localId" : "247",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "407",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "248",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "397",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "398",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "399",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                  "annotation" : [ ]
-                }
-              },
-              "low" : {
-                "type" : "Quantity",
-                "localId" : "395",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "g",
-                "annotation" : [ ]
-              },
-              "high" : {
-                "type" : "Quantity",
-                "localId" : "396",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "g",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "Interval",
-              "localId" : "402",
+              "localId" : "243",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "403",
+                "localId" : "244",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "404",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "245",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "400",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 3,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "241",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "401",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 5,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "242",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "409",
+            "localId" : "250",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "g",
+            "value" : 3,
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "423",
-        "name" : "NonOverlapping",
+        "localId" : "264",
+        "name" : "ClosedSinglePer3NoteTheWidth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "423",
+            "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "NonOverlapping", ": " ]
+              "value" : [ "", "define ", "ClosedSinglePer3NoteTheWidth", ": " ]
             }, {
-              "r" : "440",
+              "r" : "276",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "424",
+                "r" : "265",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "427",
-                  "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "425",
-                    "s" : [ {
-                      "value" : [ "2 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "426",
-                    "s" : [ {
-                      "value" : [ "4 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "432",
+                  "r" : "268",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "430",
-                    "s" : [ {
-                      "value" : [ "6 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "431",
-                    "s" : [ {
-                      "value" : [ "6 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "266",
+                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -240404,9 +272217,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "439",
+                "r" : "275",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "3 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -240414,198 +272227,160 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "448",
+          "localId" : "284",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "449",
+            "localId" : "285",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "450",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "286",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "440",
+          "localId" : "276",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "445",
+            "localId" : "281",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "446",
+              "localId" : "282",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "447",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "283",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "441",
+            "localId" : "277",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "442",
+              "localId" : "278",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "443",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "279",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "444",
+            "localId" : "280",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "424",
+            "localId" : "265",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "435",
+              "localId" : "271",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "436",
+                "localId" : "272",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "437",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "273",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "427",
-              "lowClosed" : true,
-              "highClosed" : true,
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "IntervalTypeSpecifier",
-                "localId" : "428",
-                "annotation" : [ ],
-                "pointType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "429",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
-                  "annotation" : [ ]
-                }
-              },
-              "low" : {
-                "type" : "Quantity",
-                "localId" : "425",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "g",
-                "annotation" : [ ]
-              },
-              "high" : {
-                "type" : "Quantity",
-                "localId" : "426",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "g",
-                "annotation" : [ ]
-              }
-            }, {
-              "type" : "Interval",
-              "localId" : "432",
+              "localId" : "268",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "433",
+                "localId" : "269",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "434",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "270",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "430",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 6,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "266",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "431",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 6,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "267",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "439",
+            "localId" : "275",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "g",
+            "value" : 3,
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "453",
-        "name" : "NoPerDefaultM",
+        "localId" : "289",
+        "name" : "NullInList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "453",
+            "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultM", ": " ]
+              "value" : [ "", "define ", "NullInList", ": " ]
             }, {
-              "r" : "464",
+              "r" : "305",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "454",
+                "r" : "290",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "457",
+                  "r" : "293",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "455",
-                    "s" : [ {
-                      "value" : [ "2 ", "'m'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "456",
-                    "s" : [ {
-                      "value" : [ "400 ", "'cm'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "291",
+                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "r" : "296",
+                  "value" : [ ", ", "null", " }" ]
+                } ]
+              }, {
+                "value" : [ " per " ]
+              }, {
+                "r" : "304",
+                "s" : [ {
+                  "value" : [ "1 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -240613,324 +272388,380 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "472",
+          "localId" : "313",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "473",
+            "localId" : "314",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "474",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "315",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "464",
+          "localId" : "305",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "469",
+            "localId" : "310",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "470",
+              "localId" : "311",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "471",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "312",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "465",
+            "localId" : "306",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "466",
+              "localId" : "307",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "467",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "308",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "468",
+            "localId" : "309",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "454",
+            "localId" : "290",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "460",
+              "localId" : "300",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "461",
+                "localId" : "301",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "462",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "302",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "457",
+              "localId" : "293",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "458",
+                "localId" : "294",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "459",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "295",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "455",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "m",
+                "type" : "Literal",
+                "localId" : "291",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "456",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 400,
-                "unit" : "cm",
+                "type" : "Literal",
+                "localId" : "292",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "As",
+              "localId" : "297",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "296",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
+              },
+              "asTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "298",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "299",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "463",
+            "type" : "Quantity",
+            "localId" : "304",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "477",
-        "name" : "NoPerDefaultG",
+        "localId" : "318",
+        "name" : "Overlapping",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "477",
+            "r" : "318",
             "s" : [ {
-              "value" : [ "", "define ", "NoPerDefaultG", ": " ]
+              "value" : [ "", "define ", "Overlapping", ": " ]
             }, {
-              "r" : "488",
+              "r" : "335",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "478",
+                "r" : "319",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "481",
+                  "r" : "322",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "479",
-                    "s" : [ {
-                      "value" : [ "2 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "480",
-                    "s" : [ {
-                      "value" : [ "4 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "320",
+                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "327",
+                  "s" : [ {
+                    "r" : "325",
+                    "value" : [ "Interval[", "3", ", ", "5", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
+              }, {
+                "value" : [ " per " ]
+              }, {
+                "r" : "334",
+                "s" : [ {
+                  "value" : [ "1 ", "'1'" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "496",
+          "localId" : "343",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "497",
+            "localId" : "344",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "498",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "345",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "488",
+          "localId" : "335",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "493",
+            "localId" : "340",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "494",
+              "localId" : "341",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "495",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "342",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "489",
+            "localId" : "336",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "490",
+              "localId" : "337",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "491",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "338",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "492",
+            "localId" : "339",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "478",
+            "localId" : "319",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "484",
+              "localId" : "330",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "485",
+                "localId" : "331",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "486",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "332",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "481",
+              "localId" : "322",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "482",
+                "localId" : "323",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "483",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "324",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "479",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "320",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "480",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "321",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "327",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "328",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "329",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Literal",
+                "localId" : "325",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "3",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Literal",
+                "localId" : "326",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "5",
                 "annotation" : [ ]
               }
             } ]
           }, {
-            "type" : "Null",
-            "localId" : "487",
+            "type" : "Quantity",
+            "localId" : "334",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
+            "value" : 1,
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "501",
-        "name" : "OpenStart",
+        "localId" : "348",
+        "name" : "NonOverlapping",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "501",
+            "r" : "348",
             "s" : [ {
-              "value" : [ "", "define ", "OpenStart", ": " ]
+              "value" : [ "", "define ", "NonOverlapping", ": " ]
             }, {
-              "r" : "513",
+              "r" : "365",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "502",
+                "r" : "349",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "505",
+                  "r" : "352",
                   "s" : [ {
-                    "value" : [ "Interval(" ]
-                  }, {
-                    "r" : "503",
-                    "s" : [ {
-                      "value" : [ "2 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "504",
-                    "s" : [ {
-                      "value" : [ "4 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "350",
+                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "357",
+                  "s" : [ {
+                    "r" : "355",
+                    "value" : [ "Interval[", "6", ", ", "6", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -240938,9 +272769,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "512",
+                "r" : "364",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "1 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -240948,335 +272779,333 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "521",
+          "localId" : "373",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "522",
+            "localId" : "374",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "523",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "375",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "513",
+          "localId" : "365",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "518",
+            "localId" : "370",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "519",
+              "localId" : "371",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "520",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "372",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "514",
+            "localId" : "366",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "515",
+              "localId" : "367",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "516",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "368",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "517",
+            "localId" : "369",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "502",
+            "localId" : "349",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "508",
+              "localId" : "360",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "509",
+                "localId" : "361",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "510",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "362",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "505",
-              "lowClosed" : false,
+              "localId" : "352",
+              "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "506",
+                "localId" : "353",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "507",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "354",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "503",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "350",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "504",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "351",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Interval",
+              "localId" : "357",
+              "lowClosed" : true,
+              "highClosed" : true,
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "IntervalTypeSpecifier",
+                "localId" : "358",
+                "annotation" : [ ],
+                "pointType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "359",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              },
+              "low" : {
+                "type" : "Literal",
+                "localId" : "355",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
+                "annotation" : [ ]
+              },
+              "high" : {
+                "type" : "Literal",
+                "localId" : "356",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "6",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "512",
+            "localId" : "364",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
-            "unit" : "g",
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "526",
-        "name" : "OpenEnd",
+        "localId" : "378",
+        "name" : "NoPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "526",
+            "r" : "378",
             "s" : [ {
-              "value" : [ "", "define ", "OpenEnd", ": " ]
+              "value" : [ "", "define ", "NoPer", ": " ]
             }, {
-              "r" : "538",
+              "r" : "389",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "527",
+                "r" : "379",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "530",
+                  "r" : "382",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "528",
-                    "s" : [ {
-                      "value" : [ "2 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "529",
-                    "s" : [ {
-                      "value" : [ "4 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "380",
+                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
-              }, {
-                "value" : [ " per " ]
-              }, {
-                "r" : "537",
-                "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
-                } ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "546",
+          "localId" : "397",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "547",
+            "localId" : "398",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "548",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "399",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "538",
+          "localId" : "389",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "543",
+            "localId" : "394",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "544",
+              "localId" : "395",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "545",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "396",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "539",
+            "localId" : "390",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "540",
+              "localId" : "391",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "541",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "392",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "542",
+            "localId" : "393",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "527",
+            "localId" : "379",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "533",
+              "localId" : "385",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "534",
+                "localId" : "386",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "535",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "387",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "530",
+              "localId" : "382",
               "lowClosed" : true,
-              "highClosed" : false,
+              "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "531",
+                "localId" : "383",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "532",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "384",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "528",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "380",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "529",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "381",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
             } ]
           }, {
-            "type" : "Quantity",
-            "localId" : "537",
+            "type" : "Null",
+            "localId" : "388",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "g",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "551",
-        "name" : "OpenBoth",
+        "localId" : "402",
+        "name" : "OpenStart",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "551",
+            "r" : "402",
             "s" : [ {
-              "value" : [ "", "define ", "OpenBoth", ": " ]
+              "value" : [ "", "define ", "OpenStart", ": " ]
             }, {
-              "r" : "563",
+              "r" : "414",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "552",
+                "r" : "403",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "555",
+                  "r" : "406",
                   "s" : [ {
-                    "value" : [ "Interval(" ]
-                  }, {
-                    "r" : "553",
-                    "s" : [ {
-                      "value" : [ "2 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "554",
-                    "s" : [ {
-                      "value" : [ "4 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "404",
+                    "value" : [ "Interval(", "2", ", ", "4", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -241284,9 +273113,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "562",
+                "r" : "413",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "1 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -241294,162 +273123,149 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "571",
+          "localId" : "422",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "572",
+            "localId" : "423",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "573",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "424",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "563",
+          "localId" : "414",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "568",
+            "localId" : "419",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "569",
+              "localId" : "420",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "570",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "421",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "564",
+            "localId" : "415",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "565",
+              "localId" : "416",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "566",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "417",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "567",
+            "localId" : "418",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "552",
+            "localId" : "403",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "558",
+              "localId" : "409",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "559",
+                "localId" : "410",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "560",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "411",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "555",
+              "localId" : "406",
               "lowClosed" : false,
-              "highClosed" : false,
+              "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "556",
+                "localId" : "407",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "557",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "408",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "553",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "404",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "554",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "405",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "562",
+            "localId" : "413",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
-            "unit" : "g",
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "576",
-        "name" : "OpenBothDecimal",
+        "localId" : "427",
+        "name" : "OpenEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "576",
+            "r" : "427",
             "s" : [ {
-              "value" : [ "", "define ", "OpenBothDecimal", ": " ]
+              "value" : [ "", "define ", "OpenEnd", ": " ]
             }, {
-              "r" : "588",
+              "r" : "439",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "577",
+                "r" : "428",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "580",
+                  "r" : "431",
                   "s" : [ {
-                    "value" : [ "Interval(" ]
-                  }, {
-                    "r" : "578",
-                    "s" : [ {
-                      "value" : [ "2.1 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "579",
-                    "s" : [ {
-                      "value" : [ "4.1 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "429",
+                    "value" : [ "Interval[", "2", ", ", "4", ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -241457,9 +273273,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "587",
+                "r" : "438",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "1 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -241467,162 +273283,149 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "596",
+          "localId" : "447",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "597",
+            "localId" : "448",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "598",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "449",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "588",
+          "localId" : "439",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "593",
+            "localId" : "444",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "594",
+              "localId" : "445",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "595",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "446",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "589",
+            "localId" : "440",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "590",
+              "localId" : "441",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "591",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "442",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "592",
+            "localId" : "443",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "577",
+            "localId" : "428",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "583",
+              "localId" : "434",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "584",
+                "localId" : "435",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "585",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "436",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "580",
-              "lowClosed" : false,
+              "localId" : "431",
+              "lowClosed" : true,
               "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "581",
+                "localId" : "432",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "582",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "433",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "578",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2.1,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "429",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "579",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4.1,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "430",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "587",
+            "localId" : "438",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
-            "unit" : "g",
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "601",
-        "name" : "OpenBothDecimalTrunc",
+        "localId" : "452",
+        "name" : "OpenBoth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "601",
+            "r" : "452",
             "s" : [ {
-              "value" : [ "", "define ", "OpenBothDecimalTrunc", ": " ]
+              "value" : [ "", "define ", "OpenBoth", ": " ]
             }, {
-              "r" : "613",
+              "r" : "464",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "602",
+                "r" : "453",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "605",
+                  "r" : "456",
                   "s" : [ {
-                    "value" : [ "Interval(" ]
-                  }, {
-                    "r" : "603",
-                    "s" : [ {
-                      "value" : [ "2.1 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "604",
-                    "s" : [ {
-                      "value" : [ "4.101 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ")" ]
+                    "r" : "454",
+                    "value" : [ "Interval(", "2", ", ", "4", ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -241630,9 +273433,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "612",
+                "r" : "463",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "1 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -241640,126 +273443,126 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "621",
+          "localId" : "472",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "622",
+            "localId" : "473",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "623",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "474",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "613",
+          "localId" : "464",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "618",
+            "localId" : "469",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "619",
+              "localId" : "470",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "620",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "471",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "614",
+            "localId" : "465",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "615",
+              "localId" : "466",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "616",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "467",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "617",
+            "localId" : "468",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "602",
+            "localId" : "453",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "608",
+              "localId" : "459",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "609",
+                "localId" : "460",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "610",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "461",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "605",
+              "localId" : "456",
               "lowClosed" : false,
               "highClosed" : false,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "606",
+                "localId" : "457",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "607",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "458",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "603",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2.1,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "454",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "604",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4.101,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "455",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "612",
+            "localId" : "463",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
-            "unit" : "g",
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "626",
+        "localId" : "477",
         "name" : "EmptyList",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -241767,21 +273570,21 @@ module.exports['QuantityIntervalExpand'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "626",
+            "r" : "477",
             "s" : [ {
               "value" : [ "", "define ", "EmptyList", ": " ]
             }, {
-              "r" : "631",
+              "r" : "482",
               "s" : [ {
                 "value" : [ "List<" ]
               }, {
-                "r" : "627",
+                "r" : "478",
                 "s" : [ {
                   "value" : [ "Interval<" ]
                 }, {
-                  "r" : "628",
+                  "r" : "479",
                   "s" : [ {
-                    "value" : [ "Date" ]
+                    "value" : [ "Integer" ]
                   } ]
                 }, {
                   "value" : [ ">" ]
@@ -241794,36 +273597,36 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "636",
+          "localId" : "487",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "637",
+            "localId" : "488",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "638",
-              "name" : "{urn:hl7-org:elm-types:r1}Date",
+              "localId" : "489",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "631",
+          "localId" : "482",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "633",
+            "localId" : "484",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "634",
+              "localId" : "485",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "635",
-                "name" : "{urn:hl7-org:elm-types:r1}Date",
+                "localId" : "486",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
@@ -241831,7 +273634,7 @@ module.exports['QuantityIntervalExpand'] = {
           "element" : [ ]
         }
       }, {
-        "localId" : "641",
+        "localId" : "492",
         "name" : "PerTooBig",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -241839,46 +273642,33 @@ module.exports['QuantityIntervalExpand'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "641",
+            "r" : "492",
             "s" : [ {
               "value" : [ "", "define ", "PerTooBig", ": " ]
             }, {
-              "r" : "657",
+              "r" : "508",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "642",
+                "r" : "493",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "645",
+                  "r" : "496",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "643",
-                    "s" : [ {
-                      "value" : [ "2 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "644",
-                    "s" : [ {
-                      "value" : [ "4 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "494",
+                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
                   } ]
                 }, {
-                  "r" : "648",
+                  "r" : "499",
                   "value" : [ ", ", "null", " }" ]
                 } ]
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "656",
+                "r" : "507",
                 "s" : [ {
-                  "value" : [ "5 ", "'g'" ]
+                  "value" : [ "5 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -241886,148 +273676,148 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "665",
+          "localId" : "516",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "666",
+            "localId" : "517",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "667",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "518",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "657",
+          "localId" : "508",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "662",
+            "localId" : "513",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "663",
+              "localId" : "514",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "664",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "515",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "658",
+            "localId" : "509",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "659",
+              "localId" : "510",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "660",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "511",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "661",
+            "localId" : "512",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "642",
+            "localId" : "493",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "652",
+              "localId" : "503",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "653",
+                "localId" : "504",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "654",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "505",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "645",
+              "localId" : "496",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "646",
+                "localId" : "497",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "647",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "498",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "643",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "494",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "644",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "495",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
             }, {
               "type" : "As",
-              "localId" : "649",
+              "localId" : "500",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "648",
+                "localId" : "499",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "650",
+                "localId" : "501",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "651",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "502",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "656",
+            "localId" : "507",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 5,
-            "unit" : "g",
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "670",
+        "localId" : "521",
         "name" : "NullOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -242035,29 +273825,22 @@ module.exports['QuantityIntervalExpand'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "670",
+            "r" : "521",
             "s" : [ {
               "value" : [ "", "define ", "NullOpen", ": " ]
             }, {
-              "r" : "683",
+              "r" : "534",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "671",
+                "r" : "522",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "674",
+                  "r" : "525",
                   "s" : [ {
-                    "r" : "672",
-                    "value" : [ "Interval[", "null", ", " ]
-                  }, {
-                    "r" : "673",
-                    "s" : [ {
-                      "value" : [ "4 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "523",
+                    "value" : [ "Interval[", "null", ", ", "4", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -242065,9 +273848,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "682",
+                "r" : "533",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "1 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -242075,131 +273858,131 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "691",
+          "localId" : "542",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "692",
+            "localId" : "543",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "693",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "544",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "683",
+          "localId" : "534",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "688",
+            "localId" : "539",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "689",
+              "localId" : "540",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "690",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "541",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "684",
+            "localId" : "535",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "685",
+              "localId" : "536",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "686",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "537",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "687",
+            "localId" : "538",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "671",
+            "localId" : "522",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "678",
+              "localId" : "529",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "679",
+                "localId" : "530",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "680",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "531",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "674",
+              "localId" : "525",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "676",
+                "localId" : "527",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "677",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "528",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "As",
-                "localId" : "675",
-                "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "526",
+                "asType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "operand" : {
                   "type" : "Null",
-                  "localId" : "672",
+                  "localId" : "523",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "673",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "524",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "682",
+            "localId" : "533",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
-            "unit" : "g",
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "696",
+        "localId" : "547",
         "name" : "NullClose",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -242207,29 +273990,22 @@ module.exports['QuantityIntervalExpand'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "696",
+            "r" : "547",
             "s" : [ {
               "value" : [ "", "define ", "NullClose", ": " ]
             }, {
-              "r" : "709",
+              "r" : "560",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "697",
+                "r" : "548",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "700",
+                  "r" : "551",
                   "s" : [ {
-                    "value" : [ "Interval[" ]
-                  }, {
-                    "r" : "698",
-                    "s" : [ {
-                      "value" : [ "2 ", "'g'" ]
-                    } ]
-                  }, {
-                    "r" : "699",
-                    "value" : [ ", ", "null", "]" ]
+                    "r" : "549",
+                    "value" : [ "Interval[", "2", ", ", "null", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -242237,9 +274013,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "708",
+                "r" : "559",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "1 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -242247,115 +274023,115 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "717",
+          "localId" : "568",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "718",
+            "localId" : "569",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "719",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "570",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "709",
+          "localId" : "560",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "714",
+            "localId" : "565",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "715",
+              "localId" : "566",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "716",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "567",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "710",
+            "localId" : "561",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "711",
+              "localId" : "562",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "712",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "563",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "713",
+            "localId" : "564",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "697",
+            "localId" : "548",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "704",
+              "localId" : "555",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "705",
+                "localId" : "556",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "706",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "557",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "700",
+              "localId" : "551",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "702",
+                "localId" : "553",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "703",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "554",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "698",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "549",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "As",
-                "localId" : "701",
-                "asType" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "552",
+                "asType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "operand" : {
                   "type" : "Null",
-                  "localId" : "699",
+                  "localId" : "550",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -242363,15 +274139,15 @@ module.exports['QuantityIntervalExpand'] = {
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "708",
+            "localId" : "559",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
-            "unit" : "g",
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "722",
+        "localId" : "573",
         "name" : "NullBoth",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -242379,21 +274155,21 @@ module.exports['QuantityIntervalExpand'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "722",
+            "r" : "573",
             "s" : [ {
               "value" : [ "", "define ", "NullBoth", ": " ]
             }, {
-              "r" : "734",
+              "r" : "585",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "723",
+                "r" : "574",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "726",
+                  "r" : "577",
                   "s" : [ {
-                    "r" : "724",
+                    "r" : "575",
                     "value" : [ "Interval[", "null", ", ", "null", "]" ]
                   } ]
                 }, {
@@ -242402,9 +274178,9 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "733",
+                "r" : "584",
                 "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
+                  "value" : [ "1 ", "'1'" ]
                 } ]
               } ]
             } ]
@@ -242412,15 +274188,15 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "742",
+          "localId" : "593",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "743",
+            "localId" : "594",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "744",
+              "localId" : "595",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
@@ -242428,19 +274204,19 @@ module.exports['QuantityIntervalExpand'] = {
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "734",
+          "localId" : "585",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "739",
+            "localId" : "590",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "740",
+              "localId" : "591",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "741",
+                "localId" : "592",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -242448,40 +274224,40 @@ module.exports['QuantityIntervalExpand'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "735",
+            "localId" : "586",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "736",
+              "localId" : "587",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "737",
+                "localId" : "588",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "738",
+            "localId" : "589",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "723",
+            "localId" : "574",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "729",
+              "localId" : "580",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "730",
+                "localId" : "581",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "731",
+                  "localId" : "582",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
@@ -242489,45 +274265,45 @@ module.exports['QuantityIntervalExpand'] = {
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "726",
+              "localId" : "577",
               "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "727",
+                "localId" : "578",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "728",
+                  "localId" : "579",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Null",
-                "localId" : "724",
+                "localId" : "575",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Null",
-                "localId" : "725",
+                "localId" : "576",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "733",
+            "localId" : "584",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
-            "unit" : "g",
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "747",
+        "localId" : "598",
         "name" : "BadPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -242535,35 +274311,22 @@ module.exports['QuantityIntervalExpand'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "747",
+            "r" : "598",
             "s" : [ {
               "value" : [ "", "define ", "BadPerMinute", ": " ]
             }, {
-              "r" : "759",
+              "r" : "610",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "748",
+                "r" : "599",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "751",
+                  "r" : "602",
                   "s" : [ {
-                    "value" : [ "Interval(" ]
-                  }, {
-                    "r" : "749",
-                    "s" : [ {
-                      "value" : [ "2 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "750",
-                    "s" : [ {
-                      "value" : [ "4 ", "'g'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "600",
+                    "value" : [ "Interval(", "2", ", ", "4", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -242571,7 +274334,7 @@ module.exports['QuantityIntervalExpand'] = {
               }, {
                 "value" : [ " per " ]
               }, {
-                "r" : "758",
+                "r" : "609",
                 "s" : [ {
                   "value" : [ "1 ", "minute" ]
                 } ]
@@ -242581,118 +274344,118 @@ module.exports['QuantityIntervalExpand'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "767",
+          "localId" : "618",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "768",
+            "localId" : "619",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "769",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "620",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "759",
+          "localId" : "610",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "764",
+            "localId" : "615",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "765",
+              "localId" : "616",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "617",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "760",
+            "localId" : "611",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "761",
+              "localId" : "612",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "762",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "613",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "763",
+            "localId" : "614",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "748",
+            "localId" : "599",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "754",
+              "localId" : "605",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "755",
+                "localId" : "606",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "756",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "607",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "751",
+              "localId" : "602",
               "lowClosed" : false,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "752",
+                "localId" : "603",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "753",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "604",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "749",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "600",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "750",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "g",
+                "type" : "Literal",
+                "localId" : "601",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "4",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "758",
+            "localId" : "609",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "value" : 1,
             "unit" : "minute",
@@ -242700,175 +274463,157 @@ module.exports['QuantityIntervalExpand'] = {
           } ]
         }
       }, {
-        "localId" : "772",
-        "name" : "BadPerGram",
+        "localId" : "623",
+        "name" : "PerDecimalMorePrecise",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "772",
+            "r" : "623",
             "s" : [ {
-              "value" : [ "", "define ", "BadPerGram", ": " ]
+              "value" : [ "", "define ", "PerDecimalMorePrecise", ": " ]
             }, {
-              "r" : "784",
+              "r" : "636",
               "s" : [ {
                 "value" : [ "expand " ]
               }, {
-                "r" : "773",
+                "r" : "624",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "776",
+                  "r" : "627",
                   "s" : [ {
-                    "value" : [ "Interval(" ]
-                  }, {
-                    "r" : "774",
-                    "s" : [ {
-                      "value" : [ "2 ", "'km'" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "r" : "775",
-                    "s" : [ {
-                      "value" : [ "4 ", "'km'" ]
-                    } ]
-                  }, {
-                    "value" : [ "]" ]
+                    "r" : "625",
+                    "value" : [ "Interval[", "10", ", ", "10", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
                 } ]
               }, {
-                "value" : [ "  per " ]
-              }, {
-                "r" : "783",
-                "s" : [ {
-                  "value" : [ "1 ", "'g'" ]
-                } ]
+                "r" : "634",
+                "value" : [ " per ", "0.1" ]
               } ]
             } ]
           }
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "792",
+          "localId" : "644",
           "annotation" : [ ],
           "elementType" : {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "793",
+            "localId" : "645",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "794",
-              "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+              "localId" : "646",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }
         },
         "expression" : {
           "type" : "Expand",
-          "localId" : "784",
+          "localId" : "636",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "789",
+            "localId" : "641",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "790",
+              "localId" : "642",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "791",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "643",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "785",
+            "localId" : "637",
             "annotation" : [ ],
             "elementType" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "786",
+              "localId" : "638",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "787",
-                "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                "localId" : "639",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "788",
+            "localId" : "640",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "773",
+            "localId" : "624",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "779",
+              "localId" : "630",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "780",
+                "localId" : "631",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "781",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "632",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }
             },
             "element" : [ {
               "type" : "Interval",
-              "localId" : "776",
-              "lowClosed" : false,
+              "localId" : "627",
+              "lowClosed" : true,
               "highClosed" : true,
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "IntervalTypeSpecifier",
-                "localId" : "777",
+                "localId" : "628",
                 "annotation" : [ ],
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "778",
-                  "name" : "{urn:hl7-org:elm-types:r1}Quantity",
+                  "localId" : "629",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "low" : {
-                "type" : "Quantity",
-                "localId" : "774",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 2,
-                "unit" : "km",
+                "type" : "Literal",
+                "localId" : "625",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
                 "annotation" : [ ]
               },
               "high" : {
-                "type" : "Quantity",
-                "localId" : "775",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-                "value" : 4,
-                "unit" : "km",
+                "type" : "Literal",
+                "localId" : "626",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "10",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "Quantity",
-            "localId" : "783",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
-            "value" : 1,
-            "unit" : "g",
+            "localId" : "635",
+            "value" : 0.1,
+            "unit" : "1",
             "annotation" : [ ]
           } ]
         }
@@ -242877,35 +274622,35 @@ module.exports['QuantityIntervalExpand'] = {
   }
 }
 
-/* IntegerIntervalExpand
+/* LongIntervalExpand
 library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
-define ClosedSinglePer1: expand { Interval[2, 4] } per 1 '1'
-define ClosedSinglePer3: expand { Interval[2, 10] } per 3 '1'
-define ClosedSinglePer3NoteTheWidth: expand { Interval[2, 4] } per 3 '1'
+define LongClosedSinglePer1: expand { Interval[2L, 4L] } per 1 '1'
+define LongClosedSinglePer3: expand { Interval[2L, 10L] } per 3 '1'
+define LongClosedSinglePer3NoteTheWidth: expand { Interval[2L, 4L] } per 3 '1'
 
-define NullInList: expand { Interval[2, 4], null } per 1 '1'
-define Overlapping: expand { Interval[2, 4], Interval[3, 5] } per 1 '1'
-define NonOverlapping: expand { Interval[2, 4], Interval[6, 6] } per 1 '1'
+define LongNullInList: expand { Interval[2L, 4L], null } per 1 '1'
+define LongOverlapping: expand { Interval[2L, 4L], Interval[3L, 5L] } per 1 '1'
+define LongNonOverlapping: expand { Interval[2L, 4L], Interval[6L, 6L] } per 1 '1'
 
-define NoPer: expand { Interval[2, 4] }
+define LongNoPer: expand { Interval[2L, 4L] }
 
-define OpenStart: expand { Interval(2, 4] } per 1 '1'
-define OpenEnd: expand { Interval[2, 4) } per 1 '1'
-define OpenBoth: expand { Interval(2, 4) } per 1 '1'
+define LongOpenStart: expand { Interval(2L, 4L] } per 1 '1'
+define LongOpenEnd: expand { Interval[2L, 4L) } per 1 '1'
+define LongOpenBoth: expand { Interval(2L, 4L) } per 1 '1'
 
-define EmptyList: List<Interval<Integer>>{}
-define PerTooBig: expand { Interval[2, 4], null } per 5 '1'
-define NullOpen: expand { Interval[null, 4] } per 1 '1'
-define NullClose: expand { Interval[2, null] } per 1 '1'
-define NullBoth: expand { Interval[null, null] } per 1 '1'
-define BadPerMinute: expand { Interval(2, 4] } per 1 minute
+define LongEmptyList: List<Interval<Long>>{}
+define LongPerTooBig: expand { Interval[2L, 4L], null } per 5 '1'
+define LongNullOpen: expand { Interval[null, 4L] } per 1 '1'
+define LongNullClose: expand { Interval[2L, null] } per 1 '1'
+define LongNullBoth: expand { Interval[null, null] } per 1 '1'
+define LongBadPerMinute: expand { Interval(2L, 4L] } per 1 minute
 
-define PerDecimalMorePrecise: expand { Interval[10, 10] } per 0.1
+define LongPerDecimalMorePrecise: expand { Interval[10L, 10L] } per 0.1
 */
 
-module.exports['IntegerIntervalExpand'] = {
+module.exports['LongIntervalExpand'] = {
   "library" : {
     "localId" : "0",
     "annotation" : [ {
@@ -242991,7 +274736,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "214",
-        "name" : "ClosedSinglePer1",
+        "name" : "LongClosedSinglePer1",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -243000,7 +274745,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "214",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSinglePer1", ": " ]
+              "value" : [ "", "define ", "LongClosedSinglePer1", ": " ]
             }, {
               "r" : "226",
               "s" : [ {
@@ -243013,7 +274758,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "218",
                   "s" : [ {
                     "r" : "216",
-                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                    "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -243040,7 +274785,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "236",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -243060,7 +274805,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "233",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243076,7 +274821,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "229",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243101,7 +274846,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "223",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -243119,23 +274864,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "220",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "216",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "217",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -243151,7 +274896,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "239",
-        "name" : "ClosedSinglePer3",
+        "name" : "LongClosedSinglePer3",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -243160,7 +274905,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "239",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSinglePer3", ": " ]
+              "value" : [ "", "define ", "LongClosedSinglePer3", ": " ]
             }, {
               "r" : "251",
               "s" : [ {
@@ -243173,7 +274918,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "243",
                   "s" : [ {
                     "r" : "241",
-                    "value" : [ "Interval[", "2", ", ", "10", "]" ]
+                    "value" : [ "Interval[", "2L", ", ", "10L", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -243200,7 +274945,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "261",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -243220,7 +274965,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "258",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243236,7 +274981,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "254",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243261,7 +275006,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "248",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -243279,23 +275024,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "245",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "241",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "242",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "10",
                 "annotation" : [ ]
               }
@@ -243311,7 +275056,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "264",
-        "name" : "ClosedSinglePer3NoteTheWidth",
+        "name" : "LongClosedSinglePer3NoteTheWidth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -243320,7 +275065,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "ClosedSinglePer3NoteTheWidth", ": " ]
+              "value" : [ "", "define ", "LongClosedSinglePer3NoteTheWidth", ": " ]
             }, {
               "r" : "276",
               "s" : [ {
@@ -243333,7 +275078,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "268",
                   "s" : [ {
                     "r" : "266",
-                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                    "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -243360,7 +275105,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "286",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -243380,7 +275125,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "283",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243396,7 +275141,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "279",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243421,7 +275166,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "273",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -243439,23 +275184,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "270",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "266",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "267",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -243471,7 +275216,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "289",
-        "name" : "NullInList",
+        "name" : "LongNullInList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -243480,7 +275225,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "NullInList", ": " ]
+              "value" : [ "", "define ", "LongNullInList", ": " ]
             }, {
               "r" : "305",
               "s" : [ {
@@ -243493,7 +275238,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "293",
                   "s" : [ {
                     "r" : "291",
-                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                    "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                   } ]
                 }, {
                   "r" : "296",
@@ -243521,7 +275266,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "315",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -243541,7 +275286,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "312",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243557,7 +275302,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "308",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243582,7 +275327,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "302",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -243600,23 +275345,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "295",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "291",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "292",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -243638,7 +275383,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "299",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -243654,7 +275399,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "318",
-        "name" : "Overlapping",
+        "name" : "LongOverlapping",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -243663,7 +275408,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "318",
             "s" : [ {
-              "value" : [ "", "define ", "Overlapping", ": " ]
+              "value" : [ "", "define ", "LongOverlapping", ": " ]
             }, {
               "r" : "335",
               "s" : [ {
@@ -243676,7 +275421,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "322",
                   "s" : [ {
                     "r" : "320",
-                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                    "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
@@ -243684,7 +275429,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "327",
                   "s" : [ {
                     "r" : "325",
-                    "value" : [ "Interval[", "3", ", ", "5", "]" ]
+                    "value" : [ "Interval[", "3L", ", ", "5L", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -243711,7 +275456,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "345",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -243731,7 +275476,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "342",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243747,7 +275492,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "338",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243772,7 +275517,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "332",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -243790,23 +275535,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "324",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "320",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "321",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -243823,23 +275568,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "329",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "325",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "3",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "326",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "5",
                 "annotation" : [ ]
               }
@@ -243855,7 +275600,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "348",
-        "name" : "NonOverlapping",
+        "name" : "LongNonOverlapping",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -243864,7 +275609,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "348",
             "s" : [ {
-              "value" : [ "", "define ", "NonOverlapping", ": " ]
+              "value" : [ "", "define ", "LongNonOverlapping", ": " ]
             }, {
               "r" : "365",
               "s" : [ {
@@ -243877,7 +275622,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "352",
                   "s" : [ {
                     "r" : "350",
-                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                    "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
@@ -243885,7 +275630,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "357",
                   "s" : [ {
                     "r" : "355",
-                    "value" : [ "Interval[", "6", ", ", "6", "]" ]
+                    "value" : [ "Interval[", "6L", ", ", "6L", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -243912,7 +275657,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "375",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -243932,7 +275677,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "372",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243948,7 +275693,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "368",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -243973,7 +275718,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "362",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -243991,23 +275736,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "354",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "350",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "351",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -244024,23 +275769,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "359",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "355",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "6",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "356",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "6",
                 "annotation" : [ ]
               }
@@ -244056,7 +275801,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "378",
-        "name" : "NoPer",
+        "name" : "LongNoPer",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -244065,7 +275810,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "378",
             "s" : [ {
-              "value" : [ "", "define ", "NoPer", ": " ]
+              "value" : [ "", "define ", "LongNoPer", ": " ]
             }, {
               "r" : "389",
               "s" : [ {
@@ -244078,7 +275823,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "382",
                   "s" : [ {
                     "r" : "380",
-                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                    "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -244098,7 +275843,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "399",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -244118,7 +275863,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "396",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244134,7 +275879,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "392",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244159,7 +275904,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "387",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -244177,23 +275922,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "384",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "380",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "381",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -244207,7 +275952,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "402",
-        "name" : "OpenStart",
+        "name" : "LongOpenStart",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -244216,7 +275961,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "402",
             "s" : [ {
-              "value" : [ "", "define ", "OpenStart", ": " ]
+              "value" : [ "", "define ", "LongOpenStart", ": " ]
             }, {
               "r" : "414",
               "s" : [ {
@@ -244229,7 +275974,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "406",
                   "s" : [ {
                     "r" : "404",
-                    "value" : [ "Interval(", "2", ", ", "4", "]" ]
+                    "value" : [ "Interval(", "2L", ", ", "4L", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -244256,7 +276001,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "424",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -244276,7 +276021,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "421",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244292,7 +276037,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "417",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244317,7 +276062,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "411",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -244335,23 +276080,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "408",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "404",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "405",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -244367,7 +276112,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "427",
-        "name" : "OpenEnd",
+        "name" : "LongOpenEnd",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -244376,7 +276121,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "427",
             "s" : [ {
-              "value" : [ "", "define ", "OpenEnd", ": " ]
+              "value" : [ "", "define ", "LongOpenEnd", ": " ]
             }, {
               "r" : "439",
               "s" : [ {
@@ -244389,7 +276134,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "431",
                   "s" : [ {
                     "r" : "429",
-                    "value" : [ "Interval[", "2", ", ", "4", ")" ]
+                    "value" : [ "Interval[", "2L", ", ", "4L", ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -244416,7 +276161,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "449",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -244436,7 +276181,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "446",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244452,7 +276197,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "442",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244477,7 +276222,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "436",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -244495,23 +276240,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "433",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "429",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "430",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -244527,7 +276272,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "452",
-        "name" : "OpenBoth",
+        "name" : "LongOpenBoth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -244536,7 +276281,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "452",
             "s" : [ {
-              "value" : [ "", "define ", "OpenBoth", ": " ]
+              "value" : [ "", "define ", "LongOpenBoth", ": " ]
             }, {
               "r" : "464",
               "s" : [ {
@@ -244549,7 +276294,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "456",
                   "s" : [ {
                     "r" : "454",
-                    "value" : [ "Interval(", "2", ", ", "4", ")" ]
+                    "value" : [ "Interval(", "2L", ", ", "4L", ")" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -244576,7 +276321,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "474",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -244596,7 +276341,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "471",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244612,7 +276357,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "467",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244637,7 +276382,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "461",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -244655,23 +276400,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "458",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "454",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "455",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -244687,7 +276432,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "477",
-        "name" : "EmptyList",
+        "name" : "LongEmptyList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -244696,7 +276441,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "477",
             "s" : [ {
-              "value" : [ "", "define ", "EmptyList", ": " ]
+              "value" : [ "", "define ", "LongEmptyList", ": " ]
             }, {
               "r" : "482",
               "s" : [ {
@@ -244708,7 +276453,7 @@ module.exports['IntegerIntervalExpand'] = {
                 }, {
                   "r" : "479",
                   "s" : [ {
-                    "value" : [ "Integer" ]
+                    "value" : [ "Long" ]
                   } ]
                 }, {
                   "value" : [ ">" ]
@@ -244730,7 +276475,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "489",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -244750,7 +276495,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "486",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244759,7 +276504,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "492",
-        "name" : "PerTooBig",
+        "name" : "LongPerTooBig",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -244768,7 +276513,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "492",
             "s" : [ {
-              "value" : [ "", "define ", "PerTooBig", ": " ]
+              "value" : [ "", "define ", "LongPerTooBig", ": " ]
             }, {
               "r" : "508",
               "s" : [ {
@@ -244781,7 +276526,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "496",
                   "s" : [ {
                     "r" : "494",
-                    "value" : [ "Interval[", "2", ", ", "4", "]" ]
+                    "value" : [ "Interval[", "2L", ", ", "4L", "]" ]
                   } ]
                 }, {
                   "r" : "499",
@@ -244809,7 +276554,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "518",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -244829,7 +276574,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "515",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244845,7 +276590,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "511",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -244870,7 +276615,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "505",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -244888,23 +276633,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "498",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "494",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "495",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -244926,7 +276671,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "502",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -244942,7 +276687,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "521",
-        "name" : "NullOpen",
+        "name" : "LongNullOpen",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -244951,7 +276696,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "521",
             "s" : [ {
-              "value" : [ "", "define ", "NullOpen", ": " ]
+              "value" : [ "", "define ", "LongNullOpen", ": " ]
             }, {
               "r" : "534",
               "s" : [ {
@@ -244964,7 +276709,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "525",
                   "s" : [ {
                     "r" : "523",
-                    "value" : [ "Interval[", "null", ", ", "4", "]" ]
+                    "value" : [ "Interval[", "null", ", ", "4L", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -244991,7 +276736,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "544",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -245011,7 +276756,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "541",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -245027,7 +276772,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "537",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -245052,7 +276797,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "531",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -245070,14 +276815,14 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "528",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "As",
                 "localId" : "526",
-                "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "asType" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "operand" : {
@@ -245090,8 +276835,8 @@ module.exports['IntegerIntervalExpand'] = {
               "high" : {
                 "type" : "Literal",
                 "localId" : "524",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -245107,7 +276852,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "547",
-        "name" : "NullClose",
+        "name" : "LongNullClose",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -245116,7 +276861,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "547",
             "s" : [ {
-              "value" : [ "", "define ", "NullClose", ": " ]
+              "value" : [ "", "define ", "LongNullClose", ": " ]
             }, {
               "r" : "560",
               "s" : [ {
@@ -245129,7 +276874,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "551",
                   "s" : [ {
                     "r" : "549",
-                    "value" : [ "Interval[", "2", ", ", "null", "]" ]
+                    "value" : [ "Interval[", "2L", ", ", "null", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -245156,7 +276901,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "570",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -245176,7 +276921,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "567",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -245192,7 +276937,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "563",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -245217,7 +276962,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "557",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -245235,22 +276980,22 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "554",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "549",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "As",
                 "localId" : "552",
-                "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "asType" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ],
                 "signature" : [ ],
                 "operand" : {
@@ -245272,7 +277017,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "573",
-        "name" : "NullBoth",
+        "name" : "LongNullBoth",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -245281,7 +277026,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "573",
             "s" : [ {
-              "value" : [ "", "define ", "NullBoth", ": " ]
+              "value" : [ "", "define ", "LongNullBoth", ": " ]
             }, {
               "r" : "585",
               "s" : [ {
@@ -245428,7 +277173,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "598",
-        "name" : "BadPerMinute",
+        "name" : "LongBadPerMinute",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -245437,7 +277182,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "598",
             "s" : [ {
-              "value" : [ "", "define ", "BadPerMinute", ": " ]
+              "value" : [ "", "define ", "LongBadPerMinute", ": " ]
             }, {
               "r" : "610",
               "s" : [ {
@@ -245450,7 +277195,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "602",
                   "s" : [ {
                     "r" : "600",
-                    "value" : [ "Interval(", "2", ", ", "4", "]" ]
+                    "value" : [ "Interval(", "2L", ", ", "4L", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -245477,7 +277222,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "620",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -245497,7 +277242,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "617",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -245513,7 +277258,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "613",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -245538,7 +277283,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "607",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -245556,23 +277301,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "604",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "600",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "2",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "601",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "4",
                 "annotation" : [ ]
               }
@@ -245588,7 +277333,7 @@ module.exports['IntegerIntervalExpand'] = {
         }
       }, {
         "localId" : "623",
-        "name" : "PerDecimalMorePrecise",
+        "name" : "LongPerDecimalMorePrecise",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -245597,7 +277342,7 @@ module.exports['IntegerIntervalExpand'] = {
           "s" : {
             "r" : "623",
             "s" : [ {
-              "value" : [ "", "define ", "PerDecimalMorePrecise", ": " ]
+              "value" : [ "", "define ", "LongPerDecimalMorePrecise", ": " ]
             }, {
               "r" : "636",
               "s" : [ {
@@ -245610,7 +277355,7 @@ module.exports['IntegerIntervalExpand'] = {
                   "r" : "627",
                   "s" : [ {
                     "r" : "625",
-                    "value" : [ "Interval[", "10", ", ", "10", "]" ]
+                    "value" : [ "Interval[", "10L", ", ", "10L", "]" ]
                   } ]
                 }, {
                   "value" : [ " }" ]
@@ -245633,7 +277378,7 @@ module.exports['IntegerIntervalExpand'] = {
             "pointType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "646",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }
@@ -245653,7 +277398,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "643",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -245669,7 +277414,7 @@ module.exports['IntegerIntervalExpand'] = {
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "639",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }
@@ -245694,7 +277439,7 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "632",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               }
@@ -245712,23 +277457,23 @@ module.exports['IntegerIntervalExpand'] = {
                 "pointType" : {
                   "type" : "NamedTypeSpecifier",
                   "localId" : "629",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "low" : {
                 "type" : "Literal",
                 "localId" : "625",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "10",
                 "annotation" : [ ]
               },
               "high" : {
                 "type" : "Literal",
                 "localId" : "626",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
                 "value" : "10",
                 "annotation" : [ ]
               }
@@ -248523,6 +280268,9 @@ define DateTimeMillisecondPrecisionNotSame: Interval[DateTime(2018,01,01,01,01,0
 define IntegerIntervalSame: Interval[2,5] same as Interval[2,5]
 define IntegerIntervalNotSame: Interval[2,5] same as Interval[2,4]
 define IntegerIntervalSameOpen: Interval[2,5] same as Interval[2,6)
+define LongIntervalSame: Interval[2L,5L] same as Interval[2L,5L]
+define LongIntervalNotSame: Interval[2L,5L] same as Interval[2L,4L]
+define LongIntervalSameOpen: Interval[2L,5L] same as Interval[2L,6L)
 define OpenNullHighLowDifferent: Interval(3,null) same as Interval(2,4)
 define OpenNullLowHighDifferent: Interval(1,5) same as Interval(null,4)
 define OpenNullHighLowSame: Interval(2,null) same as Interval(2,4)
@@ -248531,6 +280279,14 @@ define OpenNullLowOpenNullHigh: Interval(1,null) same as Interval(null,4)
 define OpenNullHighsLowsDifferent: Interval(1,null) same as Interval(2,null)
 define OpenNullHighsLowsSame: Interval(1,null) same as Interval(1,null)
 define OpenNullLowsHighsSame: Interval(null,3) same as Interval(null,3)
+define LongOpenNullHighLowDifferent: Interval(3L,null) same as Interval(2L,4L)
+define LongOpenNullLowHighDifferent: Interval(1L,5L) same as Interval(null,4L)
+define LongOpenNullHighLowSame: Interval(2L,null) same as Interval(2L,4L)
+define LongOpenNullLowHighSame: Interval(1L,4L) same as Interval(null,4L)
+define LongOpenNullLowOpenNullHigh: Interval(1L,null) same as Interval(null,4L)
+define LongOpenNullHighsLowsDifferent: Interval(1L,null) same as Interval(2L,null)
+define LongOpenNullHighsLowsSame: Interval(1L,null) same as Interval(1L,null)
+define LongOpenNullLowsHighsSame: Interval(null,3L) same as Interval(null,3L)
 */
 
 module.exports['SameAs'] = {
@@ -248545,7 +280301,7 @@ module.exports['SameAs'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "2714",
+        "r" : "2924",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -259247,38 +291003,510 @@ module.exports['SameAs'] = {
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2222",
+                "localId" : "2222",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2223",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2224",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2225",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2226",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2227",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2207",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2018",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2208",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2209",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2210",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2211",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2212",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2243",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2244",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2245",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2246",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2247",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2248",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2228",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2019",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2229",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2230",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2231",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2232",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2233",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2294",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2295",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2296",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2267",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2268",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2269",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2270",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2271",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2272",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2252",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2018",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2253",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2254",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2255",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2256",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2257",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "DateTime",
+              "localId" : "2287",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2288",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2289",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2290",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2291",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2292",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2293",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              } ],
+              "year" : {
+                "type" : "Literal",
+                "localId" : "2273",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "2019",
+                "annotation" : [ ]
+              },
+              "month" : {
+                "type" : "Literal",
+                "localId" : "2274",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "day" : {
+                "type" : "Literal",
+                "localId" : "2275",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "hour" : {
+                "type" : "Literal",
+                "localId" : "2276",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "minute" : {
+                "type" : "Literal",
+                "localId" : "2277",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "07",
+                "annotation" : [ ]
+              },
+              "second" : {
+                "type" : "Literal",
+                "localId" : "2278",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "55",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2304",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "DateTimeMillisecondPrecisionSame",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2304",
+            "s" : [ {
+              "value" : [ "", "define ", "DateTimeMillisecondPrecisionSame", ": " ]
+            }, {
+              "r" : "2407",
+              "s" : [ {
+                "r" : "2353",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2321",
+                  "s" : [ {
+                    "r" : "2305",
+                    "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2345",
+                  "s" : [ {
+                    "r" : "2329",
+                    "value" : [ "DateTime", "(", "2019", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              }, {
+                "r" : "2407",
+                "value" : [ " ", "same millisecond as", " " ]
+              }, {
+                "r" : "2404",
+                "s" : [ {
+                  "value" : [ "Interval[" ]
+                }, {
+                  "r" : "2372",
+                  "s" : [ {
+                    "r" : "2356",
+                    "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "2396",
+                  "s" : [ {
+                    "r" : "2380",
+                    "value" : [ "DateTime", "(", "2019", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
+                  } ]
+                }, {
+                  "value" : [ "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2407",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "precision" : "Millisecond",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2408",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2409",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2410",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2411",
+              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2353",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2354",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2355",
+                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "DateTime",
+              "localId" : "2321",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "annotation" : [ ],
+              "signature" : [ {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2322",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2323",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2223",
+                "localId" : "2324",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2224",
+                "localId" : "2325",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2225",
+                "localId" : "2326",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2226",
+                "localId" : "2327",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2227",
+                "localId" : "2328",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2207",
+                "localId" : "2305",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2018",
@@ -259286,7 +291514,7 @@ module.exports['SameAs'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2208",
+                "localId" : "2306",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259294,7 +291522,7 @@ module.exports['SameAs'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2209",
+                "localId" : "2307",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259302,7 +291530,7 @@ module.exports['SameAs'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2210",
+                "localId" : "2308",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259310,7 +291538,7 @@ module.exports['SameAs'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2211",
+                "localId" : "2309",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259318,7 +291546,15 @@ module.exports['SameAs'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2212",
+                "localId" : "2310",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2311",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259327,43 +291563,48 @@ module.exports['SameAs'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2242",
+              "localId" : "2345",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2243",
+                "localId" : "2346",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2244",
+                "localId" : "2347",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2245",
+                "localId" : "2348",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2246",
+                "localId" : "2349",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2247",
+                "localId" : "2350",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2248",
+                "localId" : "2351",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2352",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2228",
+                "localId" : "2329",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2019",
@@ -259371,7 +291612,7 @@ module.exports['SameAs'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2229",
+                "localId" : "2330",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259379,7 +291620,7 @@ module.exports['SameAs'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2230",
+                "localId" : "2331",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259387,7 +291628,7 @@ module.exports['SameAs'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2231",
+                "localId" : "2332",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259395,7 +291636,7 @@ module.exports['SameAs'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2232",
+                "localId" : "2333",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259403,7 +291644,15 @@ module.exports['SameAs'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2233",
+                "localId" : "2334",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2335",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259412,60 +291661,65 @@ module.exports['SameAs'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "2294",
+            "localId" : "2404",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2295",
+              "localId" : "2405",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2296",
+                "localId" : "2406",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2266",
+              "localId" : "2372",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2267",
+                "localId" : "2373",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2268",
+                "localId" : "2374",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2269",
+                "localId" : "2375",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2270",
+                "localId" : "2376",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2271",
+                "localId" : "2377",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2272",
+                "localId" : "2378",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2379",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2252",
+                "localId" : "2356",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2018",
@@ -259473,7 +291727,7 @@ module.exports['SameAs'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2253",
+                "localId" : "2357",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259481,7 +291735,7 @@ module.exports['SameAs'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2254",
+                "localId" : "2358",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259489,7 +291743,7 @@ module.exports['SameAs'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2255",
+                "localId" : "2359",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259497,7 +291751,7 @@ module.exports['SameAs'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2256",
+                "localId" : "2360",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259505,7 +291759,15 @@ module.exports['SameAs'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2257",
+                "localId" : "2361",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2362",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259514,43 +291776,48 @@ module.exports['SameAs'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2287",
+              "localId" : "2396",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2288",
+                "localId" : "2397",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2289",
+                "localId" : "2398",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2290",
+                "localId" : "2399",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2291",
+                "localId" : "2400",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2292",
+                "localId" : "2401",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2293",
+                "localId" : "2402",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }, {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2403",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2273",
+                "localId" : "2380",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2019",
@@ -259558,7 +291825,7 @@ module.exports['SameAs'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2274",
+                "localId" : "2381",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259566,7 +291833,7 @@ module.exports['SameAs'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2275",
+                "localId" : "2382",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259574,7 +291841,7 @@ module.exports['SameAs'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2276",
+                "localId" : "2383",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259582,79 +291849,87 @@ module.exports['SameAs'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2277",
+                "localId" : "2384",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "07",
+                "value" : "01",
                 "annotation" : [ ]
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2278",
+                "localId" : "2385",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "55",
+                "value" : "01",
+                "annotation" : [ ]
+              },
+              "millisecond" : {
+                "type" : "Literal",
+                "localId" : "2386",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                "value" : "01",
                 "annotation" : [ ]
               }
             }
           } ]
         }
       }, {
-        "localId" : "2304",
+        "localId" : "2414",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeMillisecondPrecisionSame",
+        "name" : "DateTimeMillisecondPrecisionNotSame",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2304",
+            "r" : "2414",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeMillisecondPrecisionSame", ": " ]
+              "value" : [ "", "define ", "DateTimeMillisecondPrecisionNotSame", ": " ]
             }, {
-              "r" : "2407",
+              "r" : "2517",
               "s" : [ {
-                "r" : "2353",
+                "r" : "2463",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2321",
+                  "r" : "2431",
                   "s" : [ {
-                    "r" : "2305",
+                    "r" : "2415",
                     "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2345",
+                  "r" : "2455",
                   "s" : [ {
-                    "r" : "2329",
+                    "r" : "2439",
                     "value" : [ "DateTime", "(", "2019", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
                 } ]
               }, {
-                "r" : "2407",
+                "r" : "2517",
                 "value" : [ " ", "same millisecond as", " " ]
               }, {
-                "r" : "2404",
+                "r" : "2514",
                 "s" : [ {
                   "value" : [ "Interval[" ]
                 }, {
-                  "r" : "2372",
+                  "r" : "2482",
                   "s" : [ {
-                    "r" : "2356",
+                    "r" : "2466",
                     "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "2396",
+                  "r" : "2506",
                   "s" : [ {
-                    "r" : "2380",
-                    "value" : [ "DateTime", "(", "2019", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
+                    "r" : "2490",
+                    "value" : [ "DateTime", "(", "2019", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "09", ")" ]
                   } ]
                 }, {
                   "value" : [ "]" ]
@@ -259665,92 +291940,92 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2407",
+          "localId" : "2517",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "precision" : "Millisecond",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2408",
+            "localId" : "2518",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2409",
+              "localId" : "2519",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2410",
+            "localId" : "2520",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2411",
+              "localId" : "2521",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2353",
+            "localId" : "2463",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2354",
+              "localId" : "2464",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2355",
+                "localId" : "2465",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2321",
+              "localId" : "2431",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2322",
+                "localId" : "2432",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2323",
+                "localId" : "2433",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2324",
+                "localId" : "2434",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2325",
+                "localId" : "2435",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2326",
+                "localId" : "2436",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2327",
+                "localId" : "2437",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2328",
+                "localId" : "2438",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2305",
+                "localId" : "2415",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2018",
@@ -259758,7 +292033,7 @@ module.exports['SameAs'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2306",
+                "localId" : "2416",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259766,7 +292041,7 @@ module.exports['SameAs'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2307",
+                "localId" : "2417",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259774,7 +292049,7 @@ module.exports['SameAs'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2308",
+                "localId" : "2418",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259782,7 +292057,7 @@ module.exports['SameAs'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2309",
+                "localId" : "2419",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259790,7 +292065,7 @@ module.exports['SameAs'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2310",
+                "localId" : "2420",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259798,7 +292073,7 @@ module.exports['SameAs'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2311",
+                "localId" : "2421",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259807,48 +292082,48 @@ module.exports['SameAs'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2345",
+              "localId" : "2455",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2346",
+                "localId" : "2456",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2347",
+                "localId" : "2457",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2348",
+                "localId" : "2458",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2349",
+                "localId" : "2459",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2350",
+                "localId" : "2460",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2351",
+                "localId" : "2461",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2352",
+                "localId" : "2462",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2329",
+                "localId" : "2439",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2019",
@@ -259856,7 +292131,7 @@ module.exports['SameAs'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2330",
+                "localId" : "2440",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259864,7 +292139,7 @@ module.exports['SameAs'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2331",
+                "localId" : "2441",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259872,7 +292147,7 @@ module.exports['SameAs'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2332",
+                "localId" : "2442",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259880,7 +292155,7 @@ module.exports['SameAs'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2333",
+                "localId" : "2443",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259888,7 +292163,7 @@ module.exports['SameAs'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2334",
+                "localId" : "2444",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259896,7 +292171,7 @@ module.exports['SameAs'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2335",
+                "localId" : "2445",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259905,65 +292180,65 @@ module.exports['SameAs'] = {
             }
           }, {
             "type" : "Interval",
-            "localId" : "2404",
+            "localId" : "2514",
             "lowClosed" : true,
             "highClosed" : true,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2405",
+              "localId" : "2515",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2406",
+                "localId" : "2516",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "DateTime",
-              "localId" : "2372",
+              "localId" : "2482",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2373",
+                "localId" : "2483",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2374",
+                "localId" : "2484",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2375",
+                "localId" : "2485",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2376",
+                "localId" : "2486",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2377",
+                "localId" : "2487",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2378",
+                "localId" : "2488",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2379",
+                "localId" : "2489",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2356",
+                "localId" : "2466",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2018",
@@ -259971,7 +292246,7 @@ module.exports['SameAs'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2357",
+                "localId" : "2467",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259979,7 +292254,7 @@ module.exports['SameAs'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2358",
+                "localId" : "2468",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259987,7 +292262,7 @@ module.exports['SameAs'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2359",
+                "localId" : "2469",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -259995,7 +292270,7 @@ module.exports['SameAs'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2360",
+                "localId" : "2470",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -260003,7 +292278,7 @@ module.exports['SameAs'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2361",
+                "localId" : "2471",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -260011,7 +292286,7 @@ module.exports['SameAs'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2362",
+                "localId" : "2472",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -260020,48 +292295,48 @@ module.exports['SameAs'] = {
             },
             "high" : {
               "type" : "DateTime",
-              "localId" : "2396",
+              "localId" : "2506",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2397",
+                "localId" : "2507",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2398",
+                "localId" : "2508",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2399",
+                "localId" : "2509",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2400",
+                "localId" : "2510",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2401",
+                "localId" : "2511",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2402",
+                "localId" : "2512",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2403",
+                "localId" : "2513",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "2380",
+                "localId" : "2490",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2019",
@@ -260069,7 +292344,7 @@ module.exports['SameAs'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "2381",
+                "localId" : "2491",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -260077,7 +292352,7 @@ module.exports['SameAs'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "2382",
+                "localId" : "2492",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -260085,7 +292360,7 @@ module.exports['SameAs'] = {
               },
               "hour" : {
                 "type" : "Literal",
-                "localId" : "2383",
+                "localId" : "2493",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -260093,7 +292368,7 @@ module.exports['SameAs'] = {
               },
               "minute" : {
                 "type" : "Literal",
-                "localId" : "2384",
+                "localId" : "2494",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -260101,7 +292376,7 @@ module.exports['SameAs'] = {
               },
               "second" : {
                 "type" : "Literal",
-                "localId" : "2385",
+                "localId" : "2495",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "01",
@@ -260109,74 +292384,812 @@ module.exports['SameAs'] = {
               },
               "millisecond" : {
                 "type" : "Literal",
-                "localId" : "2386",
+                "localId" : "2496",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
+                "value" : "09",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2524",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntegerIntervalSame",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2524",
+            "s" : [ {
+              "value" : [ "", "define ", "IntegerIntervalSame", ": " ]
+            }, {
+              "r" : "2535",
+              "s" : [ {
+                "r" : "2527",
+                "s" : [ {
+                  "r" : "2525",
+                  "value" : [ "Interval[", "2", ",", "5", "]" ]
+                } ]
+              }, {
+                "r" : "2535",
+                "value" : [ " ", "same as", " " ]
+              }, {
+                "r" : "2532",
+                "s" : [ {
+                  "r" : "2530",
+                  "value" : [ "Interval[", "2", ",", "5", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2535",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2536",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2537",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2538",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2539",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2527",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2528",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2529",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2525",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2526",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2532",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2533",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2534",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2530",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2531",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2542",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntegerIntervalNotSame",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2542",
+            "s" : [ {
+              "value" : [ "", "define ", "IntegerIntervalNotSame", ": " ]
+            }, {
+              "r" : "2553",
+              "s" : [ {
+                "r" : "2545",
+                "s" : [ {
+                  "r" : "2543",
+                  "value" : [ "Interval[", "2", ",", "5", "]" ]
+                } ]
+              }, {
+                "r" : "2553",
+                "value" : [ " ", "same as", " " ]
+              }, {
+                "r" : "2550",
+                "s" : [ {
+                  "r" : "2548",
+                  "value" : [ "Interval[", "2", ",", "4", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2553",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2554",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2555",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2556",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2557",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2545",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2546",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2547",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2543",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2544",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2550",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2551",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2552",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2548",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2549",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2560",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IntegerIntervalSameOpen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2560",
+            "s" : [ {
+              "value" : [ "", "define ", "IntegerIntervalSameOpen", ": " ]
+            }, {
+              "r" : "2571",
+              "s" : [ {
+                "r" : "2563",
+                "s" : [ {
+                  "r" : "2561",
+                  "value" : [ "Interval[", "2", ",", "5", "]" ]
+                } ]
+              }, {
+                "r" : "2571",
+                "value" : [ " ", "same as", " " ]
+              }, {
+                "r" : "2568",
+                "s" : [ {
+                  "r" : "2566",
+                  "value" : [ "Interval[", "2", ",", "6", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2571",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2572",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2573",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2574",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2575",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2563",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2564",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2565",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2561",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2562",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2568",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2569",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2570",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2566",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2567",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2578",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIntervalSame",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2578",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIntervalSame", ": " ]
+            }, {
+              "r" : "2589",
+              "s" : [ {
+                "r" : "2581",
+                "s" : [ {
+                  "r" : "2579",
+                  "value" : [ "Interval[", "2L", ",", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "2589",
+                "value" : [ " ", "same as", " " ]
+              }, {
+                "r" : "2586",
+                "s" : [ {
+                  "r" : "2584",
+                  "value" : [ "Interval[", "2L", ",", "5L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2589",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2590",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2591",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2592",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2593",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2581",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2582",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2583",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2579",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2580",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2586",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2587",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2588",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2584",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2585",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2596",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIntervalNotSame",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2596",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIntervalNotSame", ": " ]
+            }, {
+              "r" : "2607",
+              "s" : [ {
+                "r" : "2599",
+                "s" : [ {
+                  "r" : "2597",
+                  "value" : [ "Interval[", "2L", ",", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "2607",
+                "value" : [ " ", "same as", " " ]
+              }, {
+                "r" : "2604",
+                "s" : [ {
+                  "r" : "2602",
+                  "value" : [ "Interval[", "2L", ",", "4L", "]" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2607",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2608",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2609",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2610",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2611",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2599",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2600",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2601",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2597",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2598",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2604",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2605",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2606",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2602",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2603",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2614",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongIntervalSameOpen",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2614",
+            "s" : [ {
+              "value" : [ "", "define ", "LongIntervalSameOpen", ": " ]
+            }, {
+              "r" : "2625",
+              "s" : [ {
+                "r" : "2617",
+                "s" : [ {
+                  "r" : "2615",
+                  "value" : [ "Interval[", "2L", ",", "5L", "]" ]
+                } ]
+              }, {
+                "r" : "2625",
+                "value" : [ " ", "same as", " " ]
+              }, {
+                "r" : "2622",
+                "s" : [ {
+                  "r" : "2620",
+                  "value" : [ "Interval[", "2L", ",", "6L", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2625",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2626",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2627",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2628",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2629",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2617",
+            "lowClosed" : true,
+            "highClosed" : true,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2618",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2619",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2615",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2616",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2622",
+            "lowClosed" : true,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2623",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2624",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2620",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2621",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2414",
+        "localId" : "2632",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "DateTimeMillisecondPrecisionNotSame",
+        "name" : "OpenNullHighLowDifferent",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2414",
+            "r" : "2632",
             "s" : [ {
-              "value" : [ "", "define ", "DateTimeMillisecondPrecisionNotSame", ": " ]
+              "value" : [ "", "define ", "OpenNullHighLowDifferent", ": " ]
             }, {
-              "r" : "2517",
+              "r" : "2644",
               "s" : [ {
-                "r" : "2463",
+                "r" : "2635",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2431",
-                  "s" : [ {
-                    "r" : "2415",
-                    "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2455",
-                  "s" : [ {
-                    "r" : "2439",
-                    "value" : [ "DateTime", "(", "2019", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "2633",
+                  "value" : [ "Interval(", "3", ",", "null", ")" ]
                 } ]
               }, {
-                "r" : "2517",
-                "value" : [ " ", "same millisecond as", " " ]
+                "r" : "2644",
+                "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2514",
+                "r" : "2641",
                 "s" : [ {
-                  "value" : [ "Interval[" ]
-                }, {
-                  "r" : "2482",
-                  "s" : [ {
-                    "r" : "2466",
-                    "value" : [ "DateTime", "(", "2018", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ")" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "2506",
-                  "s" : [ {
-                    "r" : "2490",
-                    "value" : [ "DateTime", "(", "2019", ",", "01", ",", "01", ",", "01", ",", "01", ",", "01", ",", "09", ")" ]
-                  } ]
-                }, {
-                  "value" : [ "]" ]
+                  "r" : "2639",
+                  "value" : [ "Interval(", "2", ",", "4", ")" ]
                 } ]
               } ]
             } ]
@@ -260184,488 +293197,398 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2517",
+          "localId" : "2644",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "precision" : "Millisecond",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2518",
+            "localId" : "2645",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2519",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2646",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2520",
+            "localId" : "2647",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2521",
-              "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "localId" : "2648",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2463",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2635",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2464",
+              "localId" : "2637",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2465",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2638",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2431",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "Literal",
+              "localId" : "2633",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2636",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2432",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2433",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2434",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2435",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2436",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2437",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2634",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2641",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2642",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2438",
+                "localId" : "2643",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2415",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2018",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2416",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2417",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2418",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2419",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2420",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2421",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2639",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2455",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
-              "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2456",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2457",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2458",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2459",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2460",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+              "type" : "Literal",
+              "localId" : "2640",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2651",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OpenNullLowHighDifferent",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2651",
+            "s" : [ {
+              "value" : [ "", "define ", "OpenNullLowHighDifferent", ": " ]
+            }, {
+              "r" : "2663",
+              "s" : [ {
+                "r" : "2654",
+                "s" : [ {
+                  "r" : "2652",
+                  "value" : [ "Interval(", "1", ",", "5", ")" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2461",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "2663",
+                "value" : [ " ", "same as", " " ]
               }, {
+                "r" : "2659",
+                "s" : [ {
+                  "r" : "2657",
+                  "value" : [ "Interval(", "null", ",", "4", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2663",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2664",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2665",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2666",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2667",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2654",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2655",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2462",
+                "localId" : "2656",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2439",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2019",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2440",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2441",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2442",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2443",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2444",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2445",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2652",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2653",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "2514",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2659",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2515",
+              "localId" : "2661",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2516",
-                "name" : "{urn:hl7-org:elm-types:r1}DateTime",
+                "localId" : "2662",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "DateTime",
-              "localId" : "2482",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "2660",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2483",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2484",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2485",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2486",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2487",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2657",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2658",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2670",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OpenNullHighLowSame",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2670",
+            "s" : [ {
+              "value" : [ "", "define ", "OpenNullHighLowSame", ": " ]
+            }, {
+              "r" : "2682",
+              "s" : [ {
+                "r" : "2673",
+                "s" : [ {
+                  "r" : "2671",
+                  "value" : [ "Interval(", "2", ",", "null", ")" ]
+                } ]
               }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2488",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "r" : "2682",
+                "value" : [ " ", "same as", " " ]
               }, {
+                "r" : "2679",
+                "s" : [ {
+                  "r" : "2677",
+                  "value" : [ "Interval(", "2", ",", "4", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2682",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2683",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2684",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2685",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2686",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2673",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2675",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2489",
+                "localId" : "2676",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2466",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2018",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2467",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2468",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2469",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2470",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2471",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2472",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
               }
             },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2671",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
             "high" : {
-              "type" : "DateTime",
-              "localId" : "2506",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
+              "type" : "As",
+              "localId" : "2674",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
-              "signature" : [ {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2507",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2508",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2509",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2510",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2511",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }, {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "2512",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2672",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
-              }, {
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2679",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2680",
+              "annotation" : [ ],
+              "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2513",
+                "localId" : "2681",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
-              } ],
-              "year" : {
-                "type" : "Literal",
-                "localId" : "2490",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "2019",
-                "annotation" : [ ]
-              },
-              "month" : {
-                "type" : "Literal",
-                "localId" : "2491",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "day" : {
-                "type" : "Literal",
-                "localId" : "2492",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "hour" : {
-                "type" : "Literal",
-                "localId" : "2493",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "minute" : {
-                "type" : "Literal",
-                "localId" : "2494",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "second" : {
-                "type" : "Literal",
-                "localId" : "2495",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "01",
-                "annotation" : [ ]
-              },
-              "millisecond" : {
-                "type" : "Literal",
-                "localId" : "2496",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                "value" : "09",
-                "annotation" : [ ]
               }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2677",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2678",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2524",
+        "localId" : "2689",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntegerIntervalSame",
+        "name" : "OpenNullLowHighSame",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2524",
+            "r" : "2689",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerIntervalSame", ": " ]
+              "value" : [ "", "define ", "OpenNullLowHighSame", ": " ]
             }, {
-              "r" : "2535",
+              "r" : "2701",
               "s" : [ {
-                "r" : "2527",
+                "r" : "2692",
                 "s" : [ {
-                  "r" : "2525",
-                  "value" : [ "Interval[", "2", ",", "5", "]" ]
+                  "r" : "2690",
+                  "value" : [ "Interval(", "1", ",", "4", ")" ]
                 } ]
               }, {
-                "r" : "2535",
+                "r" : "2701",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2532",
+                "r" : "2697",
                 "s" : [ {
-                  "r" : "2530",
-                  "value" : [ "Interval[", "2", ",", "5", "]" ]
+                  "r" : "2695",
+                  "value" : [ "Interval(", "null", ",", "4", ")" ]
                 } ]
               } ]
             } ]
@@ -260673,127 +293596,132 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2535",
+          "localId" : "2701",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2536",
+            "localId" : "2702",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2537",
+              "localId" : "2703",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2538",
+            "localId" : "2704",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2539",
+              "localId" : "2705",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2527",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2692",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2528",
+              "localId" : "2693",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2529",
+                "localId" : "2694",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2525",
+              "localId" : "2690",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2526",
+              "localId" : "2691",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "4",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "2532",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2697",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2533",
+              "localId" : "2699",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2534",
+                "localId" : "2700",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "2530",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "2698",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2695",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2531",
+              "localId" : "2696",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "4",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2542",
+        "localId" : "2708",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntegerIntervalNotSame",
+        "name" : "OpenNullLowOpenNullHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2542",
+            "r" : "2708",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerIntervalNotSame", ": " ]
+              "value" : [ "", "define ", "OpenNullLowOpenNullHigh", ": " ]
             }, {
-              "r" : "2553",
+              "r" : "2721",
               "s" : [ {
-                "r" : "2545",
+                "r" : "2711",
                 "s" : [ {
-                  "r" : "2543",
-                  "value" : [ "Interval[", "2", ",", "5", "]" ]
+                  "r" : "2709",
+                  "value" : [ "Interval(", "1", ",", "null", ")" ]
                 } ]
               }, {
-                "r" : "2553",
+                "r" : "2721",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2550",
+                "r" : "2717",
                 "s" : [ {
-                  "r" : "2548",
-                  "value" : [ "Interval[", "2", ",", "4", "]" ]
+                  "r" : "2715",
+                  "value" : [ "Interval(", "null", ",", "4", ")" ]
                 } ]
               } ]
             } ]
@@ -260801,91 +293729,101 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2553",
+          "localId" : "2721",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2554",
+            "localId" : "2722",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2555",
+              "localId" : "2723",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2556",
+            "localId" : "2724",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2557",
+              "localId" : "2725",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2545",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2711",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2546",
+              "localId" : "2713",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2547",
+                "localId" : "2714",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2543",
+              "localId" : "2709",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
-              "type" : "Literal",
-              "localId" : "2544",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "2712",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2710",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2550",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2717",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2551",
+              "localId" : "2719",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2552",
+                "localId" : "2720",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
-              "type" : "Literal",
-              "localId" : "2548",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
+              "type" : "As",
+              "localId" : "2718",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2715",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2549",
+              "localId" : "2716",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -260894,34 +293832,34 @@ module.exports['SameAs'] = {
           } ]
         }
       }, {
-        "localId" : "2560",
+        "localId" : "2728",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IntegerIntervalSameOpen",
+        "name" : "OpenNullHighsLowsDifferent",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2560",
+            "r" : "2728",
             "s" : [ {
-              "value" : [ "", "define ", "IntegerIntervalSameOpen", ": " ]
+              "value" : [ "", "define ", "OpenNullHighsLowsDifferent", ": " ]
             }, {
-              "r" : "2571",
+              "r" : "2741",
               "s" : [ {
-                "r" : "2563",
+                "r" : "2731",
                 "s" : [ {
-                  "r" : "2561",
-                  "value" : [ "Interval[", "2", ",", "5", "]" ]
+                  "r" : "2729",
+                  "value" : [ "Interval(", "1", ",", "null", ")" ]
                 } ]
               }, {
-                "r" : "2571",
+                "r" : "2741",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2568",
+                "r" : "2737",
                 "s" : [ {
-                  "r" : "2566",
-                  "value" : [ "Interval[", "2", ",", "6", ")" ]
+                  "r" : "2735",
+                  "value" : [ "Interval(", "2", ",", "null", ")" ]
                 } ]
               } ]
             } ]
@@ -260929,127 +293867,275 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2571",
+          "localId" : "2741",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2572",
+            "localId" : "2742",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2573",
+              "localId" : "2743",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2574",
+            "localId" : "2744",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2575",
+              "localId" : "2745",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2563",
-            "lowClosed" : true,
-            "highClosed" : true,
+            "localId" : "2731",
+            "lowClosed" : false,
+            "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2564",
+              "localId" : "2733",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2565",
+                "localId" : "2734",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2561",
+              "localId" : "2729",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
+              "type" : "As",
+              "localId" : "2732",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2730",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2737",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2739",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2740",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "2562",
+              "localId" : "2735",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "2",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2738",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2736",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2748",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "OpenNullHighsLowsSame",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2748",
+            "s" : [ {
+              "value" : [ "", "define ", "OpenNullHighsLowsSame", ": " ]
+            }, {
+              "r" : "2761",
+              "s" : [ {
+                "r" : "2751",
+                "s" : [ {
+                  "r" : "2749",
+                  "value" : [ "Interval(", "1", ",", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2761",
+                "value" : [ " ", "same as", " " ]
+              }, {
+                "r" : "2757",
+                "s" : [ {
+                  "r" : "2755",
+                  "value" : [ "Interval(", "1", ",", "null", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2761",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2762",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2763",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2764",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2765",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "Interval",
-            "localId" : "2568",
-            "lowClosed" : true,
+            "localId" : "2751",
+            "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2569",
+              "localId" : "2753",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2570",
+                "localId" : "2754",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2566",
+              "localId" : "2749",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
+              "type" : "As",
+              "localId" : "2752",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2750",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2757",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2759",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2760",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
               "type" : "Literal",
-              "localId" : "2567",
+              "localId" : "2755",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
+              "value" : "1",
               "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2758",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2756",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
             }
           } ]
         }
       }, {
-        "localId" : "2578",
+        "localId" : "2768",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OpenNullHighLowDifferent",
+        "name" : "OpenNullLowsHighsSame",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2578",
+            "r" : "2768",
             "s" : [ {
-              "value" : [ "", "define ", "OpenNullHighLowDifferent", ": " ]
+              "value" : [ "", "define ", "OpenNullLowsHighsSame", ": " ]
             }, {
-              "r" : "2590",
+              "r" : "2781",
               "s" : [ {
-                "r" : "2581",
+                "r" : "2771",
                 "s" : [ {
-                  "r" : "2579",
-                  "value" : [ "Interval(", "3", ",", "null", ")" ]
+                  "r" : "2769",
+                  "value" : [ "Interval(", "null", ",", "3", ")" ]
                 } ]
               }, {
-                "r" : "2590",
+                "r" : "2781",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2587",
+                "r" : "2777",
                 "s" : [ {
-                  "r" : "2585",
-                  "value" : [ "Interval(", "2", ",", "4", ")" ]
+                  "r" : "2775",
+                  "value" : [ "Interval(", "null", ",", "3", ")" ]
                 } ]
               } ]
             } ]
@@ -261057,132 +294143,270 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2590",
+          "localId" : "2781",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2591",
+            "localId" : "2782",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2592",
+              "localId" : "2783",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2593",
+            "localId" : "2784",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2594",
+              "localId" : "2785",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2581",
+            "localId" : "2771",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2583",
+              "localId" : "2773",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2584",
+                "localId" : "2774",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "low" : {
+              "type" : "As",
+              "localId" : "2772",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2769",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
               "type" : "Literal",
-              "localId" : "2579",
+              "localId" : "2770",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
+            }
+          }, {
+            "type" : "Interval",
+            "localId" : "2777",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2779",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2780",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
             },
-            "high" : {
+            "low" : {
               "type" : "As",
-              "localId" : "2582",
+              "localId" : "2778",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2580",
+                "localId" : "2775",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            },
+            "high" : {
+              "type" : "Literal",
+              "localId" : "2776",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "2788",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "LongOpenNullHighLowDifferent",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "2788",
+            "s" : [ {
+              "value" : [ "", "define ", "LongOpenNullHighLowDifferent", ": " ]
+            }, {
+              "r" : "2800",
+              "s" : [ {
+                "r" : "2791",
+                "s" : [ {
+                  "r" : "2789",
+                  "value" : [ "Interval(", "3L", ",", "null", ")" ]
+                } ]
+              }, {
+                "r" : "2800",
+                "value" : [ " ", "same as", " " ]
+              }, {
+                "r" : "2797",
+                "s" : [ {
+                  "r" : "2795",
+                  "value" : [ "Interval(", "2L", ",", "4L", ")" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "SameAs",
+          "localId" : "2800",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2801",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2802",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "2803",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "2804",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Interval",
+            "localId" : "2791",
+            "lowClosed" : false,
+            "highClosed" : false,
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "2793",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "2794",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "low" : {
+              "type" : "Literal",
+              "localId" : "2789",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            },
+            "high" : {
+              "type" : "As",
+              "localId" : "2792",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "2790",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2587",
+            "localId" : "2797",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2588",
+              "localId" : "2798",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2589",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2799",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2585",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2795",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2586",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2796",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2597",
+        "localId" : "2807",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OpenNullLowHighDifferent",
+        "name" : "LongOpenNullLowHighDifferent",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2597",
+            "r" : "2807",
             "s" : [ {
-              "value" : [ "", "define ", "OpenNullLowHighDifferent", ": " ]
+              "value" : [ "", "define ", "LongOpenNullLowHighDifferent", ": " ]
             }, {
-              "r" : "2609",
+              "r" : "2819",
               "s" : [ {
-                "r" : "2600",
+                "r" : "2810",
                 "s" : [ {
-                  "r" : "2598",
-                  "value" : [ "Interval(", "1", ",", "5", ")" ]
+                  "r" : "2808",
+                  "value" : [ "Interval(", "1L", ",", "5L", ")" ]
                 } ]
               }, {
-                "r" : "2609",
+                "r" : "2819",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2605",
+                "r" : "2815",
                 "s" : [ {
-                  "r" : "2603",
-                  "value" : [ "Interval(", "null", ",", "4", ")" ]
+                  "r" : "2813",
+                  "value" : [ "Interval(", "null", ",", "4L", ")" ]
                 } ]
               } ]
             } ]
@@ -261190,132 +294414,132 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2609",
+          "localId" : "2819",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2610",
+            "localId" : "2820",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2611",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2821",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2612",
+            "localId" : "2822",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2613",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2823",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2600",
+            "localId" : "2810",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2601",
+              "localId" : "2811",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2602",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2812",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2598",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2808",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2599",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2809",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "2605",
+            "localId" : "2815",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2607",
+              "localId" : "2817",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2608",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2818",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "2606",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2816",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2603",
+                "localId" : "2813",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2604",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2814",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2616",
+        "localId" : "2826",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OpenNullHighLowSame",
+        "name" : "LongOpenNullHighLowSame",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2616",
+            "r" : "2826",
             "s" : [ {
-              "value" : [ "", "define ", "OpenNullHighLowSame", ": " ]
+              "value" : [ "", "define ", "LongOpenNullHighLowSame", ": " ]
             }, {
-              "r" : "2628",
+              "r" : "2838",
               "s" : [ {
-                "r" : "2619",
+                "r" : "2829",
                 "s" : [ {
-                  "r" : "2617",
-                  "value" : [ "Interval(", "2", ",", "null", ")" ]
+                  "r" : "2827",
+                  "value" : [ "Interval(", "2L", ",", "null", ")" ]
                 } ]
               }, {
-                "r" : "2628",
+                "r" : "2838",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2625",
+                "r" : "2835",
                 "s" : [ {
-                  "r" : "2623",
-                  "value" : [ "Interval(", "2", ",", "4", ")" ]
+                  "r" : "2833",
+                  "value" : [ "Interval(", "2L", ",", "4L", ")" ]
                 } ]
               } ]
             } ]
@@ -261323,132 +294547,132 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2628",
+          "localId" : "2838",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2629",
+            "localId" : "2839",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2630",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2840",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2631",
+            "localId" : "2841",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2632",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2842",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2619",
+            "localId" : "2829",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2621",
+              "localId" : "2831",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2622",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2832",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2617",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2827",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "2620",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2830",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2618",
+                "localId" : "2828",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2625",
+            "localId" : "2835",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2626",
+              "localId" : "2836",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2627",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2837",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2623",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2833",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2624",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2834",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2635",
+        "localId" : "2845",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OpenNullLowHighSame",
+        "name" : "LongOpenNullLowHighSame",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2635",
+            "r" : "2845",
             "s" : [ {
-              "value" : [ "", "define ", "OpenNullLowHighSame", ": " ]
+              "value" : [ "", "define ", "LongOpenNullLowHighSame", ": " ]
             }, {
-              "r" : "2647",
+              "r" : "2857",
               "s" : [ {
-                "r" : "2638",
+                "r" : "2848",
                 "s" : [ {
-                  "r" : "2636",
-                  "value" : [ "Interval(", "1", ",", "4", ")" ]
+                  "r" : "2846",
+                  "value" : [ "Interval(", "1L", ",", "4L", ")" ]
                 } ]
               }, {
-                "r" : "2647",
+                "r" : "2857",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2643",
+                "r" : "2853",
                 "s" : [ {
-                  "r" : "2641",
-                  "value" : [ "Interval(", "null", ",", "4", ")" ]
+                  "r" : "2851",
+                  "value" : [ "Interval(", "null", ",", "4L", ")" ]
                 } ]
               } ]
             } ]
@@ -261456,132 +294680,132 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2647",
+          "localId" : "2857",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2648",
+            "localId" : "2858",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2649",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2859",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2650",
+            "localId" : "2860",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2651",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2861",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2638",
+            "localId" : "2848",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2639",
+              "localId" : "2849",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2640",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2850",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2636",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2846",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2637",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2847",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "2643",
+            "localId" : "2853",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2645",
+              "localId" : "2855",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2646",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2856",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "2644",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2854",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2641",
+                "localId" : "2851",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2642",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2852",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2654",
+        "localId" : "2864",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OpenNullLowOpenNullHigh",
+        "name" : "LongOpenNullLowOpenNullHigh",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2654",
+            "r" : "2864",
             "s" : [ {
-              "value" : [ "", "define ", "OpenNullLowOpenNullHigh", ": " ]
+              "value" : [ "", "define ", "LongOpenNullLowOpenNullHigh", ": " ]
             }, {
-              "r" : "2667",
+              "r" : "2877",
               "s" : [ {
-                "r" : "2657",
+                "r" : "2867",
                 "s" : [ {
-                  "r" : "2655",
-                  "value" : [ "Interval(", "1", ",", "null", ")" ]
+                  "r" : "2865",
+                  "value" : [ "Interval(", "1L", ",", "null", ")" ]
                 } ]
               }, {
-                "r" : "2667",
+                "r" : "2877",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2663",
+                "r" : "2873",
                 "s" : [ {
-                  "r" : "2661",
-                  "value" : [ "Interval(", "null", ",", "4", ")" ]
+                  "r" : "2871",
+                  "value" : [ "Interval(", "null", ",", "4L", ")" ]
                 } ]
               } ]
             } ]
@@ -261589,137 +294813,137 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2667",
+          "localId" : "2877",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2668",
+            "localId" : "2878",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2669",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2879",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2670",
+            "localId" : "2880",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2671",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2881",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2657",
+            "localId" : "2867",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2659",
+              "localId" : "2869",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2660",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2870",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2655",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2865",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "2658",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2868",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2656",
+                "localId" : "2866",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2663",
+            "localId" : "2873",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2665",
+              "localId" : "2875",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2666",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2876",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "2664",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2874",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2661",
+                "localId" : "2871",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2662",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2872",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "2674",
+        "localId" : "2884",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OpenNullHighsLowsDifferent",
+        "name" : "LongOpenNullHighsLowsDifferent",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2674",
+            "r" : "2884",
             "s" : [ {
-              "value" : [ "", "define ", "OpenNullHighsLowsDifferent", ": " ]
+              "value" : [ "", "define ", "LongOpenNullHighsLowsDifferent", ": " ]
             }, {
-              "r" : "2687",
+              "r" : "2897",
               "s" : [ {
-                "r" : "2677",
+                "r" : "2887",
                 "s" : [ {
-                  "r" : "2675",
-                  "value" : [ "Interval(", "1", ",", "null", ")" ]
+                  "r" : "2885",
+                  "value" : [ "Interval(", "1L", ",", "null", ")" ]
                 } ]
               }, {
-                "r" : "2687",
+                "r" : "2897",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2683",
+                "r" : "2893",
                 "s" : [ {
-                  "r" : "2681",
-                  "value" : [ "Interval(", "2", ",", "null", ")" ]
+                  "r" : "2891",
+                  "value" : [ "Interval(", "2L", ",", "null", ")" ]
                 } ]
               } ]
             } ]
@@ -261727,102 +294951,102 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2687",
+          "localId" : "2897",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2688",
+            "localId" : "2898",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2689",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2899",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2690",
+            "localId" : "2900",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2691",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2901",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2677",
+            "localId" : "2887",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2679",
+              "localId" : "2889",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2680",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2890",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2675",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2885",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "2678",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2888",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2676",
+                "localId" : "2886",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2683",
+            "localId" : "2893",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2685",
+              "localId" : "2895",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2686",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2896",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2681",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2891",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "2684",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2894",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2682",
+                "localId" : "2892",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -261830,34 +295054,34 @@ module.exports['SameAs'] = {
           } ]
         }
       }, {
-        "localId" : "2694",
+        "localId" : "2904",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OpenNullHighsLowsSame",
+        "name" : "LongOpenNullHighsLowsSame",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2694",
+            "r" : "2904",
             "s" : [ {
-              "value" : [ "", "define ", "OpenNullHighsLowsSame", ": " ]
+              "value" : [ "", "define ", "LongOpenNullHighsLowsSame", ": " ]
             }, {
-              "r" : "2707",
+              "r" : "2917",
               "s" : [ {
-                "r" : "2697",
+                "r" : "2907",
                 "s" : [ {
-                  "r" : "2695",
-                  "value" : [ "Interval(", "1", ",", "null", ")" ]
+                  "r" : "2905",
+                  "value" : [ "Interval(", "1L", ",", "null", ")" ]
                 } ]
               }, {
-                "r" : "2707",
+                "r" : "2917",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2703",
+                "r" : "2913",
                 "s" : [ {
-                  "r" : "2701",
-                  "value" : [ "Interval(", "1", ",", "null", ")" ]
+                  "r" : "2911",
+                  "value" : [ "Interval(", "1L", ",", "null", ")" ]
                 } ]
               } ]
             } ]
@@ -261865,102 +295089,102 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2707",
+          "localId" : "2917",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2708",
+            "localId" : "2918",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2709",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2919",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2710",
+            "localId" : "2920",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2711",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2921",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2697",
+            "localId" : "2907",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2699",
+              "localId" : "2909",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2700",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2910",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2695",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2905",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "2698",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2908",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2696",
+                "localId" : "2906",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "Interval",
-            "localId" : "2703",
+            "localId" : "2913",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2705",
+              "localId" : "2915",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2706",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2916",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "Literal",
-              "localId" : "2701",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2911",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             },
             "high" : {
               "type" : "As",
-              "localId" : "2704",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2914",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2702",
+                "localId" : "2912",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -261968,34 +295192,34 @@ module.exports['SameAs'] = {
           } ]
         }
       }, {
-        "localId" : "2714",
+        "localId" : "2924",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "OpenNullLowsHighsSame",
+        "name" : "LongOpenNullLowsHighsSame",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "2714",
+            "r" : "2924",
             "s" : [ {
-              "value" : [ "", "define ", "OpenNullLowsHighsSame", ": " ]
+              "value" : [ "", "define ", "LongOpenNullLowsHighsSame", ": " ]
             }, {
-              "r" : "2727",
+              "r" : "2937",
               "s" : [ {
-                "r" : "2717",
+                "r" : "2927",
                 "s" : [ {
-                  "r" : "2715",
-                  "value" : [ "Interval(", "null", ",", "3", ")" ]
+                  "r" : "2925",
+                  "value" : [ "Interval(", "null", ",", "3L", ")" ]
                 } ]
               }, {
-                "r" : "2727",
+                "r" : "2937",
                 "value" : [ " ", "same as", " " ]
               }, {
-                "r" : "2723",
+                "r" : "2933",
                 "s" : [ {
-                  "r" : "2721",
-                  "value" : [ "Interval(", "null", ",", "3", ")" ]
+                  "r" : "2931",
+                  "value" : [ "Interval(", "null", ",", "3L", ")" ]
                 } ]
               } ]
             } ]
@@ -262003,103 +295227,103 @@ module.exports['SameAs'] = {
         } ],
         "expression" : {
           "type" : "SameAs",
-          "localId" : "2727",
+          "localId" : "2937",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2728",
+            "localId" : "2938",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2729",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2939",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "2730",
+            "localId" : "2940",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "2731",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2941",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Interval",
-            "localId" : "2717",
+            "localId" : "2927",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2719",
+              "localId" : "2929",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2720",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2930",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "2718",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2928",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2715",
+                "localId" : "2925",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2716",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2926",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "3",
               "annotation" : [ ]
             }
           }, {
             "type" : "Interval",
-            "localId" : "2723",
+            "localId" : "2933",
             "lowClosed" : false,
             "highClosed" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "2725",
+              "localId" : "2935",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "2726",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "2936",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "low" : {
               "type" : "As",
-              "localId" : "2724",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2934",
+              "asType" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "2721",
+                "localId" : "2931",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "high" : {
               "type" : "Literal",
-              "localId" : "2722",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "2932",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "3",
               "annotation" : [ ]
             }
diff --git a/test/elm/interval/interval-test.ts b/test/elm/interval/interval-test.ts
index 16a7a5279..7b1938b00 100644
--- a/test/elm/interval/interval-test.ts
+++ b/test/elm/interval/interval-test.ts
@@ -6,6 +6,8 @@ import { DateTime } from '../../../src/datatypes/datetime';
 import {
   MIN_INT_VALUE,
   MAX_INT_VALUE,
+  MIN_LONG_VALUE,
+  MAX_LONG_VALUE,
   MIN_FLOAT_VALUE,
   MIN_FLOAT_PRECISION_VALUE,
   MAX_FLOAT_VALUE,
@@ -46,6 +48,18 @@ describe('Interval', () => {
     (await this.closed.high.exec(this.ctx)).should.eql(new DateTime(2013, 1, 1));
   });
 
+  it('should properly represent long intervals', async function () {
+    this.longOpen.lowClosed.should.be.false();
+    this.longOpen.highClosed.should.be.false();
+    (await this.longOpen.low.exec(this.ctx)).should.eql(1n);
+    (await this.longOpen.high.exec(this.ctx)).should.eql(3n);
+
+    this.longClosed.lowClosed.should.be.true();
+    this.longClosed.highClosed.should.be.true();
+    (await this.longClosed.low.exec(this.ctx)).should.eql(1n);
+    (await this.longClosed.high.exec(this.ctx)).should.eql(3n);
+  });
+
   it('should exec to native Interval datatype', async function () {
     const ivl = await this.open.exec(this.ctx);
     ivl.should.be.instanceOf(Interval);
@@ -73,6 +87,18 @@ describe('Equal', () => {
     (await this.unequalClosedOpen.exec(this.ctx)).should.be.false();
   });
 
+  it('should determine equal long intervals', async function () {
+    (await this.equalLongClosed.exec(this.ctx)).should.be.true();
+    (await this.equalLongOpen.exec(this.ctx)).should.be.true();
+    (await this.equalLongOpenClosed.exec(this.ctx)).should.be.true();
+  });
+
+  it('should determine unequal long intervals', async function () {
+    (await this.unequalLongClosed.exec(this.ctx)).should.be.false();
+    (await this.unequalLongOpen.exec(this.ctx)).should.be.false();
+    (await this.unequalLongClosedOpen.exec(this.ctx)).should.be.false();
+  });
+
   it('should determine equal quantity intervals', async function () {
     (await this.equalQuantityClosed.exec(this.ctx)).should.be.true();
     (await this.equalQuantityOpen.exec(this.ctx)).should.be.true();
@@ -114,6 +140,18 @@ describe('NotEqual', () => {
     (await this.unequalClosedOpen.exec(this.ctx)).should.be.true();
   });
 
+  it('should determine equal long intervals', async function () {
+    (await this.equalLongClosed.exec(this.ctx)).should.be.false();
+    (await this.equalLongOpen.exec(this.ctx)).should.be.false();
+    (await this.equalLongOpenClosed.exec(this.ctx)).should.be.false();
+  });
+
+  it('should determine unequal long intervals', async function () {
+    (await this.unequalLongClosed.exec(this.ctx)).should.be.true();
+    (await this.unequalLongOpen.exec(this.ctx)).should.be.true();
+    (await this.unequalLongClosedOpen.exec(this.ctx)).should.be.true();
+  });
+
   it('should determine equal quantity intervals', async function () {
     (await this.equalQuantityClosed.exec(this.ctx)).should.be.false();
     (await this.equalQuantityOpen.exec(this.ctx)).should.be.false();
@@ -145,6 +183,7 @@ describe('Contains', () => {
 
   it('should accept contained items', async function () {
     (await this.containsInt.exec(this.ctx)).should.be.true();
+    (await this.containsLong.exec(this.ctx)).should.be.true();
     (await this.containsReal.exec(this.ctx)).should.be.true();
     (await this.containsQuantity.exec(this.ctx)).should.be.true();
     (await this.containsQuantityInclusiveEdge.exec(this.ctx)).should.be.true();
@@ -153,6 +192,7 @@ describe('Contains', () => {
 
   it('should reject uncontained items', async function () {
     (await this.notContainsInt.exec(this.ctx)).should.be.false();
+    (await this.notContainsLong.exec(this.ctx)).should.be.false();
     (await this.notContainsReal.exec(this.ctx)).should.be.false();
     (await this.notContainsQuantity.exec(this.ctx)).should.be.false();
     (await this.notContainsQuantityExclusiveEdge.exec(this.ctx)).should.be.false();
@@ -162,29 +202,38 @@ describe('Contains', () => {
   it('should correctly handle null endpoints (int)', async function () {
     (await this.negInfBegContainsInt.exec(this.ctx)).should.be.true();
     (await this.negInfBegNotContainsInt.exec(this.ctx)).should.be.false();
-    (await this.unknownOpenBegContainsInt.exec(this.ctx)).should.be.true();
-    (await this.unknownClosedBegContainsInt.exec(this.ctx)).should.be.true();
+    (await this.unknownBegContainsInt.exec(this.ctx)).should.be.true();
     should(await this.unknownBegMayContainInt.exec(this.ctx)).be.null();
     (await this.unknownBegNotContainsInt.exec(this.ctx)).should.be.false();
     (await this.posInfEndContainsInt.exec(this.ctx)).should.be.true();
     (await this.posInfEndNotContainsInt.exec(this.ctx)).should.be.false();
-    (await this.unknownOpenEndContainsInt.exec(this.ctx)).should.be.true();
-    (await this.unknownClosedEndContainsInt.exec(this.ctx)).should.be.true();
+    (await this.unknownEndContainsInt.exec(this.ctx)).should.be.true();
     should(await this.unknownEndMayContainInt.exec(this.ctx)).be.null();
     (await this.unknownEndNotContainsInt.exec(this.ctx)).should.be.false();
   });
 
+  it('should correctly handle null endpoints (long)', async function () {
+    (await this.negInfBegContainsLong.exec(this.ctx)).should.be.true();
+    (await this.negInfBegNotContainsLong.exec(this.ctx)).should.be.false();
+    (await this.unknownBegContainsLong.exec(this.ctx)).should.be.true();
+    should(await this.unknownBegMayContainLong.exec(this.ctx)).be.null();
+    (await this.unknownBegNotContainsLong.exec(this.ctx)).should.be.false();
+    (await this.posInfEndContainsLong.exec(this.ctx)).should.be.true();
+    (await this.posInfEndNotContainsLong.exec(this.ctx)).should.be.false();
+    (await this.unknownEndContainsLong.exec(this.ctx)).should.be.true();
+    should(await this.unknownEndMayContainLong.exec(this.ctx)).be.null();
+    (await this.unknownEndNotContainsLong.exec(this.ctx)).should.be.false();
+  });
+
   it('should correctly handle null endpoints (date)', async function () {
     (await this.negInfBegContainsDate.exec(this.ctx)).should.be.true();
     (await this.negInfBegNotContainsDate.exec(this.ctx)).should.be.false();
-    should(await this.unknownOpenBegMayContainDate.exec(this.ctx)).be.null();
-    (await this.unknownClosedBegContainsDate.exec(this.ctx)).should.be.true();
+    (await this.unknownBegContainsDate.exec(this.ctx)).should.be.true();
     should(await this.unknownBegMayContainDate.exec(this.ctx)).be.null();
     (await this.unknownBegNotContainsDate.exec(this.ctx)).should.be.false();
     (await this.posInfEndContainsDate.exec(this.ctx)).should.be.true();
     (await this.posInfEndNotContainsDate.exec(this.ctx)).should.be.false();
-    (await this.unknownOpenEndContainsDate.exec(this.ctx)).should.be.true();
-    (await this.unknownClosedEndContainsDate.exec(this.ctx)).should.be.true();
+    (await this.unknownEndContainsDate.exec(this.ctx)).should.be.true();
     should(await this.unknownEndMayContainDate.exec(this.ctx)).be.null();
     (await this.unknownEndNotContainsDate.exec(this.ctx)).should.be.false();
   });
@@ -223,6 +272,7 @@ describe('In', () => {
 
   it('should accept contained items', async function () {
     (await this.containsInt.exec(this.ctx)).should.be.true();
+    (await this.containsLong.exec(this.ctx)).should.be.true();
     (await this.containsReal.exec(this.ctx)).should.be.true();
     (await this.containsQuantity.exec(this.ctx)).should.be.true();
     (await this.containsQuantityInclusiveEdge.exec(this.ctx)).should.be.true();
@@ -231,6 +281,7 @@ describe('In', () => {
 
   it('should reject uncontained items', async function () {
     (await this.notContainsInt.exec(this.ctx)).should.be.false();
+    (await this.notContainsLong.exec(this.ctx)).should.be.false();
     (await this.notContainsReal.exec(this.ctx)).should.be.false();
     (await this.notContainsQuantity.exec(this.ctx)).should.be.false();
     (await this.notContainsQuantityExclusiveEdge.exec(this.ctx)).should.be.false();
@@ -240,29 +291,38 @@ describe('In', () => {
   it('should correctly handle null endpoints (int)', async function () {
     (await this.negInfBegContainsInt.exec(this.ctx)).should.be.true();
     (await this.negInfBegNotContainsInt.exec(this.ctx)).should.be.false();
-    (await this.unknownOpenBegContainsInt.exec(this.ctx)).should.be.true();
-    (await this.unknownClosedBegContainsInt.exec(this.ctx)).should.be.true();
+    (await this.unknownBegContainsInt.exec(this.ctx)).should.be.true();
     should(await this.unknownBegMayContainInt.exec(this.ctx)).be.null();
     (await this.unknownBegNotContainsInt.exec(this.ctx)).should.be.false();
     (await this.posInfEndContainsInt.exec(this.ctx)).should.be.true();
     (await this.posInfEndNotContainsInt.exec(this.ctx)).should.be.false();
-    (await this.unknownOpenEndContainsInt.exec(this.ctx)).should.be.true();
-    (await this.unknownClosedEndContainsInt.exec(this.ctx)).should.be.true();
+    (await this.unknownEndContainsInt.exec(this.ctx)).should.be.true();
     should(await this.unknownEndMayContainInt.exec(this.ctx)).be.null();
     (await this.unknownEndNotContainsInt.exec(this.ctx)).should.be.false();
   });
 
+  it('should correctly handle null endpoints (long)', async function () {
+    (await this.negInfBegContainsLong.exec(this.ctx)).should.be.true();
+    (await this.negInfBegNotContainsLong.exec(this.ctx)).should.be.false();
+    (await this.unknownBegContainsLong.exec(this.ctx)).should.be.true();
+    should(await this.unknownBegMayContainLong.exec(this.ctx)).be.null();
+    (await this.unknownBegNotContainsLong.exec(this.ctx)).should.be.false();
+    (await this.posInfEndContainsLong.exec(this.ctx)).should.be.true();
+    (await this.posInfEndNotContainsLong.exec(this.ctx)).should.be.false();
+    (await this.unknownEndContainsLong.exec(this.ctx)).should.be.true();
+    should(await this.unknownEndMayContainLong.exec(this.ctx)).be.null();
+    (await this.unknownEndNotContainsLong.exec(this.ctx)).should.be.false();
+  });
+
   it('should correctly handle null endpoints (date)', async function () {
     (await this.negInfBegContainsDate.exec(this.ctx)).should.be.true();
     (await this.negInfBegNotContainsDate.exec(this.ctx)).should.be.false();
-    should(await this.unknownOpenBegMayContainDate.exec(this.ctx)).be.null();
-    (await this.unknownClosedBegContainsDate.exec(this.ctx)).should.be.true();
+    (await this.unknownBegContainsDate.exec(this.ctx)).should.be.true();
     should(await this.unknownBegMayContainDate.exec(this.ctx)).be.null();
     (await this.unknownBegNotContainsDate.exec(this.ctx)).should.be.false();
     (await this.posInfEndContainsDate.exec(this.ctx)).should.be.true();
     (await this.posInfEndNotContainsDate.exec(this.ctx)).should.be.false();
-    (await this.unknownOpenEndContainsDate.exec(this.ctx)).should.be.true();
-    (await this.unknownClosedEndContainsDate.exec(this.ctx)).should.be.true();
+    (await this.unknownEndContainsDate.exec(this.ctx)).should.be.true();
     should(await this.unknownEndMayContainDate.exec(this.ctx)).be.null();
     (await this.unknownEndNotContainsDate.exec(this.ctx)).should.be.false();
   });
@@ -301,12 +361,14 @@ describe('Includes', () => {
 
   it('should accept included items', async function () {
     (await this.includesIntIvl.exec(this.ctx)).should.be.true();
+    (await this.includesLongIvl.exec(this.ctx)).should.be.true();
     (await this.includesRealIvl.exec(this.ctx)).should.be.true();
     (await this.includesDateIvl.exec(this.ctx)).should.be.true();
   });
 
   it('should reject unincluded items', async function () {
     (await this.notIncludesIntIvl.exec(this.ctx)).should.be.false();
+    (await this.notIncludesLongIvl.exec(this.ctx)).should.be.false();
     (await this.notIncludesRealIvl.exec(this.ctx)).should.be.false();
     (await this.notIncludesDateIvl.exec(this.ctx)).should.be.false();
   });
@@ -324,6 +386,19 @@ describe('Includes', () => {
     (await this.unknownEndNotIncludesIntIvl.exec(this.ctx)).should.be.false();
   });
 
+  it('should correctly handle null endpoints (long)', async function () {
+    (await this.negInfBegIncludesLongIvl.exec(this.ctx)).should.be.true();
+    (await this.negInfBegNotIncludesLongIvl.exec(this.ctx)).should.be.false();
+    (await this.unknownBegIncludesLongIvl.exec(this.ctx)).should.be.true();
+    should(await this.unknownBegMayIncludeLongIvl.exec(this.ctx)).be.null();
+    (await this.unknownBegNotIncludesLongIvl.exec(this.ctx)).should.be.false();
+    (await this.posInfEndIncludesLongIvl.exec(this.ctx)).should.be.true();
+    (await this.posInfEndNotIncludesLongIvl.exec(this.ctx)).should.be.false();
+    (await this.unknownEndIncludesLongIvl.exec(this.ctx)).should.be.true();
+    should(await this.unknownEndMayIncludeLongIvl.exec(this.ctx)).be.null();
+    (await this.unknownEndNotIncludesLongIvl.exec(this.ctx)).should.be.false();
+  });
+
   it('should correctly handle null endpoints (date)', async function () {
     (await this.negInfBegIncludesDateIvl.exec(this.ctx)).should.be.true();
     (await this.negInfBegNotIncludesDateIvl.exec(this.ctx)).should.be.false();
@@ -378,12 +453,16 @@ describe('ProperlyIncludes', () => {
     (await this.properlyIncludesIntIvl.exec(this.ctx)).should.be.true();
     (await this.properlyIncludesIntBeginsIvl.exec(this.ctx)).should.be.true();
     (await this.properlyIncludesIntEndsIvl.exec(this.ctx)).should.be.true();
+    (await this.properlyIncludesLongIvl.exec(this.ctx)).should.be.true();
+    (await this.properlyIncludesLongBeginsIvl.exec(this.ctx)).should.be.true();
+    (await this.properlyIncludesLongEndsIvl.exec(this.ctx)).should.be.true();
     (await this.properlyIncludesRealIvl.exec(this.ctx)).should.be.true();
     (await this.properlyIncludesDateIvl.exec(this.ctx)).should.be.true();
   });
 
   it('should reject intervals not properly included', async function () {
     (await this.notProperlyIncludesIntIvl.exec(this.ctx)).should.be.false();
+    (await this.notProperlyIncludesLongIvl.exec(this.ctx)).should.be.false();
     (await this.notProperlyIncludesRealIvl.exec(this.ctx)).should.be.false();
     (await this.notProperlyIncludesDateIvl.exec(this.ctx)).should.be.false();
   });
@@ -394,6 +473,12 @@ describe('ProperlyIncludes', () => {
     should(await this.unknownEndMayProperlyIncludeIntIvl.exec(this.ctx)).be.null();
   });
 
+  it('should correctly handle null endpoints (long)', async function () {
+    (await this.posInfEndProperlyIncludesLongIvl.exec(this.ctx)).should.be.true();
+    (await this.posInfEndNotProperlyIncludesLongIvl.exec(this.ctx)).should.be.false();
+    should(await this.unknownEndMayProperlyIncludeLongIvl.exec(this.ctx)).be.null();
+  });
+
   it('should correctly compare using the requested precision', async function () {
     (await this.properlyIncludesDayOfIvlLowEdge.exec(this.ctx)).should.be.true();
     (await this.properlyIncludesDayOfIvlHighEdge.exec(this.ctx)).should.be.true();
@@ -413,12 +498,14 @@ describe('IncludedIn', () => {
 
   it('should accept included items', async function () {
     (await this.includesIntIvl.exec(this.ctx)).should.be.true();
+    (await this.includesLongIvl.exec(this.ctx)).should.be.true();
     (await this.includesRealIvl.exec(this.ctx)).should.be.true();
     (await this.includesDateIvl.exec(this.ctx)).should.be.true();
   });
 
   it('should reject unincluded items', async function () {
     (await this.notIncludesIntIvl.exec(this.ctx)).should.be.false();
+    (await this.notIncludesLongIvl.exec(this.ctx)).should.be.false();
     (await this.notIncludesRealIvl.exec(this.ctx)).should.be.false();
     (await this.notIncludesDateIvl.exec(this.ctx)).should.be.false();
   });
@@ -436,6 +523,19 @@ describe('IncludedIn', () => {
     (await this.unknownEndNotIncludedInIntIvl.exec(this.ctx)).should.be.false();
   });
 
+  it('should correctly handle null endpoints (long)', async function () {
+    (await this.negInfBegIncludedInLongIvl.exec(this.ctx)).should.be.true();
+    (await this.negInfBegNotIncludedInLongIvl.exec(this.ctx)).should.be.false();
+    (await this.unknownBegIncludedInLongIvl.exec(this.ctx)).should.be.true();
+    should(await this.unknownBegMayBeIncludedInLongIvl.exec(this.ctx)).be.null();
+    (await this.unknownBegNotIncludedInLongIvl.exec(this.ctx)).should.be.false();
+    (await this.posInfEndIncludedInLongIvl.exec(this.ctx)).should.be.true();
+    (await this.posInfEndNotIncludedInLongIvl.exec(this.ctx)).should.be.false();
+    (await this.unknownEndIncludedInLongIvl.exec(this.ctx)).should.be.true();
+    should(await this.unknownEndMayBeIncludedInLongIvl.exec(this.ctx)).be.null();
+    (await this.unknownEndNotIncludedInLongIvl.exec(this.ctx)).should.be.false();
+  });
+
   it('should correctly handle null endpoints (date)', async function () {
     (await this.negInfBegIncludedInDateIvl.exec(this.ctx)).should.be.true();
     (await this.negInfBegNotIncludedInDateIvl.exec(this.ctx)).should.be.false();
@@ -490,12 +590,16 @@ describe('ProperlyIncludedIn', () => {
     (await this.properlyIncludesIntIvl.exec(this.ctx)).should.be.true();
     (await this.properlyIncludesIntBeginsIvl.exec(this.ctx)).should.be.true();
     (await this.properlyIncludesIntEndsIvl.exec(this.ctx)).should.be.true();
+    (await this.properlyIncludesLongIvl.exec(this.ctx)).should.be.true();
+    (await this.properlyIncludesLongBeginsIvl.exec(this.ctx)).should.be.true();
+    (await this.properlyIncludesLongEndsIvl.exec(this.ctx)).should.be.true();
     (await this.properlyIncludesRealIvl.exec(this.ctx)).should.be.true();
     (await this.properlyIncludesDateIvl.exec(this.ctx)).should.be.true();
   });
 
   it('should reject intervals not properly included', async function () {
     (await this.notProperlyIncludesIntIvl.exec(this.ctx)).should.be.false();
+    (await this.notProperlyIncludesLongIvl.exec(this.ctx)).should.be.false();
     (await this.notProperlyIncludesRealIvl.exec(this.ctx)).should.be.false();
     (await this.notProperlyIncludesDateIvl.exec(this.ctx)).should.be.false();
   });
@@ -525,12 +629,14 @@ describe('After', () => {
 
   it('should accept intervals before it', async function () {
     (await this.afterIntIvl.exec(this.ctx)).should.be.true();
+    (await this.afterLongIvl.exec(this.ctx)).should.be.true();
     (await this.afterRealIvl.exec(this.ctx)).should.be.true();
     (await this.afterDateIvl.exec(this.ctx)).should.be.true();
   });
 
   it('should reject intervals on or after it', async function () {
     (await this.notAfterIntIvl.exec(this.ctx)).should.be.false();
+    (await this.notAfterLongIvl.exec(this.ctx)).should.be.false();
     (await this.notAfterRealIvl.exec(this.ctx)).should.be.false();
     (await this.notAfterDateIvl.exec(this.ctx)).should.be.false();
   });
@@ -545,6 +651,16 @@ describe('After', () => {
     (await this.unknownEndNotAfterIntIvl.exec(this.ctx)).should.be.false();
   });
 
+  it('should correctly handle null endpoints (long)', async function () {
+    (await this.negInfBegNotAfterLongIvl.exec(this.ctx)).should.be.false();
+    should(await this.unknownBegMayBeAfterLongIvl.exec(this.ctx)).be.null();
+    (await this.unknownBegNotAfterLongIvl.exec(this.ctx)).should.be.false();
+    (await this.posInfEndAfterLongIvl.exec(this.ctx)).should.be.true();
+    (await this.posInfEndNotAfterLongIvl.exec(this.ctx)).should.be.false();
+    (await this.unknownEndAfterLongIvl.exec(this.ctx)).should.be.true();
+    (await this.unknownEndNotAfterLongIvl.exec(this.ctx)).should.be.false();
+  });
+
   it('should correctly handle null endpoints (date)', async function () {
     (await this.negInfBegNotAfterDateIvl.exec(this.ctx)).should.be.false();
     should(await this.unknownBegMayBeAfterDateIvl.exec(this.ctx)).be.null();
@@ -582,12 +698,14 @@ describe('Before', () => {
 
   it('should accept intervals before it', async function () {
     (await this.beforeIntIvl.exec(this.ctx)).should.be.true();
+    (await this.beforeLongIvl.exec(this.ctx)).should.be.true();
     (await this.beforeRealIvl.exec(this.ctx)).should.be.true();
     (await this.beforeDateIvl.exec(this.ctx)).should.be.true();
   });
 
   it('should reject intervals on or after it', async function () {
     (await this.notBeforeIntIvl.exec(this.ctx)).should.be.false();
+    (await this.notBeforeLongIvl.exec(this.ctx)).should.be.false();
     (await this.notBeforeRealIvl.exec(this.ctx)).should.be.false();
     (await this.notBeforeDateIvl.exec(this.ctx)).should.be.false();
   });
@@ -602,6 +720,16 @@ describe('Before', () => {
     (await this.unknownEndNotBeforeIntIvl.exec(this.ctx)).should.be.false();
   });
 
+  it('should correctly handle null endpoints (long)', async function () {
+    (await this.negInfBegBeforeLongIvl.exec(this.ctx)).should.be.true();
+    (await this.negInfBegNotBeforeLongIvl.exec(this.ctx)).should.be.false();
+    (await this.unknownBegBeforeLongIvl.exec(this.ctx)).should.be.true();
+    (await this.unknownBegNotBeforeLongIvl.exec(this.ctx)).should.be.false();
+    (await this.posInfEndNotBeforeLongIvl.exec(this.ctx)).should.be.false();
+    should(await this.unknownEndMayBeBeforeLongIvl.exec(this.ctx)).be.null();
+    (await this.unknownEndNotBeforeLongIvl.exec(this.ctx)).should.be.false();
+  });
+
   it('should correctly handle null endpoints (date)', async function () {
     (await this.negInfBegBeforeDateIvl.exec(this.ctx)).should.be.true();
     (await this.negInfBegNotBeforeDateIvl.exec(this.ctx)).should.be.false();
@@ -777,18 +905,21 @@ describe('Meets', () => {
 
   it('should accept intervals meeting after it', async function () {
     (await this.meetsBeforeIntIvl.exec(this.ctx)).should.be.true();
+    (await this.meetsBeforeLongIvl.exec(this.ctx)).should.be.true();
     (await this.meetsBeforeRealIvl.exec(this.ctx)).should.be.true();
     (await this.meetsBeforeDateIvl.exec(this.ctx)).should.be.true();
   });
 
   it('should accept intervals meeting before it', async function () {
     (await this.meetsAfterIntIvl.exec(this.ctx)).should.be.true();
+    (await this.meetsAfterLongIvl.exec(this.ctx)).should.be.true();
     (await this.meetsAfterRealIvl.exec(this.ctx)).should.be.true();
     (await this.meetsAfterDateIvl.exec(this.ctx)).should.be.true();
   });
 
   it('should reject intervals not meeting it', async function () {
     (await this.notMeetsIntIvl.exec(this.ctx)).should.be.false();
+    (await this.notMeetsLongIvl.exec(this.ctx)).should.be.false();
     (await this.notMeetsRealIvl.exec(this.ctx)).should.be.false();
     (await this.notMeetsDateIvl.exec(this.ctx)).should.be.false();
   });
@@ -810,6 +941,23 @@ describe('Meets', () => {
     should(await this.intIvlMayMeetAfterUnknownEnd.exec(this.ctx)).be.null();
   });
 
+  it('should correctly handle null endpoints (long)', async function () {
+    (await this.negInfBegMeetsBeforeLongIvl.exec(this.ctx)).should.be.true();
+    (await this.negInfBegNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    (await this.longIvlNotMeetsNegInfBeg.exec(this.ctx)).should.be.false();
+    (await this.unknownBegMeetsBeforeLongIvl.exec(this.ctx)).should.be.true();
+    should(await this.unknownBegMayMeetAfterLongIvl.exec(this.ctx)).be.null();
+    (await this.unknownBegNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    should(await this.longIvlMayMeetBeforeUnknownBeg.exec(this.ctx)).be.null();
+    (await this.posInfEndMeetsAfterLongIvl.exec(this.ctx)).should.be.true();
+    (await this.posInfEndNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    (await this.longIvlNotMeetsPosInfEnd.exec(this.ctx)).should.be.false();
+    (await this.unknownEndMeetsAfterLongIvl.exec(this.ctx)).should.be.true();
+    should(await this.unknownEndMayMeetBeforeLongIvl.exec(this.ctx)).be.null();
+    (await this.unknownEndNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    should(await this.longIvlMayMeetAfterUnknownEnd.exec(this.ctx)).be.null();
+  });
+
   it('should correctly handle null endpoints (date)', async function () {
     (await this.negInfBegMeetsBeforeDateIvl.exec(this.ctx)).should.be.true();
     (await this.negInfBegNotMeetsDateIvl.exec(this.ctx)).should.be.false();
@@ -853,18 +1001,21 @@ describe('MeetsAfter', () => {
 
   it('should accept intervals meeting before it', async function () {
     (await this.meetsAfterIntIvl.exec(this.ctx)).should.be.true();
+    (await this.meetsAfterLongIvl.exec(this.ctx)).should.be.true();
     (await this.meetsAfterRealIvl.exec(this.ctx)).should.be.true();
     (await this.meetsAfterDateIvl.exec(this.ctx)).should.be.true();
   });
 
   it('should reject intervals meeting after it', async function () {
     (await this.meetsBeforeIntIvl.exec(this.ctx)).should.be.false();
+    (await this.meetsBeforeLongIvl.exec(this.ctx)).should.be.false();
     (await this.meetsBeforeRealIvl.exec(this.ctx)).should.be.false();
     (await this.meetsBeforeDateIvl.exec(this.ctx)).should.be.false();
   });
 
   it('should reject intervals not meeting it', async function () {
     (await this.notMeetsIntIvl.exec(this.ctx)).should.be.false();
+    (await this.notMeetsLongIvl.exec(this.ctx)).should.be.false();
     (await this.notMeetsRealIvl.exec(this.ctx)).should.be.false();
     (await this.notMeetsDateIvl.exec(this.ctx)).should.be.false();
   });
@@ -886,6 +1037,23 @@ describe('MeetsAfter', () => {
     should(await this.intIvlMayMeetAfterUnknownEnd.exec(this.ctx)).be.null();
   });
 
+  it('should correctly handle null endpoints (long)', async function () {
+    (await this.negInfBegMeetsBeforeLongIvl.exec(this.ctx)).should.be.false();
+    (await this.negInfBegNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    (await this.longIvlNotMeetsNegInfBeg.exec(this.ctx)).should.be.false();
+    (await this.unknownBegMeetsBeforeLongIvl.exec(this.ctx)).should.be.false();
+    should(await this.unknownBegMayMeetAfterLongIvl.exec(this.ctx)).be.null();
+    (await this.unknownBegNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    (await this.longIvlMayMeetBeforeUnknownBeg.exec(this.ctx)).should.be.false();
+    (await this.posInfEndMeetsAfterLongIvl.exec(this.ctx)).should.be.true();
+    (await this.posInfEndNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    (await this.longIvlNotMeetsPosInfEnd.exec(this.ctx)).should.be.false();
+    (await this.unknownEndMeetsAfterLongIvl.exec(this.ctx)).should.be.true();
+    (await this.unknownEndMayMeetBeforeLongIvl.exec(this.ctx)).should.be.false();
+    (await this.unknownEndNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    should(await this.longIvlMayMeetAfterUnknownEnd.exec(this.ctx)).be.null();
+  });
+
   it('should correctly handle null endpoints (date)', async function () {
     (await this.negInfBegMeetsBeforeDateIvl.exec(this.ctx)).should.be.false();
     (await this.negInfBegNotMeetsDateIvl.exec(this.ctx)).should.be.false();
@@ -929,18 +1097,21 @@ describe('MeetsBefore', () => {
 
   it('should accept intervals meeting after it', async function () {
     (await this.meetsBeforeIntIvl.exec(this.ctx)).should.be.true();
+    (await this.meetsBeforeLongIvl.exec(this.ctx)).should.be.true();
     (await this.meetsBeforeRealIvl.exec(this.ctx)).should.be.true();
     (await this.meetsBeforeDateIvl.exec(this.ctx)).should.be.true();
   });
 
   it('should reject intervals meeting before it', async function () {
     (await this.meetsAfterIntIvl.exec(this.ctx)).should.be.false();
+    (await this.meetsAfterLongIvl.exec(this.ctx)).should.be.false();
     (await this.meetsAfterRealIvl.exec(this.ctx)).should.be.false();
     (await this.meetsAfterDateIvl.exec(this.ctx)).should.be.false();
   });
 
   it('should reject intervals not meeting it', async function () {
     (await this.notMeetsIntIvl.exec(this.ctx)).should.be.false();
+    (await this.notMeetsLongIvl.exec(this.ctx)).should.be.false();
     (await this.notMeetsRealIvl.exec(this.ctx)).should.be.false();
     (await this.notMeetsDateIvl.exec(this.ctx)).should.be.false();
   });
@@ -962,6 +1133,23 @@ describe('MeetsBefore', () => {
     (await this.intIvlMayMeetAfterUnknownEnd.exec(this.ctx)).should.be.false();
   });
 
+  it('should correctly handle null endpoints (long)', async function () {
+    (await this.negInfBegMeetsBeforeLongIvl.exec(this.ctx)).should.be.true();
+    (await this.negInfBegNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    (await this.longIvlNotMeetsNegInfBeg.exec(this.ctx)).should.be.false();
+    (await this.unknownBegMeetsBeforeLongIvl.exec(this.ctx)).should.be.true();
+    (await this.unknownBegMayMeetAfterLongIvl.exec(this.ctx)).should.be.false();
+    (await this.unknownBegNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    should(await this.longIvlMayMeetBeforeUnknownBeg.exec(this.ctx)).be.null();
+    (await this.posInfEndMeetsAfterLongIvl.exec(this.ctx)).should.be.false();
+    (await this.posInfEndNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    (await this.longIvlNotMeetsPosInfEnd.exec(this.ctx)).should.be.false();
+    (await this.unknownEndMeetsAfterLongIvl.exec(this.ctx)).should.be.false();
+    should(await this.unknownEndMayMeetBeforeLongIvl.exec(this.ctx)).be.null();
+    (await this.unknownEndNotMeetsLongIvl.exec(this.ctx)).should.be.false();
+    (await this.longIvlMayMeetAfterUnknownEnd.exec(this.ctx)).should.be.false();
+  });
+
   it('should correctly handle null endpoints (date)', async function () {
     (await this.negInfBegMeetsBeforeDateIvl.exec(this.ctx)).should.be.true();
     (await this.negInfBegNotMeetsDateIvl.exec(this.ctx)).should.be.false();
@@ -1009,6 +1197,12 @@ describe('Overlaps', () => {
     (await this.overlapsBoundaryIntIvl.exec(this.ctx)).should.be.true();
   });
 
+  it('should accept overlaps (long)', async function () {
+    (await this.overlapsBeforeLongIvl.exec(this.ctx)).should.be.true();
+    (await this.overlapsAfterLongIvl.exec(this.ctx)).should.be.true();
+    (await this.overlapsBoundaryLongIvl.exec(this.ctx)).should.be.true();
+  });
+
   it('should accept overlaps (real)', async function () {
     (await this.overlapsBeforeRealIvl.exec(this.ctx)).should.be.true();
     (await this.overlapsAfterRealIvl.exec(this.ctx)).should.be.true();
@@ -1019,6 +1213,10 @@ describe('Overlaps', () => {
     (await this.noOverlapsIntIvl.exec(this.ctx)).should.be.false();
   });
 
+  it('should reject non-overlaps (long)', async function () {
+    (await this.noOverlapsLongIvl.exec(this.ctx)).should.be.false();
+  });
+
   it('should reject non-overlaps (real)', async function () {
     (await this.noOverlapsRealIvl.exec(this.ctx)).should.be.false();
   });
@@ -1092,6 +1290,11 @@ describe('OverlapsAfter', () => {
     (await this.overlapsBoundaryIntIvl.exec(this.ctx)).should.be.true();
   });
 
+  it('should accept overlaps that are after (long)', async function () {
+    (await this.overlapsAfterIntIvl.exec(this.ctx)).should.be.true();
+    (await this.overlapsBoundaryIntIvl.exec(this.ctx)).should.be.true();
+  });
+
   it('should accept overlaps that are after (real)', async function () {
     (await this.overlapsAfterRealIvl.exec(this.ctx)).should.be.true();
     (await this.overlapsBoundaryRealIvl.exec(this.ctx)).should.be.true();
@@ -1101,6 +1304,10 @@ describe('OverlapsAfter', () => {
     (await this.overlapsBeforeIntIvl.exec(this.ctx)).should.be.false();
   });
 
+  it('should reject overlaps that are before (long)', async function () {
+    (await this.overlapsBeforeLongIvl.exec(this.ctx)).should.be.false();
+  });
+
   it('should reject overlaps that are before (real)', async function () {
     (await this.overlapsBeforeRealIvl.exec(this.ctx)).should.be.false();
   });
@@ -1109,6 +1316,10 @@ describe('OverlapsAfter', () => {
     (await this.noOverlapsIntIvl.exec(this.ctx)).should.be.false();
   });
 
+  it('should reject non-overlaps (long)', async function () {
+    (await this.noOverlapsLongIvl.exec(this.ctx)).should.be.false();
+  });
+
   it('should reject non-overlaps (real)', async function () {
     (await this.noOverlapsRealIvl.exec(this.ctx)).should.be.false();
   });
@@ -1175,6 +1386,11 @@ describe('OverlapsBefore', () => {
     (await this.overlapsBoundaryIntIvl.exec(this.ctx)).should.be.true();
   });
 
+  it('should accept overlaps that are before (long)', async function () {
+    (await this.overlapsBeforeLongIvl.exec(this.ctx)).should.be.true();
+    (await this.overlapsBoundaryLongIvl.exec(this.ctx)).should.be.true();
+  });
+
   it('should accept overlaps that are before (real)', async function () {
     (await this.overlapsBeforeRealIvl.exec(this.ctx)).should.be.true();
     (await this.overlapsBoundaryRealIvl.exec(this.ctx)).should.be.true();
@@ -1184,6 +1400,10 @@ describe('OverlapsBefore', () => {
     (await this.overlapsAfterIntIvl.exec(this.ctx)).should.be.false();
   });
 
+  it('should reject overlaps that are after (long)', async function () {
+    (await this.overlapsAfterLongIvl.exec(this.ctx)).should.be.false();
+  });
+
   it('should reject overlaps that are after (real)', async function () {
     (await this.overlapsAfterRealIvl.exec(this.ctx)).should.be.false();
   });
@@ -1192,6 +1412,10 @@ describe('OverlapsBefore', () => {
     (await this.noOverlapsIntIvl.exec(this.ctx)).should.be.false();
   });
 
+  it('should reject non-overlaps (long)', async function () {
+    (await this.noOverlapsLongIvl.exec(this.ctx)).should.be.false();
+  });
+
   it('should reject non-overlaps (real)', async function () {
     (await this.noOverlapsRealIvl.exec(this.ctx)).should.be.false();
   });
@@ -1260,6 +1484,13 @@ describe('Width', () => {
     (await this.intOpenWidth.exec(this.ctx)).should.equal(5);
   });
 
+  it('should calculate the width of long intervals', async function () {
+    // define LongWidth: width of Interval[1L, 8L]
+    (await this.longWidth.exec(this.ctx)).should.equal(7n);
+    // define LongOpenWidth: width of Interval(1L, 8L)
+    (await this.longOpenWidth.exec(this.ctx)).should.equal(5n);
+  });
+
   it('should calculate the width of real intervals', async function () {
     // define RealWidth: width of Interval[1.23, 4.56]
     (await this.realWidth.exec(this.ctx)).should.equal(3.33);
@@ -1316,6 +1547,13 @@ describe('Size', () => {
     (await this.intOpenSize.exec(this.ctx)).should.equal(6);
   });
 
+  it('should calculate the size of long intervals', async function () {
+    // define LongSize: Size(Interval[1L, 8L])
+    (await this.longSize.exec(this.ctx)).should.equal(8n);
+    // define LongOpenSize: Size(Interval(1L, 8L))
+    (await this.longOpenSize.exec(this.ctx)).should.equal(6n);
+  });
+
   it('should calculate the size of real intervals', async function () {
     // define RealSize: Size(Interval[1.23, 4.56])
     (await this.realSize.exec(this.ctx)).should.equal(3.33 + MIN_FLOAT_PRECISION_VALUE);
@@ -1350,7 +1588,7 @@ describe('Size', () => {
   it('should calculate size of interval of quantities', async function () {
     // define SizeOfQuantityInterval: Size(Interval[Quantity{value: 1, unit: 'mm'}, Quantity{value: 10, unit: 'mm'}])
     const size = await this.sizeOfQuantityInterval.exec(this.ctx);
-    size.value.should.equal(10);
+    size.value.should.equal(9.00000001);
     size.unit.should.equal('mm');
   });
 
@@ -1393,6 +1631,10 @@ describe('Start', () => {
     (await this.closedNullInteger.exec(this.ctx)).should.eql(MIN_INT_VALUE);
   });
 
+  it('should return the minimum possible Long', async function () {
+    (await this.closedNullLong.exec(this.ctx)).should.eql(MIN_LONG_VALUE);
+  });
+
   it('should return the minimum possible Decimal', async function () {
     (await this.closedNullDecimal.exec(this.ctx)).should.eql(MIN_FLOAT_VALUE);
   });
@@ -1405,6 +1647,10 @@ describe('Start', () => {
     (await this.openNotNull.exec(this.ctx)).should.eql(new DateTime(2012, 1, 1).successor());
   });
 
+  it('should return successor of long low when the interval is open', async function () {
+    (await this.openLongNotNull.exec(this.ctx)).should.eql(2n);
+  });
+
   it('should return null for open interval with null high value', async function () {
     should(await this.openNull.exec(this.ctx)).be.null();
   });
@@ -1433,6 +1679,10 @@ describe('End', () => {
     (await this.closedNullInteger.exec(this.ctx)).should.eql(MAX_INT_VALUE);
   });
 
+  it('should return the maximum possible Long', async function () {
+    (await this.closedNullLong.exec(this.ctx)).should.eql(MAX_LONG_VALUE);
+  });
+
   it('should return the maximum possible Decimal', async function () {
     (await this.closedNullDecimal.exec(this.ctx)).should.eql(MAX_FLOAT_VALUE);
   });
@@ -1445,6 +1695,10 @@ describe('End', () => {
     (await this.openNotNull.exec(this.ctx)).should.eql(new DateTime(2013, 1, 1).predecessor());
   });
 
+  it('should return predecessor of long high when the interval is open', async function () {
+    (await this.openLongNotNull.exec(this.ctx)).should.eql(2n);
+  });
+
   it('should return null for open interval with null low value', async function () {
     should(await this.openNull.exec(this.ctx)).be.null();
   });
@@ -1465,6 +1719,12 @@ describe('Starts', () => {
     (await this.integerIntervalStartEndsFalse.exec(this.ctx)).should.be.false();
   });
 
+  it('should calculate long intervals properly', async function () {
+    (await this.longIntervalStartsTrue.exec(this.ctx)).should.be.true();
+    (await this.longIntervalStartsFalse.exec(this.ctx)).should.be.false();
+    (await this.longIntervalStartEndsFalse.exec(this.ctx)).should.be.false();
+  });
+
   it('should calculate decimal intervals properly', async function () {
     (await this.decimalIntervalStartsTrue.exec(this.ctx)).should.be.true();
     (await this.decimalIntervalStartsFalse.exec(this.ctx)).should.be.false();
@@ -1500,6 +1760,12 @@ describe('Ends', () => {
     (await this.integerIntervalEndsStartsFalse.exec(this.ctx)).should.be.false();
   });
 
+  it('should calculate long intervals properly', async function () {
+    (await this.longIntervalEndsTrue.exec(this.ctx)).should.be.true();
+    (await this.longIntervalEndsFalse.exec(this.ctx)).should.be.false();
+    (await this.longIntervalEndsStartsFalse.exec(this.ctx)).should.be.false();
+  });
+
   it('should calculate decimal intervals properly', async function () {
     (await this.decimalIntervalEndsTrue.exec(this.ctx)).should.be.true();
     (await this.decimalIntervalEndsFalse.exec(this.ctx)).should.be.false();
@@ -1586,6 +1852,77 @@ describe('IntegerIntervalUnion', () => {
   it('should properly handle null unions', async function () {
     should(await this.nullUnion.exec(this.ctx)).be.null();
     should(await this.unionNull.exec(this.ctx)).be.null();
+    should(await this.nullUnionNull.exec(this.ctx)).be.null();
+  });
+});
+
+describe('LongIntervalUnion', () => {
+  beforeEach(function () {
+    setup(this, data);
+  });
+
+  it('should properly calculate open and closed unions', async function () {
+    const x = await this.longFullInterval.exec(this.ctx);
+    let y = await this.longClosedUnionClosed.exec(this.ctx);
+    y.equals(x).should.be.true();
+
+    y = await this.longClosedUnionOpen.exec(this.ctx);
+    y.contains(0n).should.be.true();
+    y.contains(10n).should.be.false();
+
+    y = await this.longOpenUnionOpen.exec(this.ctx);
+    y.contains(0n).should.be.false();
+    y.contains(10n).should.be.false();
+
+    y = await this.longOpenUnionClosed.exec(this.ctx);
+    y.contains(0n).should.be.false();
+    y.contains(10n).should.be.true();
+  });
+
+  it('should properly calculate sameAs unions', async function () {
+    const x = await this.longFullInterval.exec(this.ctx);
+    const y = await this.longSameAsUnion.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate before/after unions', async function () {
+    should(await this.longBeforeUnion.exec(this.ctx)).be.null();
+  });
+
+  it('should properly calculate meets unions', async function () {
+    const x = await this.longFullInterval.exec(this.ctx);
+    const y = await this.longMeetsUnion.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate left/right overlapping unions', async function () {
+    const x = await this.longFullInterval.exec(this.ctx);
+    const y = await this.longOverlapsUnion.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate begins/begun by unions', async function () {
+    const x = await this.longFullInterval.exec(this.ctx);
+    const y = await this.longBeginsUnion.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate includes/included by unions', async function () {
+    const x = await this.longFullInterval.exec(this.ctx);
+    const y = await this.longDuringUnion.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate ends/ended by unions', async function () {
+    const x = await this.longFullInterval.exec(this.ctx);
+    const y = await this.longEndsUnion.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly handle null unions', async function () {
+    should(await this.nullUnion.exec(this.ctx)).be.null();
+    should(await this.unionNull.exec(this.ctx)).be.null();
+    should(await this.nullUnionNull.exec(this.ctx)).be.null();
   });
 });
 
@@ -1700,6 +2037,44 @@ describe('IntegerIntervalExcept', () => {
   });
 });
 
+describe('LongIntervalExcept', () => {
+  beforeEach(function () {
+    setup(this, data);
+  });
+
+  it('should properly calculate sameAs except', async function () {
+    should(await this.longSameAsExcept.exec(this.ctx)).be.null();
+  });
+
+  it('should properly calculate before/after except', async function () {
+    (await this.longBeforeExcept.exec(this.ctx)).should.eql(new Interval(1n, 5n));
+  });
+
+  it('should properly calculate meets except', async function () {
+    const x = await this.longHalfInterval.exec(this.ctx);
+    const y = await this.longMeetsExcept.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate left/right overlapping except', async function () {
+    const x = await this.longHalfInterval.exec(this.ctx);
+    const y = await this.longOverlapsExcept.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate begins/begun by except', async function () {
+    should(await this.longBeginsExcept.exec(this.ctx)).be.null();
+  });
+
+  it('should properly calculate includes/included by except', async function () {
+    should(await this.longDuringExcept.exec(this.ctx)).be.null();
+  });
+
+  it('should properly calculate ends/ended by except', async function () {
+    should(await this.longEndsExcept.exec(this.ctx)).be.null();
+  });
+});
+
 // TODO
 // it 'should properly handle imprecision', ->
 
@@ -1792,6 +2167,52 @@ describe('IntegerIntervalIntersect', () => {
   });
 });
 
+describe('LongIntervalIntersect', () => {
+  beforeEach(function () {
+    setup(this, data);
+  });
+
+  it('should properly calculate sameAs intersect', async function () {
+    const x = await this.longSameAsIntersect.exec(this.ctx);
+    const y = await this.longFullInterval.exec(this.ctx);
+    x.equals(y).should.be.true();
+  });
+
+  it('should properly calculate before/after intersect', async function () {
+    should(await this.longBeforeIntersect.exec(this.ctx)).be.null();
+  });
+
+  it('should properly calculate meets intersect', async function () {
+    const x = await this.longMeetsInterval.exec(this.ctx);
+    const y = await this.longMeetsIntersect.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate left/right overlapping intersect', async function () {
+    const x = await this.longOverlapsInterval.exec(this.ctx);
+    const y = await this.longOverlapsIntersect.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate begins/begun by intersect', async function () {
+    const x = await this.longBeginsInterval.exec(this.ctx);
+    const y = await this.longBeginsIntersect.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate includes/included by intersect', async function () {
+    const x = await this.longDuringInterval.exec(this.ctx);
+    const y = await this.longDuringIntersect.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+
+  it('should properly calculate ends/ended by intersect', async function () {
+    const x = await this.longEndsInterval.exec(this.ctx);
+    const y = await this.longEndsIntersect.exec(this.ctx);
+    y.equals(x).should.be.true();
+  });
+});
+
 describe('DateTimeIntervalIntersect', () => {
   beforeEach(function () {
     setup(this, data);
@@ -1892,6 +2313,57 @@ describe('IntegerIntervalCollapse', () => {
   });
 });
 
+describe('LongIntervalCollapse', () => {
+  beforeEach(function () {
+    setup(this, data);
+  });
+
+  it('empty interval collapses to empty', async function () {
+    (await this.longCollapseEmpty.exec(this.ctx)).should.eql(
+      await this.longEmptyIntervalList.exec(this.ctx)
+    );
+  });
+
+  it('single interval list collapse to self', async function () {
+    (await this.longCollapseSingleInterval.exec(this.ctx)).should.eql(
+      await this.long1_10IntervalList.exec(this.ctx)
+    );
+  });
+
+  it('disjoint intervals list collapses to ordered self', async function () {
+    (await this.longCollapseDisjoint.exec(this.ctx)).should.eql(
+      await this.longTwoItemDisjointList.exec(this.ctx)
+    );
+    (await this.longCollapseDisjointReversed.exec(this.ctx)).should.eql(
+      await this.longTwoItemDisjointList.exec(this.ctx)
+    );
+  });
+
+  it('adjacent intervals list combines', async function () {
+    (await this.longCollapseAdjacent.exec(this.ctx)).should.eql(
+      await this.long1_15IntervalList.exec(this.ctx)
+    );
+  });
+
+  it('overlapping intervals list combine', async function () {
+    (await this.longCollapseOverlap.exec(this.ctx)).should.eql(
+      await this.long1_12IntervalList.exec(this.ctx)
+    );
+    (await this.longCollapseOverlapContained.exec(this.ctx)).should.eql(
+      await this.long1_15IntervalList.exec(this.ctx)
+    );
+    (await this.longCollapseOverlapContainedEdge.exec(this.ctx)).should.eql(
+      await this.long1_10IntervalList.exec(this.ctx)
+    );
+    (await this.longCollapseOverlapContainedEdge2.exec(this.ctx)).should.eql(
+      await this.long1_15IntervalList.exec(this.ctx)
+    );
+    (await this.longCollapseOverlapMultipleCombine.exec(this.ctx)).should.eql(
+      await this.long1_15IntervalList.exec(this.ctx)
+    );
+  });
+});
+
 describe('DateTimeIntervalCollapse', () => {
   beforeEach(function () {
     setup(this, data);
@@ -2087,12 +2559,6 @@ describe('Collapse', () => {
     );
   });
 
-  it('Quantity with units uses point type as default per value', async function () {
-    (await this.collapseDisjointQuantityUnits.exec(this.ctx)).should.eql(
-      await this.expectedQuantityUnitsCollapse.exec(this.ctx)
-    );
-  });
-
   it('Quantity with units disjoint but within per', async function () {
     (await this.collapseQuantityUnitsWithinPer.exec(this.ctx)).should.eql(
       await this.expectedQuantityUnitsCollapse.exec(this.ctx)
@@ -2105,6 +2571,18 @@ describe('Collapse', () => {
     );
   });
 
+  it('Quantity with units uses point type as default per value', async function () {
+    (await this.collapseDisjointQuantityUnits.exec(this.ctx)).should.eql(
+      await this.quantityMeterIntervalList.exec(this.ctx)
+    );
+  });
+
+  it('Quantity with units within default per', async function () {
+    (await this.collapseQuantityUnitsWithinDefaultPer.exec(this.ctx)).should.eql(
+      await this.expectedQuantityUnitsCollapse.exec(this.ctx)
+    );
+  });
+
   it('Quantity with units with null low value', async function () {
     (await this.collapseQuantityNullLowUnitsWithinPer.exec(this.ctx)).should.eql(
       await this.collapseQuantityNullLowUnitsWithinPerExpected.exec(this.ctx)
@@ -2939,6 +3417,74 @@ describe('IntegerIntervalExpand', () => {
   });
 });
 
+describe('LongIntervalExpand', () => {
+  beforeEach(function () {
+    setup(this, data);
+  });
+
+  it('expands single intervals', async function () {
+    let a = await this.longClosedSinglePer1.exec(this.ctx);
+    prettyList(a).should.equal('{ [2, 2], [3, 3], [4, 4] }');
+    a = await this.longClosedSinglePer3.exec(this.ctx);
+    prettyList(a).should.equal('{ [2, 4], [5, 7], [8, 10] }');
+    a = await this.longClosedSinglePer3NoteTheWidth.exec(this.ctx);
+    prettyList(a).should.equal('{ [2, 4] }');
+  });
+
+  it('expands lists of multiple intervals', async function () {
+    let a = await this.longNullInList.exec(this.ctx);
+    prettyList(a).should.equal('{ [2, 2], [3, 3], [4, 4] }');
+    a = await this.longOverlapping.exec(this.ctx);
+    prettyList(a).should.equal('{ [2, 2], [3, 3], [4, 4], [5, 5] }');
+    a = await this.longNonOverlapping.exec(this.ctx);
+    prettyList(a).should.equal('{ [2, 2], [3, 3], [4, 4], [6, 6] }');
+  });
+
+  it('expands interval using default per of 1', async function () {
+    const a = await this.longNoPer.exec(this.ctx);
+    prettyList(a).should.equal('{ [2, 2], [3, 3], [4, 4] }');
+  });
+
+  it('expands interval with open ends', async function () {
+    let a = await this.longOpenStart.exec(this.ctx);
+    prettyList(a).should.equal('{ [3, 3], [4, 4] }');
+    a = await this.longOpenEnd.exec(this.ctx);
+    prettyList(a).should.equal('{ [2, 2], [3, 3] }');
+    a = await this.longOpenBoth.exec(this.ctx);
+    prettyList(a).should.equal('{ [3, 3] }');
+  });
+
+  it('returns an empty list if we get an empty list or if there are no results', async function () {
+    let a = await this.longEmptyList.exec(this.ctx);
+    a.should.be.instanceof(Array);
+    a.length.should.equal(0);
+    a = await this.longPerTooBig.exec(this.ctx);
+    a.should.be.instanceof(Array);
+    a.length.should.equal(0);
+  });
+
+  it('returns null with open ended intervals', async function () {
+    let a = await this.longNullClose.exec(this.ctx);
+    should.not.exist(a);
+    a = await this.longNullOpen.exec(this.ctx);
+    should.not.exist(a);
+    a = await this.longNullBoth.exec(this.ctx);
+    should.not.exist(a);
+  });
+
+  it('returns null when per not applicable or mismatch interval', async function () {
+    const a = await this.longBadPerMinute.exec(this.ctx);
+    should.not.exist(a);
+  });
+
+  it('produces a more precise value for output intervals', async function () {
+    const a = await this.longPerDecimalMorePrecise.exec(this.ctx);
+    prettyList(a).should.equal(
+      '{ [10, 10.09999999], [10.1, 10.19999999], [10.2, 10.29999999], [10.3, 10.39999999], [10.4, 10.49999999], [10.5, 10.59999999], [10.6, 10.69999999], [10.7, 10.79999999], [10.8, 10.89999999], [10.9, 10.99999999] }'
+    );
+  });
+});
+
 describe('DecimalIntervalExpand', () => {
   beforeEach(function () {
     setup(this, data);
@@ -3228,6 +3774,21 @@ describe('SameAs', () => {
     (await this.integerIntervalSameOpen.exec(this.ctx)).should.be.true();
   });
 
+  it('returns true when long interval is the same', async function () {
+    // define LongIntervalSame: Interval[3L,6L] same as Interval[3L,6L]
+    (await this.longIntervalSame.exec(this.ctx)).should.be.true();
+  });
+
+  it('returns false when long interval is not the same', async function () {
+    // define LongIntervalNotSame: Interval[3L,6L] same as Interval[3L,5L]
+    (await this.longIntervalNotSame.exec(this.ctx)).should.be.false();
+  });
+
+  it('returns true when long interval is same after the open interval is closed', async function () {
+    // define LongIntervalSameOpen: Interval[3L,6L] same as Interval[3L,7L)
+    (await this.longIntervalSameOpen.exec(this.ctx)).should.be.true();
+  });
+
   it('returns false even with an open ended null because the lows are not null and not same', async function () {
     // define OpenNullHighLowDifferent: Interval(3,null) same as Interval(2,4)
     (await this.openNullHighLowDifferent.exec(this.ctx)).should.be.false();
@@ -3267,4 +3828,44 @@ describe('SameAs', () => {
     // OpenNullLowsHighsSame: Interval(null,3) same as Interval(null,3)
     should(await this.openNullLowsHighsSame.exec(this.ctx)).be.null();
   });
+
+  it('returns false even with an open ended null because the long lows are not null and not same', async function () {
+    // define LongOpenNullHighLowDifferent: Interval(4L,null) same as Interval(3L,5L)
+    (await this.longOpenNullHighLowDifferent.exec(this.ctx)).should.be.false();
+  });
+
+  it('returns false even with an open ended null because the long highs are not null and not same', async function () {
+    // define LongOpenNullLowHighDifferent: Interval(2L,6L) same as Interval(null,5L)
+    (await this.longOpenNullLowHighDifferent.exec(this.ctx)).should.be.false();
+  });
+
+  it('returns null if long lows are same and highs have an open null', async function () {
+    // LongOpenNullHighLowSame: Interval(3L,null) same as Interval(3L,5L)
+    should(await this.longOpenNullHighLowSame.exec(this.ctx)).be.null();
+  });
+
+  it('returns null if long lows have an open null and highs are same', async function () {
+    // LongOpenNullLowHighSame: Interval(2L,5L) same as Interval(null,5L)
+    should(await this.longOpenNullLowHighSame.exec(this.ctx)).be.null();
+  });
+
+  it('returns null if both long lows and highs have open null', async function () {
+    // LongOpenNullLowOpenNullHigh: Interval(2L,null) same as Interval(null,5L)
+    should(await this.longOpenNullLowOpenNullHigh.exec(this.ctx)).be.null();
+  });
+
+  it('returns false if long lows are different and highs have open null', async function () {
+    // LongOpenNullHighsLowsDifferent: Interval(2L,null) same as Interval(3L,null)
+    (await this.longOpenNullHighsLowsDifferent.exec(this.ctx)).should.be.false();
+  });
+
+  it('returns null if long lows are same and highs have open null', async function () {
+    // LongOpenNullHighsLowsSame: Interval(2L,null) same as Interval(2L,null)
+    should(await this.longOpenNullHighsLowsSame.exec(this.ctx)).be.null();
+  });
+
+  it('returns null if long lows have open null and highs are same', async function () {
+    // LongOpenNullLowsHighsSame: Interval(null,4L) same as Interval(null,4L)
+    should(await this.longOpenNullLowsHighsSame.exec(this.ctx)).be.null();
+  });
 });
diff --git a/test/elm/list/data.cql b/test/elm/list/data.cql
index 36e304202..d05729618 100644
--- a/test/elm/list/data.cql
+++ b/test/elm/list/data.cql
@@ -1,6 +1,7 @@
 // @Test: List
 define Three: 1 + 2
 define IntList: { 9, 7, 8 }
+define LongList: { 9L, 7L, 8L }
 define StringList: { 'a', 'bee', 'see' }
 define MixedList: List<Any>{ 1, 'two', Three }
 define EmptyList: List<Integer>{}
@@ -19,6 +20,9 @@ define NullExists: exists (null)
 define EqualIntList: {1, 2, 3} = {1, 2, 3}
 define UnequalIntList: {1, 2, 3} = {1, 2}
 define ReverseIntList: {1, 2, 3} = {3, 2, 1}
+define EqualLongList: {1L, 2L, 3L} = {1L, 2L, 3L}
+define UnequalLongList: {1L, 2L, 3L} = {1L, 2L}
+define ReverseLongList: {1L, 2L, 3L} = {3L, 2L, 1L}
 define EqualStringList: {'hello', 'world'} = {'hello', 'world'}
 define UnequalStringList: {'hello', 'world'} = {'foo', 'bar'}
 define EqualTupleList: List<Any>{ Tuple{a: 1, b: Tuple{c: 1}}, Tuple{x: 'y', z: 2} } = List<Any>{ Tuple{a: 1, b: Tuple{c: 1}}, Tuple{x: 'y', z: 2} }
@@ -31,6 +35,9 @@ define BothListsHaveNull: List<Integer>{(null as Integer)} = List<Integer>{(null
 define EqualIntList: {1, 2, 3} != {1, 2, 3}
 define UnequalIntList: {1, 2, 3} != {1, 2}
 define ReverseIntList: {1, 2, 3} != {3, 2, 1}
+define EqualLongList: {1L, 2L, 3L} != {1L, 2L, 3L}
+define UnequalLongList: {1L, 2L, 3L} != {1L, 2L}
+define ReverseLongList: {1L, 2L, 3L} != {3L, 2L, 1L}
 define EqualStringList: {'hello', 'world'} != {'hello', 'world'}
 define UnequalStringList: {'hello', 'world'} != {'foo', 'bar'}
 define EqualTupleList: List<Any>{ Tuple{a: 1, b: Tuple{c: 1}}, Tuple{x: 'y', z: 2} } != List<Any>{ Tuple{a: 1, b: Tuple{c: 1}}, Tuple{x: 'y', z: 2} }
@@ -39,6 +46,7 @@ define UnequalTupleList: List<Any>{ Tuple{a: 1, b: Tuple{c: 1}}, Tuple{x: 'y', z
 // @Test: Union
 define OneToTen: {1, 2, 3, 4, 5} union {6, 7, 8, 9, 10}
 define OneToFiveOverlapped: {1, 2, 3, 4} union {3, 4, 5}
+define OneToFiveLongOverlapped: {1L, 2L, 3L, 4L} union {3L, 4L, 5L}
 define OneToFiveOverlappedWithNulls: {1, null, 2, 3, 4} union {3, 4, 5, null}
 define Disjoint: {1, 2} union {4, 5}
 define NestedToFifteen: {1, 2, 3} union {4, 5, 6} union {7 ,8 , 9} union {10, 11, 12} union {13, 14, 15}
@@ -49,6 +57,7 @@ define nullUnionNull: (null as List<String>) union (null as List<String>)
 
 // @Test: Except
 define ExceptThreeFour: {1, 2, 3, 4, 5} except {3, 4}
+define ExceptThreeFourLong: {1L, 2L, 3L, 4L, 5L} except {3L, 4L}
 define ThreeFourExcept: {3, 4} except {1, 2, 3, 4, 5}
 define ExceptFiveThree: {1, 2, 3, 4, 5} except {5, 3}
 define ExceptNoOp: {1, 2, 3, 3, 4, 5} except {6, 7, 8, 9, 10}
@@ -64,6 +73,7 @@ define NullExcept: null except {1, 2, 3, 4, 5}
 // @Test: Intersect
 define NoIntersection: {1, 2, 2, 3} intersect {4, 5, 6}
 define IntersectOnFive: {4, 5, 5, 6} intersect {1, 3, 5, 7}
+define IntersectOnFiveLong: {4L, 5L, 5L, 6L} intersect {1L, 3L, 5L, 7L}
 define IntersectionOnFourDuplicates: {4, 4, 1, 1, 2} intersect {4, 4, 3, 9}
 define IntersectOnEvens: {1, 2, 3, 4, 5, 6, 7, 8, 9, 10} intersect {0, 2, 4, 6, 8, 10, 12}
 define IntersectOnAll: {1, 2, 3, 4, 5} intersect {5, 4, 3, 2, 1}
@@ -75,6 +85,7 @@ define MultipleNullInListIntersect: {1, 2, 3, null} intersect {null, 3}
 
 // @Test: IndexOf
 define IndexOfSecond: IndexOf({'a', 'b', 'c', 'd'}, 'b')
+define IndexOfSecondLong: IndexOf({12L, 34L, 56L, 78L}, 34L)
 define IndexOfThirdTuple: IndexOf({Tuple{a: 1}, Tuple{a: 2}, Tuple{a: 3}}, Tuple{a: 3})
 define MultipleMatches: IndexOf({'a', 'b', 'c', 'd', 'd', 'e', 'd'}, 'd')
 define ItemNotFound: IndexOf({'a', 'b', 'c'}, 'd')
@@ -87,6 +98,7 @@ define ListWrongCodeSystem: IndexOf({Code{code: 'F', system: '1.16.840.1.113883.
 
 // @Test: Indexer
 define SecondItem: {'a', 'b', 'c', 'd'}[1]
+define SecondItemLong: {12L, 34L, 56L, 78L}[1]
 define ZeroIndex: {'a', 'b', 'c', 'd'}[0]
 define OutOfBounds: {'a', 'b', 'c', 'd'}[100]
 define NullList: (null as List<String>)[1]
@@ -95,6 +107,8 @@ define NullIndexer: {'a', 'b', 'c', 'd'}[null]
 // @Test: In
 define IsIn: 4 in { 3, 4, 5 }
 define IsNotIn: 4 in { 3, 5, 6 }
+define IsInLong: 4L in { 3L, 4L, 5L }
+define IsNotInLong: 4L in { 3L, 5L, 6L }
 define TupleIsIn: Tuple{a: 1, b: 'c'} in {Tuple{a:1, b:'d'}, Tuple{a:1, b:'c'}, Tuple{a:2, b:'c'}}
 define TupleIsNotIn: Tuple{a: 1, b: 'c'} in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define NullIn: null in {1, 2, null, 3}
@@ -104,6 +118,8 @@ define NullNotIn: null in {1, 2, 3}
 // @Test: Contains
 define IsIn: { 3, 4, 5 } contains 4
 define IsNotIn: { 3, 5, 6 } contains 4
+define IsInLong: { 3L, 4L, 5L } contains 4L
+define IsNotInLong:{ 3L, 5L, 6L } contains 4L
 define TupleIsIn: {Tuple{a:1, b:'d'}, Tuple{a:1, b:'c'}, Tuple{a:2, b:'c'}} contains Tuple{a: 1, b: 'c'}
 define TupleIsNotIn: {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} contains Tuple{a: 1, b: 'c'}
 define InNull: (null as List<Integer>) contains 1
@@ -115,6 +131,10 @@ define IsIncluded: {1, 2, 3, 4, 5} includes {2, 3, 4}
 define IsIncludedReversed: {1, 2, 3, 4, 5} includes {4, 3, 2}
 define IsSame: {1, 2, 3, 4, 5} includes {1, 2, 3, 4, 5}
 define IsNotIncluded: {1, 2, 3, 4, 5} includes {4, 5, 6}
+define IsIncludedLong: {1L, 2L, 3L, 4L, 5L} includes {2L, 3L, 4L}
+define IsIncludedReversedLong: {1L, 2L, 3L, 4L, 5L} includes {4L, 3L, 2L}
+define IsSameLong: {1L, 2L, 3L, 4L, 5L} includes {1L, 2L, 3L, 4L, 5L}
+define IsNotIncludedLong: {1L, 2L, 3L, 4L, 5L} includes {4L, 5L, 6L}
 define TuplesIncluded: {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} includes {Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define TuplesNotIncluded: {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} includes {Tuple{a:2, b:'d'}, Tuple{a:3, b:'c'}}
 define NullIncluded: {1, 2, 3, 4, 5} includes null
@@ -123,7 +143,7 @@ define DayIncluded: {DateTime(2012, 3, 2), DateTime(2012, 3, 3), DateTime(2012,
 define DayNotIncluded: {DateTime(2012, 3, 2), DateTime(2012, 3, 3), DateTime(2012, 3, 4)} includes DateTime(2014, 3, 3)
 define IntegerIncluded: {1, 2, 3, 4, 5} includes 3
 define IntegerNotIncluded: {1, 2, 3, 4, 5} includes 33
-define QuantityInList: { ToQuantity('1 \'m\''), ToQuantity('1.995 \'m\''), ToQuantity('2 \'m\''), ToQuantity('3 \'m\'')} includes ToQuantity('1 \'m\'') 
+define QuantityInList: { ToQuantity('1 \'m\''), ToQuantity('1.995 \'m\''), ToQuantity('2 \'m\''), ToQuantity('3 \'m\'')} includes ToQuantity('1 \'m\'')
 define QuantityNotInList: { ToQuantity('100 \'m\''), ToQuantity('1.995 \'m\''), ToQuantity('2 \'m\''), ToQuantity('3 \'m\'')} includes ToQuantity('1 \'m\'')
 
 // @Test: IncludedIn
@@ -131,6 +151,10 @@ define IsIncluded: {2, 3, 4} included in {1, 2, 3, 4, 5}
 define IsIncludedReversed: {4, 3, 2} included in {1, 2, 3, 4, 5}
 define IsSame: {1, 2, 3, 4, 5} included in {1, 2, 3, 4, 5}
 define IsNotIncluded: {4, 5, 6} included in {1, 2, 3, 4, 5}
+define IsIncludedLong: {2L, 3L, 4L} included in {1L, 2L, 3L, 4L, 5L}
+define IsIncludedReversedLong: {4L, 3L, 2L} included in {1L, 2L, 3L, 4L, 5L}
+define IsSameLong: {1L, 2L, 3L, 4L, 5L} included in {1L, 2L, 3L, 4L, 5L}
+define IsNotIncludedLong: {4L, 5L, 6L} included in {1L, 2L, 3L, 4L, 5L}
 define TuplesIncluded: {Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} included in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define TuplesNotIncluded: {Tuple{a:2, b:'d'}, Tuple{a:3, b:'c'}} included in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define NullIncludes: {1, 2, 3, 4, 5} included in null
@@ -147,6 +171,10 @@ define IsIncluded: {1, 2, 3, 4, 5} properly includes {2, 3, 4, 5}
 define IsIncludedReversed: {1, 2, 3, 4, 5} properly includes {5, 4, 3, 2}
 define IsSame: {1, 2, 3, 4, 5} properly includes {1, 2, 3, 4, 5}
 define IsNotIncluded: {1, 2, 3, 4, 5} properly includes {3, 4, 5, 6}
+define IsIncludedLong: {1L, 2L, 3L, 4L, 5L} properly includes {2L, 3L, 4L}
+define IsIncludedReversedLong: {1L, 2L, 3L, 4L, 5L} properly includes {4L, 3L, 2L}
+define IsSameLong: {1L, 2L, 3L, 4L, 5L} properly includes {1L, 2L, 3L, 4L, 5L}
+define IsNotIncludedLong: {1L, 2L, 3L, 4L, 5L} properly includes {4L, 5L, 6L}
 define TuplesIncluded: {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} properly includes {Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define TuplesNotIncluded: {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} properly includes {Tuple{a:2, b:'d'}, Tuple{a:3, b:'c'}}
 define NullIncluded: {1, 2, 3, 4, 5} properly includes null
@@ -157,6 +185,10 @@ define IsIncluded: {2, 3, 4} properly included in {1, 2, 3, 4, 5}
 define IsIncludedReversed: {4, 3, 2} properly included in {1, 2, 3, 4, 5}
 define IsSame: {1, 2, 3, 4, 5} properly included in {1, 2, 3, 4, 5}
 define IsNotIncluded: {4, 5, 6} properly included in {1, 2, 3, 4, 5}
+define IsIncludedLong: {2L, 3L, 4L} properly included in {1L, 2L, 3L, 4L, 5L}
+define IsIncludedReversedLong: {4L, 3L, 2L} properly included in {1L, 2L, 3L, 4L, 5L}
+define IsSameLong: {1L, 2L, 3L, 4L, 5L} properly included in {1L, 2L, 3L, 4L, 5L}
+define IsNotIncludedLong: {4L, 5L, 6L} properly included in {1L, 2L, 3L, 4L, 5L}
 define TuplesIncluded: {Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} properly included in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define TuplesNotIncluded: {Tuple{a:2, b:'d'}, Tuple{a:3, b:'c'}} properly included in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define NullIncludes: {1, 2, 3, 4, 5} properly included in null as List<Integer>
@@ -168,6 +200,7 @@ define NullValue: flatten null
 
 // @Test: Distinct
 define LotsOfDups: distinct {1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 4, 3, 2, 1}
+define LotsOfLongDups: distinct {1L, 2L, 2L, 3L, 3L, 3L, 4L, 4L, 4L, 4L, 5L, 5L, 5L, 5L, 5L, 4L, 3L, 2L, 1L}
 define NoDups: distinct {2, 4, 6, 8, 10}
 define DupsTuples: distinct { Tuple{ hello: 'world' }, Tuple{ hello: 'cleveland' }, Tuple{ hello: 'world' }, Tuple{ hello: 'dolly' } }
 define NoDupsTuples: distinct { Tuple{ hello: 'world' }, Tuple{ hello: 'cleveland' } }
@@ -175,6 +208,7 @@ define DuplicateNulls: distinct {null, 1, 2, null, 3, 4, 5, null}
 
 // @Test: First
 define Numbers: First({1, 2, 3, 4})
+define Longs: First({1L, 2L, 3L, 4L})
 define Letters: First({'a', 'b', 'c'})
 define Lists: First({{'a','b','c'},{'d','e','f'}})
 define Tuples: First({ Tuple{a: 1, b: 2, c: 3}, Tuple{a: 24, b: 25, c: 26} })
@@ -184,6 +218,7 @@ define NullValue: First(null as List<Integer>)
 
 // @Test: Last
 define Numbers: Last({1, 2, 3, 4})
+define Longs: Last({1L, 2L, 3L, 4L})
 define Letters: Last({'a', 'b', 'c'})
 define Lists: Last({{'a','b','c'},{'d','e','f'}})
 define Tuples: Last({ Tuple{a: 1, b: 2, c: 3}, Tuple{a: 24, b: 25, c: 26} })
@@ -193,6 +228,7 @@ define NullValue: Last(null as List<Integer>)
 
 // @Test: Length
 define Numbers: Length({2, 4, 6, 8, 10})
+define Longs: Length({2L, 4L, 6L, 8L, 10L})
 define Lists: Length({ {1, 2, 3}, {4, 5, 6}, {7, 8, 9}, {10, 11, 12}})
 define Tuples: Length({ Tuple{a: 1, b: 2, c: 3}, Tuple{a: 24, b: 25, c: 26} })
 define Empty: Length(List<Integer>{})
diff --git a/test/elm/list/data.js b/test/elm/list/data.js
index 58c3f0f41..0440e73cf 100644
--- a/test/elm/list/data.js
+++ b/test/elm/list/data.js
@@ -14,6 +14,7 @@ using Simple version '1.0.0'
 context Patient
 define Three: 1 + 2
 define IntList: { 9, 7, 8 }
+define LongList: { 9L, 7L, 8L }
 define StringList: { 'a', 'bee', 'see' }
 define MixedList: List<Any>{ 1, 'two', Three }
 define EmptyList: List<Integer>{}
@@ -31,7 +32,7 @@ module.exports['List'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "261",
+        "r" : "272",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -229,7 +230,7 @@ module.exports['List'] = {
         }
       }, {
         "localId" : "233",
-        "name" : "StringList",
+        "name" : "LongList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -238,27 +239,97 @@ module.exports['List'] = {
           "s" : {
             "r" : "233",
             "s" : [ {
-              "value" : [ "", "define ", "StringList", ": " ]
+              "value" : [ "", "define ", "LongList", ": " ]
             }, {
               "r" : "234",
+              "s" : [ {
+                "r" : "235",
+                "value" : [ "{ ", "9L", ", ", "7L", ", ", "8L", " }" ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "240",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "241",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "List",
+          "localId" : "234",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "238",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "239",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "element" : [ {
+            "type" : "Literal",
+            "localId" : "235",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "9",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "236",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "7",
+            "annotation" : [ ]
+          }, {
+            "type" : "Literal",
+            "localId" : "237",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "8",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "244",
+        "name" : "StringList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "244",
+            "s" : [ {
+              "value" : [ "", "define ", "StringList", ": " ]
+            }, {
+              "r" : "245",
               "s" : [ {
                 "value" : [ "{ " ]
               }, {
-                "r" : "235",
+                "r" : "246",
                 "s" : [ {
                   "value" : [ "'a'" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "237",
+                "r" : "248",
                 "s" : [ {
                   "value" : [ "'bee'" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "239",
+                "r" : "250",
                 "s" : [ {
                   "value" : [ "'see'" ]
                 } ]
@@ -270,47 +341,47 @@ module.exports['List'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "243",
+          "localId" : "254",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "244",
+            "localId" : "255",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "234",
+          "localId" : "245",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "241",
+            "localId" : "252",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "242",
+              "localId" : "253",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           },
           "element" : [ {
             "type" : "Literal",
-            "localId" : "235",
+            "localId" : "246",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "a",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "237",
+            "localId" : "248",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "bee",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "239",
+            "localId" : "250",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "see",
@@ -318,7 +389,7 @@ module.exports['List'] = {
           } ]
         }
       }, {
-        "localId" : "247",
+        "localId" : "258",
         "name" : "MixedList",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -326,30 +397,30 @@ module.exports['List'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "247",
+            "r" : "258",
             "s" : [ {
               "value" : [ "", "define ", "MixedList", ": " ]
             }, {
-              "r" : "249",
+              "r" : "260",
               "s" : [ {
                 "value" : [ "List<" ]
               }, {
-                "r" : "248",
+                "r" : "259",
                 "s" : [ {
                   "value" : [ "Any" ]
                 } ]
               }, {
-                "r" : "251",
+                "r" : "262",
                 "value" : [ ">{ ", "1", ", " ]
               }, {
-                "r" : "252",
+                "r" : "263",
                 "s" : [ {
                   "value" : [ "'two'" ]
                 } ]
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "254",
+                "r" : "265",
                 "s" : [ {
                   "value" : [ "Three" ]
                 } ]
@@ -361,54 +432,54 @@ module.exports['List'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "257",
+          "localId" : "268",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "258",
+            "localId" : "269",
             "name" : "{urn:hl7-org:elm-types:r1}Any",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "249",
+          "localId" : "260",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "255",
+            "localId" : "266",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "256",
+              "localId" : "267",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           },
           "element" : [ {
             "type" : "Literal",
-            "localId" : "251",
+            "localId" : "262",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "1",
             "annotation" : [ ]
           }, {
             "type" : "Literal",
-            "localId" : "252",
+            "localId" : "263",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "two",
             "annotation" : [ ]
           }, {
             "type" : "ExpressionRef",
-            "localId" : "254",
+            "localId" : "265",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "name" : "Three",
             "annotation" : [ ]
           } ]
         }
       }, {
-        "localId" : "261",
+        "localId" : "272",
         "name" : "EmptyList",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -416,15 +487,15 @@ module.exports['List'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "261",
+            "r" : "272",
             "s" : [ {
               "value" : [ "", "define ", "EmptyList", ": " ]
             }, {
-              "r" : "263",
+              "r" : "274",
               "s" : [ {
                 "value" : [ "List<" ]
               }, {
-                "r" : "262",
+                "r" : "273",
                 "s" : [ {
                   "value" : [ "Integer" ]
                 } ]
@@ -436,26 +507,26 @@ module.exports['List'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "267",
+          "localId" : "278",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "268",
+            "localId" : "279",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "List",
-          "localId" : "263",
+          "localId" : "274",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "265",
+            "localId" : "276",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "266",
+              "localId" : "277",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
@@ -1145,6 +1216,9 @@ context Patient
 define EqualIntList: {1, 2, 3} = {1, 2, 3}
 define UnequalIntList: {1, 2, 3} = {1, 2}
 define ReverseIntList: {1, 2, 3} = {3, 2, 1}
+define EqualLongList: {1L, 2L, 3L} = {1L, 2L, 3L}
+define UnequalLongList: {1L, 2L, 3L} = {1L, 2L}
+define ReverseLongList: {1L, 2L, 3L} = {3L, 2L, 1L}
 define EqualStringList: {'hello', 'world'} = {'hello', 'world'}
 define UnequalStringList: {'hello', 'world'} = {'foo', 'bar'}
 define EqualTupleList: List<Any>{ Tuple{a: 1, b: Tuple{c: 1}}, Tuple{x: 'y', z: 2} } = List<Any>{ Tuple{a: 1, b: Tuple{c: 1}}, Tuple{x: 'y', z: 2} }
@@ -1166,7 +1240,7 @@ module.exports['Equal'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "497",
+        "r" : "556",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -1639,7 +1713,7 @@ module.exports['Equal'] = {
       }, {
         "localId" : "273",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualStringList",
+        "name" : "EqualLongList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -1648,48 +1722,22 @@ module.exports['Equal'] = {
           "s" : {
             "r" : "273",
             "s" : [ {
-              "value" : [ "", "define ", "EqualStringList", ": " ]
+              "value" : [ "", "define ", "EqualLongList", ": " ]
             }, {
               "r" : "274",
               "s" : [ {
                 "r" : "275",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
                   "r" : "276",
-                  "s" : [ {
-                    "value" : [ "'hello'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "278",
-                  "s" : [ {
-                    "value" : [ "'world'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", "}" ]
                 } ]
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "282",
+                "r" : "281",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "283",
-                  "s" : [ {
-                    "value" : [ "'hello'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "285",
-                  "s" : [ {
-                    "value" : [ "'world'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "282",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", "}" ]
                 } ]
               } ]
             } ]
@@ -1702,22 +1750,22 @@ module.exports['Equal'] = {
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "289",
+            "localId" : "287",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "290",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "localId" : "288",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "291",
+            "localId" : "289",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "292",
-              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "localId" : "290",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -1727,90 +1775,367 @@ module.exports['Equal'] = {
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "280",
+              "localId" : "279",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "281",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "280",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
               "localId" : "276",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "hello",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "277",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
               "localId" : "278",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "world",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
               "annotation" : [ ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "282",
+            "localId" : "281",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "287",
+              "localId" : "285",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "288",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "286",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
+              "type" : "Literal",
+              "localId" : "282",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
               "type" : "Literal",
               "localId" : "283",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "hello",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "285",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-              "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "world",
+              "localId" : "284",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
-        "localId" : "295",
+        "localId" : "293",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnequalStringList",
+        "name" : "UnequalLongList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "295",
+            "r" : "293",
             "s" : [ {
-              "value" : [ "", "define ", "UnequalStringList", ": " ]
+              "value" : [ "", "define ", "UnequalLongList", ": " ]
+            }, {
+              "r" : "294",
+              "s" : [ {
+                "r" : "295",
+                "s" : [ {
+                  "r" : "296",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", "}" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "301",
+                "s" : [ {
+                  "r" : "302",
+                  "value" : [ "{", "1L", ", ", "2L", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "294",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "306",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "307",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "308",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "309",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "295",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "299",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "300",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "296",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "297",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "298",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "301",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "304",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "305",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "302",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "303",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "312",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "ReverseLongList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "312",
+            "s" : [ {
+              "value" : [ "", "define ", "ReverseLongList", ": " ]
+            }, {
+              "r" : "313",
+              "s" : [ {
+                "r" : "314",
+                "s" : [ {
+                  "r" : "315",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", "}" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "320",
+                "s" : [ {
+                  "r" : "321",
+                  "value" : [ "{", "3L", ", ", "2L", ", ", "1L", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "313",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "326",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "327",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "328",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "329",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "314",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "318",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "319",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "315",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "316",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "317",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "320",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "324",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "325",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "321",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "322",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "323",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "332",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqualStringList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "332",
+            "s" : [ {
+              "value" : [ "", "define ", "EqualStringList", ": " ]
             }, {
-              "r" : "296",
+              "r" : "333",
               "s" : [ {
-                "r" : "297",
+                "r" : "334",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "298",
+                  "r" : "335",
                   "s" : [ {
                     "value" : [ "'hello'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "300",
+                  "r" : "337",
                   "s" : [ {
                     "value" : [ "'world'" ]
                   } ]
@@ -1820,20 +2145,20 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "304",
+                "r" : "341",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "305",
+                  "r" : "342",
                   "s" : [ {
-                    "value" : [ "'foo'" ]
+                    "value" : [ "'hello'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "307",
+                  "r" : "344",
                   "s" : [ {
-                    "value" : [ "'bar'" ]
+                    "value" : [ "'world'" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
@@ -1844,55 +2169,55 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "296",
+          "localId" : "333",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "311",
+            "localId" : "348",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "312",
+              "localId" : "349",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "313",
+            "localId" : "350",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "314",
+              "localId" : "351",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "297",
+            "localId" : "334",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "302",
+              "localId" : "339",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "303",
+                "localId" : "340",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "298",
+              "localId" : "335",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "hello",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "300",
+              "localId" : "337",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "world",
@@ -1900,103 +2225,250 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "304",
+            "localId" : "341",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "309",
+              "localId" : "346",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "310",
+                "localId" : "347",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "305",
+              "localId" : "342",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "foo",
+              "value" : "hello",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "307",
+              "localId" : "344",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
-              "value" : "bar",
+              "value" : "world",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
-        "localId" : "317",
+        "localId" : "354",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualTupleList",
+        "name" : "UnequalStringList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "317",
+            "r" : "354",
             "s" : [ {
-              "value" : [ "", "define ", "EqualTupleList", ": " ]
+              "value" : [ "", "define ", "UnequalStringList", ": " ]
             }, {
-              "r" : "318",
+              "r" : "355",
               "s" : [ {
-                "r" : "320",
+                "r" : "356",
                 "s" : [ {
-                  "value" : [ "List<" ]
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "319",
+                  "r" : "357",
                   "s" : [ {
-                    "value" : [ "Any" ]
+                    "value" : [ "'hello'" ]
                   } ]
                 }, {
-                  "value" : [ ">{ " ]
+                  "value" : [ ", " ]
                 }, {
-                  "r" : "322",
+                  "r" : "359",
                   "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "323",
-                      "value" : [ "a", ": ", "1" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ": " ]
-                    }, {
-                      "r" : "324",
-                      "s" : [ {
-                        "value" : [ "Tuple{" ]
-                      }, {
-                        "s" : [ {
-                          "r" : "325",
-                          "value" : [ "c", ": ", "1" ]
-                        } ]
-                      }, {
-                        "value" : [ "}" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
+                    "value" : [ "'world'" ]
                   } ]
                 }, {
-                  "value" : [ ", " ]
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ " ", "=", " " ]
+              }, {
+                "r" : "363",
+                "s" : [ {
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "336",
+                  "r" : "364",
                   "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
+                    "value" : [ "'foo'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "366",
+                  "s" : [ {
+                    "value" : [ "'bar'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Equal",
+          "localId" : "355",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "370",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "371",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "372",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "373",
+              "name" : "{urn:hl7-org:elm-types:r1}String",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "356",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "361",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "362",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "357",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "hello",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "359",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "world",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "363",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "368",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "369",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "foo",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+              "valueType" : "{urn:hl7-org:elm-types:r1}String",
+              "value" : "bar",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "376",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqualTupleList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "376",
+            "s" : [ {
+              "value" : [ "", "define ", "EqualTupleList", ": " ]
+            }, {
+              "r" : "377",
+              "s" : [ {
+                "r" : "379",
+                "s" : [ {
+                  "value" : [ "List<" ]
+                }, {
+                  "r" : "378",
+                  "s" : [ {
+                    "value" : [ "Any" ]
+                  } ]
+                }, {
+                  "value" : [ ">{ " ]
+                }, {
+                  "r" : "381",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "382",
+                      "value" : [ "a", ": ", "1" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ": " ]
+                    }, {
+                      "r" : "383",
+                      "s" : [ {
+                        "value" : [ "Tuple{" ]
+                      }, {
+                        "s" : [ {
+                          "r" : "384",
+                          "value" : [ "c", ": ", "1" ]
+                        } ]
+                      }, {
+                        "value" : [ "}" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "395",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
                     "s" : [ {
                       "value" : [ "x", ": " ]
                     }, {
-                      "r" : "337",
+                      "r" : "396",
                       "s" : [ {
                         "value" : [ "'y'" ]
                       } ]
@@ -2005,7 +2477,7 @@ module.exports['Equal'] = {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "339",
+                      "r" : "398",
                       "value" : [ "z", ": ", "2" ]
                     } ]
                   }, {
@@ -2017,23 +2489,23 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "348",
+                "r" : "407",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "347",
+                  "r" : "406",
                   "s" : [ {
                     "value" : [ "Any" ]
                   } ]
                 }, {
                   "value" : [ ">{ " ]
                 }, {
-                  "r" : "350",
+                  "r" : "409",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "351",
+                      "r" : "410",
                       "value" : [ "a", ": ", "1" ]
                     } ]
                   }, {
@@ -2042,12 +2514,12 @@ module.exports['Equal'] = {
                     "s" : [ {
                       "value" : [ "b", ": " ]
                     }, {
-                      "r" : "352",
+                      "r" : "411",
                       "s" : [ {
                         "value" : [ "Tuple{" ]
                       }, {
                         "s" : [ {
-                          "r" : "353",
+                          "r" : "412",
                           "value" : [ "c", ": ", "1" ]
                         } ]
                       }, {
@@ -2060,14 +2532,14 @@ module.exports['Equal'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "364",
+                  "r" : "423",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
                       "value" : [ "x", ": " ]
                     }, {
-                      "r" : "365",
+                      "r" : "424",
                       "s" : [ {
                         "value" : [ "'y'" ]
                       } ]
@@ -2076,7 +2548,7 @@ module.exports['Equal'] = {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "367",
+                      "r" : "426",
                       "value" : [ "z", ": ", "2" ]
                     } ]
                   }, {
@@ -2091,78 +2563,78 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "318",
+          "localId" : "377",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "375",
+            "localId" : "434",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "376",
+              "localId" : "435",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "377",
+            "localId" : "436",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "378",
+              "localId" : "437",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "320",
+            "localId" : "379",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "345",
+              "localId" : "404",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "346",
+                "localId" : "405",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "322",
+              "localId" : "381",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "329",
+                "localId" : "388",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "330",
+                  "localId" : "389",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "331",
+                    "localId" : "390",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "332",
+                  "localId" : "391",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "333",
+                    "localId" : "392",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "334",
+                      "localId" : "393",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "335",
+                        "localId" : "394",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -2174,7 +2646,7 @@ module.exports['Equal'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "323",
+                  "localId" : "382",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -2184,19 +2656,19 @@ module.exports['Equal'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Tuple",
-                  "localId" : "324",
+                  "localId" : "383",
                   "annotation" : [ ],
                   "resultTypeSpecifier" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "326",
+                    "localId" : "385",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "327",
+                      "localId" : "386",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "328",
+                        "localId" : "387",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -2206,7 +2678,7 @@ module.exports['Equal'] = {
                     "name" : "c",
                     "value" : {
                       "type" : "Literal",
-                      "localId" : "325",
+                      "localId" : "384",
                       "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                       "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                       "value" : "1",
@@ -2217,29 +2689,29 @@ module.exports['Equal'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "336",
+              "localId" : "395",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "340",
+                "localId" : "399",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "341",
+                  "localId" : "400",
                   "name" : "x",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "342",
+                    "localId" : "401",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "343",
+                  "localId" : "402",
                   "name" : "z",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "344",
+                    "localId" : "403",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -2249,7 +2721,7 @@ module.exports['Equal'] = {
                 "name" : "x",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "337",
+                  "localId" : "396",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "y",
@@ -2259,7 +2731,7 @@ module.exports['Equal'] = {
                 "name" : "z",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "339",
+                  "localId" : "398",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -2269,52 +2741,52 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "348",
+            "localId" : "407",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "373",
+              "localId" : "432",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "374",
+                "localId" : "433",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "350",
+              "localId" : "409",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "357",
+                "localId" : "416",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "358",
+                  "localId" : "417",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "359",
+                    "localId" : "418",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "360",
+                  "localId" : "419",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "361",
+                    "localId" : "420",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "362",
+                      "localId" : "421",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "363",
+                        "localId" : "422",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -2326,7 +2798,7 @@ module.exports['Equal'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "351",
+                  "localId" : "410",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -2336,19 +2808,19 @@ module.exports['Equal'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Tuple",
-                  "localId" : "352",
+                  "localId" : "411",
                   "annotation" : [ ],
                   "resultTypeSpecifier" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "354",
+                    "localId" : "413",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "355",
+                      "localId" : "414",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "356",
+                        "localId" : "415",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -2358,7 +2830,7 @@ module.exports['Equal'] = {
                     "name" : "c",
                     "value" : {
                       "type" : "Literal",
-                      "localId" : "353",
+                      "localId" : "412",
                       "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                       "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                       "value" : "1",
@@ -2369,29 +2841,29 @@ module.exports['Equal'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "364",
+              "localId" : "423",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "368",
+                "localId" : "427",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "369",
+                  "localId" : "428",
                   "name" : "x",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "370",
+                    "localId" : "429",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "371",
+                  "localId" : "430",
                   "name" : "z",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "372",
+                    "localId" : "431",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -2401,7 +2873,7 @@ module.exports['Equal'] = {
                 "name" : "x",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "365",
+                  "localId" : "424",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "y",
@@ -2411,7 +2883,7 @@ module.exports['Equal'] = {
                 "name" : "z",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "367",
+                  "localId" : "426",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -2422,7 +2894,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "381",
+        "localId" : "440",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnequalTupleList",
         "context" : "Patient",
@@ -2431,29 +2903,29 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "381",
+            "r" : "440",
             "s" : [ {
               "value" : [ "", "define ", "UnequalTupleList", ": " ]
             }, {
-              "r" : "382",
+              "r" : "441",
               "s" : [ {
-                "r" : "384",
+                "r" : "443",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "383",
+                  "r" : "442",
                   "s" : [ {
                     "value" : [ "Any" ]
                   } ]
                 }, {
                   "value" : [ ">{ " ]
                 }, {
-                  "r" : "386",
+                  "r" : "445",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "387",
+                      "r" : "446",
                       "value" : [ "a", ": ", "1" ]
                     } ]
                   }, {
@@ -2462,12 +2934,12 @@ module.exports['Equal'] = {
                     "s" : [ {
                       "value" : [ "b", ": " ]
                     }, {
-                      "r" : "388",
+                      "r" : "447",
                       "s" : [ {
                         "value" : [ "Tuple{" ]
                       }, {
                         "s" : [ {
-                          "r" : "389",
+                          "r" : "448",
                           "value" : [ "c", ": ", "1" ]
                         } ]
                       }, {
@@ -2480,14 +2952,14 @@ module.exports['Equal'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "400",
+                  "r" : "459",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
                       "value" : [ "x", ": " ]
                     }, {
-                      "r" : "401",
+                      "r" : "460",
                       "s" : [ {
                         "value" : [ "'y'" ]
                       } ]
@@ -2496,7 +2968,7 @@ module.exports['Equal'] = {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "403",
+                      "r" : "462",
                       "value" : [ "z", ": ", "2" ]
                     } ]
                   }, {
@@ -2508,23 +2980,23 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "412",
+                "r" : "471",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "411",
+                  "r" : "470",
                   "s" : [ {
                     "value" : [ "Any" ]
                   } ]
                 }, {
                   "value" : [ ">{ " ]
                 }, {
-                  "r" : "414",
+                  "r" : "473",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "415",
+                      "r" : "474",
                       "value" : [ "a", ": ", "1" ]
                     } ]
                   }, {
@@ -2533,16 +3005,16 @@ module.exports['Equal'] = {
                     "s" : [ {
                       "value" : [ "b", ": " ]
                     }, {
-                      "r" : "416",
+                      "r" : "475",
                       "s" : [ {
                         "value" : [ "Tuple{" ]
                       }, {
                         "s" : [ {
                           "value" : [ "c", ": " ]
                         }, {
-                          "r" : "417",
+                          "r" : "476",
                           "s" : [ {
-                            "r" : "418",
+                            "r" : "477",
                             "value" : [ "-", "1" ]
                           } ]
                         } ]
@@ -2556,14 +3028,14 @@ module.exports['Equal'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "430",
+                  "r" : "489",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
                       "value" : [ "x", ": " ]
                     }, {
-                      "r" : "431",
+                      "r" : "490",
                       "s" : [ {
                         "value" : [ "'y'" ]
                       } ]
@@ -2572,7 +3044,7 @@ module.exports['Equal'] = {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "433",
+                      "r" : "492",
                       "value" : [ "z", ": ", "2" ]
                     } ]
                   }, {
@@ -2587,78 +3059,78 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "382",
+          "localId" : "441",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "441",
+            "localId" : "500",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "442",
+              "localId" : "501",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "443",
+            "localId" : "502",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "444",
+              "localId" : "503",
               "name" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "384",
+            "localId" : "443",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "409",
+              "localId" : "468",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "410",
+                "localId" : "469",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "386",
+              "localId" : "445",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "393",
+                "localId" : "452",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "394",
+                  "localId" : "453",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "395",
+                    "localId" : "454",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "396",
+                  "localId" : "455",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "397",
+                    "localId" : "456",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "398",
+                      "localId" : "457",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "399",
+                        "localId" : "458",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -2670,7 +3142,7 @@ module.exports['Equal'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "387",
+                  "localId" : "446",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -2680,19 +3152,19 @@ module.exports['Equal'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Tuple",
-                  "localId" : "388",
+                  "localId" : "447",
                   "annotation" : [ ],
                   "resultTypeSpecifier" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "390",
+                    "localId" : "449",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "391",
+                      "localId" : "450",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "392",
+                        "localId" : "451",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -2702,7 +3174,7 @@ module.exports['Equal'] = {
                     "name" : "c",
                     "value" : {
                       "type" : "Literal",
-                      "localId" : "389",
+                      "localId" : "448",
                       "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                       "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                       "value" : "1",
@@ -2713,29 +3185,29 @@ module.exports['Equal'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "400",
+              "localId" : "459",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "404",
+                "localId" : "463",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "405",
+                  "localId" : "464",
                   "name" : "x",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "406",
+                    "localId" : "465",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "407",
+                  "localId" : "466",
                   "name" : "z",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "408",
+                    "localId" : "467",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -2745,7 +3217,7 @@ module.exports['Equal'] = {
                 "name" : "x",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "401",
+                  "localId" : "460",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "y",
@@ -2755,7 +3227,7 @@ module.exports['Equal'] = {
                 "name" : "z",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "403",
+                  "localId" : "462",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -2765,52 +3237,52 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "412",
+            "localId" : "471",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "439",
+              "localId" : "498",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "440",
+                "localId" : "499",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "414",
+              "localId" : "473",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "423",
+                "localId" : "482",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "424",
+                  "localId" : "483",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "425",
+                    "localId" : "484",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "426",
+                  "localId" : "485",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "427",
+                    "localId" : "486",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "428",
+                      "localId" : "487",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "429",
+                        "localId" : "488",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -2822,7 +3294,7 @@ module.exports['Equal'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "415",
+                  "localId" : "474",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -2832,19 +3304,19 @@ module.exports['Equal'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Tuple",
-                  "localId" : "416",
+                  "localId" : "475",
                   "annotation" : [ ],
                   "resultTypeSpecifier" : {
                     "type" : "TupleTypeSpecifier",
-                    "localId" : "420",
+                    "localId" : "479",
                     "annotation" : [ ],
                     "element" : [ {
-                      "localId" : "421",
+                      "localId" : "480",
                       "name" : "c",
                       "annotation" : [ ],
                       "elementType" : {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "422",
+                        "localId" : "481",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       }
@@ -2854,18 +3326,18 @@ module.exports['Equal'] = {
                     "name" : "c",
                     "value" : {
                       "type" : "Negate",
-                      "localId" : "417",
+                      "localId" : "476",
                       "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ],
                       "signature" : [ {
                         "type" : "NamedTypeSpecifier",
-                        "localId" : "419",
+                        "localId" : "478",
                         "name" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ]
                       } ],
                       "operand" : {
                         "type" : "Literal",
-                        "localId" : "418",
+                        "localId" : "477",
                         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                         "value" : "1",
@@ -2877,29 +3349,29 @@ module.exports['Equal'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "430",
+              "localId" : "489",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "434",
+                "localId" : "493",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "435",
+                  "localId" : "494",
                   "name" : "x",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "436",
+                    "localId" : "495",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "437",
+                  "localId" : "496",
                   "name" : "z",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "438",
+                    "localId" : "497",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -2909,7 +3381,7 @@ module.exports['Equal'] = {
                 "name" : "x",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "431",
+                  "localId" : "490",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "y",
@@ -2919,7 +3391,7 @@ module.exports['Equal'] = {
                 "name" : "z",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "433",
+                  "localId" : "492",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -2930,7 +3402,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "447",
+        "localId" : "506",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "FirstListHasNull",
         "context" : "Patient",
@@ -2939,40 +3411,40 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "447",
+            "r" : "506",
             "s" : [ {
               "value" : [ "", "define ", "FirstListHasNull", ": " ]
             }, {
-              "r" : "448",
+              "r" : "507",
               "s" : [ {
-                "r" : "449",
+                "r" : "508",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "450",
+                  "r" : "509",
                   "s" : [ {
                     "value" : [ "'hello'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "452",
+                  "r" : "511",
                   "s" : [ {
                     "value" : [ "'world'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "454",
+                  "r" : "513",
                   "s" : [ {
                     "value" : [ "(" ]
                   }, {
-                    "r" : "454",
+                    "r" : "513",
                     "s" : [ {
-                      "r" : "455",
+                      "r" : "514",
                       "value" : [ "null", " as " ]
                     }, {
-                      "r" : "456",
+                      "r" : "515",
                       "s" : [ {
                         "value" : [ "String" ]
                       } ]
@@ -2986,18 +3458,18 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "459",
+                "r" : "518",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "460",
+                  "r" : "519",
                   "s" : [ {
                     "value" : [ "'hello'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "462",
+                  "r" : "521",
                   "s" : [ {
                     "value" : [ "'world'" ]
                   } ]
@@ -3010,75 +3482,75 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "448",
+          "localId" : "507",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "466",
+            "localId" : "525",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "467",
+              "localId" : "526",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "468",
+            "localId" : "527",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "469",
+              "localId" : "528",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "449",
+            "localId" : "508",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "457",
+              "localId" : "516",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "458",
+                "localId" : "517",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "450",
+              "localId" : "509",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "hello",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "452",
+              "localId" : "511",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "world",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "454",
+              "localId" : "513",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "455",
+                "localId" : "514",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "456",
+                "localId" : "515",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
@@ -3086,29 +3558,29 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "459",
+            "localId" : "518",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "464",
+              "localId" : "523",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "465",
+                "localId" : "524",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "460",
+              "localId" : "519",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "hello",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "462",
+              "localId" : "521",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "world",
@@ -3117,7 +3589,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "472",
+        "localId" : "531",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "SecondListHasNull",
         "context" : "Patient",
@@ -3126,24 +3598,24 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "472",
+            "r" : "531",
             "s" : [ {
               "value" : [ "", "define ", "SecondListHasNull", ": " ]
             }, {
-              "r" : "473",
+              "r" : "532",
               "s" : [ {
-                "r" : "474",
+                "r" : "533",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "475",
+                  "r" : "534",
                   "s" : [ {
                     "value" : [ "'hello'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "477",
+                  "r" : "536",
                   "s" : [ {
                     "value" : [ "'world'" ]
                   } ]
@@ -3153,34 +3625,34 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "481",
+                "r" : "540",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "482",
+                  "r" : "541",
                   "s" : [ {
                     "value" : [ "'hello'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "484",
+                  "r" : "543",
                   "s" : [ {
                     "value" : [ "'world'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "486",
+                  "r" : "545",
                   "s" : [ {
                     "value" : [ "(" ]
                   }, {
-                    "r" : "486",
+                    "r" : "545",
                     "s" : [ {
-                      "r" : "487",
+                      "r" : "546",
                       "value" : [ "null", " as " ]
                     }, {
-                      "r" : "488",
+                      "r" : "547",
                       "s" : [ {
                         "value" : [ "String" ]
                       } ]
@@ -3197,55 +3669,55 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "473",
+          "localId" : "532",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "491",
+            "localId" : "550",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "492",
+              "localId" : "551",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "493",
+            "localId" : "552",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "494",
+              "localId" : "553",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "474",
+            "localId" : "533",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "479",
+              "localId" : "538",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "480",
+                "localId" : "539",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "475",
+              "localId" : "534",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "hello",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "477",
+              "localId" : "536",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "world",
@@ -3253,49 +3725,49 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "481",
+            "localId" : "540",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "489",
+              "localId" : "548",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "490",
+                "localId" : "549",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "482",
+              "localId" : "541",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "hello",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "484",
+              "localId" : "543",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "world",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "486",
+              "localId" : "545",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "487",
+                "localId" : "546",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "488",
+                "localId" : "547",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
@@ -3304,7 +3776,7 @@ module.exports['Equal'] = {
           } ]
         }
       }, {
-        "localId" : "497",
+        "localId" : "556",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "BothListsHaveNull",
         "context" : "Patient",
@@ -3313,33 +3785,33 @@ module.exports['Equal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "497",
+            "r" : "556",
             "s" : [ {
               "value" : [ "", "define ", "BothListsHaveNull", ": " ]
             }, {
-              "r" : "498",
+              "r" : "557",
               "s" : [ {
-                "r" : "500",
+                "r" : "559",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "499",
+                  "r" : "558",
                   "s" : [ {
                     "value" : [ "Integer" ]
                   } ]
                 }, {
                   "value" : [ ">{" ]
                 }, {
-                  "r" : "502",
+                  "r" : "561",
                   "s" : [ {
                     "value" : [ "(" ]
                   }, {
-                    "r" : "502",
+                    "r" : "561",
                     "s" : [ {
-                      "r" : "503",
+                      "r" : "562",
                       "value" : [ "null", " as " ]
                     }, {
-                      "r" : "504",
+                      "r" : "563",
                       "s" : [ {
                         "value" : [ "Integer" ]
                       } ]
@@ -3353,27 +3825,27 @@ module.exports['Equal'] = {
               }, {
                 "value" : [ " ", "=", " " ]
               }, {
-                "r" : "508",
+                "r" : "567",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "507",
+                  "r" : "566",
                   "s" : [ {
                     "value" : [ "Integer" ]
                   } ]
                 }, {
                   "value" : [ ">{" ]
                 }, {
-                  "r" : "510",
+                  "r" : "569",
                   "s" : [ {
                     "value" : [ "(" ]
                   }, {
-                    "r" : "510",
+                    "r" : "569",
                     "s" : [ {
-                      "r" : "511",
+                      "r" : "570",
                       "value" : [ "null", " as " ]
                     }, {
-                      "r" : "512",
+                      "r" : "571",
                       "s" : [ {
                         "value" : [ "Integer" ]
                       } ]
@@ -3390,61 +3862,61 @@ module.exports['Equal'] = {
         } ],
         "expression" : {
           "type" : "Equal",
-          "localId" : "498",
+          "localId" : "557",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "515",
+            "localId" : "574",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "516",
+              "localId" : "575",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "517",
+            "localId" : "576",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "518",
+              "localId" : "577",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "500",
+            "localId" : "559",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "505",
+              "localId" : "564",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "506",
+                "localId" : "565",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "As",
-              "localId" : "502",
+              "localId" : "561",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "503",
+                "localId" : "562",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "504",
+                "localId" : "563",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
@@ -3452,35 +3924,35 @@ module.exports['Equal'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "508",
+            "localId" : "567",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "513",
+              "localId" : "572",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "514",
+                "localId" : "573",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "As",
-              "localId" : "510",
+              "localId" : "569",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "strict" : false,
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "511",
+                "localId" : "570",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               },
               "asTypeSpecifier" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "512",
+                "localId" : "571",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
@@ -3500,6 +3972,9 @@ context Patient
 define EqualIntList: {1, 2, 3} != {1, 2, 3}
 define UnequalIntList: {1, 2, 3} != {1, 2}
 define ReverseIntList: {1, 2, 3} != {3, 2, 1}
+define EqualLongList: {1L, 2L, 3L} != {1L, 2L, 3L}
+define UnequalLongList: {1L, 2L, 3L} != {1L, 2L}
+define ReverseLongList: {1L, 2L, 3L} != {3L, 2L, 1L}
 define EqualStringList: {'hello', 'world'} != {'hello', 'world'}
 define UnequalStringList: {'hello', 'world'} != {'foo', 'bar'}
 define EqualTupleList: List<Any>{ Tuple{a: 1, b: Tuple{c: 1}}, Tuple{x: 'y', z: 2} } != List<Any>{ Tuple{a: 1, b: Tuple{c: 1}}, Tuple{x: 'y', z: 2} }
@@ -3518,7 +3993,7 @@ module.exports['NotEqual'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "393",
+        "r" : "458",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -4027,7 +4502,7 @@ module.exports['NotEqual'] = {
       }, {
         "localId" : "279",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualStringList",
+        "name" : "EqualLongList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -4036,48 +4511,22 @@ module.exports['NotEqual'] = {
           "s" : {
             "r" : "279",
             "s" : [ {
-              "value" : [ "", "define ", "EqualStringList", ": " ]
+              "value" : [ "", "define ", "EqualLongList", ": " ]
             }, {
-              "r" : "299",
+              "r" : "297",
               "s" : [ {
                 "r" : "281",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
                   "r" : "282",
-                  "s" : [ {
-                    "value" : [ "'hello'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "284",
-                  "s" : [ {
-                    "value" : [ "'world'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", "}" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "288",
+                "r" : "287",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "289",
-                  "s" : [ {
-                    "value" : [ "'hello'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "291",
-                  "s" : [ {
-                    "value" : [ "'world'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "288",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", "}" ]
                 } ]
               } ]
             } ]
@@ -4085,12 +4534,12 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "299",
+          "localId" : "297",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "300",
+            "localId" : "298",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
@@ -4101,22 +4550,22 @@ module.exports['NotEqual'] = {
             "annotation" : [ ],
             "signature" : [ {
               "type" : "ListTypeSpecifier",
-              "localId" : "295",
+              "localId" : "293",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "296",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "294",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }, {
               "type" : "ListTypeSpecifier",
-              "localId" : "297",
+              "localId" : "295",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "298",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "296",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             } ],
@@ -4126,117 +4575,105 @@ module.exports['NotEqual'] = {
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "286",
+                "localId" : "285",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "287",
-                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "localId" : "286",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
                 "localId" : "282",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "hello",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
+                "annotation" : [ ]
+              }, {
+                "type" : "Literal",
+                "localId" : "283",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
                 "localId" : "284",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "world",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "3",
                 "annotation" : [ ]
               } ]
             }, {
               "type" : "List",
-              "localId" : "288",
+              "localId" : "287",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "293",
+                "localId" : "291",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "294",
-                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "localId" : "292",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
+                "type" : "Literal",
+                "localId" : "288",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
+                "annotation" : [ ]
+              }, {
                 "type" : "Literal",
                 "localId" : "289",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "hello",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "291",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "world",
+                "localId" : "290",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "3",
                 "annotation" : [ ]
               } ]
             } ]
           }
         }
       }, {
-        "localId" : "303",
+        "localId" : "301",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "UnequalStringList",
+        "name" : "UnequalLongList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "303",
+            "r" : "301",
             "s" : [ {
-              "value" : [ "", "define ", "UnequalStringList", ": " ]
+              "value" : [ "", "define ", "UnequalLongList", ": " ]
             }, {
-              "r" : "323",
+              "r" : "318",
               "s" : [ {
-                "r" : "305",
+                "r" : "303",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "306",
-                  "s" : [ {
-                    "value" : [ "'hello'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "308",
-                  "s" : [ {
-                    "value" : [ "'world'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "304",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", "}" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "312",
+                "r" : "309",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "313",
-                  "s" : [ {
-                    "value" : [ "'foo'" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "315",
-                  "s" : [ {
-                    "value" : [ "'bar'" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "310",
+                  "value" : [ "{", "1L", ", ", "2L", "}" ]
                 } ]
               } ]
             } ]
@@ -4244,258 +4681,312 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "323",
+          "localId" : "318",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "324",
+            "localId" : "319",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "304",
+            "localId" : "302",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "ListTypeSpecifier",
-              "localId" : "319",
+              "localId" : "314",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "320",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "315",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             }, {
               "type" : "ListTypeSpecifier",
-              "localId" : "321",
+              "localId" : "316",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "322",
-                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "localId" : "317",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "List",
-              "localId" : "305",
+              "localId" : "303",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "310",
+                "localId" : "307",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "311",
-                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "localId" : "308",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "306",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "hello",
+                "localId" : "304",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "308",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "world",
+                "localId" : "305",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
+                "annotation" : [ ]
+              }, {
+                "type" : "Literal",
+                "localId" : "306",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "3",
                 "annotation" : [ ]
               } ]
             }, {
               "type" : "List",
-              "localId" : "312",
+              "localId" : "309",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "317",
+                "localId" : "312",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "318",
-                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "localId" : "313",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "313",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "foo",
+                "localId" : "310",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "315",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "bar",
+                "localId" : "311",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
                 "annotation" : [ ]
               } ]
             } ]
           }
         }
       }, {
-        "localId" : "327",
+        "localId" : "322",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "EqualTupleList",
+        "name" : "ReverseLongList",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "327",
+            "r" : "322",
             "s" : [ {
-              "value" : [ "", "define ", "EqualTupleList", ": " ]
+              "value" : [ "", "define ", "ReverseLongList", ": " ]
             }, {
-              "r" : "389",
+              "r" : "340",
               "s" : [ {
+                "r" : "324",
+                "s" : [ {
+                  "r" : "325",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", "}" ]
+                } ]
+              }, {
+                "value" : [ " ", "!=", " " ]
+              }, {
                 "r" : "330",
                 "s" : [ {
-                  "value" : [ "List<" ]
-                }, {
-                  "r" : "329",
-                  "s" : [ {
-                    "value" : [ "Any" ]
-                  } ]
-                }, {
-                  "value" : [ ">{ " ]
+                  "r" : "331",
+                  "value" : [ "{", "3L", ", ", "2L", ", ", "1L", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "340",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "341",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "323",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "ListTypeSpecifier",
+              "localId" : "336",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "337",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ListTypeSpecifier",
+              "localId" : "338",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "339",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            } ],
+            "operand" : [ {
+              "type" : "List",
+              "localId" : "324",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "ListTypeSpecifier",
+                "localId" : "328",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "329",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
+                  "annotation" : [ ]
+                }
+              },
+              "element" : [ {
+                "type" : "Literal",
+                "localId" : "325",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
+                "annotation" : [ ]
+              }, {
+                "type" : "Literal",
+                "localId" : "326",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
+                "annotation" : [ ]
+              }, {
+                "type" : "Literal",
+                "localId" : "327",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "3",
+                "annotation" : [ ]
+              } ]
+            }, {
+              "type" : "List",
+              "localId" : "330",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "ListTypeSpecifier",
+                "localId" : "334",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "335",
+                  "name" : "{urn:hl7-org:elm-types:r1}Long",
+                  "annotation" : [ ]
+                }
+              },
+              "element" : [ {
+                "type" : "Literal",
+                "localId" : "331",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "3",
+                "annotation" : [ ]
+              }, {
+                "type" : "Literal",
+                "localId" : "332",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "2",
+                "annotation" : [ ]
+              }, {
+                "type" : "Literal",
+                "localId" : "333",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+                "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+                "value" : "1",
+                "annotation" : [ ]
+              } ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "344",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqualStringList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "344",
+            "s" : [ {
+              "value" : [ "", "define ", "EqualStringList", ": " ]
+            }, {
+              "r" : "364",
+              "s" : [ {
+                "r" : "346",
+                "s" : [ {
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "332",
+                  "r" : "347",
                   "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "333",
-                      "value" : [ "a", ": ", "1" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ": " ]
-                    }, {
-                      "r" : "334",
-                      "s" : [ {
-                        "value" : [ "Tuple{" ]
-                      }, {
-                        "s" : [ {
-                          "r" : "335",
-                          "value" : [ "c", ": ", "1" ]
-                        } ]
-                      }, {
-                        "value" : [ "}" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
+                    "value" : [ "'hello'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "346",
+                  "r" : "349",
                   "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "x", ": " ]
-                    }, {
-                      "r" : "347",
-                      "s" : [ {
-                        "value" : [ "'y'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "r" : "349",
-                      "value" : [ "z", ": ", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
+                    "value" : [ "'world'" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ "}" ]
                 } ]
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "358",
+                "r" : "353",
                 "s" : [ {
-                  "value" : [ "List<" ]
-                }, {
-                  "r" : "357",
-                  "s" : [ {
-                    "value" : [ "Any" ]
-                  } ]
-                }, {
-                  "value" : [ ">{ " ]
+                  "value" : [ "{" ]
                 }, {
-                  "r" : "360",
+                  "r" : "354",
                   "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "361",
-                      "value" : [ "a", ": ", "1" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ": " ]
-                    }, {
-                      "r" : "362",
-                      "s" : [ {
-                        "value" : [ "Tuple{" ]
-                      }, {
-                        "s" : [ {
-                          "r" : "363",
-                          "value" : [ "c", ": ", "1" ]
-                        } ]
-                      }, {
-                        "value" : [ "}" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
+                    "value" : [ "'hello'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "374",
+                  "r" : "356",
                   "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "x", ": " ]
-                    }, {
-                      "r" : "375",
-                      "s" : [ {
-                        "value" : [ "'y'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "r" : "377",
-                      "value" : [ "z", ": ", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
+                    "value" : [ "'world'" ]
                   } ]
                 }, {
-                  "value" : [ " }" ]
+                  "value" : [ "}" ]
                 } ]
               } ]
             } ]
@@ -4503,89 +4994,507 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "389",
+          "localId" : "364",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "390",
+            "localId" : "365",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "328",
+            "localId" : "345",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "ListTypeSpecifier",
-              "localId" : "385",
+              "localId" : "360",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "386",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "361",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             }, {
               "type" : "ListTypeSpecifier",
-              "localId" : "387",
+              "localId" : "362",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "388",
-                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "localId" : "363",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "List",
-              "localId" : "330",
+              "localId" : "346",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "355",
+                "localId" : "351",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "356",
-                  "name" : "{urn:hl7-org:elm-types:r1}Any",
+                  "localId" : "352",
+                  "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
-                "type" : "Tuple",
-                "localId" : "332",
-                "annotation" : [ ],
-                "resultTypeSpecifier" : {
-                  "type" : "TupleTypeSpecifier",
-                  "localId" : "339",
-                  "annotation" : [ ],
-                  "element" : [ {
-                    "localId" : "340",
+                "type" : "Literal",
+                "localId" : "347",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "hello",
+                "annotation" : [ ]
+              }, {
+                "type" : "Literal",
+                "localId" : "349",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "world",
+                "annotation" : [ ]
+              } ]
+            }, {
+              "type" : "List",
+              "localId" : "353",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "ListTypeSpecifier",
+                "localId" : "358",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "359",
+                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "annotation" : [ ]
+                }
+              },
+              "element" : [ {
+                "type" : "Literal",
+                "localId" : "354",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "hello",
+                "annotation" : [ ]
+              }, {
+                "type" : "Literal",
+                "localId" : "356",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "world",
+                "annotation" : [ ]
+              } ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "368",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "UnequalStringList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "368",
+            "s" : [ {
+              "value" : [ "", "define ", "UnequalStringList", ": " ]
+            }, {
+              "r" : "388",
+              "s" : [ {
+                "r" : "370",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "371",
+                  "s" : [ {
+                    "value" : [ "'hello'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "373",
+                  "s" : [ {
+                    "value" : [ "'world'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ " ", "!=", " " ]
+              }, {
+                "r" : "377",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "378",
+                  "s" : [ {
+                    "value" : [ "'foo'" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "380",
+                  "s" : [ {
+                    "value" : [ "'bar'" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "388",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "389",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "369",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "ListTypeSpecifier",
+              "localId" : "384",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "385",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ListTypeSpecifier",
+              "localId" : "386",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "387",
+                "name" : "{urn:hl7-org:elm-types:r1}String",
+                "annotation" : [ ]
+              }
+            } ],
+            "operand" : [ {
+              "type" : "List",
+              "localId" : "370",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "ListTypeSpecifier",
+                "localId" : "375",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "376",
+                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "annotation" : [ ]
+                }
+              },
+              "element" : [ {
+                "type" : "Literal",
+                "localId" : "371",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "hello",
+                "annotation" : [ ]
+              }, {
+                "type" : "Literal",
+                "localId" : "373",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "world",
+                "annotation" : [ ]
+              } ]
+            }, {
+              "type" : "List",
+              "localId" : "377",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "ListTypeSpecifier",
+                "localId" : "382",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "383",
+                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "annotation" : [ ]
+                }
+              },
+              "element" : [ {
+                "type" : "Literal",
+                "localId" : "378",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "foo",
+                "annotation" : [ ]
+              }, {
+                "type" : "Literal",
+                "localId" : "380",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "bar",
+                "annotation" : [ ]
+              } ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "392",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "EqualTupleList",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "392",
+            "s" : [ {
+              "value" : [ "", "define ", "EqualTupleList", ": " ]
+            }, {
+              "r" : "454",
+              "s" : [ {
+                "r" : "395",
+                "s" : [ {
+                  "value" : [ "List<" ]
+                }, {
+                  "r" : "394",
+                  "s" : [ {
+                    "value" : [ "Any" ]
+                  } ]
+                }, {
+                  "value" : [ ">{ " ]
+                }, {
+                  "r" : "397",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "398",
+                      "value" : [ "a", ": ", "1" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ": " ]
+                    }, {
+                      "r" : "399",
+                      "s" : [ {
+                        "value" : [ "Tuple{" ]
+                      }, {
+                        "s" : [ {
+                          "r" : "400",
+                          "value" : [ "c", ": ", "1" ]
+                        } ]
+                      }, {
+                        "value" : [ "}" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "411",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "x", ": " ]
+                    }, {
+                      "r" : "412",
+                      "s" : [ {
+                        "value" : [ "'y'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "r" : "414",
+                      "value" : [ "z", ": ", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
+                } ]
+              }, {
+                "value" : [ " ", "!=", " " ]
+              }, {
+                "r" : "423",
+                "s" : [ {
+                  "value" : [ "List<" ]
+                }, {
+                  "r" : "422",
+                  "s" : [ {
+                    "value" : [ "Any" ]
+                  } ]
+                }, {
+                  "value" : [ ">{ " ]
+                }, {
+                  "r" : "425",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "426",
+                      "value" : [ "a", ": ", "1" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ": " ]
+                    }, {
+                      "r" : "427",
+                      "s" : [ {
+                        "value" : [ "Tuple{" ]
+                      }, {
+                        "s" : [ {
+                          "r" : "428",
+                          "value" : [ "c", ": ", "1" ]
+                        } ]
+                      }, {
+                        "value" : [ "}" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "439",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "x", ": " ]
+                    }, {
+                      "r" : "440",
+                      "s" : [ {
+                        "value" : [ "'y'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "r" : "442",
+                      "value" : [ "z", ": ", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ " }" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Not",
+          "localId" : "454",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "455",
+            "name" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ]
+          } ],
+          "operand" : {
+            "type" : "Equal",
+            "localId" : "393",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+            "annotation" : [ ],
+            "signature" : [ {
+              "type" : "ListTypeSpecifier",
+              "localId" : "450",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "451",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "ListTypeSpecifier",
+              "localId" : "452",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "453",
+                "name" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            } ],
+            "operand" : [ {
+              "type" : "List",
+              "localId" : "395",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "ListTypeSpecifier",
+                "localId" : "420",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "421",
+                  "name" : "{urn:hl7-org:elm-types:r1}Any",
+                  "annotation" : [ ]
+                }
+              },
+              "element" : [ {
+                "type" : "Tuple",
+                "localId" : "397",
+                "annotation" : [ ],
+                "resultTypeSpecifier" : {
+                  "type" : "TupleTypeSpecifier",
+                  "localId" : "404",
+                  "annotation" : [ ],
+                  "element" : [ {
+                    "localId" : "405",
                     "name" : "a",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "341",
+                      "localId" : "406",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
                   }, {
-                    "localId" : "342",
+                    "localId" : "407",
                     "name" : "b",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "TupleTypeSpecifier",
-                      "localId" : "343",
+                      "localId" : "408",
                       "annotation" : [ ],
                       "element" : [ {
-                        "localId" : "344",
+                        "localId" : "409",
                         "name" : "c",
                         "annotation" : [ ],
                         "elementType" : {
                           "type" : "NamedTypeSpecifier",
-                          "localId" : "345",
+                          "localId" : "410",
                           "name" : "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation" : [ ]
                         }
@@ -4597,7 +5506,7 @@ module.exports['NotEqual'] = {
                   "name" : "a",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "333",
+                    "localId" : "398",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "1",
@@ -4607,19 +5516,19 @@ module.exports['NotEqual'] = {
                   "name" : "b",
                   "value" : {
                     "type" : "Tuple",
-                    "localId" : "334",
+                    "localId" : "399",
                     "annotation" : [ ],
                     "resultTypeSpecifier" : {
                       "type" : "TupleTypeSpecifier",
-                      "localId" : "336",
+                      "localId" : "401",
                       "annotation" : [ ],
                       "element" : [ {
-                        "localId" : "337",
+                        "localId" : "402",
                         "name" : "c",
                         "annotation" : [ ],
                         "elementType" : {
                           "type" : "NamedTypeSpecifier",
-                          "localId" : "338",
+                          "localId" : "403",
                           "name" : "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation" : [ ]
                         }
@@ -4629,7 +5538,7 @@ module.exports['NotEqual'] = {
                       "name" : "c",
                       "value" : {
                         "type" : "Literal",
-                        "localId" : "335",
+                        "localId" : "400",
                         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                         "value" : "1",
@@ -4640,29 +5549,29 @@ module.exports['NotEqual'] = {
                 } ]
               }, {
                 "type" : "Tuple",
-                "localId" : "346",
+                "localId" : "411",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "350",
+                  "localId" : "415",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "351",
+                    "localId" : "416",
                     "name" : "x",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "352",
+                      "localId" : "417",
                       "name" : "{urn:hl7-org:elm-types:r1}String",
                       "annotation" : [ ]
                     }
                   }, {
-                    "localId" : "353",
+                    "localId" : "418",
                     "name" : "z",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "354",
+                      "localId" : "419",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -4672,7 +5581,7 @@ module.exports['NotEqual'] = {
                   "name" : "x",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "347",
+                    "localId" : "412",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                     "valueType" : "{urn:hl7-org:elm-types:r1}String",
                     "value" : "y",
@@ -4682,7 +5591,7 @@ module.exports['NotEqual'] = {
                   "name" : "z",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "349",
+                    "localId" : "414",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "2",
@@ -4692,52 +5601,52 @@ module.exports['NotEqual'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "358",
+              "localId" : "423",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "383",
+                "localId" : "448",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "384",
+                  "localId" : "449",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Tuple",
-                "localId" : "360",
+                "localId" : "425",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "367",
+                  "localId" : "432",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "368",
+                    "localId" : "433",
                     "name" : "a",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "369",
+                      "localId" : "434",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
                   }, {
-                    "localId" : "370",
+                    "localId" : "435",
                     "name" : "b",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "TupleTypeSpecifier",
-                      "localId" : "371",
+                      "localId" : "436",
                       "annotation" : [ ],
                       "element" : [ {
-                        "localId" : "372",
+                        "localId" : "437",
                         "name" : "c",
                         "annotation" : [ ],
                         "elementType" : {
                           "type" : "NamedTypeSpecifier",
-                          "localId" : "373",
+                          "localId" : "438",
                           "name" : "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation" : [ ]
                         }
@@ -4749,7 +5658,7 @@ module.exports['NotEqual'] = {
                   "name" : "a",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "361",
+                    "localId" : "426",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "1",
@@ -4759,19 +5668,19 @@ module.exports['NotEqual'] = {
                   "name" : "b",
                   "value" : {
                     "type" : "Tuple",
-                    "localId" : "362",
+                    "localId" : "427",
                     "annotation" : [ ],
                     "resultTypeSpecifier" : {
                       "type" : "TupleTypeSpecifier",
-                      "localId" : "364",
+                      "localId" : "429",
                       "annotation" : [ ],
                       "element" : [ {
-                        "localId" : "365",
+                        "localId" : "430",
                         "name" : "c",
                         "annotation" : [ ],
                         "elementType" : {
                           "type" : "NamedTypeSpecifier",
-                          "localId" : "366",
+                          "localId" : "431",
                           "name" : "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation" : [ ]
                         }
@@ -4781,7 +5690,7 @@ module.exports['NotEqual'] = {
                       "name" : "c",
                       "value" : {
                         "type" : "Literal",
-                        "localId" : "363",
+                        "localId" : "428",
                         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                         "value" : "1",
@@ -4792,29 +5701,29 @@ module.exports['NotEqual'] = {
                 } ]
               }, {
                 "type" : "Tuple",
-                "localId" : "374",
+                "localId" : "439",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "378",
+                  "localId" : "443",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "379",
+                    "localId" : "444",
                     "name" : "x",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "380",
+                      "localId" : "445",
                       "name" : "{urn:hl7-org:elm-types:r1}String",
                       "annotation" : [ ]
                     }
                   }, {
-                    "localId" : "381",
+                    "localId" : "446",
                     "name" : "z",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "382",
+                      "localId" : "447",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -4824,7 +5733,7 @@ module.exports['NotEqual'] = {
                   "name" : "x",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "375",
+                    "localId" : "440",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                     "valueType" : "{urn:hl7-org:elm-types:r1}String",
                     "value" : "y",
@@ -4834,7 +5743,7 @@ module.exports['NotEqual'] = {
                   "name" : "z",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "377",
+                    "localId" : "442",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "2",
@@ -4846,7 +5755,7 @@ module.exports['NotEqual'] = {
           }
         }
       }, {
-        "localId" : "393",
+        "localId" : "458",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "UnequalTupleList",
         "context" : "Patient",
@@ -4855,29 +5764,29 @@ module.exports['NotEqual'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "393",
+            "r" : "458",
             "s" : [ {
               "value" : [ "", "define ", "UnequalTupleList", ": " ]
             }, {
-              "r" : "457",
+              "r" : "522",
               "s" : [ {
-                "r" : "396",
+                "r" : "461",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "395",
+                  "r" : "460",
                   "s" : [ {
                     "value" : [ "Any" ]
                   } ]
                 }, {
                   "value" : [ ">{ " ]
                 }, {
-                  "r" : "398",
+                  "r" : "463",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "399",
+                      "r" : "464",
                       "value" : [ "a", ": ", "1" ]
                     } ]
                   }, {
@@ -4886,12 +5795,12 @@ module.exports['NotEqual'] = {
                     "s" : [ {
                       "value" : [ "b", ": " ]
                     }, {
-                      "r" : "400",
+                      "r" : "465",
                       "s" : [ {
                         "value" : [ "Tuple{" ]
                       }, {
                         "s" : [ {
-                          "r" : "401",
+                          "r" : "466",
                           "value" : [ "c", ": ", "1" ]
                         } ]
                       }, {
@@ -4904,14 +5813,14 @@ module.exports['NotEqual'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "412",
+                  "r" : "477",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
                       "value" : [ "x", ": " ]
                     }, {
-                      "r" : "413",
+                      "r" : "478",
                       "s" : [ {
                         "value" : [ "'y'" ]
                       } ]
@@ -4920,7 +5829,7 @@ module.exports['NotEqual'] = {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "415",
+                      "r" : "480",
                       "value" : [ "z", ": ", "2" ]
                     } ]
                   }, {
@@ -4932,23 +5841,23 @@ module.exports['NotEqual'] = {
               }, {
                 "value" : [ " ", "!=", " " ]
               }, {
-                "r" : "424",
+                "r" : "489",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "423",
+                  "r" : "488",
                   "s" : [ {
                     "value" : [ "Any" ]
                   } ]
                 }, {
                   "value" : [ ">{ " ]
                 }, {
-                  "r" : "426",
+                  "r" : "491",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "427",
+                      "r" : "492",
                       "value" : [ "a", ": ", "1" ]
                     } ]
                   }, {
@@ -4957,16 +5866,16 @@ module.exports['NotEqual'] = {
                     "s" : [ {
                       "value" : [ "b", ": " ]
                     }, {
-                      "r" : "428",
+                      "r" : "493",
                       "s" : [ {
                         "value" : [ "Tuple{" ]
                       }, {
                         "s" : [ {
                           "value" : [ "c", ": " ]
                         }, {
-                          "r" : "429",
+                          "r" : "494",
                           "s" : [ {
-                            "r" : "430",
+                            "r" : "495",
                             "value" : [ "-", "1" ]
                           } ]
                         } ]
@@ -4980,14 +5889,14 @@ module.exports['NotEqual'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "442",
+                  "r" : "507",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
                       "value" : [ "x", ": " ]
                     }, {
-                      "r" : "443",
+                      "r" : "508",
                       "s" : [ {
                         "value" : [ "'y'" ]
                       } ]
@@ -4996,7 +5905,7 @@ module.exports['NotEqual'] = {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "445",
+                      "r" : "510",
                       "value" : [ "z", ": ", "2" ]
                     } ]
                   }, {
@@ -5011,89 +5920,89 @@ module.exports['NotEqual'] = {
         } ],
         "expression" : {
           "type" : "Not",
-          "localId" : "457",
+          "localId" : "522",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "458",
+            "localId" : "523",
             "name" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ]
           } ],
           "operand" : {
             "type" : "Equal",
-            "localId" : "394",
+            "localId" : "459",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "ListTypeSpecifier",
-              "localId" : "453",
+              "localId" : "518",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "454",
+                "localId" : "519",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
               "type" : "ListTypeSpecifier",
-              "localId" : "455",
+              "localId" : "520",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "456",
+                "localId" : "521",
                 "name" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "List",
-              "localId" : "396",
+              "localId" : "461",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "421",
+                "localId" : "486",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "422",
+                  "localId" : "487",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Tuple",
-                "localId" : "398",
+                "localId" : "463",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "405",
+                  "localId" : "470",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "406",
+                    "localId" : "471",
                     "name" : "a",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "407",
+                      "localId" : "472",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
                   }, {
-                    "localId" : "408",
+                    "localId" : "473",
                     "name" : "b",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "TupleTypeSpecifier",
-                      "localId" : "409",
+                      "localId" : "474",
                       "annotation" : [ ],
                       "element" : [ {
-                        "localId" : "410",
+                        "localId" : "475",
                         "name" : "c",
                         "annotation" : [ ],
                         "elementType" : {
                           "type" : "NamedTypeSpecifier",
-                          "localId" : "411",
+                          "localId" : "476",
                           "name" : "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation" : [ ]
                         }
@@ -5105,7 +6014,7 @@ module.exports['NotEqual'] = {
                   "name" : "a",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "399",
+                    "localId" : "464",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "1",
@@ -5115,19 +6024,19 @@ module.exports['NotEqual'] = {
                   "name" : "b",
                   "value" : {
                     "type" : "Tuple",
-                    "localId" : "400",
+                    "localId" : "465",
                     "annotation" : [ ],
                     "resultTypeSpecifier" : {
                       "type" : "TupleTypeSpecifier",
-                      "localId" : "402",
+                      "localId" : "467",
                       "annotation" : [ ],
                       "element" : [ {
-                        "localId" : "403",
+                        "localId" : "468",
                         "name" : "c",
                         "annotation" : [ ],
                         "elementType" : {
                           "type" : "NamedTypeSpecifier",
-                          "localId" : "404",
+                          "localId" : "469",
                           "name" : "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation" : [ ]
                         }
@@ -5137,7 +6046,7 @@ module.exports['NotEqual'] = {
                       "name" : "c",
                       "value" : {
                         "type" : "Literal",
-                        "localId" : "401",
+                        "localId" : "466",
                         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                         "value" : "1",
@@ -5148,29 +6057,29 @@ module.exports['NotEqual'] = {
                 } ]
               }, {
                 "type" : "Tuple",
-                "localId" : "412",
+                "localId" : "477",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "416",
+                  "localId" : "481",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "417",
+                    "localId" : "482",
                     "name" : "x",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "418",
+                      "localId" : "483",
                       "name" : "{urn:hl7-org:elm-types:r1}String",
                       "annotation" : [ ]
                     }
                   }, {
-                    "localId" : "419",
+                    "localId" : "484",
                     "name" : "z",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "420",
+                      "localId" : "485",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -5180,7 +6089,7 @@ module.exports['NotEqual'] = {
                   "name" : "x",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "413",
+                    "localId" : "478",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                     "valueType" : "{urn:hl7-org:elm-types:r1}String",
                     "value" : "y",
@@ -5190,7 +6099,7 @@ module.exports['NotEqual'] = {
                   "name" : "z",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "415",
+                    "localId" : "480",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "2",
@@ -5200,52 +6109,52 @@ module.exports['NotEqual'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "424",
+              "localId" : "489",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "451",
+                "localId" : "516",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "452",
+                  "localId" : "517",
                   "name" : "{urn:hl7-org:elm-types:r1}Any",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Tuple",
-                "localId" : "426",
+                "localId" : "491",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "435",
+                  "localId" : "500",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "436",
+                    "localId" : "501",
                     "name" : "a",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "437",
+                      "localId" : "502",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
                   }, {
-                    "localId" : "438",
+                    "localId" : "503",
                     "name" : "b",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "TupleTypeSpecifier",
-                      "localId" : "439",
+                      "localId" : "504",
                       "annotation" : [ ],
                       "element" : [ {
-                        "localId" : "440",
+                        "localId" : "505",
                         "name" : "c",
                         "annotation" : [ ],
                         "elementType" : {
                           "type" : "NamedTypeSpecifier",
-                          "localId" : "441",
+                          "localId" : "506",
                           "name" : "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation" : [ ]
                         }
@@ -5257,7 +6166,7 @@ module.exports['NotEqual'] = {
                   "name" : "a",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "427",
+                    "localId" : "492",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "1",
@@ -5267,19 +6176,19 @@ module.exports['NotEqual'] = {
                   "name" : "b",
                   "value" : {
                     "type" : "Tuple",
-                    "localId" : "428",
+                    "localId" : "493",
                     "annotation" : [ ],
                     "resultTypeSpecifier" : {
                       "type" : "TupleTypeSpecifier",
-                      "localId" : "432",
+                      "localId" : "497",
                       "annotation" : [ ],
                       "element" : [ {
-                        "localId" : "433",
+                        "localId" : "498",
                         "name" : "c",
                         "annotation" : [ ],
                         "elementType" : {
                           "type" : "NamedTypeSpecifier",
-                          "localId" : "434",
+                          "localId" : "499",
                           "name" : "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation" : [ ]
                         }
@@ -5289,18 +6198,18 @@ module.exports['NotEqual'] = {
                       "name" : "c",
                       "value" : {
                         "type" : "Negate",
-                        "localId" : "429",
+                        "localId" : "494",
                         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation" : [ ],
                         "signature" : [ {
                           "type" : "NamedTypeSpecifier",
-                          "localId" : "431",
+                          "localId" : "496",
                           "name" : "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation" : [ ]
                         } ],
                         "operand" : {
                           "type" : "Literal",
-                          "localId" : "430",
+                          "localId" : "495",
                           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                           "value" : "1",
@@ -5312,29 +6221,29 @@ module.exports['NotEqual'] = {
                 } ]
               }, {
                 "type" : "Tuple",
-                "localId" : "442",
+                "localId" : "507",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "TupleTypeSpecifier",
-                  "localId" : "446",
+                  "localId" : "511",
                   "annotation" : [ ],
                   "element" : [ {
-                    "localId" : "447",
+                    "localId" : "512",
                     "name" : "x",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "448",
+                      "localId" : "513",
                       "name" : "{urn:hl7-org:elm-types:r1}String",
                       "annotation" : [ ]
                     }
                   }, {
-                    "localId" : "449",
+                    "localId" : "514",
                     "name" : "z",
                     "annotation" : [ ],
                     "elementType" : {
                       "type" : "NamedTypeSpecifier",
-                      "localId" : "450",
+                      "localId" : "515",
                       "name" : "{urn:hl7-org:elm-types:r1}Integer",
                       "annotation" : [ ]
                     }
@@ -5344,7 +6253,7 @@ module.exports['NotEqual'] = {
                   "name" : "x",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "443",
+                    "localId" : "508",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                     "valueType" : "{urn:hl7-org:elm-types:r1}String",
                     "value" : "y",
@@ -5354,7 +6263,7 @@ module.exports['NotEqual'] = {
                   "name" : "z",
                   "value" : {
                     "type" : "Literal",
-                    "localId" : "445",
+                    "localId" : "510",
                     "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                     "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                     "value" : "2",
@@ -5376,6 +6285,7 @@ using Simple version '1.0.0'
 context Patient
 define OneToTen: {1, 2, 3, 4, 5} union {6, 7, 8, 9, 10}
 define OneToFiveOverlapped: {1, 2, 3, 4} union {3, 4, 5}
+define OneToFiveLongOverlapped: {1L, 2L, 3L, 4L} union {3L, 4L, 5L}
 define OneToFiveOverlappedWithNulls: {1, null, 2, 3, 4} union {3, 4, 5, null}
 define Disjoint: {1, 2} union {4, 5}
 define NestedToFifteen: {1, 2, 3} union {4, 5, 6} union {7 ,8 , 9} union {10, 11, 12} union {13, 14, 15}
@@ -5396,7 +6306,7 @@ module.exports['Union'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "430",
+        "r" : "455",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -5815,7 +6725,7 @@ module.exports['Union'] = {
         }
       }, {
         "localId" : "267",
-        "name" : "OneToFiveOverlappedWithNulls",
+        "name" : "OneToFiveLongOverlapped",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -5824,21 +6734,183 @@ module.exports['Union'] = {
           "s" : {
             "r" : "267",
             "s" : [ {
-              "value" : [ "", "define ", "OneToFiveOverlappedWithNulls", ": " ]
+              "value" : [ "", "define ", "OneToFiveLongOverlapped", ": " ]
             }, {
-              "r" : "285",
+              "r" : "281",
               "s" : [ {
                 "r" : "268",
                 "s" : [ {
                   "r" : "269",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", "}" ]
+                } ]
+              }, {
+                "value" : [ " union " ]
+              }, {
+                "r" : "275",
+                "s" : [ {
+                  "r" : "276",
+                  "value" : [ "{", "3L", ", ", "4L", ", ", "5L", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "288",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "289",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Union",
+          "localId" : "281",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "286",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "287",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "282",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "283",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "284",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "285",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "268",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "273",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "274",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "271",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "272",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "275",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "279",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "280",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "276",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "277",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "278",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "292",
+        "name" : "OneToFiveOverlappedWithNulls",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "292",
+            "s" : [ {
+              "value" : [ "", "define ", "OneToFiveOverlappedWithNulls", ": " ]
+            }, {
+              "r" : "310",
+              "s" : [ {
+                "r" : "293",
+                "s" : [ {
+                  "r" : "294",
                   "value" : [ "{", "1", ", ", "null", ", ", "2", ", ", "3", ", ", "4", "}" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "277",
+                "r" : "302",
                 "s" : [ {
-                  "r" : "278",
+                  "r" : "303",
                   "value" : [ "{", "3", ", ", "4", ", ", "5", ", ", "null", "}" ]
                 } ]
               } ]
@@ -5847,102 +6919,102 @@ module.exports['Union'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "292",
+          "localId" : "317",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "293",
+            "localId" : "318",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "285",
+          "localId" : "310",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "290",
+            "localId" : "315",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "291",
+              "localId" : "316",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "286",
+            "localId" : "311",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "287",
+              "localId" : "312",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "288",
+            "localId" : "313",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "289",
+              "localId" : "314",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "268",
+            "localId" : "293",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "275",
+              "localId" : "300",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "276",
+                "localId" : "301",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "269",
+              "localId" : "294",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "274",
+              "localId" : "299",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "270",
+                "localId" : "295",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
               "type" : "Literal",
-              "localId" : "271",
+              "localId" : "296",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "272",
+              "localId" : "297",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "273",
+              "localId" : "298",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
@@ -5950,49 +7022,49 @@ module.exports['Union'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "277",
+            "localId" : "302",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "283",
+              "localId" : "308",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "284",
+                "localId" : "309",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "278",
+              "localId" : "303",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "279",
+              "localId" : "304",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "280",
+              "localId" : "305",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "282",
+              "localId" : "307",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "281",
+                "localId" : "306",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -6000,7 +7072,7 @@ module.exports['Union'] = {
           } ]
         }
       }, {
-        "localId" : "296",
+        "localId" : "321",
         "name" : "Disjoint",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -6008,23 +7080,23 @@ module.exports['Union'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "296",
+            "r" : "321",
             "s" : [ {
               "value" : [ "", "define ", "Disjoint", ": " ]
             }, {
-              "r" : "307",
+              "r" : "332",
               "s" : [ {
-                "r" : "297",
+                "r" : "322",
                 "s" : [ {
-                  "r" : "298",
+                  "r" : "323",
                   "value" : [ "{", "1", ", ", "2", "}" ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "302",
+                "r" : "327",
                 "s" : [ {
-                  "r" : "303",
+                  "r" : "328",
                   "value" : [ "{", "4", ", ", "5", "}" ]
                 } ]
               } ]
@@ -6033,76 +7105,76 @@ module.exports['Union'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "314",
+          "localId" : "339",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "315",
+            "localId" : "340",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "307",
+          "localId" : "332",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "312",
+            "localId" : "337",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "313",
+              "localId" : "338",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "308",
+            "localId" : "333",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "309",
+              "localId" : "334",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "310",
+            "localId" : "335",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "311",
+              "localId" : "336",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "297",
+            "localId" : "322",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "300",
+              "localId" : "325",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "301",
+                "localId" : "326",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "298",
+              "localId" : "323",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "299",
+              "localId" : "324",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -6110,29 +7182,29 @@ module.exports['Union'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "302",
+            "localId" : "327",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "305",
+              "localId" : "330",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "306",
+                "localId" : "331",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "303",
+              "localId" : "328",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "304",
+              "localId" : "329",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -6141,7 +7213,7 @@ module.exports['Union'] = {
           } ]
         }
       }, {
-        "localId" : "318",
+        "localId" : "343",
         "name" : "NestedToFifteen",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -6149,56 +7221,56 @@ module.exports['Union'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "318",
+            "r" : "343",
             "s" : [ {
               "value" : [ "", "define ", "NestedToFifteen", ": " ]
             }, {
-              "r" : "375",
+              "r" : "400",
               "s" : [ {
-                "r" : "362",
+                "r" : "387",
                 "s" : [ {
-                  "r" : "344",
+                  "r" : "369",
                   "s" : [ {
-                    "r" : "331",
+                    "r" : "356",
                     "s" : [ {
-                      "r" : "319",
+                      "r" : "344",
                       "s" : [ {
-                        "r" : "320",
+                        "r" : "345",
                         "value" : [ "{", "1", ", ", "2", ", ", "3", "}" ]
                       } ]
                     }, {
                       "value" : [ " union " ]
                     }, {
-                      "r" : "325",
+                      "r" : "350",
                       "s" : [ {
-                        "r" : "326",
+                        "r" : "351",
                         "value" : [ "{", "4", ", ", "5", ", ", "6", "}" ]
                       } ]
                     } ]
                   }, {
                     "value" : [ " union " ]
                   }, {
-                    "r" : "338",
+                    "r" : "363",
                     "s" : [ {
-                      "r" : "339",
+                      "r" : "364",
                       "value" : [ "{", "7", " ,", "8", " , ", "9", "}" ]
                     } ]
                   } ]
                 }, {
                   "value" : [ " union " ]
                 }, {
-                  "r" : "351",
+                  "r" : "376",
                   "s" : [ {
-                    "r" : "352",
+                    "r" : "377",
                     "value" : [ "{", "10", ", ", "11", ", ", "12", "}" ]
                   } ]
                 } ]
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "369",
+                "r" : "394",
                 "s" : [ {
-                  "r" : "370",
+                  "r" : "395",
                   "value" : [ "{", "13", ", ", "14", ", ", "15", "}" ]
                 } ]
               } ]
@@ -6207,155 +7279,155 @@ module.exports['Union'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "382",
+          "localId" : "407",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "383",
+            "localId" : "408",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "375",
+          "localId" : "400",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "380",
+            "localId" : "405",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "381",
+              "localId" : "406",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "376",
+            "localId" : "401",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "377",
+              "localId" : "402",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "378",
+            "localId" : "403",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "379",
+              "localId" : "404",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Union",
-            "localId" : "362",
+            "localId" : "387",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "367",
+              "localId" : "392",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "368",
+                "localId" : "393",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "signature" : [ {
               "type" : "ListTypeSpecifier",
-              "localId" : "363",
+              "localId" : "388",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "364",
+                "localId" : "389",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
               "type" : "ListTypeSpecifier",
-              "localId" : "365",
+              "localId" : "390",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "366",
+                "localId" : "391",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "Union",
-              "localId" : "331",
+              "localId" : "356",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "336",
+                "localId" : "361",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "337",
+                  "localId" : "362",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "signature" : [ {
                 "type" : "ListTypeSpecifier",
-                "localId" : "332",
+                "localId" : "357",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "333",
+                  "localId" : "358",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
                 "type" : "ListTypeSpecifier",
-                "localId" : "334",
+                "localId" : "359",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "335",
+                  "localId" : "360",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               } ],
               "operand" : [ {
                 "type" : "List",
-                "localId" : "319",
+                "localId" : "344",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "ListTypeSpecifier",
-                  "localId" : "323",
+                  "localId" : "348",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "324",
+                    "localId" : "349",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 },
                 "element" : [ {
                   "type" : "Literal",
-                  "localId" : "320",
+                  "localId" : "345",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "321",
+                  "localId" : "346",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "322",
+                  "localId" : "347",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -6363,36 +7435,36 @@ module.exports['Union'] = {
                 } ]
               }, {
                 "type" : "List",
-                "localId" : "325",
+                "localId" : "350",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "ListTypeSpecifier",
-                  "localId" : "329",
+                  "localId" : "354",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "330",
+                    "localId" : "355",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 },
                 "element" : [ {
                   "type" : "Literal",
-                  "localId" : "326",
+                  "localId" : "351",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "4",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "327",
+                  "localId" : "352",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "5",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "328",
+                  "localId" : "353",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "6",
@@ -6401,61 +7473,61 @@ module.exports['Union'] = {
               } ]
             }, {
               "type" : "Union",
-              "localId" : "357",
+              "localId" : "382",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "ListTypeSpecifier",
-                "localId" : "358",
+                "localId" : "383",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "359",
+                  "localId" : "384",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
                 "type" : "ListTypeSpecifier",
-                "localId" : "360",
+                "localId" : "385",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "361",
+                  "localId" : "386",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               } ],
               "operand" : [ {
                 "type" : "List",
-                "localId" : "338",
+                "localId" : "363",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "ListTypeSpecifier",
-                  "localId" : "342",
+                  "localId" : "367",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "343",
+                    "localId" : "368",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 },
                 "element" : [ {
                   "type" : "Literal",
-                  "localId" : "339",
+                  "localId" : "364",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "7",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "340",
+                  "localId" : "365",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "8",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "341",
+                  "localId" : "366",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "9",
@@ -6463,36 +7535,36 @@ module.exports['Union'] = {
                 } ]
               }, {
                 "type" : "List",
-                "localId" : "351",
+                "localId" : "376",
                 "annotation" : [ ],
                 "resultTypeSpecifier" : {
                   "type" : "ListTypeSpecifier",
-                  "localId" : "355",
+                  "localId" : "380",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "356",
+                    "localId" : "381",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 },
                 "element" : [ {
                   "type" : "Literal",
-                  "localId" : "352",
+                  "localId" : "377",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "10",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "353",
+                  "localId" : "378",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "11",
                   "annotation" : [ ]
                 }, {
                   "type" : "Literal",
-                  "localId" : "354",
+                  "localId" : "379",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "12",
@@ -6502,36 +7574,36 @@ module.exports['Union'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "369",
+            "localId" : "394",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "373",
+              "localId" : "398",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "374",
+                "localId" : "399",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "370",
+              "localId" : "395",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "13",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "371",
+              "localId" : "396",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "14",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "372",
+              "localId" : "397",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "15",
@@ -6540,7 +7612,7 @@ module.exports['Union'] = {
           } ]
         }
       }, {
-        "localId" : "386",
+        "localId" : "411",
         "name" : "NullUnion",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -6548,18 +7620,18 @@ module.exports['Union'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "386",
+            "r" : "411",
             "s" : [ {
               "value" : [ "", "define ", "NullUnion", ": " ]
             }, {
-              "r" : "394",
+              "r" : "419",
               "s" : [ {
-                "r" : "387",
+                "r" : "412",
                 "value" : [ "null", " union " ]
               }, {
-                "r" : "388",
+                "r" : "413",
                 "s" : [ {
-                  "r" : "389",
+                  "r" : "414",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", "}" ]
                 } ]
               } ]
@@ -6568,105 +7640,105 @@ module.exports['Union'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "404",
+          "localId" : "429",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "405",
+            "localId" : "430",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "394",
+          "localId" : "419",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "402",
+            "localId" : "427",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "403",
+              "localId" : "428",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "398",
+            "localId" : "423",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "399",
+              "localId" : "424",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "400",
+            "localId" : "425",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "401",
+              "localId" : "426",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "395",
+            "localId" : "420",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "387",
+              "localId" : "412",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "396",
+              "localId" : "421",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "397",
+                "localId" : "422",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "List",
-            "localId" : "388",
+            "localId" : "413",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "392",
+              "localId" : "417",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "393",
+                "localId" : "418",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "389",
+              "localId" : "414",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "390",
+              "localId" : "415",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "391",
+              "localId" : "416",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -6675,7 +7747,7 @@ module.exports['Union'] = {
           } ]
         }
       }, {
-        "localId" : "408",
+        "localId" : "433",
         "name" : "UnionNull",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -6683,19 +7755,19 @@ module.exports['Union'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "408",
+            "r" : "433",
             "s" : [ {
               "value" : [ "", "define ", "UnionNull", ": " ]
             }, {
-              "r" : "416",
+              "r" : "441",
               "s" : [ {
-                "r" : "409",
+                "r" : "434",
                 "s" : [ {
-                  "r" : "410",
+                  "r" : "435",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", "}" ]
                 } ]
               }, {
-                "r" : "415",
+                "r" : "440",
                 "value" : [ " union ", "null" ]
               } ]
             } ]
@@ -6703,83 +7775,83 @@ module.exports['Union'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "426",
+          "localId" : "451",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "427",
+            "localId" : "452",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "416",
+          "localId" : "441",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "424",
+            "localId" : "449",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "425",
+              "localId" : "450",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "420",
+            "localId" : "445",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "421",
+              "localId" : "446",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "422",
+            "localId" : "447",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "423",
+              "localId" : "448",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "409",
+            "localId" : "434",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "413",
+              "localId" : "438",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "414",
+                "localId" : "439",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "410",
+              "localId" : "435",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "411",
+              "localId" : "436",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "412",
+              "localId" : "437",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -6787,22 +7859,22 @@ module.exports['Union'] = {
             } ]
           }, {
             "type" : "As",
-            "localId" : "417",
+            "localId" : "442",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "415",
+              "localId" : "440",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "418",
+              "localId" : "443",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "419",
+                "localId" : "444",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -6810,7 +7882,7 @@ module.exports['Union'] = {
           } ]
         }
       }, {
-        "localId" : "430",
+        "localId" : "455",
         "name" : "nullUnionNull",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -6818,26 +7890,26 @@ module.exports['Union'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "430",
+            "r" : "455",
             "s" : [ {
               "value" : [ "", "define ", "nullUnionNull", ": " ]
             }, {
-              "r" : "451",
+              "r" : "476",
               "s" : [ {
-                "r" : "431",
+                "r" : "456",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "431",
+                  "r" : "456",
                   "s" : [ {
-                    "r" : "432",
+                    "r" : "457",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "433",
+                    "r" : "458",
                     "s" : [ {
                       "value" : [ "List<" ]
                     }, {
-                      "r" : "434",
+                      "r" : "459",
                       "s" : [ {
                         "value" : [ "String" ]
                       } ]
@@ -6851,20 +7923,20 @@ module.exports['Union'] = {
               }, {
                 "value" : [ " union " ]
               }, {
-                "r" : "441",
+                "r" : "466",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "441",
+                  "r" : "466",
                   "s" : [ {
-                    "r" : "442",
+                    "r" : "467",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "443",
+                    "r" : "468",
                     "s" : [ {
                       "value" : [ "List<" ]
                     }, {
-                      "r" : "444",
+                      "r" : "469",
                       "s" : [ {
                         "value" : [ "String" ]
                       } ]
@@ -6881,63 +7953,63 @@ module.exports['Union'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "458",
+          "localId" : "483",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "459",
+            "localId" : "484",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Union",
-          "localId" : "451",
+          "localId" : "476",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "456",
+            "localId" : "481",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "457",
+              "localId" : "482",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "452",
+            "localId" : "477",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "453",
+              "localId" : "478",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "454",
+            "localId" : "479",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "455",
+              "localId" : "480",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "431",
+            "localId" : "456",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "439",
+              "localId" : "464",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "440",
+                "localId" : "465",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -6945,28 +8017,28 @@ module.exports['Union'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "432",
+              "localId" : "457",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "433",
+              "localId" : "458",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "435",
+                "localId" : "460",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "436",
+                  "localId" : "461",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "434",
+                "localId" : "459",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
@@ -6974,16 +8046,16 @@ module.exports['Union'] = {
             }
           }, {
             "type" : "As",
-            "localId" : "441",
+            "localId" : "466",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "449",
+              "localId" : "474",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "450",
+                "localId" : "475",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -6991,28 +8063,28 @@ module.exports['Union'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "442",
+              "localId" : "467",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "443",
+              "localId" : "468",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "445",
+                "localId" : "470",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "446",
+                  "localId" : "471",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "444",
+                "localId" : "469",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
@@ -7030,6 +8102,7 @@ library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
 define ExceptThreeFour: {1, 2, 3, 4, 5} except {3, 4}
+define ExceptThreeFourLong: {1L, 2L, 3L, 4L, 5L} except {3L, 4L}
 define ThreeFourExcept: {3, 4} except {1, 2, 3, 4, 5}
 define ExceptFiveThree: {1, 2, 3, 4, 5} except {5, 3}
 define ExceptNoOp: {1, 2, 3, 3, 4, 5} except {6, 7, 8, 9, 10}
@@ -7055,7 +8128,7 @@ module.exports['Except'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "500",
+        "r" : "525",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -7291,7 +8364,7 @@ module.exports['Except'] = {
         }
       }, {
         "localId" : "239",
-        "name" : "ThreeFourExcept",
+        "name" : "ExceptThreeFourLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -7300,22 +8373,22 @@ module.exports['Except'] = {
           "s" : {
             "r" : "239",
             "s" : [ {
-              "value" : [ "", "define ", "ThreeFourExcept", ": " ]
+              "value" : [ "", "define ", "ExceptThreeFourLong", ": " ]
             }, {
               "r" : "253",
               "s" : [ {
                 "r" : "240",
                 "s" : [ {
                   "r" : "241",
-                  "value" : [ "{", "3", ", ", "4", "}" ]
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "245",
+                "r" : "248",
                 "s" : [ {
-                  "r" : "246",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "r" : "249",
+                  "value" : [ "{", "3L", ", ", "4L", "}" ]
                 } ]
               } ]
             } ]
@@ -7328,7 +8401,7 @@ module.exports['Except'] = {
           "elementType" : {
             "type" : "NamedTypeSpecifier",
             "localId" : "261",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -7343,7 +8416,7 @@ module.exports['Except'] = {
             "elementType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "259",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           },
@@ -7354,7 +8427,7 @@ module.exports['Except'] = {
             "elementType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "255",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
@@ -7364,7 +8437,7 @@ module.exports['Except'] = {
             "elementType" : {
               "type" : "NamedTypeSpecifier",
               "localId" : "257",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
@@ -7374,33 +8447,54 @@ module.exports['Except'] = {
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "243",
+              "localId" : "246",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "244",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "247",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
               "localId" : "241",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
               "localId" : "242",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "243",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "244",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "245",
+            "localId" : "248",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
@@ -7409,51 +8503,30 @@ module.exports['Except'] = {
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
                 "localId" : "252",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "246",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "247",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "248",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }, {
               "type" : "Literal",
               "localId" : "249",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
               "localId" : "250",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
         "localId" : "264",
-        "name" : "ExceptFiveThree",
+        "name" : "ThreeFourExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -7462,22 +8535,22 @@ module.exports['Except'] = {
           "s" : {
             "r" : "264",
             "s" : [ {
-              "value" : [ "", "define ", "ExceptFiveThree", ": " ]
+              "value" : [ "", "define ", "ThreeFourExcept", ": " ]
             }, {
               "r" : "278",
               "s" : [ {
                 "r" : "265",
                 "s" : [ {
                   "r" : "266",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "value" : [ "{", "3", ", ", "4", "}" ]
                 } ]
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "273",
+                "r" : "270",
                 "s" : [ {
-                  "r" : "274",
-                  "value" : [ "{", "5", ", ", "3", "}" ]
+                  "r" : "271",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               } ]
             } ]
@@ -7536,11 +8609,11 @@ module.exports['Except'] = {
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "271",
+              "localId" : "268",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "272",
+                "localId" : "269",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -7550,40 +8623,19 @@ module.exports['Except'] = {
               "localId" : "266",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "267",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "268",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "269",
+              "localId" : "267",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "270",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "273",
+            "localId" : "270",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
@@ -7597,25 +8649,46 @@ module.exports['Except'] = {
               }
             },
             "element" : [ {
+              "type" : "Literal",
+              "localId" : "271",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "272",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "273",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
               "type" : "Literal",
               "localId" : "274",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
               "localId" : "275",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "5",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
         "localId" : "289",
-        "name" : "ExceptNoOp",
+        "name" : "ExceptFiveThree",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -7624,22 +8697,22 @@ module.exports['Except'] = {
           "s" : {
             "r" : "289",
             "s" : [ {
-              "value" : [ "", "define ", "ExceptNoOp", ": " ]
+              "value" : [ "", "define ", "ExceptFiveThree", ": " ]
             }, {
-              "r" : "307",
+              "r" : "303",
               "s" : [ {
                 "r" : "290",
                 "s" : [ {
                   "r" : "291",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "299",
+                "r" : "298",
                 "s" : [ {
-                  "r" : "300",
-                  "value" : [ "{", "6", ", ", "7", ", ", "8", ", ", "9", ", ", "10", "}" ]
+                  "r" : "299",
+                  "value" : [ "{", "5", ", ", "3", "}" ]
                 } ]
               } ]
             } ]
@@ -7647,47 +8720,47 @@ module.exports['Except'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "314",
+          "localId" : "310",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "315",
+            "localId" : "311",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "307",
+          "localId" : "303",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "312",
+            "localId" : "308",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "313",
+              "localId" : "309",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "308",
+            "localId" : "304",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "309",
+              "localId" : "305",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "310",
+            "localId" : "306",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "311",
+              "localId" : "307",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
@@ -7698,11 +8771,11 @@ module.exports['Except'] = {
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "297",
+              "localId" : "296",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "298",
+                "localId" : "297",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -7733,18 +8806,11 @@ module.exports['Except'] = {
               "localId" : "294",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "295",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "296",
+              "localId" : "295",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -7752,84 +8818,63 @@ module.exports['Except'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "299",
+            "localId" : "298",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "305",
+              "localId" : "301",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "306",
+                "localId" : "302",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "300",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "6",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "301",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "302",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "8",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "303",
+              "localId" : "299",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "9",
+              "value" : "5",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "304",
+              "localId" : "300",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "10",
+              "value" : "3",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
-        "localId" : "318",
-        "name" : "ExceptEverything",
+        "localId" : "314",
+        "name" : "ExceptNoOp",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "318",
+            "r" : "314",
             "s" : [ {
-              "value" : [ "", "define ", "ExceptEverything", ": " ]
+              "value" : [ "", "define ", "ExceptNoOp", ": " ]
             }, {
-              "r" : "336",
+              "r" : "332",
               "s" : [ {
-                "r" : "319",
+                "r" : "315",
                 "s" : [ {
-                  "r" : "320",
+                  "r" : "316",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "328",
+                "r" : "324",
                 "s" : [ {
-                  "r" : "329",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "r" : "325",
+                  "value" : [ "{", "6", ", ", "7", ", ", "8", ", ", "9", ", ", "10", "}" ]
                 } ]
               } ]
             } ]
@@ -7837,104 +8882,104 @@ module.exports['Except'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "343",
+          "localId" : "339",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "344",
+            "localId" : "340",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "336",
+          "localId" : "332",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "341",
+            "localId" : "337",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "342",
+              "localId" : "338",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "337",
+            "localId" : "333",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "338",
+              "localId" : "334",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "339",
+            "localId" : "335",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "340",
+              "localId" : "336",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "319",
+            "localId" : "315",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "326",
+              "localId" : "322",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "327",
+                "localId" : "323",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "320",
+              "localId" : "316",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "321",
+              "localId" : "317",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "322",
+              "localId" : "318",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "323",
+              "localId" : "319",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "324",
+              "localId" : "320",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "325",
+              "localId" : "321",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -7942,84 +8987,84 @@ module.exports['Except'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "328",
+            "localId" : "324",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "334",
+              "localId" : "330",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "335",
+                "localId" : "331",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "329",
+              "localId" : "325",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
+              "value" : "6",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "330",
+              "localId" : "326",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "7",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "331",
+              "localId" : "327",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "8",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "332",
+              "localId" : "328",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
+              "value" : "9",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "333",
+              "localId" : "329",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "10",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
-        "localId" : "347",
-        "name" : "MultipleNullExcept",
+        "localId" : "343",
+        "name" : "ExceptEverything",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "347",
+            "r" : "343",
             "s" : [ {
-              "value" : [ "", "define ", "MultipleNullExcept", ": " ]
+              "value" : [ "", "define ", "ExceptEverything", ": " ]
             }, {
-              "r" : "365",
+              "r" : "361",
               "s" : [ {
-                "r" : "348",
+                "r" : "344",
                 "s" : [ {
-                  "r" : "349",
-                  "value" : [ "{", "1", ", ", "3", ", ", "5", ", ", "7", ", ", "null", ", ", "null", "}" ]
+                  "r" : "345",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "359",
+                "r" : "353",
                 "s" : [ {
-                  "r" : "360",
-                  "value" : [ "{", "null", ", ", "3", "}" ]
+                  "r" : "354",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               } ]
             } ]
@@ -8027,189 +9072,189 @@ module.exports['Except'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "372",
+          "localId" : "368",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "373",
+            "localId" : "369",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "365",
+          "localId" : "361",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "370",
+            "localId" : "366",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "371",
+              "localId" : "367",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "366",
+            "localId" : "362",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "367",
+              "localId" : "363",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "368",
+            "localId" : "364",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "369",
+              "localId" : "365",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "348",
+            "localId" : "344",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "357",
+              "localId" : "351",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "358",
+                "localId" : "352",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "349",
+              "localId" : "345",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "350",
+              "localId" : "346",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
+              "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "351",
+              "localId" : "347",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
+              "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "352",
+              "localId" : "348",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "7",
+              "value" : "3",
               "annotation" : [ ]
             }, {
-              "type" : "As",
-              "localId" : "355",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "353",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "349",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
             }, {
-              "type" : "As",
-              "localId" : "356",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "354",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "350",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "359",
+            "localId" : "353",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "363",
+              "localId" : "359",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "364",
+                "localId" : "360",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "As",
-              "localId" : "362",
-              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ],
-              "signature" : [ ],
-              "operand" : {
-                "type" : "Null",
-                "localId" : "360",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-                "annotation" : [ ]
-              }
+              "type" : "Literal",
+              "localId" : "354",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "361",
+              "localId" : "355",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "356",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "357",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "358",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
             } ]
           } ]
         }
       }, {
-        "localId" : "376",
-        "name" : "SomethingExceptNothing",
+        "localId" : "372",
+        "name" : "MultipleNullExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "376",
+            "r" : "372",
             "s" : [ {
-              "value" : [ "", "define ", "SomethingExceptNothing", ": " ]
+              "value" : [ "", "define ", "MultipleNullExcept", ": " ]
             }, {
               "r" : "390",
               "s" : [ {
-                "r" : "377",
+                "r" : "373",
                 "s" : [ {
-                  "r" : "378",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "r" : "374",
+                  "value" : [ "{", "1", ", ", "3", ", ", "5", ", ", "7", ", ", "null", ", ", "null", "}" ]
                 } ]
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "386",
+                "r" : "384",
                 "s" : [ {
-                  "value" : [ "List<" ]
-                }, {
                   "r" : "385",
-                  "s" : [ {
-                    "value" : [ "Integer" ]
-                  } ]
-                }, {
-                  "value" : [ ">{}" ]
+                  "value" : [ "{", "null", ", ", "3", "}" ]
                 } ]
               } ]
             } ]
@@ -8264,50 +9309,240 @@ module.exports['Except'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "377",
+            "localId" : "373",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "383",
+              "localId" : "382",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "384",
+                "localId" : "383",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "378",
+              "localId" : "374",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "379",
+              "localId" : "375",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "376",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
+              "localId" : "377",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "7",
+              "annotation" : [ ]
+            }, {
+              "type" : "As",
               "localId" : "380",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "378",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "As",
+              "localId" : "381",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "379",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "384",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "388",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "389",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "As",
+              "localId" : "387",
+              "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ],
+              "signature" : [ ],
+              "operand" : {
+                "type" : "Null",
+                "localId" : "385",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+                "annotation" : [ ]
+              }
+            }, {
+              "type" : "Literal",
+              "localId" : "386",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "401",
+        "name" : "SomethingExceptNothing",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "401",
+            "s" : [ {
+              "value" : [ "", "define ", "SomethingExceptNothing", ": " ]
             }, {
+              "r" : "415",
+              "s" : [ {
+                "r" : "402",
+                "s" : [ {
+                  "r" : "403",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                } ]
+              }, {
+                "value" : [ " except " ]
+              }, {
+                "r" : "411",
+                "s" : [ {
+                  "value" : [ "List<" ]
+                }, {
+                  "r" : "410",
+                  "s" : [ {
+                    "value" : [ "Integer" ]
+                  } ]
+                }, {
+                  "value" : [ ">{}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "422",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "423",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Except",
+          "localId" : "415",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "420",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "421",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "416",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "417",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "418",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "419",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "402",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "408",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "409",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
               "type" : "Literal",
-              "localId" : "381",
+              "localId" : "403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "405",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "406",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "382",
+              "localId" : "407",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -8315,15 +9550,15 @@ module.exports['Except'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "386",
+            "localId" : "411",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "388",
+              "localId" : "413",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "389",
+                "localId" : "414",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -8332,7 +9567,7 @@ module.exports['Except'] = {
           } ]
         }
       }, {
-        "localId" : "401",
+        "localId" : "426",
         "name" : "NothingExceptSomething",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -8340,17 +9575,17 @@ module.exports['Except'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "401",
+            "r" : "426",
             "s" : [ {
               "value" : [ "", "define ", "NothingExceptSomething", ": " ]
             }, {
-              "r" : "415",
+              "r" : "440",
               "s" : [ {
-                "r" : "403",
+                "r" : "428",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "402",
+                  "r" : "427",
                   "s" : [ {
                     "value" : [ "Integer" ]
                   } ]
@@ -8360,9 +9595,9 @@ module.exports['Except'] = {
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "407",
+                "r" : "432",
                 "s" : [ {
-                  "r" : "408",
+                  "r" : "433",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               } ]
@@ -8371,62 +9606,62 @@ module.exports['Except'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "422",
+          "localId" : "447",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "423",
+            "localId" : "448",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "415",
+          "localId" : "440",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "420",
+            "localId" : "445",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "421",
+              "localId" : "446",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "416",
+            "localId" : "441",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "417",
+              "localId" : "442",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "418",
+            "localId" : "443",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "419",
+              "localId" : "444",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "403",
+            "localId" : "428",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "405",
+              "localId" : "430",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "406",
+                "localId" : "431",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -8434,50 +9669,50 @@ module.exports['Except'] = {
             "element" : [ ]
           }, {
             "type" : "List",
-            "localId" : "407",
+            "localId" : "432",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "413",
+              "localId" : "438",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "414",
+                "localId" : "439",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "408",
+              "localId" : "433",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "409",
+              "localId" : "434",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "410",
+              "localId" : "435",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "411",
+              "localId" : "436",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "412",
+              "localId" : "437",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -8486,7 +9721,7 @@ module.exports['Except'] = {
           } ]
         }
       }, {
-        "localId" : "426",
+        "localId" : "451",
         "name" : "ExceptTuples",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -8494,22 +9729,22 @@ module.exports['Except'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "426",
+            "r" : "451",
             "s" : [ {
               "value" : [ "", "define ", "ExceptTuples", ": " ]
             }, {
-              "r" : "457",
+              "r" : "482",
               "s" : [ {
-                "r" : "427",
+                "r" : "452",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "428",
+                  "r" : "453",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "429",
+                      "r" : "454",
                       "value" : [ "a", ": ", "1" ]
                     } ]
                   }, {
@@ -8518,12 +9753,12 @@ module.exports['Except'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "433",
+                  "r" : "458",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "434",
+                      "r" : "459",
                       "value" : [ "a", ": ", "2" ]
                     } ]
                   }, {
@@ -8532,12 +9767,12 @@ module.exports['Except'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "438",
+                  "r" : "463",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "439",
+                      "r" : "464",
                       "value" : [ "a", ": ", "3" ]
                     } ]
                   }, {
@@ -8549,16 +9784,16 @@ module.exports['Except'] = {
               }, {
                 "value" : [ " except " ]
               }, {
-                "r" : "447",
+                "r" : "472",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "448",
+                  "r" : "473",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "449",
+                      "r" : "474",
                       "value" : [ "a", ": ", "2" ]
                     } ]
                   }, {
@@ -8573,19 +9808,19 @@ module.exports['Except'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "470",
+          "localId" : "495",
           "annotation" : [ ],
           "elementType" : {
             "type" : "TupleTypeSpecifier",
-            "localId" : "471",
+            "localId" : "496",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "472",
+              "localId" : "497",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "473",
+                "localId" : "498",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -8594,23 +9829,23 @@ module.exports['Except'] = {
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "457",
+          "localId" : "482",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "466",
+            "localId" : "491",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "467",
+              "localId" : "492",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "468",
+                "localId" : "493",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "469",
+                  "localId" : "494",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
@@ -8619,19 +9854,19 @@ module.exports['Except'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "458",
+            "localId" : "483",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "459",
+              "localId" : "484",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "460",
+                "localId" : "485",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "461",
+                  "localId" : "486",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
@@ -8639,19 +9874,19 @@ module.exports['Except'] = {
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "462",
+            "localId" : "487",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "463",
+              "localId" : "488",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "464",
+                "localId" : "489",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "465",
+                  "localId" : "490",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
@@ -8660,23 +9895,23 @@ module.exports['Except'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "427",
+            "localId" : "452",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "443",
+              "localId" : "468",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "444",
+                "localId" : "469",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "445",
+                  "localId" : "470",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "446",
+                    "localId" : "471",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -8685,19 +9920,19 @@ module.exports['Except'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "428",
+              "localId" : "453",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "430",
+                "localId" : "455",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "431",
+                  "localId" : "456",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "432",
+                    "localId" : "457",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -8707,7 +9942,7 @@ module.exports['Except'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "429",
+                  "localId" : "454",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -8716,19 +9951,19 @@ module.exports['Except'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "433",
+              "localId" : "458",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "435",
+                "localId" : "460",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "436",
+                  "localId" : "461",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "437",
+                    "localId" : "462",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -8738,7 +9973,7 @@ module.exports['Except'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "434",
+                  "localId" : "459",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -8747,19 +9982,19 @@ module.exports['Except'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "438",
+              "localId" : "463",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "440",
+                "localId" : "465",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "441",
+                  "localId" : "466",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "442",
+                    "localId" : "467",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -8769,7 +10004,7 @@ module.exports['Except'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "439",
+                  "localId" : "464",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -8779,23 +10014,23 @@ module.exports['Except'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "447",
+            "localId" : "472",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "453",
+              "localId" : "478",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "454",
+                "localId" : "479",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "455",
+                  "localId" : "480",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "456",
+                    "localId" : "481",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -8804,19 +10039,19 @@ module.exports['Except'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "448",
+              "localId" : "473",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "450",
+                "localId" : "475",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "451",
+                  "localId" : "476",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "452",
+                    "localId" : "477",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -8826,7 +10061,7 @@ module.exports['Except'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "449",
+                  "localId" : "474",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -8837,7 +10072,7 @@ module.exports['Except'] = {
           } ]
         }
       }, {
-        "localId" : "476",
+        "localId" : "501",
         "name" : "ExceptNull",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -8845,19 +10080,19 @@ module.exports['Except'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "476",
+            "r" : "501",
             "s" : [ {
               "value" : [ "", "define ", "ExceptNull", ": " ]
             }, {
-              "r" : "486",
+              "r" : "511",
               "s" : [ {
-                "r" : "477",
+                "r" : "502",
                 "s" : [ {
-                  "r" : "478",
+                  "r" : "503",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               }, {
-                "r" : "485",
+                "r" : "510",
                 "value" : [ " except ", "null" ]
               } ]
             } ]
@@ -8865,97 +10100,97 @@ module.exports['Except'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "496",
+          "localId" : "521",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "497",
+            "localId" : "522",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "486",
+          "localId" : "511",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "494",
+            "localId" : "519",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "495",
+              "localId" : "520",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "490",
+            "localId" : "515",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "491",
+              "localId" : "516",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "492",
+            "localId" : "517",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "493",
+              "localId" : "518",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "477",
+            "localId" : "502",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "483",
+              "localId" : "508",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "484",
+                "localId" : "509",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "478",
+              "localId" : "503",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "479",
+              "localId" : "504",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "480",
+              "localId" : "505",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "481",
+              "localId" : "506",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "482",
+              "localId" : "507",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -8963,22 +10198,22 @@ module.exports['Except'] = {
             } ]
           }, {
             "type" : "As",
-            "localId" : "487",
+            "localId" : "512",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "485",
+              "localId" : "510",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "488",
+              "localId" : "513",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "489",
+                "localId" : "514",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -8986,7 +10221,7 @@ module.exports['Except'] = {
           } ]
         }
       }, {
-        "localId" : "500",
+        "localId" : "525",
         "name" : "NullExcept",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -8994,18 +10229,18 @@ module.exports['Except'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "500",
+            "r" : "525",
             "s" : [ {
               "value" : [ "", "define ", "NullExcept", ": " ]
             }, {
-              "r" : "510",
+              "r" : "535",
               "s" : [ {
-                "r" : "501",
+                "r" : "526",
                 "value" : [ "null", " except " ]
               }, {
-                "r" : "502",
+                "r" : "527",
                 "s" : [ {
-                  "r" : "503",
+                  "r" : "528",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               } ]
@@ -9014,119 +10249,119 @@ module.exports['Except'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "520",
+          "localId" : "545",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "521",
+            "localId" : "546",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Except",
-          "localId" : "510",
+          "localId" : "535",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "518",
+            "localId" : "543",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "519",
+              "localId" : "544",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "514",
+            "localId" : "539",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "515",
+              "localId" : "540",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "516",
+            "localId" : "541",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "517",
+              "localId" : "542",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "511",
+            "localId" : "536",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "501",
+              "localId" : "526",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "512",
+              "localId" : "537",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "513",
+                "localId" : "538",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "List",
-            "localId" : "502",
+            "localId" : "527",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "508",
+              "localId" : "533",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "509",
+                "localId" : "534",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "503",
+              "localId" : "528",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "504",
+              "localId" : "529",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "505",
+              "localId" : "530",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "506",
+              "localId" : "531",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "507",
+              "localId" : "532",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -9145,6 +10380,7 @@ using Simple version '1.0.0'
 context Patient
 define NoIntersection: {1, 2, 2, 3} intersect {4, 5, 6}
 define IntersectOnFive: {4, 5, 5, 6} intersect {1, 3, 5, 7}
+define IntersectOnFiveLong: {4L, 5L, 5L, 6L} intersect {1L, 3L, 5L, 7L}
 define IntersectionOnFourDuplicates: {4, 4, 1, 1, 2} intersect {4, 4, 3, 9}
 define IntersectOnEvens: {1, 2, 3, 4, 5, 6, 7, 8, 9, 10} intersect {0, 2, 4, 6, 8, 10, 12}
 define IntersectOnAll: {1, 2, 3, 4, 5} intersect {5, 4, 3, 2, 1}
@@ -9167,7 +10403,7 @@ module.exports['Intersect'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "567",
+        "r" : "593",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -9572,7 +10808,7 @@ module.exports['Intersect'] = {
         }
       }, {
         "localId" : "265",
-        "name" : "IntersectionOnFourDuplicates",
+        "name" : "IntersectOnFiveLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -9581,21 +10817,190 @@ module.exports['Intersect'] = {
           "s" : {
             "r" : "265",
             "s" : [ {
-              "value" : [ "", "define ", "IntersectionOnFourDuplicates", ": " ]
+              "value" : [ "", "define ", "IntersectOnFiveLong", ": " ]
             }, {
-              "r" : "281",
+              "r" : "280",
               "s" : [ {
                 "r" : "266",
                 "s" : [ {
                   "r" : "267",
+                  "value" : [ "{", "4L", ", ", "5L", ", ", "5L", ", ", "6L", "}" ]
+                } ]
+              }, {
+                "value" : [ " intersect " ]
+              }, {
+                "r" : "273",
+                "s" : [ {
+                  "r" : "274",
+                  "value" : [ "{", "1L", ", ", "3L", ", ", "5L", ", ", "7L", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "287",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "288",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Intersect",
+          "localId" : "280",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "285",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "286",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "281",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "282",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "283",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "284",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "266",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "271",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "272",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "267",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "268",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "269",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "270",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "273",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "278",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "279",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "276",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "277",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "7",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "291",
+        "name" : "IntersectionOnFourDuplicates",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "291",
+            "s" : [ {
+              "value" : [ "", "define ", "IntersectionOnFourDuplicates", ": " ]
+            }, {
+              "r" : "307",
+              "s" : [ {
+                "r" : "292",
+                "s" : [ {
+                  "r" : "293",
                   "value" : [ "{", "4", ", ", "4", ", ", "1", ", ", "1", ", ", "2", "}" ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
               }, {
-                "r" : "274",
+                "r" : "300",
                 "s" : [ {
-                  "r" : "275",
+                  "r" : "301",
                   "value" : [ "{", "4", ", ", "4", ", ", "3", ", ", "9", "}" ]
                 } ]
               } ]
@@ -9604,97 +11009,97 @@ module.exports['Intersect'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "288",
+          "localId" : "314",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "289",
+            "localId" : "315",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "281",
+          "localId" : "307",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "286",
+            "localId" : "312",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "287",
+              "localId" : "313",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "282",
+            "localId" : "308",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "283",
+              "localId" : "309",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "284",
+            "localId" : "310",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "285",
+              "localId" : "311",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "266",
+            "localId" : "292",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "272",
+              "localId" : "298",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "273",
+                "localId" : "299",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "267",
+              "localId" : "293",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "268",
+              "localId" : "294",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "269",
+              "localId" : "295",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "270",
+              "localId" : "296",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "271",
+              "localId" : "297",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -9702,43 +11107,43 @@ module.exports['Intersect'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "274",
+            "localId" : "300",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "279",
+              "localId" : "305",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "280",
+                "localId" : "306",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "275",
+              "localId" : "301",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "276",
+              "localId" : "302",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "277",
+              "localId" : "303",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "278",
+              "localId" : "304",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
@@ -9747,7 +11152,7 @@ module.exports['Intersect'] = {
           } ]
         }
       }, {
-        "localId" : "292",
+        "localId" : "318",
         "name" : "IntersectOnEvens",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -9755,23 +11160,23 @@ module.exports['Intersect'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "292",
+            "r" : "318",
             "s" : [ {
               "value" : [ "", "define ", "IntersectOnEvens", ": " ]
             }, {
-              "r" : "316",
+              "r" : "342",
               "s" : [ {
-                "r" : "293",
+                "r" : "319",
                 "s" : [ {
-                  "r" : "294",
+                  "r" : "320",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", ", ", "6", ", ", "7", ", ", "8", ", ", "9", ", ", "10", "}" ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
               }, {
-                "r" : "306",
+                "r" : "332",
                 "s" : [ {
-                  "r" : "307",
+                  "r" : "333",
                   "value" : [ "{", "0", ", ", "2", ", ", "4", ", ", "6", ", ", "8", ", ", "10", ", ", "12", "}" ]
                 } ]
               } ]
@@ -9780,132 +11185,132 @@ module.exports['Intersect'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "323",
+          "localId" : "349",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "324",
+            "localId" : "350",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "316",
+          "localId" : "342",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "321",
+            "localId" : "347",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "322",
+              "localId" : "348",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "317",
+            "localId" : "343",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "318",
+              "localId" : "344",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "319",
+            "localId" : "345",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "320",
+              "localId" : "346",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "293",
+            "localId" : "319",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "304",
+              "localId" : "330",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "305",
+                "localId" : "331",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "294",
+              "localId" : "320",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "295",
+              "localId" : "321",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "296",
+              "localId" : "322",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "297",
+              "localId" : "323",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "298",
+              "localId" : "324",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "299",
+              "localId" : "325",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "6",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "300",
+              "localId" : "326",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "7",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "301",
+              "localId" : "327",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "8",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "302",
+              "localId" : "328",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "9",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "303",
+              "localId" : "329",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -9913,64 +11318,64 @@ module.exports['Intersect'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "306",
+            "localId" : "332",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "314",
+              "localId" : "340",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "315",
+                "localId" : "341",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "307",
+              "localId" : "333",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "0",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "308",
+              "localId" : "334",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "309",
+              "localId" : "335",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "310",
+              "localId" : "336",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "6",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "311",
+              "localId" : "337",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "8",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "312",
+              "localId" : "338",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "313",
+              "localId" : "339",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "12",
@@ -9979,7 +11384,7 @@ module.exports['Intersect'] = {
           } ]
         }
       }, {
-        "localId" : "327",
+        "localId" : "353",
         "name" : "IntersectOnAll",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -9987,23 +11392,23 @@ module.exports['Intersect'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "327",
+            "r" : "353",
             "s" : [ {
               "value" : [ "", "define ", "IntersectOnAll", ": " ]
             }, {
-              "r" : "344",
+              "r" : "370",
               "s" : [ {
-                "r" : "328",
+                "r" : "354",
                 "s" : [ {
-                  "r" : "329",
+                  "r" : "355",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
               }, {
-                "r" : "336",
+                "r" : "362",
                 "s" : [ {
-                  "r" : "337",
+                  "r" : "363",
                   "value" : [ "{", "5", ", ", "4", ", ", "3", ", ", "2", ", ", "1", "}" ]
                 } ]
               } ]
@@ -10012,97 +11417,97 @@ module.exports['Intersect'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "351",
+          "localId" : "377",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "352",
+            "localId" : "378",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "344",
+          "localId" : "370",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "349",
+            "localId" : "375",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "350",
+              "localId" : "376",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "345",
+            "localId" : "371",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "346",
+              "localId" : "372",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "347",
+            "localId" : "373",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "348",
+              "localId" : "374",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "328",
+            "localId" : "354",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "334",
+              "localId" : "360",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "335",
+                "localId" : "361",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "329",
+              "localId" : "355",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "330",
+              "localId" : "356",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "331",
+              "localId" : "357",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "332",
+              "localId" : "358",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "333",
+              "localId" : "359",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -10110,50 +11515,50 @@ module.exports['Intersect'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "336",
+            "localId" : "362",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "342",
+              "localId" : "368",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "343",
+                "localId" : "369",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "337",
+              "localId" : "363",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "338",
+              "localId" : "364",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "339",
+              "localId" : "365",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "340",
+              "localId" : "366",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "341",
+              "localId" : "367",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
@@ -10162,7 +11567,7 @@ module.exports['Intersect'] = {
           } ]
         }
       }, {
-        "localId" : "355",
+        "localId" : "381",
         "name" : "NestedIntersects",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -10170,45 +11575,45 @@ module.exports['Intersect'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "355",
+            "r" : "381",
             "s" : [ {
               "value" : [ "", "define ", "NestedIntersects", ": " ]
             }, {
-              "r" : "407",
+              "r" : "433",
               "s" : [ {
-                "r" : "387",
+                "r" : "413",
                 "s" : [ {
-                  "r" : "372",
+                  "r" : "398",
                   "s" : [ {
-                    "r" : "356",
+                    "r" : "382",
                     "s" : [ {
-                      "r" : "357",
+                      "r" : "383",
                       "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                     } ]
                   }, {
                     "value" : [ " intersect " ]
                   }, {
-                    "r" : "364",
+                    "r" : "390",
                     "s" : [ {
-                      "r" : "365",
+                      "r" : "391",
                       "value" : [ "{", "2", ", ", "3", ", ", "4", ", ", "5", ", ", "6", "}" ]
                     } ]
                   } ]
                 }, {
                   "value" : [ " intersect " ]
                 }, {
-                  "r" : "379",
+                  "r" : "405",
                   "s" : [ {
-                    "r" : "380",
+                    "r" : "406",
                     "value" : [ "{", "3", ", ", "4", ", ", "5", ", ", "6", ", ", "7", "}" ]
                   } ]
                 } ]
               }, {
                 "value" : [ " intersect " ]
               }, {
-                "r" : "394",
+                "r" : "420",
                 "s" : [ {
-                  "r" : "395",
+                  "r" : "421",
                   "value" : [ "{", "4", ", ", "5", ", ", "6", ", ", "7", ", ", "8", "}" ]
                 } ]
               } ]
@@ -10217,133 +11622,133 @@ module.exports['Intersect'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "414",
+          "localId" : "440",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "415",
+            "localId" : "441",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "407",
+          "localId" : "433",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "412",
+            "localId" : "438",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "413",
+              "localId" : "439",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "408",
+            "localId" : "434",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "409",
+              "localId" : "435",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "410",
+            "localId" : "436",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "411",
+              "localId" : "437",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Intersect",
-            "localId" : "372",
+            "localId" : "398",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "377",
+              "localId" : "403",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "378",
+                "localId" : "404",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "signature" : [ {
               "type" : "ListTypeSpecifier",
-              "localId" : "373",
+              "localId" : "399",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "374",
+                "localId" : "400",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
               "type" : "ListTypeSpecifier",
-              "localId" : "375",
+              "localId" : "401",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "376",
+                "localId" : "402",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "List",
-              "localId" : "356",
+              "localId" : "382",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "362",
+                "localId" : "388",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "363",
+                  "localId" : "389",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "357",
+                "localId" : "383",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "358",
+                "localId" : "384",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "359",
+                "localId" : "385",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "360",
+                "localId" : "386",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "361",
+                "localId" : "387",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "5",
@@ -10351,50 +11756,50 @@ module.exports['Intersect'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "364",
+              "localId" : "390",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "370",
+                "localId" : "396",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "371",
+                  "localId" : "397",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "365",
+                "localId" : "391",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "366",
+                "localId" : "392",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "367",
+                "localId" : "393",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "368",
+                "localId" : "394",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "5",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "369",
+                "localId" : "395",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -10403,75 +11808,75 @@ module.exports['Intersect'] = {
             } ]
           }, {
             "type" : "Intersect",
-            "localId" : "402",
+            "localId" : "428",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "ListTypeSpecifier",
-              "localId" : "403",
+              "localId" : "429",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "404",
+                "localId" : "430",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
               "type" : "ListTypeSpecifier",
-              "localId" : "405",
+              "localId" : "431",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "406",
+                "localId" : "432",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             } ],
             "operand" : [ {
               "type" : "List",
-              "localId" : "379",
+              "localId" : "405",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "385",
+                "localId" : "411",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "386",
+                  "localId" : "412",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "380",
+                "localId" : "406",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "381",
+                "localId" : "407",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "382",
+                "localId" : "408",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "5",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "383",
+                "localId" : "409",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "384",
+                "localId" : "410",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "7",
@@ -10479,50 +11884,50 @@ module.exports['Intersect'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "394",
+              "localId" : "420",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "400",
+                "localId" : "426",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "401",
+                  "localId" : "427",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "395",
+                "localId" : "421",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "396",
+                "localId" : "422",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "5",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "397",
+                "localId" : "423",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "398",
+                "localId" : "424",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "7",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "399",
+                "localId" : "425",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "8",
@@ -10532,7 +11937,7 @@ module.exports['Intersect'] = {
           } ]
         }
       }, {
-        "localId" : "418",
+        "localId" : "444",
         "name" : "IntersectTuples",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -10540,22 +11945,22 @@ module.exports['Intersect'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "418",
+            "r" : "444",
             "s" : [ {
               "value" : [ "", "define ", "IntersectTuples", ": " ]
             }, {
-              "r" : "496",
+              "r" : "522",
               "s" : [ {
-                "r" : "419",
+                "r" : "445",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "420",
+                  "r" : "446",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "421",
+                      "r" : "447",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -10564,7 +11969,7 @@ module.exports['Intersect'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "422",
+                      "r" : "448",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -10575,12 +11980,12 @@ module.exports['Intersect'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "429",
+                  "r" : "455",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "430",
+                      "r" : "456",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -10589,7 +11994,7 @@ module.exports['Intersect'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "431",
+                      "r" : "457",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -10600,12 +12005,12 @@ module.exports['Intersect'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "438",
+                  "r" : "464",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "439",
+                      "r" : "465",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -10614,7 +12019,7 @@ module.exports['Intersect'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "440",
+                      "r" : "466",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -10628,16 +12033,16 @@ module.exports['Intersect'] = {
               }, {
                 "value" : [ " intersect " ]
               }, {
-                "r" : "453",
+                "r" : "479",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "454",
+                  "r" : "480",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "455",
+                      "r" : "481",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -10646,7 +12051,7 @@ module.exports['Intersect'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "456",
+                      "r" : "482",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -10657,12 +12062,12 @@ module.exports['Intersect'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "463",
+                  "r" : "489",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "464",
+                      "r" : "490",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -10671,7 +12076,7 @@ module.exports['Intersect'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "465",
+                      "r" : "491",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -10682,12 +12087,12 @@ module.exports['Intersect'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "472",
+                  "r" : "498",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "473",
+                      "r" : "499",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -10696,7 +12101,7 @@ module.exports['Intersect'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "474",
+                      "r" : "500",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -10707,12 +12112,12 @@ module.exports['Intersect'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "481",
+                  "r" : "507",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "482",
+                      "r" : "508",
                       "value" : [ "a", ":", "5" ]
                     } ]
                   }, {
@@ -10721,7 +12126,7 @@ module.exports['Intersect'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "483",
+                      "r" : "509",
                       "s" : [ {
                         "value" : [ "'e'" ]
                       } ]
@@ -10738,29 +12143,29 @@ module.exports['Intersect'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "515",
+          "localId" : "541",
           "annotation" : [ ],
           "elementType" : {
             "type" : "TupleTypeSpecifier",
-            "localId" : "516",
+            "localId" : "542",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "517",
+              "localId" : "543",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "518",
+                "localId" : "544",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "519",
+              "localId" : "545",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "520",
+                "localId" : "546",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -10769,33 +12174,33 @@ module.exports['Intersect'] = {
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "496",
+          "localId" : "522",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "509",
+            "localId" : "535",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "510",
+              "localId" : "536",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "511",
+                "localId" : "537",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "512",
+                  "localId" : "538",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "513",
+                "localId" : "539",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "514",
+                  "localId" : "540",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -10804,29 +12209,29 @@ module.exports['Intersect'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "497",
+            "localId" : "523",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "498",
+              "localId" : "524",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "499",
+                "localId" : "525",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "500",
+                  "localId" : "526",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "501",
+                "localId" : "527",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "502",
+                  "localId" : "528",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -10834,29 +12239,29 @@ module.exports['Intersect'] = {
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "503",
+            "localId" : "529",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "504",
+              "localId" : "530",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "505",
+                "localId" : "531",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "506",
+                  "localId" : "532",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "507",
+                "localId" : "533",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "508",
+                  "localId" : "534",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -10865,33 +12270,33 @@ module.exports['Intersect'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "419",
+            "localId" : "445",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "447",
+              "localId" : "473",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "448",
+                "localId" : "474",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "449",
+                  "localId" : "475",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "450",
+                    "localId" : "476",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "451",
+                  "localId" : "477",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "452",
+                    "localId" : "478",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -10900,29 +12305,29 @@ module.exports['Intersect'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "420",
+              "localId" : "446",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "424",
+                "localId" : "450",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "425",
+                  "localId" : "451",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "426",
+                    "localId" : "452",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "427",
+                  "localId" : "453",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "428",
+                    "localId" : "454",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -10932,7 +12337,7 @@ module.exports['Intersect'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "421",
+                  "localId" : "447",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -10942,7 +12347,7 @@ module.exports['Intersect'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "422",
+                  "localId" : "448",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -10951,29 +12356,29 @@ module.exports['Intersect'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "429",
+              "localId" : "455",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "433",
+                "localId" : "459",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "434",
+                  "localId" : "460",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "435",
+                    "localId" : "461",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "436",
+                  "localId" : "462",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "437",
+                    "localId" : "463",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -10983,7 +12388,7 @@ module.exports['Intersect'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "430",
+                  "localId" : "456",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -10993,7 +12398,7 @@ module.exports['Intersect'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "431",
+                  "localId" : "457",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -11002,29 +12407,29 @@ module.exports['Intersect'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "438",
+              "localId" : "464",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "442",
+                "localId" : "468",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "443",
+                  "localId" : "469",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "444",
+                    "localId" : "470",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "445",
+                  "localId" : "471",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "446",
+                    "localId" : "472",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -11034,7 +12439,7 @@ module.exports['Intersect'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "439",
+                  "localId" : "465",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -11044,7 +12449,7 @@ module.exports['Intersect'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "440",
+                  "localId" : "466",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -11054,33 +12459,33 @@ module.exports['Intersect'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "453",
+            "localId" : "479",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "490",
+              "localId" : "516",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "491",
+                "localId" : "517",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "492",
+                  "localId" : "518",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "493",
+                    "localId" : "519",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "494",
+                  "localId" : "520",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "495",
+                    "localId" : "521",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -11089,29 +12494,29 @@ module.exports['Intersect'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "454",
+              "localId" : "480",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "458",
+                "localId" : "484",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "459",
+                  "localId" : "485",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "460",
+                    "localId" : "486",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "461",
+                  "localId" : "487",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "462",
+                    "localId" : "488",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -11121,7 +12526,7 @@ module.exports['Intersect'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "455",
+                  "localId" : "481",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -11131,7 +12536,7 @@ module.exports['Intersect'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "456",
+                  "localId" : "482",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -11140,29 +12545,29 @@ module.exports['Intersect'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "463",
+              "localId" : "489",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "467",
+                "localId" : "493",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "468",
+                  "localId" : "494",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "469",
+                    "localId" : "495",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "470",
+                  "localId" : "496",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "471",
+                    "localId" : "497",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -11172,7 +12577,7 @@ module.exports['Intersect'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "464",
+                  "localId" : "490",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -11182,7 +12587,7 @@ module.exports['Intersect'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "465",
+                  "localId" : "491",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -11191,29 +12596,29 @@ module.exports['Intersect'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "472",
+              "localId" : "498",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "476",
+                "localId" : "502",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "477",
+                  "localId" : "503",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "478",
+                    "localId" : "504",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "479",
+                  "localId" : "505",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "480",
+                    "localId" : "506",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -11223,7 +12628,7 @@ module.exports['Intersect'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "473",
+                  "localId" : "499",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -11233,7 +12638,7 @@ module.exports['Intersect'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "474",
+                  "localId" : "500",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -11242,29 +12647,29 @@ module.exports['Intersect'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "481",
+              "localId" : "507",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "485",
+                "localId" : "511",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "486",
+                  "localId" : "512",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "487",
+                    "localId" : "513",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "488",
+                  "localId" : "514",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "489",
+                    "localId" : "515",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -11274,7 +12679,7 @@ module.exports['Intersect'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "482",
+                  "localId" : "508",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "5",
@@ -11284,7 +12689,7 @@ module.exports['Intersect'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "483",
+                  "localId" : "509",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "e",
@@ -11295,7 +12700,7 @@ module.exports['Intersect'] = {
           } ]
         }
       }, {
-        "localId" : "523",
+        "localId" : "549",
         "name" : "NullIntersect",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -11303,18 +12708,18 @@ module.exports['Intersect'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "523",
+            "r" : "549",
             "s" : [ {
               "value" : [ "", "define ", "NullIntersect", ": " ]
             }, {
-              "r" : "531",
+              "r" : "557",
               "s" : [ {
-                "r" : "524",
+                "r" : "550",
                 "value" : [ "null", " intersect " ]
               }, {
-                "r" : "525",
+                "r" : "551",
                 "s" : [ {
-                  "r" : "526",
+                  "r" : "552",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", "}" ]
                 } ]
               } ]
@@ -11323,105 +12728,105 @@ module.exports['Intersect'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "541",
+          "localId" : "567",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "542",
+            "localId" : "568",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "531",
+          "localId" : "557",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "539",
+            "localId" : "565",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "540",
+              "localId" : "566",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "535",
+            "localId" : "561",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "536",
+              "localId" : "562",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "537",
+            "localId" : "563",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "538",
+              "localId" : "564",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "532",
+            "localId" : "558",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "524",
+              "localId" : "550",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "533",
+              "localId" : "559",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "534",
+                "localId" : "560",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "List",
-            "localId" : "525",
+            "localId" : "551",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "529",
+              "localId" : "555",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "530",
+                "localId" : "556",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "526",
+              "localId" : "552",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "527",
+              "localId" : "553",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "528",
+              "localId" : "554",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -11430,7 +12835,7 @@ module.exports['Intersect'] = {
           } ]
         }
       }, {
-        "localId" : "545",
+        "localId" : "571",
         "name" : "IntersectNull",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -11438,164 +12843,24 @@ module.exports['Intersect'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "545",
+            "r" : "571",
             "s" : [ {
               "value" : [ "", "define ", "IntersectNull", ": " ]
             }, {
-              "r" : "553",
+              "r" : "579",
               "s" : [ {
-                "r" : "546",
+                "r" : "572",
                 "s" : [ {
-                  "r" : "547",
+                  "r" : "573",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", "}" ]
                 } ]
               }, {
-                "r" : "552",
+                "r" : "578",
                 "value" : [ " intersect ", "null" ]
               } ]
             } ]
           }
         } ],
-        "resultTypeSpecifier" : {
-          "type" : "ListTypeSpecifier",
-          "localId" : "563",
-          "annotation" : [ ],
-          "elementType" : {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "564",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }
-        },
-        "expression" : {
-          "type" : "Intersect",
-          "localId" : "553",
-          "annotation" : [ ],
-          "resultTypeSpecifier" : {
-            "type" : "ListTypeSpecifier",
-            "localId" : "561",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "562",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          },
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "557",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "558",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "ListTypeSpecifier",
-            "localId" : "559",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "560",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "List",
-            "localId" : "546",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "550",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "551",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            },
-            "element" : [ {
-              "type" : "Literal",
-              "localId" : "547",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "548",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "549",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            } ]
-          }, {
-            "type" : "As",
-            "localId" : "554",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "552",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "555",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "556",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "567",
-        "name" : "MultipleNullInListIntersect",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "567",
-            "s" : [ {
-              "value" : [ "", "define ", "MultipleNullInListIntersect", ": " ]
-            }, {
-              "r" : "582",
-              "s" : [ {
-                "r" : "568",
-                "s" : [ {
-                  "r" : "569",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "null", "}" ]
-                } ]
-              }, {
-                "value" : [ " intersect " ]
-              }, {
-                "r" : "576",
-                "s" : [ {
-                  "r" : "577",
-                  "value" : [ "{", "null", ", ", "3", "}" ]
-                } ]
-              } ]
-            } ]
-          }
-        } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
           "localId" : "589",
@@ -11609,7 +12874,7 @@ module.exports['Intersect'] = {
         },
         "expression" : {
           "type" : "Intersect",
-          "localId" : "582",
+          "localId" : "579",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
@@ -11645,83 +12910,223 @@ module.exports['Intersect'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "568",
+            "localId" : "572",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
+              "localId" : "576",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "577",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "573",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
               "localId" : "574",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "575",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "As",
+            "localId" : "580",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "578",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "581",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "575",
+                "localId" : "582",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "593",
+        "name" : "MultipleNullInListIntersect",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "593",
+            "s" : [ {
+              "value" : [ "", "define ", "MultipleNullInListIntersect", ": " ]
+            }, {
+              "r" : "608",
+              "s" : [ {
+                "r" : "594",
+                "s" : [ {
+                  "r" : "595",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "null", "}" ]
+                } ]
+              }, {
+                "value" : [ " intersect " ]
+              }, {
+                "r" : "602",
+                "s" : [ {
+                  "r" : "603",
+                  "value" : [ "{", "null", ", ", "3", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "615",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "616",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Intersect",
+          "localId" : "608",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "613",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "614",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "609",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "610",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "611",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "612",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "594",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "600",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "601",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "569",
+              "localId" : "595",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "570",
+              "localId" : "596",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "571",
+              "localId" : "597",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "573",
+              "localId" : "599",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "572",
+                "localId" : "598",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "List",
-            "localId" : "576",
+            "localId" : "602",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "580",
+              "localId" : "606",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "581",
+                "localId" : "607",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "As",
-              "localId" : "579",
+              "localId" : "605",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "577",
+                "localId" : "603",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
               "type" : "Literal",
-              "localId" : "578",
+              "localId" : "604",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -11739,6 +13144,7 @@ library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
 define IndexOfSecond: IndexOf({'a', 'b', 'c', 'd'}, 'b')
+define IndexOfSecondLong: IndexOf({12L, 34L, 56L, 78L}, 34L)
 define IndexOfThirdTuple: IndexOf({Tuple{a: 1}, Tuple{a: 2}, Tuple{a: 3}}, Tuple{a: 3})
 define MultipleMatches: IndexOf({'a', 'b', 'c', 'd', 'd', 'e', 'd'}, 'd')
 define ItemNotFound: IndexOf({'a', 'b', 'c'}, 'd')
@@ -11762,7 +13168,7 @@ module.exports['IndexOf'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "480",
+        "r" : "500",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -11975,7 +13381,7 @@ module.exports['IndexOf'] = {
       }, {
         "localId" : "239",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "IndexOfThirdTuple",
+        "name" : "IndexOfSecondLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -11984,22 +13390,127 @@ module.exports['IndexOf'] = {
           "s" : {
             "r" : "239",
             "s" : [ {
-              "value" : [ "", "define ", "IndexOfThirdTuple", ": " ]
+              "value" : [ "", "define ", "IndexOfSecondLong", ": " ]
             }, {
-              "r" : "274",
+              "r" : "253",
               "s" : [ {
                 "value" : [ "IndexOf", "(" ]
               }, {
                 "r" : "240",
+                "s" : [ {
+                  "r" : "241",
+                  "value" : [ "{", "12L", ", ", "34L", ", ", "56L", ", ", "78L", "}" ]
+                } ]
+              }, {
+                "r" : "247",
+                "value" : [ ", ", "34L", ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IndexOf",
+          "localId" : "253",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "254",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "255",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "256",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "240",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "245",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "246",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "241",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "12",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "242",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "34",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "243",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "56",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "244",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "78",
+              "annotation" : [ ]
+            } ]
+          },
+          "element" : {
+            "type" : "Literal",
+            "localId" : "247",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "34",
+            "annotation" : [ ]
+          }
+        }
+      }, {
+        "localId" : "259",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "IndexOfThirdTuple",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "259",
+            "s" : [ {
+              "value" : [ "", "define ", "IndexOfThirdTuple", ": " ]
+            }, {
+              "r" : "294",
+              "s" : [ {
+                "value" : [ "IndexOf", "(" ]
+              }, {
+                "r" : "260",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "241",
+                  "r" : "261",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "242",
+                      "r" : "262",
                       "value" : [ "a", ": ", "1" ]
                     } ]
                   }, {
@@ -12008,12 +13519,12 @@ module.exports['IndexOf'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "246",
+                  "r" : "266",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "247",
+                      "r" : "267",
                       "value" : [ "a", ": ", "2" ]
                     } ]
                   }, {
@@ -12022,12 +13533,12 @@ module.exports['IndexOf'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "251",
+                  "r" : "271",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "252",
+                      "r" : "272",
                       "value" : [ "a", ": ", "3" ]
                     } ]
                   }, {
@@ -12039,12 +13550,12 @@ module.exports['IndexOf'] = {
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "260",
+                "r" : "280",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "261",
+                    "r" : "281",
                     "value" : [ "a", ": ", "3" ]
                   } ]
                 }, {
@@ -12058,24 +13569,24 @@ module.exports['IndexOf'] = {
         } ],
         "expression" : {
           "type" : "IndexOf",
-          "localId" : "274",
+          "localId" : "294",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "275",
+            "localId" : "295",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "276",
+              "localId" : "296",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "277",
+                "localId" : "297",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "278",
+                  "localId" : "298",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
@@ -12083,15 +13594,15 @@ module.exports['IndexOf'] = {
             }
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "279",
+            "localId" : "299",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "280",
+              "localId" : "300",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "281",
+                "localId" : "301",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -12099,23 +13610,23 @@ module.exports['IndexOf'] = {
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "240",
+            "localId" : "260",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "256",
+              "localId" : "276",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "257",
+                "localId" : "277",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "258",
+                  "localId" : "278",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "259",
+                    "localId" : "279",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -12124,19 +13635,19 @@ module.exports['IndexOf'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "241",
+              "localId" : "261",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "243",
+                "localId" : "263",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "244",
+                  "localId" : "264",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "245",
+                    "localId" : "265",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -12146,7 +13657,7 @@ module.exports['IndexOf'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "242",
+                  "localId" : "262",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -12155,19 +13666,19 @@ module.exports['IndexOf'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "246",
+              "localId" : "266",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "248",
+                "localId" : "268",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "249",
+                  "localId" : "269",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "250",
+                    "localId" : "270",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -12177,7 +13688,7 @@ module.exports['IndexOf'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "247",
+                  "localId" : "267",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -12186,19 +13697,19 @@ module.exports['IndexOf'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "251",
+              "localId" : "271",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "253",
+                "localId" : "273",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "254",
+                  "localId" : "274",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "255",
+                    "localId" : "275",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -12208,7 +13719,7 @@ module.exports['IndexOf'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "252",
+                  "localId" : "272",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -12219,19 +13730,19 @@ module.exports['IndexOf'] = {
           },
           "element" : {
             "type" : "Tuple",
-            "localId" : "260",
+            "localId" : "280",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "262",
+              "localId" : "282",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "263",
+                "localId" : "283",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "264",
+                  "localId" : "284",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
@@ -12241,7 +13752,7 @@ module.exports['IndexOf'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "261",
+                "localId" : "281",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -12251,7 +13762,7 @@ module.exports['IndexOf'] = {
           }
         }
       }, {
-        "localId" : "284",
+        "localId" : "304",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "MultipleMatches",
         "context" : "Patient",
@@ -12260,61 +13771,61 @@ module.exports['IndexOf'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "284",
+            "r" : "304",
             "s" : [ {
               "value" : [ "", "define ", "MultipleMatches", ": " ]
             }, {
-              "r" : "309",
+              "r" : "329",
               "s" : [ {
                 "value" : [ "IndexOf", "(" ]
               }, {
-                "r" : "285",
+                "r" : "305",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "286",
+                  "r" : "306",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "288",
+                  "r" : "308",
                   "s" : [ {
                     "value" : [ "'b'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "290",
+                  "r" : "310",
                   "s" : [ {
                     "value" : [ "'c'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "292",
+                  "r" : "312",
                   "s" : [ {
                     "value" : [ "'d'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "294",
+                  "r" : "314",
                   "s" : [ {
                     "value" : [ "'d'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "296",
+                  "r" : "316",
                   "s" : [ {
                     "value" : [ "'e'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "298",
+                  "r" : "318",
                   "s" : [ {
                     "value" : [ "'d'" ]
                   } ]
@@ -12324,7 +13835,7 @@ module.exports['IndexOf'] = {
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "302",
+                "r" : "322",
                 "s" : [ {
                   "value" : [ "'d'" ]
                 } ]
@@ -12336,85 +13847,85 @@ module.exports['IndexOf'] = {
         } ],
         "expression" : {
           "type" : "IndexOf",
-          "localId" : "309",
+          "localId" : "329",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "310",
+            "localId" : "330",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "311",
+              "localId" : "331",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "312",
+            "localId" : "332",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "285",
+            "localId" : "305",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "300",
+              "localId" : "320",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "301",
+                "localId" : "321",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "286",
+              "localId" : "306",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "288",
+              "localId" : "308",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "290",
+              "localId" : "310",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "c",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "292",
+              "localId" : "312",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "d",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "294",
+              "localId" : "314",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "d",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "296",
+              "localId" : "316",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "e",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "298",
+              "localId" : "318",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "d",
@@ -12423,7 +13934,7 @@ module.exports['IndexOf'] = {
           },
           "element" : {
             "type" : "Literal",
-            "localId" : "302",
+            "localId" : "322",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "d",
@@ -12431,7 +13942,7 @@ module.exports['IndexOf'] = {
           }
         }
       }, {
-        "localId" : "315",
+        "localId" : "335",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "ItemNotFound",
         "context" : "Patient",
@@ -12440,33 +13951,33 @@ module.exports['IndexOf'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "315",
+            "r" : "335",
             "s" : [ {
               "value" : [ "", "define ", "ItemNotFound", ": " ]
             }, {
-              "r" : "332",
+              "r" : "352",
               "s" : [ {
                 "value" : [ "IndexOf", "(" ]
               }, {
-                "r" : "316",
+                "r" : "336",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "317",
+                  "r" : "337",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "319",
+                  "r" : "339",
                   "s" : [ {
                     "value" : [ "'b'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "321",
+                  "r" : "341",
                   "s" : [ {
                     "value" : [ "'c'" ]
                   } ]
@@ -12476,7 +13987,7 @@ module.exports['IndexOf'] = {
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "325",
+                "r" : "345",
                 "s" : [ {
                   "value" : [ "'d'" ]
                 } ]
@@ -12488,57 +13999,57 @@ module.exports['IndexOf'] = {
         } ],
         "expression" : {
           "type" : "IndexOf",
-          "localId" : "332",
+          "localId" : "352",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "333",
+            "localId" : "353",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "334",
+              "localId" : "354",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "335",
+            "localId" : "355",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "316",
+            "localId" : "336",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "323",
+              "localId" : "343",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "324",
+                "localId" : "344",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "317",
+              "localId" : "337",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "319",
+              "localId" : "339",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "321",
+              "localId" : "341",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "c",
@@ -12547,7 +14058,7 @@ module.exports['IndexOf'] = {
           },
           "element" : {
             "type" : "Literal",
-            "localId" : "325",
+            "localId" : "345",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "d",
@@ -12555,7 +14066,7 @@ module.exports['IndexOf'] = {
           }
         }
       }, {
-        "localId" : "338",
+        "localId" : "358",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "NullList",
         "context" : "Patient",
@@ -12564,16 +14075,16 @@ module.exports['IndexOf'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "338",
+            "r" : "358",
             "s" : [ {
               "value" : [ "", "define ", "NullList", ": " ]
             }, {
-              "r" : "350",
+              "r" : "370",
               "s" : [ {
-                "r" : "339",
+                "r" : "359",
                 "value" : [ "IndexOf", "(", "null", ", " ]
               }, {
-                "r" : "340",
+                "r" : "360",
                 "s" : [ {
                   "value" : [ "'a'" ]
                 } ]
@@ -12585,43 +14096,43 @@ module.exports['IndexOf'] = {
         } ],
         "expression" : {
           "type" : "IndexOf",
-          "localId" : "350",
+          "localId" : "370",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "354",
+            "localId" : "374",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "355",
+              "localId" : "375",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "356",
+            "localId" : "376",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "source" : {
             "type" : "As",
-            "localId" : "351",
+            "localId" : "371",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "339",
+              "localId" : "359",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "352",
+              "localId" : "372",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "353",
+                "localId" : "373",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -12629,7 +14140,7 @@ module.exports['IndexOf'] = {
           },
           "element" : {
             "type" : "Literal",
-            "localId" : "340",
+            "localId" : "360",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
             "valueType" : "{urn:hl7-org:elm-types:r1}String",
             "value" : "a",
@@ -12637,7 +14148,7 @@ module.exports['IndexOf'] = {
           }
         }
       }, {
-        "localId" : "359",
+        "localId" : "379",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "NullItem",
         "context" : "Patient",
@@ -12646,33 +14157,33 @@ module.exports['IndexOf'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "359",
+            "r" : "379",
             "s" : [ {
               "value" : [ "", "define ", "NullItem", ": " ]
             }, {
-              "r" : "376",
+              "r" : "396",
               "s" : [ {
                 "value" : [ "IndexOf", "(" ]
               }, {
-                "r" : "360",
+                "r" : "380",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "361",
+                  "r" : "381",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "363",
+                  "r" : "383",
                   "s" : [ {
                     "value" : [ "'b'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "365",
+                  "r" : "385",
                   "s" : [ {
                     "value" : [ "'c'" ]
                   } ]
@@ -12680,7 +14191,7 @@ module.exports['IndexOf'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "369",
+                "r" : "389",
                 "value" : [ ", ", "null", ")" ]
               } ]
             } ]
@@ -12688,57 +14199,57 @@ module.exports['IndexOf'] = {
         } ],
         "expression" : {
           "type" : "IndexOf",
-          "localId" : "376",
+          "localId" : "396",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "378",
+            "localId" : "398",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "379",
+              "localId" : "399",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "380",
+            "localId" : "400",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "360",
+            "localId" : "380",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "367",
+              "localId" : "387",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "368",
+                "localId" : "388",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "361",
+              "localId" : "381",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "363",
+              "localId" : "383",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "365",
+              "localId" : "385",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "c",
@@ -12747,20 +14258,20 @@ module.exports['IndexOf'] = {
           },
           "element" : {
             "type" : "As",
-            "localId" : "377",
+            "localId" : "397",
             "asType" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "369",
+              "localId" : "389",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }
         }
       }, {
-        "localId" : "383",
+        "localId" : "403",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "ListCode",
         "context" : "Patient",
@@ -12769,26 +14280,26 @@ module.exports['IndexOf'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "383",
+            "r" : "403",
             "s" : [ {
               "value" : [ "", "define ", "ListCode", ": " ]
             }, {
-              "r" : "412",
+              "r" : "432",
               "s" : [ {
                 "value" : [ "IndexOf", "(" ]
               }, {
-                "r" : "384",
+                "r" : "404",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "385",
+                  "r" : "405",
                   "s" : [ {
                     "value" : [ "Code", "{" ]
                   }, {
                     "s" : [ {
                       "value" : [ "code", ": " ]
                     }, {
-                      "r" : "387",
+                      "r" : "407",
                       "s" : [ {
                         "value" : [ "'F'" ]
                       } ]
@@ -12799,7 +14310,7 @@ module.exports['IndexOf'] = {
                     "s" : [ {
                       "value" : [ "system", ": " ]
                     }, {
-                      "r" : "389",
+                      "r" : "409",
                       "s" : [ {
                         "value" : [ "'2.16.840.1.113883.18.2'" ]
                       } ]
@@ -12810,7 +14321,7 @@ module.exports['IndexOf'] = {
                     "s" : [ {
                       "value" : [ "version", ": " ]
                     }, {
-                      "r" : "391",
+                      "r" : "411",
                       "s" : [ {
                         "value" : [ "'HL7V2.5'" ]
                       } ]
@@ -12821,7 +14332,7 @@ module.exports['IndexOf'] = {
                     "s" : [ {
                       "value" : [ "display", ": " ]
                     }, {
-                      "r" : "393",
+                      "r" : "413",
                       "s" : [ {
                         "value" : [ "'foo'" ]
                       } ]
@@ -12835,14 +14346,14 @@ module.exports['IndexOf'] = {
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "397",
+                "r" : "417",
                 "s" : [ {
                   "value" : [ "Code", "{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "code", ": " ]
                   }, {
-                    "r" : "399",
+                    "r" : "419",
                     "s" : [ {
                       "value" : [ "'F'" ]
                     } ]
@@ -12853,7 +14364,7 @@ module.exports['IndexOf'] = {
                   "s" : [ {
                     "value" : [ "system", ": " ]
                   }, {
-                    "r" : "401",
+                    "r" : "421",
                     "s" : [ {
                       "value" : [ "'2.16.840.1.113883.18.2'" ]
                     } ]
@@ -12864,7 +14375,7 @@ module.exports['IndexOf'] = {
                   "s" : [ {
                     "value" : [ "version", ": " ]
                   }, {
-                    "r" : "403",
+                    "r" : "423",
                     "s" : [ {
                       "value" : [ "'HL7V2.5'" ]
                     } ]
@@ -12875,7 +14386,7 @@ module.exports['IndexOf'] = {
                   "s" : [ {
                     "value" : [ "display", ": " ]
                   }, {
-                    "r" : "405",
+                    "r" : "425",
                     "s" : [ {
                       "value" : [ "'foo'" ]
                     } ]
@@ -12891,43 +14402,43 @@ module.exports['IndexOf'] = {
         } ],
         "expression" : {
           "type" : "IndexOf",
-          "localId" : "412",
+          "localId" : "432",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "413",
+            "localId" : "433",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "414",
+              "localId" : "434",
               "name" : "{urn:hl7-org:elm-types:r1}Code",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "415",
+            "localId" : "435",
             "name" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ]
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "384",
+            "localId" : "404",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "395",
+              "localId" : "415",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "396",
+                "localId" : "416",
                 "name" : "{urn:hl7-org:elm-types:r1}Code",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Instance",
-              "localId" : "385",
+              "localId" : "405",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
               "classType" : "{urn:hl7-org:elm-types:r1}Code",
               "annotation" : [ ],
@@ -12935,7 +14446,7 @@ module.exports['IndexOf'] = {
                 "name" : "code",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "387",
+                  "localId" : "407",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "F",
@@ -12945,7 +14456,7 @@ module.exports['IndexOf'] = {
                 "name" : "system",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "389",
+                  "localId" : "409",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "2.16.840.1.113883.18.2",
@@ -12955,7 +14466,7 @@ module.exports['IndexOf'] = {
                 "name" : "version",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "391",
+                  "localId" : "411",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "HL7V2.5",
@@ -12965,7 +14476,7 @@ module.exports['IndexOf'] = {
                 "name" : "display",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "393",
+                  "localId" : "413",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "foo",
@@ -12976,7 +14487,7 @@ module.exports['IndexOf'] = {
           },
           "element" : {
             "type" : "Instance",
-            "localId" : "397",
+            "localId" : "417",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
             "classType" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ],
@@ -12984,7 +14495,7 @@ module.exports['IndexOf'] = {
               "name" : "code",
               "value" : {
                 "type" : "Literal",
-                "localId" : "399",
+                "localId" : "419",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "F",
@@ -12994,7 +14505,7 @@ module.exports['IndexOf'] = {
               "name" : "system",
               "value" : {
                 "type" : "Literal",
-                "localId" : "401",
+                "localId" : "421",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "2.16.840.1.113883.18.2",
@@ -13004,7 +14515,7 @@ module.exports['IndexOf'] = {
               "name" : "version",
               "value" : {
                 "type" : "Literal",
-                "localId" : "403",
+                "localId" : "423",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "HL7V2.5",
@@ -13014,7 +14525,7 @@ module.exports['IndexOf'] = {
               "name" : "display",
               "value" : {
                 "type" : "Literal",
-                "localId" : "405",
+                "localId" : "425",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "foo",
@@ -13024,7 +14535,7 @@ module.exports['IndexOf'] = {
           }
         }
       }, {
-        "localId" : "418",
+        "localId" : "438",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "ListCodeUndefined",
         "context" : "Patient",
@@ -13033,26 +14544,26 @@ module.exports['IndexOf'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "418",
+            "r" : "438",
             "s" : [ {
               "value" : [ "", "define ", "ListCodeUndefined", ": " ]
             }, {
-              "r" : "443",
+              "r" : "463",
               "s" : [ {
                 "value" : [ "IndexOf", "(" ]
               }, {
-                "r" : "419",
+                "r" : "439",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "420",
+                  "r" : "440",
                   "s" : [ {
                     "value" : [ "Code", "{" ]
                   }, {
                     "s" : [ {
                       "value" : [ "code", ": " ]
                     }, {
-                      "r" : "422",
+                      "r" : "442",
                       "s" : [ {
                         "value" : [ "'F'" ]
                       } ]
@@ -13063,7 +14574,7 @@ module.exports['IndexOf'] = {
                     "s" : [ {
                       "value" : [ "system", ": " ]
                     }, {
-                      "r" : "424",
+                      "r" : "444",
                       "s" : [ {
                         "value" : [ "'2.16.840.1.113883.18.2'" ]
                       } ]
@@ -13074,7 +14585,7 @@ module.exports['IndexOf'] = {
                     "s" : [ {
                       "value" : [ "version", ": " ]
                     }, {
-                      "r" : "426",
+                      "r" : "446",
                       "s" : [ {
                         "value" : [ "'HL7V2.5'" ]
                       } ]
@@ -13088,14 +14599,14 @@ module.exports['IndexOf'] = {
               }, {
                 "value" : [ ", " ]
               }, {
-                "r" : "430",
+                "r" : "450",
                 "s" : [ {
                   "value" : [ "Code", "{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "code", ": " ]
                   }, {
-                    "r" : "432",
+                    "r" : "452",
                     "s" : [ {
                       "value" : [ "'F'" ]
                     } ]
@@ -13106,7 +14617,7 @@ module.exports['IndexOf'] = {
                   "s" : [ {
                     "value" : [ "system", ": " ]
                   }, {
-                    "r" : "434",
+                    "r" : "454",
                     "s" : [ {
                       "value" : [ "'2.16.840.1.113883.18.2'" ]
                     } ]
@@ -13117,7 +14628,7 @@ module.exports['IndexOf'] = {
                   "s" : [ {
                     "value" : [ "version", ": " ]
                   }, {
-                    "r" : "436",
+                    "r" : "456",
                     "s" : [ {
                       "value" : [ "'HL7V2.5'" ]
                     } ]
@@ -13133,43 +14644,43 @@ module.exports['IndexOf'] = {
         } ],
         "expression" : {
           "type" : "IndexOf",
-          "localId" : "443",
+          "localId" : "463",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "444",
+            "localId" : "464",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "445",
+              "localId" : "465",
               "name" : "{urn:hl7-org:elm-types:r1}Code",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "446",
+            "localId" : "466",
             "name" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ]
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "419",
+            "localId" : "439",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "428",
+              "localId" : "448",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "429",
+                "localId" : "449",
                 "name" : "{urn:hl7-org:elm-types:r1}Code",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Instance",
-              "localId" : "420",
+              "localId" : "440",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
               "classType" : "{urn:hl7-org:elm-types:r1}Code",
               "annotation" : [ ],
@@ -13177,7 +14688,7 @@ module.exports['IndexOf'] = {
                 "name" : "code",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "422",
+                  "localId" : "442",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "F",
@@ -13187,7 +14698,7 @@ module.exports['IndexOf'] = {
                 "name" : "system",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "424",
+                  "localId" : "444",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "2.16.840.1.113883.18.2",
@@ -13197,7 +14708,7 @@ module.exports['IndexOf'] = {
                 "name" : "version",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "426",
+                  "localId" : "446",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "HL7V2.5",
@@ -13208,7 +14719,7 @@ module.exports['IndexOf'] = {
           },
           "element" : {
             "type" : "Instance",
-            "localId" : "430",
+            "localId" : "450",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
             "classType" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ],
@@ -13216,7 +14727,7 @@ module.exports['IndexOf'] = {
               "name" : "code",
               "value" : {
                 "type" : "Literal",
-                "localId" : "432",
+                "localId" : "452",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "F",
@@ -13226,7 +14737,7 @@ module.exports['IndexOf'] = {
               "name" : "system",
               "value" : {
                 "type" : "Literal",
-                "localId" : "434",
+                "localId" : "454",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "2.16.840.1.113883.18.2",
@@ -13236,7 +14747,7 @@ module.exports['IndexOf'] = {
               "name" : "version",
               "value" : {
                 "type" : "Literal",
-                "localId" : "436",
+                "localId" : "456",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "HL7V2.5",
@@ -13246,7 +14757,7 @@ module.exports['IndexOf'] = {
           }
         }
       }, {
-        "localId" : "449",
+        "localId" : "469",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "ListWrongCode",
         "context" : "Patient",
@@ -13255,26 +14766,26 @@ module.exports['IndexOf'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "449",
+            "r" : "469",
             "s" : [ {
               "value" : [ "", "define ", "ListWrongCode", ": " ]
             }, {
-              "r" : "474",
+              "r" : "494",
               "s" : [ {
                 "value" : [ "IndexOf", "(" ]
               }, {
-                "r" : "450",
+                "r" : "470",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "451",
+                  "r" : "471",
                   "s" : [ {
                     "value" : [ "Code", "{" ]
                   }, {
                     "s" : [ {
                       "value" : [ "code", ": " ]
                     }, {
-                      "r" : "453",
+                      "r" : "473",
                       "s" : [ {
                         "value" : [ "'M'" ]
                       } ]
@@ -13285,7 +14796,7 @@ module.exports['IndexOf'] = {
                     "s" : [ {
                       "value" : [ "system", ": " ]
                     }, {
-                      "r" : "455",
+                      "r" : "475",
                       "s" : [ {
                         "value" : [ "'2.16.840.1.113883.18.2'" ]
                       } ]
@@ -13296,7 +14807,7 @@ module.exports['IndexOf'] = {
                     "s" : [ {
                       "value" : [ "version", ": " ]
                     }, {
-                      "r" : "457",
+                      "r" : "477",
                       "s" : [ {
                         "value" : [ "'HL7V2.5'" ]
                       } ]
@@ -13309,237 +14820,15 @@ module.exports['IndexOf'] = {
                 } ]
               }, {
                 "value" : [ ", " ]
-              }, {
-                "r" : "461",
-                "s" : [ {
-                  "value" : [ "Code", "{" ]
-                }, {
-                  "s" : [ {
-                    "value" : [ "code", ": " ]
-                  }, {
-                    "r" : "463",
-                    "s" : [ {
-                      "value" : [ "'F'" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "s" : [ {
-                    "value" : [ "system", ": " ]
-                  }, {
-                    "r" : "465",
-                    "s" : [ {
-                      "value" : [ "'2.16.840.1.113883.18.2'" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "s" : [ {
-                    "value" : [ "version", ": " ]
-                  }, {
-                    "r" : "467",
-                    "s" : [ {
-                      "value" : [ "'foo'" ]
-                    } ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
-                } ]
-              }, {
-                "value" : [ ")" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "IndexOf",
-          "localId" : "474",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "ListTypeSpecifier",
-            "localId" : "475",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "476",
-              "name" : "{urn:hl7-org:elm-types:r1}Code",
-              "annotation" : [ ]
-            }
-          }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "477",
-            "name" : "{urn:hl7-org:elm-types:r1}Code",
-            "annotation" : [ ]
-          } ],
-          "source" : {
-            "type" : "List",
-            "localId" : "450",
-            "annotation" : [ ],
-            "resultTypeSpecifier" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "459",
-              "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "460",
-                "name" : "{urn:hl7-org:elm-types:r1}Code",
-                "annotation" : [ ]
-              }
-            },
-            "element" : [ {
-              "type" : "Instance",
-              "localId" : "451",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
-              "classType" : "{urn:hl7-org:elm-types:r1}Code",
-              "annotation" : [ ],
-              "element" : [ {
-                "name" : "code",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "453",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "M",
-                  "annotation" : [ ]
-                }
-              }, {
-                "name" : "system",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "455",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "2.16.840.1.113883.18.2",
-                  "annotation" : [ ]
-                }
-              }, {
-                "name" : "version",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "457",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "HL7V2.5",
-                  "annotation" : [ ]
-                }
-              } ]
-            } ]
-          },
-          "element" : {
-            "type" : "Instance",
-            "localId" : "461",
-            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
-            "classType" : "{urn:hl7-org:elm-types:r1}Code",
-            "annotation" : [ ],
-            "element" : [ {
-              "name" : "code",
-              "value" : {
-                "type" : "Literal",
-                "localId" : "463",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "F",
-                "annotation" : [ ]
-              }
-            }, {
-              "name" : "system",
-              "value" : {
-                "type" : "Literal",
-                "localId" : "465",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "2.16.840.1.113883.18.2",
-                "annotation" : [ ]
-              }
-            }, {
-              "name" : "version",
-              "value" : {
-                "type" : "Literal",
-                "localId" : "467",
-                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                "value" : "foo",
-                "annotation" : [ ]
-              }
-            } ]
-          }
-        }
-      }, {
-        "localId" : "480",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "ListWrongCodeSystem",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "480",
-            "s" : [ {
-              "value" : [ "", "define ", "ListWrongCodeSystem", ": " ]
-            }, {
-              "r" : "505",
-              "s" : [ {
-                "value" : [ "IndexOf", "(" ]
               }, {
                 "r" : "481",
-                "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "482",
-                  "s" : [ {
-                    "value" : [ "Code", "{" ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "code", ": " ]
-                    }, {
-                      "r" : "484",
-                      "s" : [ {
-                        "value" : [ "'F'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "system", ": " ]
-                    }, {
-                      "r" : "486",
-                      "s" : [ {
-                        "value" : [ "'1.16.840.1.113883.18.2'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "version", ": " ]
-                    }, {
-                      "r" : "488",
-                      "s" : [ {
-                        "value" : [ "'HL7V2.5'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
-                } ]
-              }, {
-                "value" : [ ", " ]
-              }, {
-                "r" : "492",
                 "s" : [ {
                   "value" : [ "Code", "{" ]
                 }, {
                   "s" : [ {
                     "value" : [ "code", ": " ]
                   }, {
-                    "r" : "494",
+                    "r" : "483",
                     "s" : [ {
                       "value" : [ "'F'" ]
                     } ]
@@ -13550,7 +14839,7 @@ module.exports['IndexOf'] = {
                   "s" : [ {
                     "value" : [ "system", ": " ]
                   }, {
-                    "r" : "496",
+                    "r" : "485",
                     "s" : [ {
                       "value" : [ "'2.16.840.1.113883.18.2'" ]
                     } ]
@@ -13561,7 +14850,7 @@ module.exports['IndexOf'] = {
                   "s" : [ {
                     "value" : [ "version", ": " ]
                   }, {
-                    "r" : "498",
+                    "r" : "487",
                     "s" : [ {
                       "value" : [ "'foo'" ]
                     } ]
@@ -13577,43 +14866,265 @@ module.exports['IndexOf'] = {
         } ],
         "expression" : {
           "type" : "IndexOf",
-          "localId" : "505",
+          "localId" : "494",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "506",
+            "localId" : "495",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "507",
+              "localId" : "496",
               "name" : "{urn:hl7-org:elm-types:r1}Code",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "508",
+            "localId" : "497",
             "name" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ]
           } ],
           "source" : {
             "type" : "List",
+            "localId" : "470",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "479",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "480",
+                "name" : "{urn:hl7-org:elm-types:r1}Code",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Instance",
+              "localId" : "471",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
+              "classType" : "{urn:hl7-org:elm-types:r1}Code",
+              "annotation" : [ ],
+              "element" : [ {
+                "name" : "code",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "473",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "M",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "system",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "475",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "2.16.840.1.113883.18.2",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "version",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "477",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "HL7V2.5",
+                  "annotation" : [ ]
+                }
+              } ]
+            } ]
+          },
+          "element" : {
+            "type" : "Instance",
             "localId" : "481",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
+            "classType" : "{urn:hl7-org:elm-types:r1}Code",
+            "annotation" : [ ],
+            "element" : [ {
+              "name" : "code",
+              "value" : {
+                "type" : "Literal",
+                "localId" : "483",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "F",
+                "annotation" : [ ]
+              }
+            }, {
+              "name" : "system",
+              "value" : {
+                "type" : "Literal",
+                "localId" : "485",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "2.16.840.1.113883.18.2",
+                "annotation" : [ ]
+              }
+            }, {
+              "name" : "version",
+              "value" : {
+                "type" : "Literal",
+                "localId" : "487",
+                "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                "value" : "foo",
+                "annotation" : [ ]
+              }
+            } ]
+          }
+        }
+      }, {
+        "localId" : "500",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "ListWrongCodeSystem",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "500",
+            "s" : [ {
+              "value" : [ "", "define ", "ListWrongCodeSystem", ": " ]
+            }, {
+              "r" : "525",
+              "s" : [ {
+                "value" : [ "IndexOf", "(" ]
+              }, {
+                "r" : "501",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "502",
+                  "s" : [ {
+                    "value" : [ "Code", "{" ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "code", ": " ]
+                    }, {
+                      "r" : "504",
+                      "s" : [ {
+                        "value" : [ "'F'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "system", ": " ]
+                    }, {
+                      "r" : "506",
+                      "s" : [ {
+                        "value" : [ "'1.16.840.1.113883.18.2'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "version", ": " ]
+                    }, {
+                      "r" : "508",
+                      "s" : [ {
+                        "value" : [ "'HL7V2.5'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ", " ]
+              }, {
+                "r" : "512",
+                "s" : [ {
+                  "value" : [ "Code", "{" ]
+                }, {
+                  "s" : [ {
+                    "value" : [ "code", ": " ]
+                  }, {
+                    "r" : "514",
+                    "s" : [ {
+                      "value" : [ "'F'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "s" : [ {
+                    "value" : [ "system", ": " ]
+                  }, {
+                    "r" : "516",
+                    "s" : [ {
+                      "value" : [ "'2.16.840.1.113883.18.2'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "s" : [ {
+                    "value" : [ "version", ": " ]
+                  }, {
+                    "r" : "518",
+                    "s" : [ {
+                      "value" : [ "'foo'" ]
+                    } ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IndexOf",
+          "localId" : "525",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "526",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "527",
+              "name" : "{urn:hl7-org:elm-types:r1}Code",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "528",
+            "name" : "{urn:hl7-org:elm-types:r1}Code",
+            "annotation" : [ ]
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "501",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "490",
+              "localId" : "510",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "491",
+                "localId" : "511",
                 "name" : "{urn:hl7-org:elm-types:r1}Code",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Instance",
-              "localId" : "482",
+              "localId" : "502",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
               "classType" : "{urn:hl7-org:elm-types:r1}Code",
               "annotation" : [ ],
@@ -13621,7 +15132,7 @@ module.exports['IndexOf'] = {
                 "name" : "code",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "484",
+                  "localId" : "504",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "F",
@@ -13631,7 +15142,7 @@ module.exports['IndexOf'] = {
                 "name" : "system",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "486",
+                  "localId" : "506",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "1.16.840.1.113883.18.2",
@@ -13641,7 +15152,7 @@ module.exports['IndexOf'] = {
                 "name" : "version",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "488",
+                  "localId" : "508",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "HL7V2.5",
@@ -13652,7 +15163,7 @@ module.exports['IndexOf'] = {
           },
           "element" : {
             "type" : "Instance",
-            "localId" : "492",
+            "localId" : "512",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code",
             "classType" : "{urn:hl7-org:elm-types:r1}Code",
             "annotation" : [ ],
@@ -13660,7 +15171,7 @@ module.exports['IndexOf'] = {
               "name" : "code",
               "value" : {
                 "type" : "Literal",
-                "localId" : "494",
+                "localId" : "514",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "F",
@@ -13670,7 +15181,7 @@ module.exports['IndexOf'] = {
               "name" : "system",
               "value" : {
                 "type" : "Literal",
-                "localId" : "496",
+                "localId" : "516",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "2.16.840.1.113883.18.2",
@@ -13680,7 +15191,7 @@ module.exports['IndexOf'] = {
               "name" : "version",
               "value" : {
                 "type" : "Literal",
-                "localId" : "498",
+                "localId" : "518",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "foo",
@@ -13699,6 +15210,7 @@ library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
 define SecondItem: {'a', 'b', 'c', 'd'}[1]
+define SecondItemLong: {12L, 34L, 56L, 78L}[1]
 define ZeroIndex: {'a', 'b', 'c', 'd'}[0]
 define OutOfBounds: {'a', 'b', 'c', 'd'}[100]
 define NullList: (null as List<String>)[1]
@@ -13717,7 +15229,7 @@ module.exports['Indexer'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "289",
+        "r" : "304",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -13920,8 +15432,8 @@ module.exports['Indexer'] = {
         }
       }, {
         "localId" : "233",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-        "name" : "ZeroIndex",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "SecondItemLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -13930,36 +15442,138 @@ module.exports['Indexer'] = {
           "s" : {
             "r" : "233",
             "s" : [ {
-              "value" : [ "", "define ", "ZeroIndex", ": " ]
+              "value" : [ "", "define ", "SecondItemLong", ": " ]
             }, {
               "r" : "234",
               "s" : [ {
                 "r" : "235",
+                "s" : [ {
+                  "r" : "236",
+                  "value" : [ "{", "12L", ", ", "34L", ", ", "56L", ", ", "78L", "}" ]
+                } ]
+              }, {
+                "r" : "242",
+                "value" : [ "[", "1", "]" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Indexer",
+          "localId" : "234",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "243",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "244",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "245",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "235",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "240",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "241",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "12",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "237",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "34",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "238",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "56",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "239",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "78",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "Literal",
+            "localId" : "242",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "value" : "1",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "248",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+        "name" : "ZeroIndex",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "248",
+            "s" : [ {
+              "value" : [ "", "define ", "ZeroIndex", ": " ]
+            }, {
+              "r" : "249",
+              "s" : [ {
+                "r" : "250",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "236",
+                  "r" : "251",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "238",
+                  "r" : "253",
                   "s" : [ {
                     "value" : [ "'b'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "240",
+                  "r" : "255",
                   "s" : [ {
                     "value" : [ "'c'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "242",
+                  "r" : "257",
                   "s" : [ {
                     "value" : [ "'d'" ]
                   } ]
@@ -13967,7 +15581,7 @@ module.exports['Indexer'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "246",
+                "r" : "261",
                 "value" : [ "[", "0", "]" ]
               } ]
             } ]
@@ -13975,64 +15589,64 @@ module.exports['Indexer'] = {
         } ],
         "expression" : {
           "type" : "Indexer",
-          "localId" : "234",
+          "localId" : "249",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "247",
+            "localId" : "262",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "248",
+              "localId" : "263",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "249",
+            "localId" : "264",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "235",
+            "localId" : "250",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "244",
+              "localId" : "259",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "245",
+                "localId" : "260",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "236",
+              "localId" : "251",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "238",
+              "localId" : "253",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "240",
+              "localId" : "255",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "c",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "242",
+              "localId" : "257",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "d",
@@ -14040,7 +15654,7 @@ module.exports['Indexer'] = {
             } ]
           }, {
             "type" : "Literal",
-            "localId" : "246",
+            "localId" : "261",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "0",
@@ -14048,7 +15662,7 @@ module.exports['Indexer'] = {
           } ]
         }
       }, {
-        "localId" : "252",
+        "localId" : "267",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
         "name" : "OutOfBounds",
         "context" : "Patient",
@@ -14057,38 +15671,38 @@ module.exports['Indexer'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "252",
+            "r" : "267",
             "s" : [ {
               "value" : [ "", "define ", "OutOfBounds", ": " ]
             }, {
-              "r" : "253",
+              "r" : "268",
               "s" : [ {
-                "r" : "254",
+                "r" : "269",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "255",
+                  "r" : "270",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "257",
+                  "r" : "272",
                   "s" : [ {
                     "value" : [ "'b'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "259",
+                  "r" : "274",
                   "s" : [ {
                     "value" : [ "'c'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "261",
+                  "r" : "276",
                   "s" : [ {
                     "value" : [ "'d'" ]
                   } ]
@@ -14096,7 +15710,7 @@ module.exports['Indexer'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "265",
+                "r" : "280",
                 "value" : [ "[", "100", "]" ]
               } ]
             } ]
@@ -14104,64 +15718,64 @@ module.exports['Indexer'] = {
         } ],
         "expression" : {
           "type" : "Indexer",
-          "localId" : "253",
+          "localId" : "268",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "266",
+            "localId" : "281",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "267",
+              "localId" : "282",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "268",
+            "localId" : "283",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "254",
+            "localId" : "269",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "263",
+              "localId" : "278",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "264",
+                "localId" : "279",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "255",
+              "localId" : "270",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "257",
+              "localId" : "272",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "259",
+              "localId" : "274",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "c",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "261",
+              "localId" : "276",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "d",
@@ -14169,7 +15783,7 @@ module.exports['Indexer'] = {
             } ]
           }, {
             "type" : "Literal",
-            "localId" : "265",
+            "localId" : "280",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "100",
@@ -14177,7 +15791,7 @@ module.exports['Indexer'] = {
           } ]
         }
       }, {
-        "localId" : "271",
+        "localId" : "286",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
         "name" : "NullList",
         "context" : "Patient",
@@ -14186,26 +15800,26 @@ module.exports['Indexer'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "271",
+            "r" : "286",
             "s" : [ {
               "value" : [ "", "define ", "NullList", ": " ]
             }, {
-              "r" : "272",
+              "r" : "287",
               "s" : [ {
-                "r" : "273",
+                "r" : "288",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "273",
+                  "r" : "288",
                   "s" : [ {
-                    "r" : "274",
+                    "r" : "289",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "275",
+                    "r" : "290",
                     "s" : [ {
                       "value" : [ "List<" ]
                     }, {
-                      "r" : "276",
+                      "r" : "291",
                       "s" : [ {
                         "value" : [ "String" ]
                       } ]
@@ -14217,7 +15831,7 @@ module.exports['Indexer'] = {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "283",
+                "r" : "298",
                 "value" : [ "[", "1", "]" ]
               } ]
             } ]
@@ -14225,37 +15839,37 @@ module.exports['Indexer'] = {
         } ],
         "expression" : {
           "type" : "Indexer",
-          "localId" : "272",
+          "localId" : "287",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "284",
+            "localId" : "299",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "285",
+              "localId" : "300",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "286",
+            "localId" : "301",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "273",
+            "localId" : "288",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "281",
+              "localId" : "296",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "282",
+                "localId" : "297",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -14263,28 +15877,28 @@ module.exports['Indexer'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "274",
+              "localId" : "289",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "275",
+              "localId" : "290",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "277",
+                "localId" : "292",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "278",
+                  "localId" : "293",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "276",
+                "localId" : "291",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
@@ -14292,7 +15906,7 @@ module.exports['Indexer'] = {
             }
           }, {
             "type" : "Literal",
-            "localId" : "283",
+            "localId" : "298",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "1",
@@ -14300,7 +15914,7 @@ module.exports['Indexer'] = {
           } ]
         }
       }, {
-        "localId" : "289",
+        "localId" : "304",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
         "name" : "NullIndexer",
         "context" : "Patient",
@@ -14309,38 +15923,38 @@ module.exports['Indexer'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "289",
+            "r" : "304",
             "s" : [ {
               "value" : [ "", "define ", "NullIndexer", ": " ]
             }, {
-              "r" : "290",
+              "r" : "305",
               "s" : [ {
-                "r" : "291",
+                "r" : "306",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "292",
+                  "r" : "307",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "294",
+                  "r" : "309",
                   "s" : [ {
                     "value" : [ "'b'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "296",
+                  "r" : "311",
                   "s" : [ {
                     "value" : [ "'c'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "298",
+                  "r" : "313",
                   "s" : [ {
                     "value" : [ "'d'" ]
                   } ]
@@ -14348,7 +15962,7 @@ module.exports['Indexer'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "302",
+                "r" : "317",
                 "value" : [ "[", "null", "]" ]
               } ]
             } ]
@@ -14356,64 +15970,64 @@ module.exports['Indexer'] = {
         } ],
         "expression" : {
           "type" : "Indexer",
-          "localId" : "290",
+          "localId" : "305",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "304",
+            "localId" : "319",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "305",
+              "localId" : "320",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "306",
+            "localId" : "321",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "291",
+            "localId" : "306",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "300",
+              "localId" : "315",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "301",
+                "localId" : "316",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "292",
+              "localId" : "307",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "294",
+              "localId" : "309",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "296",
+              "localId" : "311",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "c",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "298",
+              "localId" : "313",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "d",
@@ -14421,13 +16035,13 @@ module.exports['Indexer'] = {
             } ]
           }, {
             "type" : "As",
-            "localId" : "303",
+            "localId" : "318",
             "asType" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "302",
+              "localId" : "317",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
@@ -14444,6 +16058,8 @@ using Simple version '1.0.0'
 context Patient
 define IsIn: 4 in { 3, 4, 5 }
 define IsNotIn: 4 in { 3, 5, 6 }
+define IsInLong: 4L in { 3L, 4L, 5L }
+define IsNotInLong: 4L in { 3L, 5L, 6L }
 define TupleIsIn: Tuple{a: 1, b: 'c'} in {Tuple{a:1, b:'d'}, Tuple{a:1, b:'c'}, Tuple{a:2, b:'c'}}
 define TupleIsNotIn: Tuple{a: 1, b: 'c'} in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define NullIn: null in {1, 2, null, 3}
@@ -14463,7 +16079,7 @@ module.exports['In'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "387",
+        "r" : "415",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -14728,7 +16344,7 @@ module.exports['In'] = {
       }, {
         "localId" : "242",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "TupleIsIn",
+        "name" : "IsInLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -14737,16 +16353,206 @@ module.exports['In'] = {
           "s" : {
             "r" : "242",
             "s" : [ {
-              "value" : [ "", "define ", "TupleIsIn", ": " ]
+              "value" : [ "", "define ", "IsInLong", ": " ]
             }, {
-              "r" : "286",
+              "r" : "250",
               "s" : [ {
                 "r" : "243",
+                "value" : [ "4L", " in " ]
+              }, {
+                "r" : "244",
+                "s" : [ {
+                  "r" : "245",
+                  "value" : [ "{ ", "3L", ", ", "4L", ", ", "5L", " }" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "251",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "252",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "253",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "243",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "4",
+            "annotation" : [ ]
+          }, {
+            "type" : "List",
+            "localId" : "244",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "248",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "249",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "246",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "247",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "256",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsNotInLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "256",
+            "s" : [ {
+              "value" : [ "", "define ", "IsNotInLong", ": " ]
+            }, {
+              "r" : "264",
+              "s" : [ {
+                "r" : "257",
+                "value" : [ "4L", " in " ]
+              }, {
+                "r" : "258",
+                "s" : [ {
+                  "r" : "259",
+                  "value" : [ "{ ", "3L", ", ", "5L", ", ", "6L", " }" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "264",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "265",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "266",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "267",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "Literal",
+            "localId" : "257",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "4",
+            "annotation" : [ ]
+          }, {
+            "type" : "List",
+            "localId" : "258",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "262",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "263",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "259",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "260",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "261",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "270",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "TupleIsIn",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "270",
+            "s" : [ {
+              "value" : [ "", "define ", "TupleIsIn", ": " ]
+            }, {
+              "r" : "314",
+              "s" : [ {
+                "r" : "271",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "244",
+                    "r" : "272",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -14755,7 +16561,7 @@ module.exports['In'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "245",
+                    "r" : "273",
                     "s" : [ {
                       "value" : [ "'c'" ]
                     } ]
@@ -14766,16 +16572,16 @@ module.exports['In'] = {
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "252",
+                "r" : "280",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "253",
+                  "r" : "281",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "254",
+                      "r" : "282",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -14784,7 +16590,7 @@ module.exports['In'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "255",
+                      "r" : "283",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -14795,12 +16601,12 @@ module.exports['In'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "262",
+                  "r" : "290",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "263",
+                      "r" : "291",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -14809,7 +16615,7 @@ module.exports['In'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "264",
+                      "r" : "292",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -14820,12 +16626,12 @@ module.exports['In'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "271",
+                  "r" : "299",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "272",
+                      "r" : "300",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -14834,7 +16640,7 @@ module.exports['In'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "273",
+                      "r" : "301",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -14851,59 +16657,59 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "286",
+          "localId" : "314",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "287",
+            "localId" : "315",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "288",
+              "localId" : "316",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "289",
+                "localId" : "317",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "290",
+              "localId" : "318",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "291",
+                "localId" : "319",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "292",
+            "localId" : "320",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "293",
+              "localId" : "321",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "294",
+                "localId" : "322",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "295",
+                  "localId" : "323",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "296",
+                "localId" : "324",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "297",
+                  "localId" : "325",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -14912,29 +16718,29 @@ module.exports['In'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "243",
+            "localId" : "271",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "247",
+              "localId" : "275",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "248",
+                "localId" : "276",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "249",
+                  "localId" : "277",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "250",
+                "localId" : "278",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "251",
+                  "localId" : "279",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -14944,7 +16750,7 @@ module.exports['In'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "244",
+                "localId" : "272",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -14954,7 +16760,7 @@ module.exports['In'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "245",
+                "localId" : "273",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "c",
@@ -14963,33 +16769,33 @@ module.exports['In'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "252",
+            "localId" : "280",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "280",
+              "localId" : "308",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "281",
+                "localId" : "309",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "282",
+                  "localId" : "310",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "283",
+                    "localId" : "311",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "284",
+                  "localId" : "312",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "285",
+                    "localId" : "313",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -14998,29 +16804,29 @@ module.exports['In'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "253",
+              "localId" : "281",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "257",
+                "localId" : "285",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "258",
+                  "localId" : "286",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "259",
+                    "localId" : "287",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "260",
+                  "localId" : "288",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "261",
+                    "localId" : "289",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -15030,7 +16836,7 @@ module.exports['In'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "254",
+                  "localId" : "282",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -15040,7 +16846,7 @@ module.exports['In'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "255",
+                  "localId" : "283",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -15049,29 +16855,29 @@ module.exports['In'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "262",
+              "localId" : "290",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "266",
+                "localId" : "294",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "267",
+                  "localId" : "295",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "268",
+                    "localId" : "296",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "269",
+                  "localId" : "297",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "270",
+                    "localId" : "298",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -15081,7 +16887,7 @@ module.exports['In'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "263",
+                  "localId" : "291",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -15091,7 +16897,7 @@ module.exports['In'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "264",
+                  "localId" : "292",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -15100,29 +16906,29 @@ module.exports['In'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "271",
+              "localId" : "299",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "275",
+                "localId" : "303",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "276",
+                  "localId" : "304",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "277",
+                    "localId" : "305",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "278",
+                  "localId" : "306",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "279",
+                    "localId" : "307",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -15132,7 +16938,7 @@ module.exports['In'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "272",
+                  "localId" : "300",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -15142,7 +16948,7 @@ module.exports['In'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "273",
+                  "localId" : "301",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -15153,7 +16959,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "300",
+        "localId" : "328",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "TupleIsNotIn",
         "context" : "Patient",
@@ -15162,18 +16968,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "300",
+            "r" : "328",
             "s" : [ {
               "value" : [ "", "define ", "TupleIsNotIn", ": " ]
             }, {
-              "r" : "344",
+              "r" : "372",
               "s" : [ {
-                "r" : "301",
+                "r" : "329",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "302",
+                    "r" : "330",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -15182,7 +16988,7 @@ module.exports['In'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "303",
+                    "r" : "331",
                     "s" : [ {
                       "value" : [ "'c'" ]
                     } ]
@@ -15193,16 +16999,16 @@ module.exports['In'] = {
               }, {
                 "value" : [ " in " ]
               }, {
-                "r" : "310",
+                "r" : "338",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "311",
+                  "r" : "339",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "312",
+                      "r" : "340",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -15211,7 +17017,7 @@ module.exports['In'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "313",
+                      "r" : "341",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -15222,12 +17028,12 @@ module.exports['In'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "320",
+                  "r" : "348",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "321",
+                      "r" : "349",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -15236,7 +17042,7 @@ module.exports['In'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "322",
+                      "r" : "350",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -15247,12 +17053,12 @@ module.exports['In'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "329",
+                  "r" : "357",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "330",
+                      "r" : "358",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -15261,7 +17067,7 @@ module.exports['In'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "331",
+                      "r" : "359",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -15278,59 +17084,59 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "344",
+          "localId" : "372",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "TupleTypeSpecifier",
-            "localId" : "345",
+            "localId" : "373",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "346",
+              "localId" : "374",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "347",
+                "localId" : "375",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "348",
+              "localId" : "376",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "349",
+                "localId" : "377",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             } ]
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "350",
+            "localId" : "378",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "351",
+              "localId" : "379",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "352",
+                "localId" : "380",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "353",
+                  "localId" : "381",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "354",
+                "localId" : "382",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "355",
+                  "localId" : "383",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -15339,29 +17145,29 @@ module.exports['In'] = {
           } ],
           "operand" : [ {
             "type" : "Tuple",
-            "localId" : "301",
+            "localId" : "329",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "305",
+              "localId" : "333",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "306",
+                "localId" : "334",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "307",
+                  "localId" : "335",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "308",
+                "localId" : "336",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "309",
+                  "localId" : "337",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -15371,7 +17177,7 @@ module.exports['In'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "302",
+                "localId" : "330",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -15381,7 +17187,7 @@ module.exports['In'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "303",
+                "localId" : "331",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "c",
@@ -15390,33 +17196,33 @@ module.exports['In'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "310",
+            "localId" : "338",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "338",
+              "localId" : "366",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "339",
+                "localId" : "367",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "340",
+                  "localId" : "368",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "341",
+                    "localId" : "369",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "342",
+                  "localId" : "370",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "343",
+                    "localId" : "371",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -15425,29 +17231,29 @@ module.exports['In'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "311",
+              "localId" : "339",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "315",
+                "localId" : "343",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "316",
+                  "localId" : "344",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "317",
+                    "localId" : "345",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "318",
+                  "localId" : "346",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "319",
+                    "localId" : "347",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -15457,7 +17263,7 @@ module.exports['In'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "312",
+                  "localId" : "340",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -15467,7 +17273,7 @@ module.exports['In'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "313",
+                  "localId" : "341",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -15476,29 +17282,29 @@ module.exports['In'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "320",
+              "localId" : "348",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "324",
+                "localId" : "352",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "325",
+                  "localId" : "353",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "326",
+                    "localId" : "354",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "327",
+                  "localId" : "355",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "328",
+                    "localId" : "356",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -15508,7 +17314,7 @@ module.exports['In'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "321",
+                  "localId" : "349",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -15518,7 +17324,7 @@ module.exports['In'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "322",
+                  "localId" : "350",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -15527,29 +17333,29 @@ module.exports['In'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "329",
+              "localId" : "357",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "333",
+                "localId" : "361",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "334",
+                  "localId" : "362",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "335",
+                    "localId" : "363",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "336",
+                  "localId" : "364",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "337",
+                    "localId" : "365",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -15559,7 +17365,7 @@ module.exports['In'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "330",
+                  "localId" : "358",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -15569,7 +17375,7 @@ module.exports['In'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "331",
+                  "localId" : "359",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -15580,7 +17386,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "358",
+        "localId" : "386",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NullIn",
         "context" : "Patient",
@@ -15589,18 +17395,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "358",
+            "r" : "386",
             "s" : [ {
               "value" : [ "", "define ", "NullIn", ": " ]
             }, {
-              "r" : "368",
+              "r" : "396",
               "s" : [ {
-                "r" : "359",
+                "r" : "387",
                 "value" : [ "null", " in " ]
               }, {
-                "r" : "360",
+                "r" : "388",
                 "s" : [ {
-                  "r" : "361",
+                  "r" : "389",
                   "value" : [ "{", "1", ", ", "2", ", ", "null", ", ", "3", "}" ]
                 } ]
               } ]
@@ -15609,81 +17415,81 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "368",
+          "localId" : "396",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "370",
+            "localId" : "398",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "371",
+            "localId" : "399",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "372",
+              "localId" : "400",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "369",
+            "localId" : "397",
             "asType" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "359",
+              "localId" : "387",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "List",
-            "localId" : "360",
+            "localId" : "388",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "366",
+              "localId" : "394",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "367",
+                "localId" : "395",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "361",
+              "localId" : "389",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "362",
+              "localId" : "390",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "365",
+              "localId" : "393",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "363",
+                "localId" : "391",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
               "type" : "Literal",
-              "localId" : "364",
+              "localId" : "392",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -15692,7 +17498,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "375",
+        "localId" : "403",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "InNull",
         "context" : "Patient",
@@ -15701,13 +17507,13 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "375",
+            "r" : "403",
             "s" : [ {
               "value" : [ "", "define ", "InNull", ": " ]
             }, {
-              "r" : "378",
+              "r" : "406",
               "s" : [ {
-                "r" : "376",
+                "r" : "404",
                 "value" : [ "1", " in ", "null" ]
               } ]
             } ]
@@ -15715,50 +17521,50 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "378",
+          "localId" : "406",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "382",
+            "localId" : "410",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "IntervalTypeSpecifier",
-            "localId" : "383",
+            "localId" : "411",
             "annotation" : [ ],
             "pointType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "384",
+              "localId" : "412",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "376",
+            "localId" : "404",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "1",
             "annotation" : [ ]
           }, {
             "type" : "As",
-            "localId" : "379",
+            "localId" : "407",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "377",
+              "localId" : "405",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "IntervalTypeSpecifier",
-              "localId" : "380",
+              "localId" : "408",
               "annotation" : [ ],
               "pointType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "381",
+                "localId" : "409",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -15766,7 +17572,7 @@ module.exports['In'] = {
           } ]
         }
       }, {
-        "localId" : "387",
+        "localId" : "415",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NullNotIn",
         "context" : "Patient",
@@ -15775,18 +17581,18 @@ module.exports['In'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "387",
+            "r" : "415",
             "s" : [ {
               "value" : [ "", "define ", "NullNotIn", ": " ]
             }, {
-              "r" : "395",
+              "r" : "423",
               "s" : [ {
-                "r" : "388",
+                "r" : "416",
                 "value" : [ "null", " in " ]
               }, {
-                "r" : "389",
+                "r" : "417",
                 "s" : [ {
-                  "r" : "390",
+                  "r" : "418",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", "}" ]
                 } ]
               } ]
@@ -15795,69 +17601,69 @@ module.exports['In'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "395",
+          "localId" : "423",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "397",
+            "localId" : "425",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "398",
+            "localId" : "426",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "399",
+              "localId" : "427",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "396",
+            "localId" : "424",
             "asType" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "388",
+              "localId" : "416",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           }, {
             "type" : "List",
-            "localId" : "389",
+            "localId" : "417",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "393",
+              "localId" : "421",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "394",
+                "localId" : "422",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "390",
+              "localId" : "418",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "391",
+              "localId" : "419",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "392",
+              "localId" : "420",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -15876,6 +17682,8 @@ using Simple version '1.0.0'
 context Patient
 define IsIn: { 3, 4, 5 } contains 4
 define IsNotIn: { 3, 5, 6 } contains 4
+define IsInLong: { 3L, 4L, 5L } contains 4L
+define IsNotInLong:{ 3L, 5L, 6L } contains 4L
 define TupleIsIn: {Tuple{a:1, b:'d'}, Tuple{a:1, b:'c'}, Tuple{a:2, b:'c'}} contains Tuple{a: 1, b: 'c'}
 define TupleIsNotIn: {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} contains Tuple{a: 1, b: 'c'}
 define InNull: (null as List<Integer>) contains 1
@@ -15895,7 +17703,7 @@ module.exports['Contains'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "393",
+        "r" : "421",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -16160,7 +17968,7 @@ module.exports['Contains'] = {
       }, {
         "localId" : "242",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "TupleIsIn",
+        "name" : "IsInLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -16169,20 +17977,210 @@ module.exports['Contains'] = {
           "s" : {
             "r" : "242",
             "s" : [ {
-              "value" : [ "", "define ", "TupleIsIn", ": " ]
+              "value" : [ "", "define ", "IsInLong", ": " ]
             }, {
-              "r" : "286",
+              "r" : "250",
               "s" : [ {
                 "r" : "243",
+                "s" : [ {
+                  "r" : "244",
+                  "value" : [ "{ ", "3L", ", ", "4L", ", ", "5L", " }" ]
+                } ]
+              }, {
+                "r" : "249",
+                "value" : [ " contains ", "4L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "250",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "251",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "252",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "253",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "243",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "247",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "248",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "244",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "246",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "Literal",
+            "localId" : "249",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "4",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "256",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsNotInLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "256",
+            "s" : [ {
+              "value" : [ "", "define ", "IsNotInLong", ":" ]
+            }, {
+              "r" : "264",
+              "s" : [ {
+                "r" : "257",
+                "s" : [ {
+                  "r" : "258",
+                  "value" : [ "{ ", "3L", ", ", "5L", ", ", "6L", " }" ]
+                } ]
+              }, {
+                "r" : "263",
+                "value" : [ " contains ", "4L" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "264",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "265",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "266",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "267",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "257",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "261",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "262",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "258",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "259",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "260",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "Literal",
+            "localId" : "263",
+            "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+            "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+            "value" : "4",
+            "annotation" : [ ]
+          } ]
+        }
+      }, {
+        "localId" : "270",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "TupleIsIn",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "270",
+            "s" : [ {
+              "value" : [ "", "define ", "TupleIsIn", ": " ]
+            }, {
+              "r" : "314",
+              "s" : [ {
+                "r" : "271",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "244",
+                  "r" : "272",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "245",
+                      "r" : "273",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -16191,7 +18189,7 @@ module.exports['Contains'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "246",
+                      "r" : "274",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -16202,12 +18200,12 @@ module.exports['Contains'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "253",
+                  "r" : "281",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "254",
+                      "r" : "282",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -16216,7 +18214,7 @@ module.exports['Contains'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "255",
+                      "r" : "283",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -16227,12 +18225,12 @@ module.exports['Contains'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "262",
+                  "r" : "290",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "263",
+                      "r" : "291",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -16241,7 +18239,7 @@ module.exports['Contains'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "264",
+                      "r" : "292",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -16255,12 +18253,12 @@ module.exports['Contains'] = {
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "277",
+                "r" : "305",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "278",
+                    "r" : "306",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -16269,7 +18267,7 @@ module.exports['Contains'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "279",
+                    "r" : "307",
                     "s" : [ {
                       "value" : [ "'c'" ]
                     } ]
@@ -16283,34 +18281,34 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "286",
+          "localId" : "314",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "287",
+            "localId" : "315",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "288",
+              "localId" : "316",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "289",
+                "localId" : "317",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "290",
+                  "localId" : "318",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "291",
+                "localId" : "319",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "292",
+                  "localId" : "320",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -16318,25 +18316,25 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "293",
+            "localId" : "321",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "294",
+              "localId" : "322",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "295",
+                "localId" : "323",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "296",
+              "localId" : "324",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "297",
+                "localId" : "325",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -16344,33 +18342,33 @@ module.exports['Contains'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "243",
+            "localId" : "271",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "271",
+              "localId" : "299",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "272",
+                "localId" : "300",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "273",
+                  "localId" : "301",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "274",
+                    "localId" : "302",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "275",
+                  "localId" : "303",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "276",
+                    "localId" : "304",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -16379,29 +18377,29 @@ module.exports['Contains'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "244",
+              "localId" : "272",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "248",
+                "localId" : "276",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "249",
+                  "localId" : "277",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "250",
+                    "localId" : "278",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "251",
+                  "localId" : "279",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "252",
+                    "localId" : "280",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -16411,7 +18409,7 @@ module.exports['Contains'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "245",
+                  "localId" : "273",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -16421,7 +18419,7 @@ module.exports['Contains'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "246",
+                  "localId" : "274",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -16430,29 +18428,29 @@ module.exports['Contains'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "253",
+              "localId" : "281",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "257",
+                "localId" : "285",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "258",
+                  "localId" : "286",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "259",
+                    "localId" : "287",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "260",
+                  "localId" : "288",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "261",
+                    "localId" : "289",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -16462,7 +18460,7 @@ module.exports['Contains'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "254",
+                  "localId" : "282",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -16472,7 +18470,7 @@ module.exports['Contains'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "255",
+                  "localId" : "283",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -16481,29 +18479,29 @@ module.exports['Contains'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "262",
+              "localId" : "290",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "266",
+                "localId" : "294",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "267",
+                  "localId" : "295",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "268",
+                    "localId" : "296",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "269",
+                  "localId" : "297",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "270",
+                    "localId" : "298",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -16513,7 +18511,7 @@ module.exports['Contains'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "263",
+                  "localId" : "291",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -16523,7 +18521,7 @@ module.exports['Contains'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "264",
+                  "localId" : "292",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -16533,29 +18531,29 @@ module.exports['Contains'] = {
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "277",
+            "localId" : "305",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "281",
+              "localId" : "309",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "282",
+                "localId" : "310",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "283",
+                  "localId" : "311",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "284",
+                "localId" : "312",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "285",
+                  "localId" : "313",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -16565,7 +18563,7 @@ module.exports['Contains'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "278",
+                "localId" : "306",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -16575,7 +18573,7 @@ module.exports['Contains'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "279",
+                "localId" : "307",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "c",
@@ -16585,7 +18583,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "300",
+        "localId" : "328",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "TupleIsNotIn",
         "context" : "Patient",
@@ -16594,22 +18592,22 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "300",
+            "r" : "328",
             "s" : [ {
               "value" : [ "", "define ", "TupleIsNotIn", ": " ]
             }, {
-              "r" : "344",
+              "r" : "372",
               "s" : [ {
-                "r" : "301",
+                "r" : "329",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "302",
+                  "r" : "330",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "303",
+                      "r" : "331",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -16618,7 +18616,7 @@ module.exports['Contains'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "304",
+                      "r" : "332",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -16629,12 +18627,12 @@ module.exports['Contains'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "311",
+                  "r" : "339",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "312",
+                      "r" : "340",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -16643,7 +18641,7 @@ module.exports['Contains'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "313",
+                      "r" : "341",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -16654,12 +18652,12 @@ module.exports['Contains'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "320",
+                  "r" : "348",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "321",
+                      "r" : "349",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -16668,7 +18666,7 @@ module.exports['Contains'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "322",
+                      "r" : "350",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -16682,12 +18680,12 @@ module.exports['Contains'] = {
               }, {
                 "value" : [ " contains " ]
               }, {
-                "r" : "335",
+                "r" : "363",
                 "s" : [ {
                   "value" : [ "Tuple{" ]
                 }, {
                   "s" : [ {
-                    "r" : "336",
+                    "r" : "364",
                     "value" : [ "a", ": ", "1" ]
                   } ]
                 }, {
@@ -16696,7 +18694,7 @@ module.exports['Contains'] = {
                   "s" : [ {
                     "value" : [ "b", ": " ]
                   }, {
-                    "r" : "337",
+                    "r" : "365",
                     "s" : [ {
                       "value" : [ "'c'" ]
                     } ]
@@ -16710,34 +18708,34 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "344",
+          "localId" : "372",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "345",
+            "localId" : "373",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "346",
+              "localId" : "374",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "347",
+                "localId" : "375",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "348",
+                  "localId" : "376",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "349",
+                "localId" : "377",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "350",
+                  "localId" : "378",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -16745,25 +18743,25 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "TupleTypeSpecifier",
-            "localId" : "351",
+            "localId" : "379",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "352",
+              "localId" : "380",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "353",
+                "localId" : "381",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "354",
+              "localId" : "382",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "355",
+                "localId" : "383",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -16771,33 +18769,33 @@ module.exports['Contains'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "301",
+            "localId" : "329",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "329",
+              "localId" : "357",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "330",
+                "localId" : "358",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "331",
+                  "localId" : "359",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "332",
+                    "localId" : "360",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "333",
+                  "localId" : "361",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "334",
+                    "localId" : "362",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -16806,29 +18804,29 @@ module.exports['Contains'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "302",
+              "localId" : "330",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "306",
+                "localId" : "334",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "307",
+                  "localId" : "335",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "308",
+                    "localId" : "336",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "309",
+                  "localId" : "337",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "310",
+                    "localId" : "338",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -16838,7 +18836,7 @@ module.exports['Contains'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "303",
+                  "localId" : "331",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -16848,7 +18846,7 @@ module.exports['Contains'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "304",
+                  "localId" : "332",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -16857,29 +18855,29 @@ module.exports['Contains'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "311",
+              "localId" : "339",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "315",
+                "localId" : "343",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "316",
+                  "localId" : "344",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "317",
+                    "localId" : "345",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "318",
+                  "localId" : "346",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "319",
+                    "localId" : "347",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -16889,7 +18887,7 @@ module.exports['Contains'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "312",
+                  "localId" : "340",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -16899,7 +18897,7 @@ module.exports['Contains'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "313",
+                  "localId" : "341",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -16908,29 +18906,29 @@ module.exports['Contains'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "320",
+              "localId" : "348",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "324",
+                "localId" : "352",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "325",
+                  "localId" : "353",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "326",
+                    "localId" : "354",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "327",
+                  "localId" : "355",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "328",
+                    "localId" : "356",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -16940,7 +18938,7 @@ module.exports['Contains'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "321",
+                  "localId" : "349",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -16950,7 +18948,7 @@ module.exports['Contains'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "322",
+                  "localId" : "350",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -16960,29 +18958,29 @@ module.exports['Contains'] = {
             } ]
           }, {
             "type" : "Tuple",
-            "localId" : "335",
+            "localId" : "363",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "339",
+              "localId" : "367",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "340",
+                "localId" : "368",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "341",
+                  "localId" : "369",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "342",
+                "localId" : "370",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "343",
+                  "localId" : "371",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -16992,7 +18990,7 @@ module.exports['Contains'] = {
               "name" : "a",
               "value" : {
                 "type" : "Literal",
-                "localId" : "336",
+                "localId" : "364",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
@@ -17002,7 +19000,7 @@ module.exports['Contains'] = {
               "name" : "b",
               "value" : {
                 "type" : "Literal",
-                "localId" : "337",
+                "localId" : "365",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "c",
@@ -17012,7 +19010,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "358",
+        "localId" : "386",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "InNull",
         "context" : "Patient",
@@ -17021,26 +19019,26 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "358",
+            "r" : "386",
             "s" : [ {
               "value" : [ "", "define ", "InNull", ": " ]
             }, {
-              "r" : "370",
+              "r" : "398",
               "s" : [ {
-                "r" : "359",
+                "r" : "387",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "359",
+                  "r" : "387",
                   "s" : [ {
-                    "r" : "360",
+                    "r" : "388",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "361",
+                    "r" : "389",
                     "s" : [ {
                       "value" : [ "List<" ]
                     }, {
-                      "r" : "362",
+                      "r" : "390",
                       "s" : [ {
                         "value" : [ "Integer" ]
                       } ]
@@ -17052,7 +19050,7 @@ module.exports['Contains'] = {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "369",
+                "r" : "397",
                 "value" : [ " contains ", "1" ]
               } ]
             } ]
@@ -17060,37 +19058,37 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "370",
+          "localId" : "398",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "371",
+            "localId" : "399",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "372",
+              "localId" : "400",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "373",
+            "localId" : "401",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "359",
+            "localId" : "387",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "367",
+              "localId" : "395",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "368",
+                "localId" : "396",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -17098,28 +19096,28 @@ module.exports['Contains'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "360",
+              "localId" : "388",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "361",
+              "localId" : "389",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "363",
+                "localId" : "391",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "364",
+                  "localId" : "392",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "362",
+                "localId" : "390",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
@@ -17127,7 +19125,7 @@ module.exports['Contains'] = {
             }
           }, {
             "type" : "Literal",
-            "localId" : "369",
+            "localId" : "397",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "1",
@@ -17135,7 +19133,7 @@ module.exports['Contains'] = {
           } ]
         }
       }, {
-        "localId" : "376",
+        "localId" : "404",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NullIn",
         "context" : "Patient",
@@ -17144,19 +19142,19 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "376",
+            "r" : "404",
             "s" : [ {
               "value" : [ "", "define ", "NullIn", ": " ]
             }, {
-              "r" : "386",
+              "r" : "414",
               "s" : [ {
-                "r" : "377",
+                "r" : "405",
                 "s" : [ {
-                  "r" : "378",
+                  "r" : "406",
                   "value" : [ "{", "1", ", ", "2", ", ", "null", ", ", "3", "}" ]
                 } ]
               }, {
-                "r" : "385",
+                "r" : "413",
                 "value" : [ " contains ", "null" ]
               } ]
             } ]
@@ -17164,69 +19162,69 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "386",
+          "localId" : "414",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "388",
+            "localId" : "416",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "389",
+              "localId" : "417",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "390",
+            "localId" : "418",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "377",
+            "localId" : "405",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "383",
+              "localId" : "411",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "384",
+                "localId" : "412",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "378",
+              "localId" : "406",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "379",
+              "localId" : "407",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "382",
+              "localId" : "410",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "380",
+                "localId" : "408",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
               "type" : "Literal",
-              "localId" : "381",
+              "localId" : "409",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -17234,20 +19232,20 @@ module.exports['Contains'] = {
             } ]
           }, {
             "type" : "As",
-            "localId" : "387",
+            "localId" : "415",
             "asType" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "385",
+              "localId" : "413",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "393",
+        "localId" : "421",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NullNotIn",
         "context" : "Patient",
@@ -17256,19 +19254,19 @@ module.exports['Contains'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "393",
+            "r" : "421",
             "s" : [ {
               "value" : [ "", "define ", "NullNotIn", ": " ]
             }, {
-              "r" : "401",
+              "r" : "429",
               "s" : [ {
-                "r" : "394",
+                "r" : "422",
                 "s" : [ {
-                  "r" : "395",
+                  "r" : "423",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", "}" ]
                 } ]
               }, {
-                "r" : "400",
+                "r" : "428",
                 "value" : [ " contains ", "null" ]
               } ]
             } ]
@@ -17276,57 +19274,57 @@ module.exports['Contains'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "401",
+          "localId" : "429",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "403",
+            "localId" : "431",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "404",
+              "localId" : "432",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "405",
+            "localId" : "433",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "394",
+            "localId" : "422",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "398",
+              "localId" : "426",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "399",
+                "localId" : "427",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "395",
+              "localId" : "423",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "396",
+              "localId" : "424",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "397",
+              "localId" : "425",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -17334,13 +19332,13 @@ module.exports['Contains'] = {
             } ]
           }, {
             "type" : "As",
-            "localId" : "402",
+            "localId" : "430",
             "asType" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "400",
+              "localId" : "428",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
@@ -17359,6 +19357,10 @@ define IsIncluded: {1, 2, 3, 4, 5} includes {2, 3, 4}
 define IsIncludedReversed: {1, 2, 3, 4, 5} includes {4, 3, 2}
 define IsSame: {1, 2, 3, 4, 5} includes {1, 2, 3, 4, 5}
 define IsNotIncluded: {1, 2, 3, 4, 5} includes {4, 5, 6}
+define IsIncludedLong: {1L, 2L, 3L, 4L, 5L} includes {2L, 3L, 4L}
+define IsIncludedReversedLong: {1L, 2L, 3L, 4L, 5L} includes {4L, 3L, 2L}
+define IsSameLong: {1L, 2L, 3L, 4L, 5L} includes {1L, 2L, 3L, 4L, 5L}
+define IsNotIncludedLong: {1L, 2L, 3L, 4L, 5L} includes {4L, 5L, 6L}
 define TuplesIncluded: {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} includes {Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define TuplesNotIncluded: {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} includes {Tuple{a:2, b:'d'}, Tuple{a:3, b:'c'}}
 define NullIncluded: {1, 2, 3, 4, 5} includes null
@@ -17367,7 +19369,7 @@ define DayIncluded: {DateTime(2012, 3, 2), DateTime(2012, 3, 3), DateTime(2012,
 define DayNotIncluded: {DateTime(2012, 3, 2), DateTime(2012, 3, 3), DateTime(2012, 3, 4)} includes DateTime(2014, 3, 3)
 define IntegerIncluded: {1, 2, 3, 4, 5} includes 3
 define IntegerNotIncluded: {1, 2, 3, 4, 5} includes 33
-define QuantityInList: { ToQuantity('1 \'m\''), ToQuantity('1.995 \'m\''), ToQuantity('2 \'m\''), ToQuantity('3 \'m\'')} includes ToQuantity('1 \'m\'') 
+define QuantityInList: { ToQuantity('1 \'m\''), ToQuantity('1.995 \'m\''), ToQuantity('2 \'m\''), ToQuantity('3 \'m\'')} includes ToQuantity('1 \'m\'')
 define QuantityNotInList: { ToQuantity('100 \'m\''), ToQuantity('1.995 \'m\''), ToQuantity('2 \'m\''), ToQuantity('3 \'m\'')} includes ToQuantity('1 \'m\'')
 */
 
@@ -17428,9 +19430,9 @@ module.exports['Includes'] = {
       "libraryId" : "TestSnippet",
       "libraryVersion" : "1",
       "startLine" : 8,
-      "startChar" : 91,
+      "startChar" : 54,
       "endLine" : 8,
-      "endChar" : 128,
+      "endChar" : 65,
       "message" : "List-valued expression was demoted to a singleton.",
       "errorType" : "semantic",
       "errorSeverity" : "warning"
@@ -17439,8 +19441,52 @@ module.exports['Includes'] = {
       "libraryId" : "TestSnippet",
       "libraryVersion" : "1",
       "startLine" : 9,
-      "startChar" : 94,
+      "startChar" : 62,
       "endLine" : 9,
+      "endChar" : 73,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 10,
+      "startChar" : 50,
+      "endLine" : 10,
+      "endChar" : 69,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 11,
+      "startChar" : 57,
+      "endLine" : 11,
+      "endChar" : 68,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 12,
+      "startChar" : 91,
+      "endLine" : 12,
+      "endChar" : 128,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 13,
+      "startChar" : 94,
+      "endLine" : 13,
       "endChar" : 131,
       "message" : "List-valued expression was demoted to a singleton.",
       "errorType" : "semantic",
@@ -17449,7 +19495,7 @@ module.exports['Includes'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "795",
+        "r" : "913",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -18138,7 +20184,7 @@ module.exports['Includes'] = {
       }, {
         "localId" : "332",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "TuplesIncluded",
+        "name" : "IsIncludedLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -18147,146 +20193,23 @@ module.exports['Includes'] = {
           "s" : {
             "r" : "332",
             "s" : [ {
-              "value" : [ "", "define ", "TuplesIncluded", ": " ]
+              "value" : [ "", "define ", "IsIncludedLong", ": " ]
             }, {
-              "r" : "392",
+              "r" : "347",
               "s" : [ {
                 "r" : "333",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
                   "r" : "334",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "335",
-                      "value" : [ "a", ":", "1" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "336",
-                      "s" : [ {
-                        "value" : [ "'d'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "343",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "344",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "345",
-                      "s" : [ {
-                        "value" : [ "'d'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "352",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "353",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "354",
-                      "s" : [ {
-                        "value" : [ "'c'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
               }, {
-                "r" : "392",
+                "r" : "347",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "367",
+                "r" : "341",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "368",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "369",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "370",
-                      "s" : [ {
-                        "value" : [ "'d'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "377",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "378",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "379",
-                      "s" : [ {
-                        "value" : [ "'c'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "342",
+                  "value" : [ "{", "2L", ", ", "3L", ", ", "4L", "}" ]
                 } ]
               } ]
             } ]
@@ -18294,68 +20217,28 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "392",
+          "localId" : "347",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "393",
+            "localId" : "348",
             "annotation" : [ ],
             "elementType" : {
-              "type" : "TupleTypeSpecifier",
-              "localId" : "394",
-              "annotation" : [ ],
-              "element" : [ {
-                "localId" : "395",
-                "name" : "a",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "396",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              }, {
-                "localId" : "397",
-                "name" : "b",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "398",
-                  "name" : "{urn:hl7-org:elm-types:r1}String",
-                  "annotation" : [ ]
-                }
-              } ]
+              "type" : "NamedTypeSpecifier",
+              "localId" : "349",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "399",
+            "localId" : "350",
             "annotation" : [ ],
             "elementType" : {
-              "type" : "TupleTypeSpecifier",
-              "localId" : "400",
-              "annotation" : [ ],
-              "element" : [ {
-                "localId" : "401",
-                "name" : "a",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "402",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              }, {
-                "localId" : "403",
-                "name" : "b",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "404",
-                  "name" : "{urn:hl7-org:elm-types:r1}String",
-                  "annotation" : [ ]
-                }
-              } ]
+              "type" : "NamedTypeSpecifier",
+              "localId" : "351",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
           } ],
           "operand" : [ {
@@ -18364,355 +20247,580 @@ module.exports['Includes'] = {
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "361",
+              "localId" : "339",
               "annotation" : [ ],
               "elementType" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "362",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "363",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "364",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "365",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "366",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "340",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Tuple",
+              "type" : "Literal",
               "localId" : "334",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "335",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "336",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "337",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "338",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "341",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "345",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "338",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "339",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "340",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "341",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "342",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "335",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
-              }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "336",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "d",
-                  "annotation" : [ ]
-                }
-              } ]
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "346",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
             }, {
-              "type" : "Tuple",
+              "type" : "Literal",
               "localId" : "343",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "347",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "348",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "349",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "350",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "351",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "344",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
-              }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "345",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "d",
-                  "annotation" : [ ]
-                }
-              } ]
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
             }, {
-              "type" : "Tuple",
-              "localId" : "352",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "356",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "357",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "358",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "359",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "360",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
+              "type" : "Literal",
+              "localId" : "344",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "361",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsIncludedReversedLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "361",
+            "s" : [ {
+              "value" : [ "", "define ", "IsIncludedReversedLong", ": " ]
+            }, {
+              "r" : "376",
+              "s" : [ {
+                "r" : "362",
+                "s" : [ {
+                  "r" : "363",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "353",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
               }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "354",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "c",
-                  "annotation" : [ ]
-                }
+                "r" : "376",
+                "value" : [ " ", "includes", " " ]
+              }, {
+                "r" : "370",
+                "s" : [ {
+                  "r" : "371",
+                  "value" : [ "{", "4L", ", ", "3L", ", ", "2L", "}" ]
+                } ]
               } ]
             } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "376",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "377",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "378",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
           }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "379",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "380",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "List",
-            "localId" : "367",
+            "localId" : "362",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "386",
+              "localId" : "368",
               "annotation" : [ ],
               "elementType" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "387",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "388",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "389",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "390",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "391",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "369",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Tuple",
-              "localId" : "368",
+              "type" : "Literal",
+              "localId" : "363",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "367",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "370",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "374",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "372",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "373",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "374",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "375",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "376",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "375",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "372",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "373",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "390",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsSameLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "390",
+            "s" : [ {
+              "value" : [ "", "define ", "IsSameLong", ": " ]
+            }, {
+              "r" : "407",
+              "s" : [ {
+                "r" : "391",
+                "s" : [ {
+                  "r" : "392",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "369",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
               }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "370",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "d",
-                  "annotation" : [ ]
-                }
+                "r" : "407",
+                "value" : [ " ", "includes", " " ]
+              }, {
+                "r" : "399",
+                "s" : [ {
+                  "r" : "400",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
+                } ]
               } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "407",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "408",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "409",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "410",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "411",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "391",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "397",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "398",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "392",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
             }, {
-              "type" : "Tuple",
-              "localId" : "377",
+              "type" : "Literal",
+              "localId" : "393",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "394",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "399",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "405",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "381",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "382",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "383",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "384",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "385",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "406",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "400",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "402",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "421",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsNotIncludedLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "421",
+            "s" : [ {
+              "value" : [ "", "define ", "IsNotIncludedLong", ": " ]
+            }, {
+              "r" : "436",
+              "s" : [ {
+                "r" : "422",
+                "s" : [ {
+                  "r" : "423",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "378",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
               }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "379",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "c",
-                  "annotation" : [ ]
-                }
+                "r" : "436",
+                "value" : [ " ", "includes", " " ]
+              }, {
+                "r" : "430",
+                "s" : [ {
+                  "r" : "431",
+                  "value" : [ "{", "4L", ", ", "5L", ", ", "6L", "}" ]
+                } ]
               } ]
             } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "436",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "437",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "438",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "439",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "440",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "422",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "428",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "429",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "423",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "424",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "425",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "426",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "427",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "430",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "434",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "435",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "431",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "432",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "433",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
+            } ]
           } ]
         }
       }, {
-        "localId" : "426",
+        "localId" : "450",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "TuplesNotIncluded",
+        "name" : "TuplesIncluded",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "426",
+            "r" : "450",
             "s" : [ {
-              "value" : [ "", "define ", "TuplesNotIncluded", ": " ]
+              "value" : [ "", "define ", "TuplesIncluded", ": " ]
             }, {
-              "r" : "486",
+              "r" : "510",
               "s" : [ {
-                "r" : "427",
+                "r" : "451",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "428",
+                  "r" : "452",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "429",
+                      "r" : "453",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -18721,7 +20829,7 @@ module.exports['Includes'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "430",
+                      "r" : "454",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -18732,12 +20840,12 @@ module.exports['Includes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "437",
+                  "r" : "461",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "438",
+                      "r" : "462",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -18746,7 +20854,7 @@ module.exports['Includes'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "439",
+                      "r" : "463",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -18757,12 +20865,12 @@ module.exports['Includes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "446",
+                  "r" : "470",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "447",
+                      "r" : "471",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -18771,7 +20879,7 @@ module.exports['Includes'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "448",
+                      "r" : "472",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -18783,19 +20891,19 @@ module.exports['Includes'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "486",
+                "r" : "510",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "461",
+                "r" : "485",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "462",
+                  "r" : "486",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "463",
+                      "r" : "487",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -18804,7 +20912,7 @@ module.exports['Includes'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "464",
+                      "r" : "488",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -18815,13 +20923,13 @@ module.exports['Includes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "471",
+                  "r" : "495",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "472",
-                      "value" : [ "a", ":", "3" ]
+                      "r" : "496",
+                      "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
@@ -18829,7 +20937,7 @@ module.exports['Includes'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "473",
+                      "r" : "497",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -18846,34 +20954,34 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "486",
+          "localId" : "510",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "487",
+            "localId" : "511",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "488",
+              "localId" : "512",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "489",
+                "localId" : "513",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "490",
+                  "localId" : "514",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "491",
+                "localId" : "515",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "492",
+                  "localId" : "516",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -18881,29 +20989,29 @@ module.exports['Includes'] = {
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "493",
+            "localId" : "517",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "494",
+              "localId" : "518",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "495",
+                "localId" : "519",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "496",
+                  "localId" : "520",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "497",
+                "localId" : "521",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "498",
+                  "localId" : "522",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -18912,33 +21020,33 @@ module.exports['Includes'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "427",
+            "localId" : "451",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "455",
+              "localId" : "479",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "456",
+                "localId" : "480",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "457",
+                  "localId" : "481",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "458",
+                    "localId" : "482",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "459",
+                  "localId" : "483",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "460",
+                    "localId" : "484",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -18947,29 +21055,29 @@ module.exports['Includes'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "428",
+              "localId" : "452",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "432",
+                "localId" : "456",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "433",
+                  "localId" : "457",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "434",
+                    "localId" : "458",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "435",
+                  "localId" : "459",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "436",
+                    "localId" : "460",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -18979,7 +21087,7 @@ module.exports['Includes'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "429",
+                  "localId" : "453",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -18989,7 +21097,7 @@ module.exports['Includes'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "430",
+                  "localId" : "454",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -18998,29 +21106,29 @@ module.exports['Includes'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "437",
+              "localId" : "461",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "441",
+                "localId" : "465",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "442",
+                  "localId" : "466",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "443",
+                    "localId" : "467",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "444",
+                  "localId" : "468",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "445",
+                    "localId" : "469",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -19030,7 +21138,7 @@ module.exports['Includes'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "438",
+                  "localId" : "462",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -19040,7 +21148,7 @@ module.exports['Includes'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "439",
+                  "localId" : "463",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -19049,29 +21157,29 @@ module.exports['Includes'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "446",
+              "localId" : "470",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "450",
+                "localId" : "474",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "451",
+                  "localId" : "475",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "452",
+                    "localId" : "476",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "453",
+                  "localId" : "477",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "454",
+                    "localId" : "478",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -19081,7 +21189,7 @@ module.exports['Includes'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "447",
+                  "localId" : "471",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -19091,7 +21199,7 @@ module.exports['Includes'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "448",
+                  "localId" : "472",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -19101,33 +21209,33 @@ module.exports['Includes'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "461",
+            "localId" : "485",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "480",
+              "localId" : "504",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "481",
+                "localId" : "505",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "482",
+                  "localId" : "506",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "483",
+                    "localId" : "507",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "484",
+                  "localId" : "508",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "485",
+                    "localId" : "509",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -19136,29 +21244,29 @@ module.exports['Includes'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "462",
+              "localId" : "486",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "466",
+                "localId" : "490",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "467",
+                  "localId" : "491",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "468",
+                    "localId" : "492",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "469",
+                  "localId" : "493",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "470",
+                    "localId" : "494",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -19168,7 +21276,7 @@ module.exports['Includes'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "463",
+                  "localId" : "487",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -19178,7 +21286,7 @@ module.exports['Includes'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "464",
+                  "localId" : "488",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -19187,29 +21295,29 @@ module.exports['Includes'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "471",
+              "localId" : "495",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "475",
+                "localId" : "499",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "476",
+                  "localId" : "500",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "477",
+                    "localId" : "501",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "478",
+                  "localId" : "502",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "479",
+                    "localId" : "503",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -19219,17 +21327,17 @@ module.exports['Includes'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "472",
+                  "localId" : "496",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "2",
                   "annotation" : [ ]
                 }
               }, {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "473",
+                  "localId" : "497",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -19240,100 +21348,652 @@ module.exports['Includes'] = {
           } ]
         }
       }, {
-        "localId" : "520",
+        "localId" : "544",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullIncluded",
+        "name" : "TuplesNotIncluded",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "520",
+            "r" : "544",
             "s" : [ {
-              "value" : [ "", "define ", "NullIncluded", ": " ]
+              "value" : [ "", "define ", "TuplesNotIncluded", ": " ]
             }, {
-              "r" : "538",
+              "r" : "604",
               "s" : [ {
-                "r" : "521",
+                "r" : "545",
                 "s" : [ {
-                  "r" : "522",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
-                } ]
-              }, {
-                "r" : "538",
-                "value" : [ " ", "includes", " ", "null" ]
-              } ]
-            } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "Contains",
-          "localId" : "538",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "546",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "547",
+                      "value" : [ "a", ":", "1" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "548",
+                      "s" : [ {
+                        "value" : [ "'d'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "555",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "556",
+                      "value" : [ "a", ":", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "557",
+                      "s" : [ {
+                        "value" : [ "'d'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "564",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "565",
+                      "value" : [ "a", ":", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "566",
+                      "s" : [ {
+                        "value" : [ "'c'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "r" : "604",
+                "value" : [ " ", "includes", " " ]
+              }, {
+                "r" : "579",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "580",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "581",
+                      "value" : [ "a", ":", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "582",
+                      "s" : [ {
+                        "value" : [ "'d'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "589",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "590",
+                      "value" : [ "a", ":", "3" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "591",
+                      "s" : [ {
+                        "value" : [ "'c'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Includes",
+          "localId" : "604",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "540",
+            "localId" : "605",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "TupleTypeSpecifier",
+              "localId" : "606",
+              "annotation" : [ ],
+              "element" : [ {
+                "localId" : "607",
+                "name" : "a",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "608",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }, {
+                "localId" : "609",
+                "name" : "b",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "610",
+                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "annotation" : [ ]
+                }
+              } ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "611",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "TupleTypeSpecifier",
+              "localId" : "612",
+              "annotation" : [ ],
+              "element" : [ {
+                "localId" : "613",
+                "name" : "a",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "614",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }, {
+                "localId" : "615",
+                "name" : "b",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "616",
+                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "annotation" : [ ]
+                }
+              } ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "545",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "573",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "574",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "575",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "576",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "577",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "578",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              }
+            },
+            "element" : [ {
+              "type" : "Tuple",
+              "localId" : "546",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "550",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "551",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "552",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "553",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "554",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "547",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "548",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "d",
+                  "annotation" : [ ]
+                }
+              } ]
+            }, {
+              "type" : "Tuple",
+              "localId" : "555",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "559",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "560",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "561",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "562",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "563",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "556",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "557",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "d",
+                  "annotation" : [ ]
+                }
+              } ]
+            }, {
+              "type" : "Tuple",
+              "localId" : "564",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "568",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "569",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "570",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "571",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "572",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "565",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "566",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "c",
+                  "annotation" : [ ]
+                }
+              } ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "579",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "598",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "599",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "600",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "601",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "602",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "603",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              }
+            },
+            "element" : [ {
+              "type" : "Tuple",
+              "localId" : "580",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "584",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "585",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "586",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "587",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "588",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "581",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "582",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "d",
+                  "annotation" : [ ]
+                }
+              } ]
+            }, {
+              "type" : "Tuple",
+              "localId" : "589",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "593",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "594",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "595",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "596",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "597",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "590",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "591",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "c",
+                  "annotation" : [ ]
+                }
+              } ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "638",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullIncluded",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "638",
+            "s" : [ {
+              "value" : [ "", "define ", "NullIncluded", ": " ]
+            }, {
+              "r" : "656",
+              "s" : [ {
+                "r" : "639",
+                "s" : [ {
+                  "r" : "640",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                } ]
+              }, {
+                "r" : "656",
+                "value" : [ " ", "includes", " ", "null" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Contains",
+          "localId" : "656",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "658",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "541",
+              "localId" : "659",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "542",
+            "localId" : "660",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "521",
+            "localId" : "639",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "527",
+              "localId" : "645",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "528",
+                "localId" : "646",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "522",
+              "localId" : "640",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "523",
+              "localId" : "641",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "524",
+              "localId" : "642",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "525",
+              "localId" : "643",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "526",
+              "localId" : "644",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -19341,20 +22001,20 @@ module.exports['Includes'] = {
             } ]
           }, {
             "type" : "As",
-            "localId" : "539",
+            "localId" : "657",
             "asType" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "529",
+              "localId" : "647",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             }
           } ]
         }
       }, {
-        "localId" : "545",
+        "localId" : "663",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NullIncludes",
         "context" : "Patient",
@@ -19363,18 +22023,18 @@ module.exports['Includes'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "545",
+            "r" : "663",
             "s" : [ {
               "value" : [ "", "define ", "NullIncludes", ": " ]
             }, {
-              "r" : "555",
+              "r" : "673",
               "s" : [ {
-                "r" : "546",
+                "r" : "664",
                 "value" : [ "null", " ", "includes", " " ]
               }, {
-                "r" : "547",
+                "r" : "665",
                 "s" : [ {
-                  "r" : "548",
+                  "r" : "666",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               } ]
@@ -19383,98 +22043,98 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Includes",
-          "localId" : "555",
+          "localId" : "673",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "559",
+            "localId" : "677",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "560",
+              "localId" : "678",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "561",
+            "localId" : "679",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "562",
+              "localId" : "680",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "556",
+            "localId" : "674",
             "annotation" : [ ],
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "546",
+              "localId" : "664",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "557",
+              "localId" : "675",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "558",
+                "localId" : "676",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }
           }, {
             "type" : "List",
-            "localId" : "547",
+            "localId" : "665",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "553",
+              "localId" : "671",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "554",
+                "localId" : "672",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "548",
+              "localId" : "666",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "549",
+              "localId" : "667",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "550",
+              "localId" : "668",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "551",
+              "localId" : "669",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "552",
+              "localId" : "670",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -19483,7 +22143,7 @@ module.exports['Includes'] = {
           } ]
         }
       }, {
-        "localId" : "572",
+        "localId" : "690",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DayIncluded",
         "context" : "Patient",
@@ -19492,47 +22152,47 @@ module.exports['Includes'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "572",
+            "r" : "690",
             "s" : [ {
               "value" : [ "", "define ", "DayIncluded", ": " ]
             }, {
-              "r" : "630",
+              "r" : "748",
               "s" : [ {
-                "r" : "573",
+                "r" : "691",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "582",
+                  "r" : "700",
                   "s" : [ {
-                    "r" : "574",
+                    "r" : "692",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "594",
+                  "r" : "712",
                   "s" : [ {
-                    "r" : "586",
+                    "r" : "704",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "606",
+                  "r" : "724",
                   "s" : [ {
-                    "r" : "598",
+                    "r" : "716",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "4", ")" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "630",
+                "r" : "748",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "620",
+                "r" : "738",
                 "s" : [ {
-                  "r" : "612",
+                  "r" : "730",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ")" ]
                 } ]
               } ]
@@ -19541,64 +22201,64 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "630",
+          "localId" : "748",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "631",
+            "localId" : "749",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "632",
+              "localId" : "750",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "633",
+            "localId" : "751",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "573",
+            "localId" : "691",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "610",
+              "localId" : "728",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "611",
+                "localId" : "729",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "DateTime",
-              "localId" : "582",
+              "localId" : "700",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "583",
+                "localId" : "701",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "584",
+                "localId" : "702",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "585",
+                "localId" : "703",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "574",
+                "localId" : "692",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -19606,7 +22266,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "575",
+                "localId" : "693",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -19614,7 +22274,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "576",
+                "localId" : "694",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -19622,28 +22282,28 @@ module.exports['Includes'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "594",
+              "localId" : "712",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "595",
+                "localId" : "713",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "596",
+                "localId" : "714",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "597",
+                "localId" : "715",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "586",
+                "localId" : "704",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -19651,7 +22311,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "587",
+                "localId" : "705",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -19659,7 +22319,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "588",
+                "localId" : "706",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -19667,28 +22327,28 @@ module.exports['Includes'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "606",
+              "localId" : "724",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "607",
+                "localId" : "725",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "608",
+                "localId" : "726",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "609",
+                "localId" : "727",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "598",
+                "localId" : "716",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -19696,7 +22356,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "599",
+                "localId" : "717",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -19704,7 +22364,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "600",
+                "localId" : "718",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -19713,28 +22373,28 @@ module.exports['Includes'] = {
             } ]
           }, {
             "type" : "DateTime",
-            "localId" : "620",
+            "localId" : "738",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "621",
+              "localId" : "739",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "622",
+              "localId" : "740",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "623",
+              "localId" : "741",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "612",
+              "localId" : "730",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -19742,7 +22402,7 @@ module.exports['Includes'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "613",
+              "localId" : "731",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -19750,7 +22410,7 @@ module.exports['Includes'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "614",
+              "localId" : "732",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -19759,7 +22419,7 @@ module.exports['Includes'] = {
           } ]
         }
       }, {
-        "localId" : "636",
+        "localId" : "754",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DayNotIncluded",
         "context" : "Patient",
@@ -19768,47 +22428,47 @@ module.exports['Includes'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "636",
+            "r" : "754",
             "s" : [ {
               "value" : [ "", "define ", "DayNotIncluded", ": " ]
             }, {
-              "r" : "694",
+              "r" : "812",
               "s" : [ {
-                "r" : "637",
+                "r" : "755",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "646",
+                  "r" : "764",
                   "s" : [ {
-                    "r" : "638",
+                    "r" : "756",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "658",
+                  "r" : "776",
                   "s" : [ {
-                    "r" : "650",
+                    "r" : "768",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "670",
+                  "r" : "788",
                   "s" : [ {
-                    "r" : "662",
+                    "r" : "780",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "4", ")" ]
                   } ]
                 }, {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "694",
+                "r" : "812",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "684",
+                "r" : "802",
                 "s" : [ {
-                  "r" : "676",
+                  "r" : "794",
                   "value" : [ "DateTime", "(", "2014", ", ", "3", ", ", "3", ")" ]
                 } ]
               } ]
@@ -19817,64 +22477,64 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "694",
+          "localId" : "812",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "695",
+            "localId" : "813",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "696",
+              "localId" : "814",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "697",
+            "localId" : "815",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "637",
+            "localId" : "755",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "674",
+              "localId" : "792",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "675",
+                "localId" : "793",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "DateTime",
-              "localId" : "646",
+              "localId" : "764",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "647",
+                "localId" : "765",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "648",
+                "localId" : "766",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "649",
+                "localId" : "767",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "638",
+                "localId" : "756",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -19882,7 +22542,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "639",
+                "localId" : "757",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -19890,7 +22550,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "640",
+                "localId" : "758",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -19898,28 +22558,28 @@ module.exports['Includes'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "658",
+              "localId" : "776",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "659",
+                "localId" : "777",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "660",
+                "localId" : "778",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "661",
+                "localId" : "779",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "650",
+                "localId" : "768",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -19927,7 +22587,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "651",
+                "localId" : "769",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -19935,7 +22595,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "652",
+                "localId" : "770",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -19943,28 +22603,28 @@ module.exports['Includes'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "670",
+              "localId" : "788",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "671",
+                "localId" : "789",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "672",
+                "localId" : "790",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "673",
+                "localId" : "791",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "662",
+                "localId" : "780",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -19972,7 +22632,7 @@ module.exports['Includes'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "663",
+                "localId" : "781",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -19980,7 +22640,7 @@ module.exports['Includes'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "664",
+                "localId" : "782",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -19989,28 +22649,28 @@ module.exports['Includes'] = {
             } ]
           }, {
             "type" : "DateTime",
-            "localId" : "684",
+            "localId" : "802",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "685",
+              "localId" : "803",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "686",
+              "localId" : "804",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "687",
+              "localId" : "805",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "676",
+              "localId" : "794",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2014",
@@ -20018,7 +22678,7 @@ module.exports['Includes'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "677",
+              "localId" : "795",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20026,7 +22686,7 @@ module.exports['Includes'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "678",
+              "localId" : "796",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -20035,7 +22695,7 @@ module.exports['Includes'] = {
           } ]
         }
       }, {
-        "localId" : "700",
+        "localId" : "818",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IntegerIncluded",
         "context" : "Patient",
@@ -20044,19 +22704,19 @@ module.exports['Includes'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "700",
+            "r" : "818",
             "s" : [ {
               "value" : [ "", "define ", "IntegerIncluded", ": " ]
             }, {
-              "r" : "716",
+              "r" : "834",
               "s" : [ {
-                "r" : "701",
+                "r" : "819",
                 "s" : [ {
-                  "r" : "702",
+                  "r" : "820",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               }, {
-                "r" : "716",
+                "r" : "834",
                 "value" : [ " ", "includes", " ", "3" ]
               } ]
             } ]
@@ -20064,71 +22724,71 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "716",
+          "localId" : "834",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "717",
+            "localId" : "835",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "718",
+              "localId" : "836",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "719",
+            "localId" : "837",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "701",
+            "localId" : "819",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "707",
+              "localId" : "825",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "708",
+                "localId" : "826",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "702",
+              "localId" : "820",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "703",
+              "localId" : "821",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "704",
+              "localId" : "822",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "705",
+              "localId" : "823",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "706",
+              "localId" : "824",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -20136,7 +22796,7 @@ module.exports['Includes'] = {
             } ]
           }, {
             "type" : "Literal",
-            "localId" : "709",
+            "localId" : "827",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "3",
@@ -20144,7 +22804,7 @@ module.exports['Includes'] = {
           } ]
         }
       }, {
-        "localId" : "722",
+        "localId" : "840",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IntegerNotIncluded",
         "context" : "Patient",
@@ -20153,19 +22813,19 @@ module.exports['Includes'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "722",
+            "r" : "840",
             "s" : [ {
               "value" : [ "", "define ", "IntegerNotIncluded", ": " ]
             }, {
-              "r" : "738",
+              "r" : "856",
               "s" : [ {
-                "r" : "723",
+                "r" : "841",
                 "s" : [ {
-                  "r" : "724",
+                  "r" : "842",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               }, {
-                "r" : "738",
+                "r" : "856",
                 "value" : [ " ", "includes", " ", "33" ]
               } ]
             } ]
@@ -20173,71 +22833,71 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "738",
+          "localId" : "856",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "739",
+            "localId" : "857",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "740",
+              "localId" : "858",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "741",
+            "localId" : "859",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "723",
+            "localId" : "841",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "729",
+              "localId" : "847",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "730",
+                "localId" : "848",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "724",
+              "localId" : "842",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "725",
+              "localId" : "843",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "726",
+              "localId" : "844",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "727",
+              "localId" : "845",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "728",
+              "localId" : "846",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -20245,7 +22905,7 @@ module.exports['Includes'] = {
             } ]
           }, {
             "type" : "Literal",
-            "localId" : "731",
+            "localId" : "849",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "33",
@@ -20253,7 +22913,7 @@ module.exports['Includes'] = {
           } ]
         }
       }, {
-        "localId" : "744",
+        "localId" : "862",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "QuantityInList",
         "context" : "Patient",
@@ -20262,21 +22922,21 @@ module.exports['Includes'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "744",
+            "r" : "862",
             "s" : [ {
               "value" : [ "", "define ", "QuantityInList", ": " ]
             }, {
-              "r" : "789",
+              "r" : "907",
               "s" : [ {
-                "r" : "745",
+                "r" : "863",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "751",
+                  "r" : "869",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "746",
+                    "r" : "864",
                     "s" : [ {
                       "value" : [ "'1 \\'m\\''" ]
                     } ]
@@ -20286,11 +22946,11 @@ module.exports['Includes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "758",
+                  "r" : "876",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "753",
+                    "r" : "871",
                     "s" : [ {
                       "value" : [ "'1.995 \\'m\\''" ]
                     } ]
@@ -20300,11 +22960,11 @@ module.exports['Includes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "765",
+                  "r" : "883",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "760",
+                    "r" : "878",
                     "s" : [ {
                       "value" : [ "'2 \\'m\\''" ]
                     } ]
@@ -20314,11 +22974,11 @@ module.exports['Includes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "772",
+                  "r" : "890",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "767",
+                    "r" : "885",
                     "s" : [ {
                       "value" : [ "'3 \\'m\\''" ]
                     } ]
@@ -20329,14 +22989,14 @@ module.exports['Includes'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "789",
+                "r" : "907",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "781",
+                "r" : "899",
                 "s" : [ {
                   "value" : [ "ToQuantity", "(" ]
                 }, {
-                  "r" : "776",
+                  "r" : "894",
                   "s" : [ {
                     "value" : [ "'1 \\'m\\''" ]
                   } ]
@@ -20349,54 +23009,54 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "789",
+          "localId" : "907",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "790",
+            "localId" : "908",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "791",
+              "localId" : "909",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "792",
+            "localId" : "910",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "745",
+            "localId" : "863",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "774",
+              "localId" : "892",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "775",
+                "localId" : "893",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "ToQuantity",
-              "localId" : "751",
+              "localId" : "869",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "752",
+                "localId" : "870",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "746",
+                "localId" : "864",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "1 'm'",
@@ -20404,18 +23064,18 @@ module.exports['Includes'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "758",
+              "localId" : "876",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "759",
+                "localId" : "877",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "753",
+                "localId" : "871",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "1.995 'm'",
@@ -20423,18 +23083,18 @@ module.exports['Includes'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "765",
+              "localId" : "883",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "766",
+                "localId" : "884",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "760",
+                "localId" : "878",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "2 'm'",
@@ -20442,18 +23102,18 @@ module.exports['Includes'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "772",
+              "localId" : "890",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "773",
+                "localId" : "891",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "767",
+                "localId" : "885",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "3 'm'",
@@ -20462,18 +23122,18 @@ module.exports['Includes'] = {
             } ]
           }, {
             "type" : "ToQuantity",
-            "localId" : "781",
+            "localId" : "899",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "782",
+              "localId" : "900",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "776",
+              "localId" : "894",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "1 'm'",
@@ -20482,7 +23142,7 @@ module.exports['Includes'] = {
           } ]
         }
       }, {
-        "localId" : "795",
+        "localId" : "913",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "QuantityNotInList",
         "context" : "Patient",
@@ -20491,21 +23151,21 @@ module.exports['Includes'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "795",
+            "r" : "913",
             "s" : [ {
               "value" : [ "", "define ", "QuantityNotInList", ": " ]
             }, {
-              "r" : "840",
+              "r" : "958",
               "s" : [ {
-                "r" : "796",
+                "r" : "914",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "802",
+                  "r" : "920",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "797",
+                    "r" : "915",
                     "s" : [ {
                       "value" : [ "'100 \\'m\\''" ]
                     } ]
@@ -20515,11 +23175,11 @@ module.exports['Includes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "809",
+                  "r" : "927",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "804",
+                    "r" : "922",
                     "s" : [ {
                       "value" : [ "'1.995 \\'m\\''" ]
                     } ]
@@ -20529,11 +23189,11 @@ module.exports['Includes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "816",
+                  "r" : "934",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "811",
+                    "r" : "929",
                     "s" : [ {
                       "value" : [ "'2 \\'m\\''" ]
                     } ]
@@ -20543,11 +23203,11 @@ module.exports['Includes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "823",
+                  "r" : "941",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "818",
+                    "r" : "936",
                     "s" : [ {
                       "value" : [ "'3 \\'m\\''" ]
                     } ]
@@ -20558,14 +23218,14 @@ module.exports['Includes'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "840",
+                "r" : "958",
                 "value" : [ " ", "includes", " " ]
               }, {
-                "r" : "832",
+                "r" : "950",
                 "s" : [ {
                   "value" : [ "ToQuantity", "(" ]
                 }, {
-                  "r" : "827",
+                  "r" : "945",
                   "s" : [ {
                     "value" : [ "'1 \\'m\\''" ]
                   } ]
@@ -20578,54 +23238,54 @@ module.exports['Includes'] = {
         } ],
         "expression" : {
           "type" : "Contains",
-          "localId" : "840",
+          "localId" : "958",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "841",
+            "localId" : "959",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "842",
+              "localId" : "960",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           }, {
             "type" : "NamedTypeSpecifier",
-            "localId" : "843",
+            "localId" : "961",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "796",
+            "localId" : "914",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "825",
+              "localId" : "943",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "826",
+                "localId" : "944",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "ToQuantity",
-              "localId" : "802",
+              "localId" : "920",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "803",
+                "localId" : "921",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "797",
+                "localId" : "915",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "100 'm'",
@@ -20633,18 +23293,18 @@ module.exports['Includes'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "809",
+              "localId" : "927",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "810",
+                "localId" : "928",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "804",
+                "localId" : "922",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "1.995 'm'",
@@ -20652,18 +23312,18 @@ module.exports['Includes'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "816",
+              "localId" : "934",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "817",
+                "localId" : "935",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "811",
+                "localId" : "929",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "2 'm'",
@@ -20671,18 +23331,18 @@ module.exports['Includes'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "823",
+              "localId" : "941",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "824",
+                "localId" : "942",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "818",
+                "localId" : "936",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "3 'm'",
@@ -20691,18 +23351,18 @@ module.exports['Includes'] = {
             } ]
           }, {
             "type" : "ToQuantity",
-            "localId" : "832",
+            "localId" : "950",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "833",
+              "localId" : "951",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "827",
+              "localId" : "945",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "1 'm'",
@@ -20723,6 +23383,10 @@ define IsIncluded: {2, 3, 4} included in {1, 2, 3, 4, 5}
 define IsIncludedReversed: {4, 3, 2} included in {1, 2, 3, 4, 5}
 define IsSame: {1, 2, 3, 4, 5} included in {1, 2, 3, 4, 5}
 define IsNotIncluded: {4, 5, 6} included in {1, 2, 3, 4, 5}
+define IsIncludedLong: {2L, 3L, 4L} included in {1L, 2L, 3L, 4L, 5L}
+define IsIncludedReversedLong: {4L, 3L, 2L} included in {1L, 2L, 3L, 4L, 5L}
+define IsSameLong: {1L, 2L, 3L, 4L, 5L} included in {1L, 2L, 3L, 4L, 5L}
+define IsNotIncludedLong: {4L, 5L, 6L} included in {1L, 2L, 3L, 4L, 5L}
 define TuplesIncluded: {Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} included in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define TuplesNotIncluded: {Tuple{a:2, b:'d'}, Tuple{a:3, b:'c'}} included in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define NullIncludes: {1, 2, 3, 4, 5} included in null
@@ -20794,7 +23458,7 @@ module.exports['IncludedIn'] = {
       "startLine" : 8,
       "startChar" : 24,
       "endLine" : 8,
-      "endChar" : 61,
+      "endChar" : 35,
       "message" : "List-valued expression was demoted to a singleton.",
       "errorType" : "semantic",
       "errorSeverity" : "warning"
@@ -20803,8 +23467,52 @@ module.exports['IncludedIn'] = {
       "libraryId" : "TestSnippet",
       "libraryVersion" : "1",
       "startLine" : 9,
-      "startChar" : 27,
+      "startChar" : 32,
       "endLine" : 9,
+      "endChar" : 43,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 10,
+      "startChar" : 20,
+      "endLine" : 10,
+      "endChar" : 39,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 11,
+      "startChar" : 27,
+      "endLine" : 11,
+      "endChar" : 38,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 12,
+      "startChar" : 24,
+      "endLine" : 12,
+      "endChar" : 61,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 13,
+      "startChar" : 27,
+      "endLine" : 13,
       "endChar" : 64,
       "message" : "List-valued expression was demoted to a singleton.",
       "errorType" : "semantic",
@@ -20813,7 +23521,7 @@ module.exports['IncludedIn'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "798",
+        "r" : "916",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -21502,7 +24210,7 @@ module.exports['IncludedIn'] = {
       }, {
         "localId" : "332",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "TuplesIncluded",
+        "name" : "IsIncludedLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -21511,146 +24219,23 @@ module.exports['IncludedIn'] = {
           "s" : {
             "r" : "332",
             "s" : [ {
-              "value" : [ "", "define ", "TuplesIncluded", ": " ]
+              "value" : [ "", "define ", "IsIncludedLong", ": " ]
             }, {
-              "r" : "392",
+              "r" : "347",
               "s" : [ {
                 "r" : "333",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
                   "r" : "334",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "335",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "336",
-                      "s" : [ {
-                        "value" : [ "'d'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "343",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "344",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "345",
-                      "s" : [ {
-                        "value" : [ "'c'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "value" : [ "{", "2L", ", ", "3L", ", ", "4L", "}" ]
                 } ]
               }, {
-                "r" : "392",
+                "r" : "347",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "358",
+                "r" : "339",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "359",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "360",
-                      "value" : [ "a", ":", "1" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "361",
-                      "s" : [ {
-                        "value" : [ "'d'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "368",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "369",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "370",
-                      "s" : [ {
-                        "value" : [ "'d'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "377",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "378",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "379",
-                      "s" : [ {
-                        "value" : [ "'c'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "340",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
               } ]
             } ]
@@ -21658,68 +24243,28 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "392",
+          "localId" : "347",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "393",
+            "localId" : "348",
             "annotation" : [ ],
             "elementType" : {
-              "type" : "TupleTypeSpecifier",
-              "localId" : "394",
-              "annotation" : [ ],
-              "element" : [ {
-                "localId" : "395",
-                "name" : "a",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "396",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              }, {
-                "localId" : "397",
-                "name" : "b",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "398",
-                  "name" : "{urn:hl7-org:elm-types:r1}String",
-                  "annotation" : [ ]
-                }
-              } ]
+              "type" : "NamedTypeSpecifier",
+              "localId" : "349",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "399",
+            "localId" : "350",
             "annotation" : [ ],
             "elementType" : {
-              "type" : "TupleTypeSpecifier",
-              "localId" : "400",
-              "annotation" : [ ],
-              "element" : [ {
-                "localId" : "401",
-                "name" : "a",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "402",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              }, {
-                "localId" : "403",
-                "name" : "b",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "404",
-                  "name" : "{urn:hl7-org:elm-types:r1}String",
-                  "annotation" : [ ]
-                }
-              } ]
+              "type" : "NamedTypeSpecifier",
+              "localId" : "351",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
           } ],
           "operand" : [ {
@@ -21728,355 +24273,580 @@ module.exports['IncludedIn'] = {
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "352",
+              "localId" : "337",
               "annotation" : [ ],
               "elementType" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "353",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "354",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "355",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "356",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "357",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "338",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Tuple",
+              "type" : "Literal",
               "localId" : "334",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "338",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "339",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "340",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "341",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "342",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "335",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
-              }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "336",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "d",
-                  "annotation" : [ ]
-                }
-              } ]
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
             }, {
-              "type" : "Tuple",
-              "localId" : "343",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "347",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "348",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "349",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "350",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "351",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "344",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
-              }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "345",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "c",
-                  "annotation" : [ ]
-                }
-              } ]
+              "type" : "Literal",
+              "localId" : "335",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "336",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "358",
+            "localId" : "339",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "386",
+              "localId" : "345",
               "annotation" : [ ],
               "elementType" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "387",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "388",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "389",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "390",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "391",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "346",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Tuple",
-              "localId" : "359",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "363",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "364",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "365",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "366",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "367",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "360",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
-              }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "361",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "d",
-                  "annotation" : [ ]
-                }
+              "type" : "Literal",
+              "localId" : "340",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "343",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "344",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "361",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsIncludedReversedLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "361",
+            "s" : [ {
+              "value" : [ "", "define ", "IsIncludedReversedLong", ": " ]
+            }, {
+              "r" : "376",
+              "s" : [ {
+                "r" : "362",
+                "s" : [ {
+                  "r" : "363",
+                  "value" : [ "{", "4L", ", ", "3L", ", ", "2L", "}" ]
+                } ]
+              }, {
+                "r" : "376",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "368",
+                "s" : [ {
+                  "r" : "369",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
+                } ]
               } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "376",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "377",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "378",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "379",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "380",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "362",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "366",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "367",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "363",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
             }, {
-              "type" : "Tuple",
-              "localId" : "368",
+              "type" : "Literal",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "368",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "374",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "372",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "373",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "374",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "375",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "376",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "375",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "369",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "370",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "372",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "373",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "390",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsSameLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "390",
+            "s" : [ {
+              "value" : [ "", "define ", "IsSameLong", ": " ]
+            }, {
+              "r" : "407",
+              "s" : [ {
+                "r" : "391",
+                "s" : [ {
+                  "r" : "392",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "369",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
               }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "370",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "d",
-                  "annotation" : [ ]
-                }
+                "r" : "407",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "399",
+                "s" : [ {
+                  "r" : "400",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
+                } ]
               } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "407",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "408",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "409",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "410",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "411",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "391",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "397",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "398",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "392",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
             }, {
-              "type" : "Tuple",
-              "localId" : "377",
+              "type" : "Literal",
+              "localId" : "393",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "394",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "399",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "405",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "381",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "382",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "383",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "384",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "385",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "406",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "400",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "402",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "421",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsNotIncludedLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "421",
+            "s" : [ {
+              "value" : [ "", "define ", "IsNotIncludedLong", ": " ]
+            }, {
+              "r" : "436",
+              "s" : [ {
+                "r" : "422",
+                "s" : [ {
+                  "r" : "423",
+                  "value" : [ "{", "4L", ", ", "5L", ", ", "6L", "}" ]
                 } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "378",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
               }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "379",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "c",
-                  "annotation" : [ ]
-                }
+                "r" : "436",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "428",
+                "s" : [ {
+                  "r" : "429",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
+                } ]
               } ]
             } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "IncludedIn",
+          "localId" : "436",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "437",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "438",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "439",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "440",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "422",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "426",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "427",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "423",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "424",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "425",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "428",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "434",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "435",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "429",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "430",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "431",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "432",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "433",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
           } ]
         }
       }, {
-        "localId" : "426",
+        "localId" : "450",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "TuplesNotIncluded",
+        "name" : "TuplesIncluded",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "426",
+            "r" : "450",
             "s" : [ {
-              "value" : [ "", "define ", "TuplesNotIncluded", ": " ]
+              "value" : [ "", "define ", "TuplesIncluded", ": " ]
             }, {
-              "r" : "486",
+              "r" : "510",
               "s" : [ {
-                "r" : "427",
+                "r" : "451",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "428",
+                  "r" : "452",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "429",
+                      "r" : "453",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -22085,7 +24855,7 @@ module.exports['IncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "430",
+                      "r" : "454",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -22096,13 +24866,13 @@ module.exports['IncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "437",
+                  "r" : "461",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "438",
-                      "value" : [ "a", ":", "3" ]
+                      "r" : "462",
+                      "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
@@ -22110,7 +24880,7 @@ module.exports['IncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "439",
+                      "r" : "463",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -22122,19 +24892,19 @@ module.exports['IncludedIn'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "486",
+                "r" : "510",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "452",
+                "r" : "476",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "453",
+                  "r" : "477",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "454",
+                      "r" : "478",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -22143,7 +24913,7 @@ module.exports['IncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "455",
+                      "r" : "479",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -22154,12 +24924,12 @@ module.exports['IncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "462",
+                  "r" : "486",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "463",
+                      "r" : "487",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -22168,7 +24938,7 @@ module.exports['IncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "464",
+                      "r" : "488",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -22179,12 +24949,12 @@ module.exports['IncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "471",
+                  "r" : "495",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "472",
+                      "r" : "496",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -22193,7 +24963,7 @@ module.exports['IncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "473",
+                      "r" : "497",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -22210,34 +24980,34 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "IncludedIn",
-          "localId" : "486",
+          "localId" : "510",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "487",
+            "localId" : "511",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "488",
+              "localId" : "512",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "489",
+                "localId" : "513",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "490",
+                  "localId" : "514",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "491",
+                "localId" : "515",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "492",
+                  "localId" : "516",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -22245,29 +25015,29 @@ module.exports['IncludedIn'] = {
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "493",
+            "localId" : "517",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "494",
+              "localId" : "518",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "495",
+                "localId" : "519",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "496",
+                  "localId" : "520",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "497",
+                "localId" : "521",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "498",
+                  "localId" : "522",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -22276,33 +25046,33 @@ module.exports['IncludedIn'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "427",
+            "localId" : "451",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "446",
+              "localId" : "470",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "447",
+                "localId" : "471",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "448",
+                  "localId" : "472",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "449",
+                    "localId" : "473",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "450",
+                  "localId" : "474",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "451",
+                    "localId" : "475",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -22311,29 +25081,29 @@ module.exports['IncludedIn'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "428",
+              "localId" : "452",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "432",
+                "localId" : "456",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "433",
+                  "localId" : "457",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "434",
+                    "localId" : "458",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "435",
+                  "localId" : "459",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "436",
+                    "localId" : "460",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -22343,7 +25113,7 @@ module.exports['IncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "429",
+                  "localId" : "453",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -22353,7 +25123,7 @@ module.exports['IncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "430",
+                  "localId" : "454",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -22362,29 +25132,29 @@ module.exports['IncludedIn'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "437",
+              "localId" : "461",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "441",
+                "localId" : "465",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "442",
+                  "localId" : "466",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "443",
+                    "localId" : "467",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "444",
+                  "localId" : "468",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "445",
+                    "localId" : "469",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -22394,17 +25164,17 @@ module.exports['IncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "438",
+                  "localId" : "462",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "2",
                   "annotation" : [ ]
                 }
               }, {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "439",
+                  "localId" : "463",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -22414,33 +25184,33 @@ module.exports['IncludedIn'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "452",
+            "localId" : "476",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "480",
+              "localId" : "504",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "481",
+                "localId" : "505",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "482",
+                  "localId" : "506",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "483",
+                    "localId" : "507",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "484",
+                  "localId" : "508",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "485",
+                    "localId" : "509",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -22449,29 +25219,29 @@ module.exports['IncludedIn'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "453",
+              "localId" : "477",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "457",
+                "localId" : "481",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "458",
+                  "localId" : "482",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "459",
+                    "localId" : "483",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "460",
+                  "localId" : "484",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "461",
+                    "localId" : "485",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -22481,7 +25251,7 @@ module.exports['IncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "454",
+                  "localId" : "478",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -22491,7 +25261,7 @@ module.exports['IncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "455",
+                  "localId" : "479",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -22500,29 +25270,29 @@ module.exports['IncludedIn'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "462",
+              "localId" : "486",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "466",
+                "localId" : "490",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "467",
+                  "localId" : "491",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "468",
+                    "localId" : "492",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "469",
+                  "localId" : "493",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "470",
+                    "localId" : "494",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -22532,7 +25302,7 @@ module.exports['IncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "463",
+                  "localId" : "487",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -22542,7 +25312,7 @@ module.exports['IncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "464",
+                  "localId" : "488",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -22551,29 +25321,29 @@ module.exports['IncludedIn'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "471",
+              "localId" : "495",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "475",
+                "localId" : "499",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "476",
+                  "localId" : "500",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "477",
+                    "localId" : "501",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "478",
+                  "localId" : "502",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "479",
+                    "localId" : "503",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -22583,7 +25353,7 @@ module.exports['IncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "472",
+                  "localId" : "496",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -22593,7 +25363,7 @@ module.exports['IncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "473",
+                  "localId" : "497",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -22604,251 +25374,803 @@ module.exports['IncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "520",
+        "localId" : "544",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullIncludes",
+        "name" : "TuplesNotIncluded",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "520",
+            "r" : "544",
             "s" : [ {
-              "value" : [ "", "define ", "NullIncludes", ": " ]
+              "value" : [ "", "define ", "TuplesNotIncluded", ": " ]
             }, {
-              "r" : "538",
+              "r" : "604",
               "s" : [ {
-                "r" : "521",
+                "r" : "545",
                 "s" : [ {
-                  "r" : "522",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "546",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "547",
+                      "value" : [ "a", ":", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "548",
+                      "s" : [ {
+                        "value" : [ "'d'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "555",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "556",
+                      "value" : [ "a", ":", "3" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "557",
+                      "s" : [ {
+                        "value" : [ "'c'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "538",
-                "value" : [ " ", "included in", " ", "null" ]
+                "r" : "604",
+                "value" : [ " ", "included in", " " ]
+              }, {
+                "r" : "570",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "571",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "572",
+                      "value" : [ "a", ":", "1" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "573",
+                      "s" : [ {
+                        "value" : [ "'d'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "580",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "581",
+                      "value" : [ "a", ":", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "582",
+                      "s" : [ {
+                        "value" : [ "'d'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "589",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "590",
+                      "value" : [ "a", ":", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "591",
+                      "s" : [ {
+                        "value" : [ "'c'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "In",
-          "localId" : "538",
+          "type" : "IncludedIn",
+          "localId" : "604",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "543",
+            "localId" : "605",
             "annotation" : [ ],
             "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "544",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
+              "type" : "TupleTypeSpecifier",
+              "localId" : "606",
+              "annotation" : [ ],
+              "element" : [ {
+                "localId" : "607",
+                "name" : "a",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "608",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }, {
+                "localId" : "609",
+                "name" : "b",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "610",
+                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "annotation" : [ ]
+                }
+              } ]
             }
           }, {
-            "type" : "IntervalTypeSpecifier",
-            "localId" : "545",
+            "type" : "ListTypeSpecifier",
+            "localId" : "611",
             "annotation" : [ ],
-            "pointType" : {
-              "type" : "ListTypeSpecifier",
-              "localId" : "546",
+            "elementType" : {
+              "type" : "TupleTypeSpecifier",
+              "localId" : "612",
               "annotation" : [ ],
-              "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "547",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
-              }
+              "element" : [ {
+                "localId" : "613",
+                "name" : "a",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "614",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }, {
+                "localId" : "615",
+                "name" : "b",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "616",
+                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "annotation" : [ ]
+                }
+              } ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "521",
+            "localId" : "545",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "527",
+              "localId" : "564",
               "annotation" : [ ],
               "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "528",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "type" : "TupleTypeSpecifier",
+                "localId" : "565",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "566",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "567",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "568",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "569",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
               }
             },
             "element" : [ {
-              "type" : "Literal",
-              "localId" : "522",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "523",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "524",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "3",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "525",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "4",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "526",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "5",
-              "annotation" : [ ]
-            } ]
-          }, {
-            "type" : "As",
-            "localId" : "539",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "529",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
-              "type" : "IntervalTypeSpecifier",
-              "localId" : "540",
+              "type" : "Tuple",
+              "localId" : "546",
               "annotation" : [ ],
-              "pointType" : {
-                "type" : "ListTypeSpecifier",
-                "localId" : "541",
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "550",
                 "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "542",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "element" : [ {
+                  "localId" : "551",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "552",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "553",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "554",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "547",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
                   "annotation" : [ ]
                 }
-              }
-            }
-          } ]
-        }
-      }, {
-        "localId" : "550",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullIncluded",
-        "context" : "Patient",
-        "accessLevel" : "Public",
-        "annotation" : [ {
-          "type" : "Annotation",
-          "t" : [ ],
-          "s" : {
-            "r" : "550",
-            "s" : [ {
-              "value" : [ "", "define ", "NullIncluded", ": " ]
-            }, {
-              "r" : "568",
-              "s" : [ {
-                "r" : "551",
-                "value" : [ "null", " ", "included in", " " ]
               }, {
-                "r" : "552",
-                "s" : [ {
-                  "r" : "553",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "548",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "d",
+                  "annotation" : [ ]
+                }
+              } ]
+            }, {
+              "type" : "Tuple",
+              "localId" : "555",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "559",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "560",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "561",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "562",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "563",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
                 } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "556",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "557",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "c",
+                  "annotation" : [ ]
+                }
               } ]
             } ]
-          }
-        } ],
-        "expression" : {
-          "type" : "In",
-          "localId" : "568",
-          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-          "annotation" : [ ],
-          "signature" : [ {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "570",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
-          }, {
-            "type" : "ListTypeSpecifier",
-            "localId" : "571",
-            "annotation" : [ ],
-            "elementType" : {
-              "type" : "NamedTypeSpecifier",
-              "localId" : "572",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
-              "annotation" : [ ]
-            }
-          } ],
-          "operand" : [ {
-            "type" : "As",
-            "localId" : "569",
-            "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "551",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            }
           }, {
             "type" : "List",
-            "localId" : "552",
+            "localId" : "570",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "558",
+              "localId" : "598",
               "annotation" : [ ],
               "elementType" : {
-                "type" : "NamedTypeSpecifier",
-                "localId" : "559",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                "annotation" : [ ]
+                "type" : "TupleTypeSpecifier",
+                "localId" : "599",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "600",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "601",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "602",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "603",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              }
+            },
+            "element" : [ {
+              "type" : "Tuple",
+              "localId" : "571",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "575",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "576",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "577",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "578",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "579",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "572",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "573",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "d",
+                  "annotation" : [ ]
+                }
+              } ]
+            }, {
+              "type" : "Tuple",
+              "localId" : "580",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "584",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "585",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "586",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "587",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "588",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "581",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "582",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "d",
+                  "annotation" : [ ]
+                }
+              } ]
+            }, {
+              "type" : "Tuple",
+              "localId" : "589",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "593",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "594",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "595",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "596",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "597",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "590",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "591",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "c",
+                  "annotation" : [ ]
+                }
+              } ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "638",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullIncludes",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "638",
+            "s" : [ {
+              "value" : [ "", "define ", "NullIncludes", ": " ]
+            }, {
+              "r" : "656",
+              "s" : [ {
+                "r" : "639",
+                "s" : [ {
+                  "r" : "640",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                } ]
+              }, {
+                "r" : "656",
+                "value" : [ " ", "included in", " ", "null" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "656",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "661",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "662",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "IntervalTypeSpecifier",
+            "localId" : "663",
+            "annotation" : [ ],
+            "pointType" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "664",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "665",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "639",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "645",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "646",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "553",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "1",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "554",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-              "value" : "2",
-              "annotation" : [ ]
-            }, {
-              "type" : "Literal",
-              "localId" : "555",
+              "localId" : "640",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "641",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "642",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "643",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "644",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "As",
+            "localId" : "657",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "647",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "IntervalTypeSpecifier",
+              "localId" : "658",
+              "annotation" : [ ],
+              "pointType" : {
+                "type" : "ListTypeSpecifier",
+                "localId" : "659",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "660",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }
+            }
+          } ]
+        }
+      }, {
+        "localId" : "668",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullIncluded",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "668",
+            "s" : [ {
+              "value" : [ "", "define ", "NullIncluded", ": " ]
+            }, {
+              "r" : "686",
+              "s" : [ {
+                "r" : "669",
+                "value" : [ "null", " ", "included in", " " ]
+              }, {
+                "r" : "670",
+                "s" : [ {
+                  "r" : "671",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "In",
+          "localId" : "686",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "688",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "689",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "690",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "As",
+            "localId" : "687",
+            "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "669",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "List",
+            "localId" : "670",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "676",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "677",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "671",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "672",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "673",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "556",
+              "localId" : "674",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "557",
+              "localId" : "675",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -22857,7 +26179,7 @@ module.exports['IncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "575",
+        "localId" : "693",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DayIncluded",
         "context" : "Patient",
@@ -22866,44 +26188,44 @@ module.exports['IncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "575",
+            "r" : "693",
             "s" : [ {
               "value" : [ "", "define ", "DayIncluded", ": " ]
             }, {
-              "r" : "633",
+              "r" : "751",
               "s" : [ {
-                "r" : "584",
+                "r" : "702",
                 "s" : [ {
-                  "r" : "576",
+                  "r" : "694",
                   "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ")" ]
                 } ]
               }, {
-                "r" : "633",
+                "r" : "751",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "588",
+                "r" : "706",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "597",
+                  "r" : "715",
                   "s" : [ {
-                    "r" : "589",
+                    "r" : "707",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "609",
+                  "r" : "727",
                   "s" : [ {
-                    "r" : "601",
+                    "r" : "719",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "621",
+                  "r" : "739",
                   "s" : [ {
-                    "r" : "613",
+                    "r" : "731",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "4", ")" ]
                   } ]
                 }, {
@@ -22915,49 +26237,49 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "633",
+          "localId" : "751",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "634",
+            "localId" : "752",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "635",
+            "localId" : "753",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "636",
+              "localId" : "754",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "584",
+            "localId" : "702",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "585",
+              "localId" : "703",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "586",
+              "localId" : "704",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "587",
+              "localId" : "705",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "576",
+              "localId" : "694",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2012",
@@ -22965,7 +26287,7 @@ module.exports['IncludedIn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "577",
+              "localId" : "695",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -22973,7 +26295,7 @@ module.exports['IncludedIn'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "578",
+              "localId" : "696",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -22981,43 +26303,43 @@ module.exports['IncludedIn'] = {
             }
           }, {
             "type" : "List",
-            "localId" : "588",
+            "localId" : "706",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "625",
+              "localId" : "743",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "626",
+                "localId" : "744",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "DateTime",
-              "localId" : "597",
+              "localId" : "715",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "598",
+                "localId" : "716",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "599",
+                "localId" : "717",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "600",
+                "localId" : "718",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "589",
+                "localId" : "707",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -23025,7 +26347,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "590",
+                "localId" : "708",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -23033,7 +26355,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "591",
+                "localId" : "709",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -23041,28 +26363,28 @@ module.exports['IncludedIn'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "609",
+              "localId" : "727",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "610",
+                "localId" : "728",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "611",
+                "localId" : "729",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "612",
+                "localId" : "730",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "601",
+                "localId" : "719",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -23070,7 +26392,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "602",
+                "localId" : "720",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -23078,7 +26400,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "603",
+                "localId" : "721",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -23086,28 +26408,28 @@ module.exports['IncludedIn'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "621",
+              "localId" : "739",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "622",
+                "localId" : "740",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "623",
+                "localId" : "741",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "624",
+                "localId" : "742",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "613",
+                "localId" : "731",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -23115,7 +26437,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "614",
+                "localId" : "732",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -23123,7 +26445,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "615",
+                "localId" : "733",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -23133,7 +26455,7 @@ module.exports['IncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "639",
+        "localId" : "757",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "DayNotIncluded",
         "context" : "Patient",
@@ -23142,44 +26464,44 @@ module.exports['IncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "639",
+            "r" : "757",
             "s" : [ {
               "value" : [ "", "define ", "DayNotIncluded", ": " ]
             }, {
-              "r" : "697",
+              "r" : "815",
               "s" : [ {
-                "r" : "648",
+                "r" : "766",
                 "s" : [ {
-                  "r" : "640",
+                  "r" : "758",
                   "value" : [ "DateTime", "(", "2014", ", ", "3", ", ", "3", ")" ]
                 } ]
               }, {
-                "r" : "697",
+                "r" : "815",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "652",
+                "r" : "770",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "661",
+                  "r" : "779",
                   "s" : [ {
-                    "r" : "653",
+                    "r" : "771",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "2", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "673",
+                  "r" : "791",
                   "s" : [ {
-                    "r" : "665",
+                    "r" : "783",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "3", ")" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "685",
+                  "r" : "803",
                   "s" : [ {
-                    "r" : "677",
+                    "r" : "795",
                     "value" : [ "DateTime", "(", "2012", ", ", "3", ", ", "4", ")" ]
                   } ]
                 }, {
@@ -23191,49 +26513,49 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "697",
+          "localId" : "815",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "698",
+            "localId" : "816",
             "name" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ]
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "699",
+            "localId" : "817",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "700",
+              "localId" : "818",
               "name" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "DateTime",
-            "localId" : "648",
+            "localId" : "766",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "649",
+              "localId" : "767",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "650",
+              "localId" : "768",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }, {
               "type" : "NamedTypeSpecifier",
-              "localId" : "651",
+              "localId" : "769",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             } ],
             "year" : {
               "type" : "Literal",
-              "localId" : "640",
+              "localId" : "758",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2014",
@@ -23241,7 +26563,7 @@ module.exports['IncludedIn'] = {
             },
             "month" : {
               "type" : "Literal",
-              "localId" : "641",
+              "localId" : "759",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -23249,7 +26571,7 @@ module.exports['IncludedIn'] = {
             },
             "day" : {
               "type" : "Literal",
-              "localId" : "642",
+              "localId" : "760",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
@@ -23257,43 +26579,43 @@ module.exports['IncludedIn'] = {
             }
           }, {
             "type" : "List",
-            "localId" : "652",
+            "localId" : "770",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "689",
+              "localId" : "807",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "690",
+                "localId" : "808",
                 "name" : "{urn:hl7-org:elm-types:r1}DateTime",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "DateTime",
-              "localId" : "661",
+              "localId" : "779",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "662",
+                "localId" : "780",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "663",
+                "localId" : "781",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "664",
+                "localId" : "782",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "653",
+                "localId" : "771",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -23301,7 +26623,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "654",
+                "localId" : "772",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -23309,7 +26631,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "655",
+                "localId" : "773",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
@@ -23317,28 +26639,28 @@ module.exports['IncludedIn'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "673",
+              "localId" : "791",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "674",
+                "localId" : "792",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "675",
+                "localId" : "793",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "676",
+                "localId" : "794",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "665",
+                "localId" : "783",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -23346,7 +26668,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "666",
+                "localId" : "784",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -23354,7 +26676,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "667",
+                "localId" : "785",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -23362,28 +26684,28 @@ module.exports['IncludedIn'] = {
               }
             }, {
               "type" : "DateTime",
-              "localId" : "685",
+              "localId" : "803",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "686",
+                "localId" : "804",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "687",
+                "localId" : "805",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }, {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "688",
+                "localId" : "806",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               } ],
               "year" : {
                 "type" : "Literal",
-                "localId" : "677",
+                "localId" : "795",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2012",
@@ -23391,7 +26713,7 @@ module.exports['IncludedIn'] = {
               },
               "month" : {
                 "type" : "Literal",
-                "localId" : "678",
+                "localId" : "796",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -23399,7 +26721,7 @@ module.exports['IncludedIn'] = {
               },
               "day" : {
                 "type" : "Literal",
-                "localId" : "679",
+                "localId" : "797",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
@@ -23409,7 +26731,7 @@ module.exports['IncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "703",
+        "localId" : "821",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IntegerIncluded",
         "context" : "Patient",
@@ -23418,18 +26740,18 @@ module.exports['IncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "703",
+            "r" : "821",
             "s" : [ {
               "value" : [ "", "define ", "IntegerIncluded", ": " ]
             }, {
-              "r" : "719",
+              "r" : "837",
               "s" : [ {
-                "r" : "704",
+                "r" : "822",
                 "value" : [ "3", " ", "included in", " " ]
               }, {
-                "r" : "705",
+                "r" : "823",
                 "s" : [ {
-                  "r" : "706",
+                  "r" : "824",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               } ]
@@ -23438,78 +26760,78 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "719",
+          "localId" : "837",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "720",
+            "localId" : "838",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "721",
+            "localId" : "839",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "722",
+              "localId" : "840",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "704",
+            "localId" : "822",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "3",
             "annotation" : [ ]
           }, {
             "type" : "List",
-            "localId" : "705",
+            "localId" : "823",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "711",
+              "localId" : "829",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "712",
+                "localId" : "830",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "706",
+              "localId" : "824",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "707",
+              "localId" : "825",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "708",
+              "localId" : "826",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "709",
+              "localId" : "827",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "710",
+              "localId" : "828",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -23518,7 +26840,7 @@ module.exports['IncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "725",
+        "localId" : "843",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "IntegerNotIncluded",
         "context" : "Patient",
@@ -23527,18 +26849,18 @@ module.exports['IncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "725",
+            "r" : "843",
             "s" : [ {
               "value" : [ "", "define ", "IntegerNotIncluded", ": " ]
             }, {
-              "r" : "741",
+              "r" : "859",
               "s" : [ {
-                "r" : "726",
+                "r" : "844",
                 "value" : [ "33", " ", "included in", " " ]
               }, {
-                "r" : "727",
+                "r" : "845",
                 "s" : [ {
-                  "r" : "728",
+                  "r" : "846",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               } ]
@@ -23547,78 +26869,78 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "741",
+          "localId" : "859",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "742",
+            "localId" : "860",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "743",
+            "localId" : "861",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "744",
+              "localId" : "862",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "Literal",
-            "localId" : "726",
+            "localId" : "844",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "33",
             "annotation" : [ ]
           }, {
             "type" : "List",
-            "localId" : "727",
+            "localId" : "845",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "733",
+              "localId" : "851",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "734",
+                "localId" : "852",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "728",
+              "localId" : "846",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "729",
+              "localId" : "847",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "730",
+              "localId" : "848",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "731",
+              "localId" : "849",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "732",
+              "localId" : "850",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -23627,7 +26949,7 @@ module.exports['IncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "747",
+        "localId" : "865",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "QuantityInList",
         "context" : "Patient",
@@ -23636,17 +26958,17 @@ module.exports['IncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "747",
+            "r" : "865",
             "s" : [ {
               "value" : [ "", "define ", "QuantityInList", ": " ]
             }, {
-              "r" : "792",
+              "r" : "910",
               "s" : [ {
-                "r" : "753",
+                "r" : "871",
                 "s" : [ {
                   "value" : [ "ToQuantity", "(" ]
                 }, {
-                  "r" : "748",
+                  "r" : "866",
                   "s" : [ {
                     "value" : [ "'1 \\'m\\''" ]
                   } ]
@@ -23654,18 +26976,18 @@ module.exports['IncludedIn'] = {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "792",
+                "r" : "910",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "755",
+                "r" : "873",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "761",
+                  "r" : "879",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "756",
+                    "r" : "874",
                     "s" : [ {
                       "value" : [ "'1 \\'m\\''" ]
                     } ]
@@ -23675,11 +26997,11 @@ module.exports['IncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "768",
+                  "r" : "886",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "763",
+                    "r" : "881",
                     "s" : [ {
                       "value" : [ "'1.995 \\'m\\''" ]
                     } ]
@@ -23689,11 +27011,11 @@ module.exports['IncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "775",
+                  "r" : "893",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "770",
+                    "r" : "888",
                     "s" : [ {
                       "value" : [ "'2 \\'m\\''" ]
                     } ]
@@ -23703,11 +27025,11 @@ module.exports['IncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "782",
+                  "r" : "900",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "777",
+                    "r" : "895",
                     "s" : [ {
                       "value" : [ "'3 \\'m\\''" ]
                     } ]
@@ -23723,39 +27045,39 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "792",
+          "localId" : "910",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "793",
+            "localId" : "911",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "794",
+            "localId" : "912",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "795",
+              "localId" : "913",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ToQuantity",
-            "localId" : "753",
+            "localId" : "871",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "754",
+              "localId" : "872",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "748",
+              "localId" : "866",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "1 'm'",
@@ -23763,33 +27085,33 @@ module.exports['IncludedIn'] = {
             }
           }, {
             "type" : "List",
-            "localId" : "755",
+            "localId" : "873",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "784",
+              "localId" : "902",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "785",
+                "localId" : "903",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "ToQuantity",
-              "localId" : "761",
+              "localId" : "879",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "762",
+                "localId" : "880",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "756",
+                "localId" : "874",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "1 'm'",
@@ -23797,18 +27119,18 @@ module.exports['IncludedIn'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "768",
+              "localId" : "886",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "769",
+                "localId" : "887",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "763",
+                "localId" : "881",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "1.995 'm'",
@@ -23816,18 +27138,18 @@ module.exports['IncludedIn'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "775",
+              "localId" : "893",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "776",
+                "localId" : "894",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "770",
+                "localId" : "888",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "2 'm'",
@@ -23835,18 +27157,18 @@ module.exports['IncludedIn'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "782",
+              "localId" : "900",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "783",
+                "localId" : "901",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "777",
+                "localId" : "895",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "3 'm'",
@@ -23856,7 +27178,7 @@ module.exports['IncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "798",
+        "localId" : "916",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "QuantityNotInList",
         "context" : "Patient",
@@ -23865,17 +27187,17 @@ module.exports['IncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "798",
+            "r" : "916",
             "s" : [ {
               "value" : [ "", "define ", "QuantityNotInList", ": " ]
             }, {
-              "r" : "843",
+              "r" : "961",
               "s" : [ {
-                "r" : "804",
+                "r" : "922",
                 "s" : [ {
                   "value" : [ "ToQuantity", "(" ]
                 }, {
-                  "r" : "799",
+                  "r" : "917",
                   "s" : [ {
                     "value" : [ "'100 \\'m\\''" ]
                   } ]
@@ -23883,18 +27205,18 @@ module.exports['IncludedIn'] = {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "843",
+                "r" : "961",
                 "value" : [ " ", "included in", " " ]
               }, {
-                "r" : "806",
+                "r" : "924",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "812",
+                  "r" : "930",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "807",
+                    "r" : "925",
                     "s" : [ {
                       "value" : [ "'1 \\'m\\''" ]
                     } ]
@@ -23904,11 +27226,11 @@ module.exports['IncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "819",
+                  "r" : "937",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "814",
+                    "r" : "932",
                     "s" : [ {
                       "value" : [ "'1.995 \\'m\\''" ]
                     } ]
@@ -23918,11 +27240,11 @@ module.exports['IncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "826",
+                  "r" : "944",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "821",
+                    "r" : "939",
                     "s" : [ {
                       "value" : [ "'2 \\'m\\''" ]
                     } ]
@@ -23932,11 +27254,11 @@ module.exports['IncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "833",
+                  "r" : "951",
                   "s" : [ {
                     "value" : [ "ToQuantity", "(" ]
                   }, {
-                    "r" : "828",
+                    "r" : "946",
                     "s" : [ {
                       "value" : [ "'3 \\'m\\''" ]
                     } ]
@@ -23952,39 +27274,39 @@ module.exports['IncludedIn'] = {
         } ],
         "expression" : {
           "type" : "In",
-          "localId" : "843",
+          "localId" : "961",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "NamedTypeSpecifier",
-            "localId" : "844",
+            "localId" : "962",
             "name" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ]
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "845",
+            "localId" : "963",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "846",
+              "localId" : "964",
               "name" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "ToQuantity",
-            "localId" : "804",
+            "localId" : "922",
             "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
             "annotation" : [ ],
             "signature" : [ {
               "type" : "NamedTypeSpecifier",
-              "localId" : "805",
+              "localId" : "923",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             } ],
             "operand" : {
               "type" : "Literal",
-              "localId" : "799",
+              "localId" : "917",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "100 'm'",
@@ -23992,33 +27314,33 @@ module.exports['IncludedIn'] = {
             }
           }, {
             "type" : "List",
-            "localId" : "806",
+            "localId" : "924",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "835",
+              "localId" : "953",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "836",
+                "localId" : "954",
                 "name" : "{urn:hl7-org:elm-types:r1}Quantity",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "ToQuantity",
-              "localId" : "812",
+              "localId" : "930",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "813",
+                "localId" : "931",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "807",
+                "localId" : "925",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "1 'm'",
@@ -24026,18 +27348,18 @@ module.exports['IncludedIn'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "819",
+              "localId" : "937",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "820",
+                "localId" : "938",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "814",
+                "localId" : "932",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "1.995 'm'",
@@ -24045,18 +27367,18 @@ module.exports['IncludedIn'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "826",
+              "localId" : "944",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "827",
+                "localId" : "945",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "821",
+                "localId" : "939",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "2 'm'",
@@ -24064,18 +27386,18 @@ module.exports['IncludedIn'] = {
               }
             }, {
               "type" : "ToQuantity",
-              "localId" : "833",
+              "localId" : "951",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Quantity",
               "annotation" : [ ],
               "signature" : [ {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "834",
+                "localId" : "952",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               } ],
               "operand" : {
                 "type" : "Literal",
-                "localId" : "828",
+                "localId" : "946",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "3 'm'",
@@ -24097,6 +27419,10 @@ define IsIncluded: {1, 2, 3, 4, 5} properly includes {2, 3, 4, 5}
 define IsIncludedReversed: {1, 2, 3, 4, 5} properly includes {5, 4, 3, 2}
 define IsSame: {1, 2, 3, 4, 5} properly includes {1, 2, 3, 4, 5}
 define IsNotIncluded: {1, 2, 3, 4, 5} properly includes {3, 4, 5, 6}
+define IsIncludedLong: {1L, 2L, 3L, 4L, 5L} properly includes {2L, 3L, 4L}
+define IsIncludedReversedLong: {1L, 2L, 3L, 4L, 5L} properly includes {4L, 3L, 2L}
+define IsSameLong: {1L, 2L, 3L, 4L, 5L} properly includes {1L, 2L, 3L, 4L, 5L}
+define IsNotIncludedLong: {1L, 2L, 3L, 4L, 5L} properly includes {4L, 5L, 6L}
 define TuplesIncluded: {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} properly includes {Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
 define TuplesNotIncluded: {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} properly includes {Tuple{a:2, b:'d'}, Tuple{a:3, b:'c'}}
 define NullIncluded: {1, 2, 3, 4, 5} properly includes null
@@ -24160,9 +27486,9 @@ module.exports['ProperIncludes'] = {
       "libraryId" : "TestSnippet",
       "libraryVersion" : "1",
       "startLine" : 8,
-      "startChar" : 100,
+      "startChar" : 63,
       "endLine" : 8,
-      "endChar" : 137,
+      "endChar" : 74,
       "message" : "List-valued expression was demoted to a singleton.",
       "errorType" : "semantic",
       "errorSeverity" : "warning"
@@ -24171,8 +27497,52 @@ module.exports['ProperIncludes'] = {
       "libraryId" : "TestSnippet",
       "libraryVersion" : "1",
       "startLine" : 9,
-      "startChar" : 103,
+      "startChar" : 71,
       "endLine" : 9,
+      "endChar" : 82,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 10,
+      "startChar" : 59,
+      "endLine" : 10,
+      "endChar" : 78,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 11,
+      "startChar" : 66,
+      "endLine" : 11,
+      "endChar" : 77,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 12,
+      "startChar" : 100,
+      "endLine" : 12,
+      "endChar" : 137,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 13,
+      "startChar" : 103,
+      "endLine" : 13,
       "endChar" : 140,
       "message" : "List-valued expression was demoted to a singleton.",
       "errorType" : "semantic",
@@ -24181,7 +27551,7 @@ module.exports['ProperIncludes'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "548",
+        "r" : "666",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -24891,7 +28261,7 @@ module.exports['ProperIncludes'] = {
       }, {
         "localId" : "335",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "TuplesIncluded",
+        "name" : "IsIncludedLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -24900,146 +28270,23 @@ module.exports['ProperIncludes'] = {
           "s" : {
             "r" : "335",
             "s" : [ {
-              "value" : [ "", "define ", "TuplesIncluded", ": " ]
+              "value" : [ "", "define ", "IsIncludedLong", ": " ]
             }, {
-              "r" : "395",
+              "r" : "350",
               "s" : [ {
                 "r" : "336",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
                   "r" : "337",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "338",
-                      "value" : [ "a", ":", "1" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "339",
-                      "s" : [ {
-                        "value" : [ "'d'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "346",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "347",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "348",
-                      "s" : [ {
-                        "value" : [ "'d'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "355",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "356",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "357",
-                      "s" : [ {
-                        "value" : [ "'c'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
               }, {
-                "r" : "395",
+                "r" : "350",
                 "value" : [ " ", "properly includes", " " ]
               }, {
-                "r" : "370",
+                "r" : "344",
                 "s" : [ {
-                  "value" : [ "{" ]
-                }, {
-                  "r" : "371",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "372",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "373",
-                      "s" : [ {
-                        "value" : [ "'d'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ ", " ]
-                }, {
-                  "r" : "380",
-                  "s" : [ {
-                    "value" : [ "Tuple{" ]
-                  }, {
-                    "s" : [ {
-                      "r" : "381",
-                      "value" : [ "a", ":", "2" ]
-                    } ]
-                  }, {
-                    "value" : [ ", " ]
-                  }, {
-                    "s" : [ {
-                      "value" : [ "b", ":" ]
-                    }, {
-                      "r" : "382",
-                      "s" : [ {
-                        "value" : [ "'c'" ]
-                      } ]
-                    } ]
-                  }, {
-                    "value" : [ "}" ]
-                  } ]
-                }, {
-                  "value" : [ "}" ]
+                  "r" : "345",
+                  "value" : [ "{", "2L", ", ", "3L", ", ", "4L", "}" ]
                 } ]
               } ]
             } ]
@@ -25047,68 +28294,28 @@ module.exports['ProperIncludes'] = {
         } ],
         "expression" : {
           "type" : "ProperIncludes",
-          "localId" : "395",
+          "localId" : "350",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "396",
+            "localId" : "351",
             "annotation" : [ ],
             "elementType" : {
-              "type" : "TupleTypeSpecifier",
-              "localId" : "397",
-              "annotation" : [ ],
-              "element" : [ {
-                "localId" : "398",
-                "name" : "a",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "399",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              }, {
-                "localId" : "400",
-                "name" : "b",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "401",
-                  "name" : "{urn:hl7-org:elm-types:r1}String",
-                  "annotation" : [ ]
-                }
-              } ]
+              "type" : "NamedTypeSpecifier",
+              "localId" : "352",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "402",
+            "localId" : "353",
             "annotation" : [ ],
             "elementType" : {
-              "type" : "TupleTypeSpecifier",
-              "localId" : "403",
-              "annotation" : [ ],
-              "element" : [ {
-                "localId" : "404",
-                "name" : "a",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "405",
-                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "annotation" : [ ]
-                }
-              }, {
-                "localId" : "406",
-                "name" : "b",
-                "annotation" : [ ],
-                "elementType" : {
-                  "type" : "NamedTypeSpecifier",
-                  "localId" : "407",
-                  "name" : "{urn:hl7-org:elm-types:r1}String",
-                  "annotation" : [ ]
-                }
-              } ]
+              "type" : "NamedTypeSpecifier",
+              "localId" : "354",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
             }
           } ],
           "operand" : [ {
@@ -25117,355 +28324,580 @@ module.exports['ProperIncludes'] = {
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "364",
+              "localId" : "342",
               "annotation" : [ ],
               "elementType" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "365",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "366",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "367",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "368",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "369",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "343",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Tuple",
+              "type" : "Literal",
               "localId" : "337",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "338",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "339",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "340",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "344",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "348",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "341",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "342",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "343",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "344",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "345",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "338",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "1",
-                  "annotation" : [ ]
-                }
-              }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "339",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "d",
-                  "annotation" : [ ]
-                }
-              } ]
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "349",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "345",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
             }, {
-              "type" : "Tuple",
+              "type" : "Literal",
               "localId" : "346",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "350",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "351",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "352",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "353",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "354",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "347",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
-              }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "348",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "d",
-                  "annotation" : [ ]
-                }
-              } ]
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
             }, {
-              "type" : "Tuple",
-              "localId" : "355",
-              "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "359",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "360",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "361",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "362",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "363",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
+              "type" : "Literal",
+              "localId" : "347",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "364",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsIncludedReversedLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "364",
+            "s" : [ {
+              "value" : [ "", "define ", "IsIncludedReversedLong", ": " ]
+            }, {
+              "r" : "379",
+              "s" : [ {
+                "r" : "365",
+                "s" : [ {
+                  "r" : "366",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "356",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
               }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "357",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "c",
-                  "annotation" : [ ]
-                }
+                "r" : "379",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "373",
+                "s" : [ {
+                  "r" : "374",
+                  "value" : [ "{", "4L", ", ", "3L", ", ", "2L", "}" ]
+                } ]
               } ]
             } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "379",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "380",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "381",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
           }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "382",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "383",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
             "type" : "List",
-            "localId" : "370",
+            "localId" : "365",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "389",
+              "localId" : "371",
               "annotation" : [ ],
               "elementType" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "390",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "391",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "392",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "393",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "394",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
-                } ]
+                "type" : "NamedTypeSpecifier",
+                "localId" : "372",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
               }
             },
             "element" : [ {
-              "type" : "Tuple",
-              "localId" : "371",
+              "type" : "Literal",
+              "localId" : "366",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "367",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "368",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "369",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "370",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "373",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "377",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "375",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "376",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "377",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "378",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "379",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "378",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "374",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "375",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "376",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "393",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsSameLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "393",
+            "s" : [ {
+              "value" : [ "", "define ", "IsSameLong", ": " ]
+            }, {
+              "r" : "410",
+              "s" : [ {
+                "r" : "394",
+                "s" : [ {
+                  "r" : "395",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "372",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
               }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "373",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "d",
-                  "annotation" : [ ]
-                }
+                "r" : "410",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "402",
+                "s" : [ {
+                  "r" : "403",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
+                } ]
               } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "410",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "411",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "412",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "413",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "414",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "394",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "400",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "401",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
             }, {
-              "type" : "Tuple",
-              "localId" : "380",
+              "type" : "Literal",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "397",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "398",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "399",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "402",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "408",
               "annotation" : [ ],
-              "resultTypeSpecifier" : {
-                "type" : "TupleTypeSpecifier",
-                "localId" : "384",
-                "annotation" : [ ],
-                "element" : [ {
-                  "localId" : "385",
-                  "name" : "a",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "386",
-                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
-                    "annotation" : [ ]
-                  }
-                }, {
-                  "localId" : "387",
-                  "name" : "b",
-                  "annotation" : [ ],
-                  "elementType" : {
-                    "type" : "NamedTypeSpecifier",
-                    "localId" : "388",
-                    "name" : "{urn:hl7-org:elm-types:r1}String",
-                    "annotation" : [ ]
-                  }
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "409",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "405",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "406",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "407",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "424",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsNotIncludedLong",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "424",
+            "s" : [ {
+              "value" : [ "", "define ", "IsNotIncludedLong", ": " ]
+            }, {
+              "r" : "439",
+              "s" : [ {
+                "r" : "425",
+                "s" : [ {
+                  "r" : "426",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
-              },
-              "element" : [ {
-                "name" : "a",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "381",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "2",
-                  "annotation" : [ ]
-                }
               }, {
-                "name" : "b",
-                "value" : {
-                  "type" : "Literal",
-                  "localId" : "382",
-                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
-                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
-                  "value" : "c",
-                  "annotation" : [ ]
-                }
+                "r" : "439",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "433",
+                "s" : [ {
+                  "r" : "434",
+                  "value" : [ "{", "4L", ", ", "5L", ", ", "6L", "}" ]
+                } ]
               } ]
             } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "439",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "440",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "441",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "442",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "443",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "425",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "431",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "432",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "426",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "427",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "428",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "429",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "430",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "433",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "437",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "438",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "434",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "435",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "436",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
+            } ]
           } ]
         }
       }, {
-        "localId" : "429",
+        "localId" : "453",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "TuplesNotIncluded",
+        "name" : "TuplesIncluded",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "429",
+            "r" : "453",
             "s" : [ {
-              "value" : [ "", "define ", "TuplesNotIncluded", ": " ]
+              "value" : [ "", "define ", "TuplesIncluded", ": " ]
             }, {
-              "r" : "489",
+              "r" : "513",
               "s" : [ {
-                "r" : "430",
+                "r" : "454",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "431",
+                  "r" : "455",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "432",
+                      "r" : "456",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -25474,7 +28906,7 @@ module.exports['ProperIncludes'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "433",
+                      "r" : "457",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -25485,12 +28917,12 @@ module.exports['ProperIncludes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "440",
+                  "r" : "464",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "441",
+                      "r" : "465",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -25499,7 +28931,7 @@ module.exports['ProperIncludes'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "442",
+                      "r" : "466",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -25510,12 +28942,12 @@ module.exports['ProperIncludes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "449",
+                  "r" : "473",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "450",
+                      "r" : "474",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -25524,7 +28956,7 @@ module.exports['ProperIncludes'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "451",
+                      "r" : "475",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -25536,19 +28968,19 @@ module.exports['ProperIncludes'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "489",
+                "r" : "513",
                 "value" : [ " ", "properly includes", " " ]
               }, {
-                "r" : "464",
+                "r" : "488",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "465",
+                  "r" : "489",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "466",
+                      "r" : "490",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -25557,7 +28989,7 @@ module.exports['ProperIncludes'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "467",
+                      "r" : "491",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -25568,13 +29000,13 @@ module.exports['ProperIncludes'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "474",
+                  "r" : "498",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "475",
-                      "value" : [ "a", ":", "3" ]
+                      "r" : "499",
+                      "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
@@ -25582,7 +29014,7 @@ module.exports['ProperIncludes'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "476",
+                      "r" : "500",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -25599,34 +29031,34 @@ module.exports['ProperIncludes'] = {
         } ],
         "expression" : {
           "type" : "ProperIncludes",
-          "localId" : "489",
+          "localId" : "513",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "490",
+            "localId" : "514",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "491",
+              "localId" : "515",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "492",
+                "localId" : "516",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "493",
+                  "localId" : "517",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "494",
+                "localId" : "518",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "495",
+                  "localId" : "519",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -25634,29 +29066,29 @@ module.exports['ProperIncludes'] = {
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "496",
+            "localId" : "520",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "497",
+              "localId" : "521",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "498",
+                "localId" : "522",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "499",
+                  "localId" : "523",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "500",
+                "localId" : "524",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "501",
+                  "localId" : "525",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -25665,33 +29097,33 @@ module.exports['ProperIncludes'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "430",
+            "localId" : "454",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "458",
+              "localId" : "482",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "459",
+                "localId" : "483",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "460",
+                  "localId" : "484",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "461",
+                    "localId" : "485",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "462",
+                  "localId" : "486",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "463",
+                    "localId" : "487",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -25700,29 +29132,29 @@ module.exports['ProperIncludes'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "431",
+              "localId" : "455",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "435",
+                "localId" : "459",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "436",
+                  "localId" : "460",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "437",
+                    "localId" : "461",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "438",
+                  "localId" : "462",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "439",
+                    "localId" : "463",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -25732,7 +29164,7 @@ module.exports['ProperIncludes'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "432",
+                  "localId" : "456",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -25742,7 +29174,7 @@ module.exports['ProperIncludes'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "433",
+                  "localId" : "457",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -25751,29 +29183,29 @@ module.exports['ProperIncludes'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "440",
+              "localId" : "464",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "444",
+                "localId" : "468",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "445",
+                  "localId" : "469",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "446",
+                    "localId" : "470",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "447",
+                  "localId" : "471",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "448",
+                    "localId" : "472",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -25783,7 +29215,7 @@ module.exports['ProperIncludes'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "441",
+                  "localId" : "465",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -25793,7 +29225,7 @@ module.exports['ProperIncludes'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "442",
+                  "localId" : "466",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -25802,29 +29234,29 @@ module.exports['ProperIncludes'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "449",
+              "localId" : "473",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "453",
+                "localId" : "477",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "454",
+                  "localId" : "478",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "455",
+                    "localId" : "479",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "456",
+                  "localId" : "480",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "457",
+                    "localId" : "481",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -25834,7 +29266,7 @@ module.exports['ProperIncludes'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "450",
+                  "localId" : "474",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -25844,7 +29276,7 @@ module.exports['ProperIncludes'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "451",
+                  "localId" : "475",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -25854,33 +29286,33 @@ module.exports['ProperIncludes'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "464",
+            "localId" : "488",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "483",
+              "localId" : "507",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "484",
+                "localId" : "508",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "485",
+                  "localId" : "509",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "486",
+                    "localId" : "510",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "487",
+                  "localId" : "511",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "488",
+                    "localId" : "512",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -25889,29 +29321,29 @@ module.exports['ProperIncludes'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "465",
+              "localId" : "489",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "469",
+                "localId" : "493",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "470",
+                  "localId" : "494",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "471",
+                    "localId" : "495",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "472",
+                  "localId" : "496",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "473",
+                    "localId" : "497",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -25921,7 +29353,7 @@ module.exports['ProperIncludes'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "466",
+                  "localId" : "490",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -25931,7 +29363,7 @@ module.exports['ProperIncludes'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "467",
+                  "localId" : "491",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -25940,29 +29372,29 @@ module.exports['ProperIncludes'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "474",
+              "localId" : "498",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "478",
+                "localId" : "502",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "479",
+                  "localId" : "503",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "480",
+                    "localId" : "504",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "481",
+                  "localId" : "505",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "482",
+                    "localId" : "506",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -25972,17 +29404,17 @@ module.exports['ProperIncludes'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "475",
+                  "localId" : "499",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
-                  "value" : "3",
+                  "value" : "2",
                   "annotation" : [ ]
                 }
               }, {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "476",
+                  "localId" : "500",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -25993,141 +29425,1367 @@ module.exports['ProperIncludes'] = {
           } ]
         }
       }, {
-        "localId" : "523",
+        "localId" : "547",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "TuplesNotIncluded",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "547",
+            "s" : [ {
+              "value" : [ "", "define ", "TuplesNotIncluded", ": " ]
+            }, {
+              "r" : "607",
+              "s" : [ {
+                "r" : "548",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "549",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "550",
+                      "value" : [ "a", ":", "1" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "551",
+                      "s" : [ {
+                        "value" : [ "'d'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "558",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "559",
+                      "value" : [ "a", ":", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "560",
+                      "s" : [ {
+                        "value" : [ "'d'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "567",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "568",
+                      "value" : [ "a", ":", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "569",
+                      "s" : [ {
+                        "value" : [ "'c'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              }, {
+                "r" : "607",
+                "value" : [ " ", "properly includes", " " ]
+              }, {
+                "r" : "582",
+                "s" : [ {
+                  "value" : [ "{" ]
+                }, {
+                  "r" : "583",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "584",
+                      "value" : [ "a", ":", "2" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "585",
+                      "s" : [ {
+                        "value" : [ "'d'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ ", " ]
+                }, {
+                  "r" : "592",
+                  "s" : [ {
+                    "value" : [ "Tuple{" ]
+                  }, {
+                    "s" : [ {
+                      "r" : "593",
+                      "value" : [ "a", ":", "3" ]
+                    } ]
+                  }, {
+                    "value" : [ ", " ]
+                  }, {
+                    "s" : [ {
+                      "value" : [ "b", ":" ]
+                    }, {
+                      "r" : "594",
+                      "s" : [ {
+                        "value" : [ "'c'" ]
+                      } ]
+                    } ]
+                  }, {
+                    "value" : [ "}" ]
+                  } ]
+                }, {
+                  "value" : [ "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "607",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "608",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "TupleTypeSpecifier",
+              "localId" : "609",
+              "annotation" : [ ],
+              "element" : [ {
+                "localId" : "610",
+                "name" : "a",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "611",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }, {
+                "localId" : "612",
+                "name" : "b",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "613",
+                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "annotation" : [ ]
+                }
+              } ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "614",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "TupleTypeSpecifier",
+              "localId" : "615",
+              "annotation" : [ ],
+              "element" : [ {
+                "localId" : "616",
+                "name" : "a",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "617",
+                  "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "annotation" : [ ]
+                }
+              }, {
+                "localId" : "618",
+                "name" : "b",
+                "annotation" : [ ],
+                "elementType" : {
+                  "type" : "NamedTypeSpecifier",
+                  "localId" : "619",
+                  "name" : "{urn:hl7-org:elm-types:r1}String",
+                  "annotation" : [ ]
+                }
+              } ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "548",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "576",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "577",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "578",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "579",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "580",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "581",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              }
+            },
+            "element" : [ {
+              "type" : "Tuple",
+              "localId" : "549",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "553",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "554",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "555",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "556",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "557",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "550",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "1",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "551",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "d",
+                  "annotation" : [ ]
+                }
+              } ]
+            }, {
+              "type" : "Tuple",
+              "localId" : "558",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "562",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "563",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "564",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "565",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "566",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "559",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "560",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "d",
+                  "annotation" : [ ]
+                }
+              } ]
+            }, {
+              "type" : "Tuple",
+              "localId" : "567",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "571",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "572",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "573",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "574",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "575",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "568",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "569",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "c",
+                  "annotation" : [ ]
+                }
+              } ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "582",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "601",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "602",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "603",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "604",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "605",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "606",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              }
+            },
+            "element" : [ {
+              "type" : "Tuple",
+              "localId" : "583",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "587",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "588",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "589",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "590",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "591",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "584",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "2",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "585",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "d",
+                  "annotation" : [ ]
+                }
+              } ]
+            }, {
+              "type" : "Tuple",
+              "localId" : "592",
+              "annotation" : [ ],
+              "resultTypeSpecifier" : {
+                "type" : "TupleTypeSpecifier",
+                "localId" : "596",
+                "annotation" : [ ],
+                "element" : [ {
+                  "localId" : "597",
+                  "name" : "a",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "598",
+                    "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                    "annotation" : [ ]
+                  }
+                }, {
+                  "localId" : "599",
+                  "name" : "b",
+                  "annotation" : [ ],
+                  "elementType" : {
+                    "type" : "NamedTypeSpecifier",
+                    "localId" : "600",
+                    "name" : "{urn:hl7-org:elm-types:r1}String",
+                    "annotation" : [ ]
+                  }
+                } ]
+              },
+              "element" : [ {
+                "name" : "a",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "593",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+                  "value" : "3",
+                  "annotation" : [ ]
+                }
+              }, {
+                "name" : "b",
+                "value" : {
+                  "type" : "Literal",
+                  "localId" : "594",
+                  "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
+                  "valueType" : "{urn:hl7-org:elm-types:r1}String",
+                  "value" : "c",
+                  "annotation" : [ ]
+                }
+              } ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "641",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullIncluded",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "641",
+            "s" : [ {
+              "value" : [ "", "define ", "NullIncluded", ": " ]
+            }, {
+              "r" : "659",
+              "s" : [ {
+                "r" : "642",
+                "s" : [ {
+                  "r" : "643",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                } ]
+              }, {
+                "r" : "659",
+                "value" : [ " ", "properly includes", " ", "null" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperContains",
+          "localId" : "659",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "661",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "662",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "663",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "642",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "648",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "649",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "643",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "644",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "645",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "646",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "647",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "As",
+            "localId" : "660",
+            "asType" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "650",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            }
+          } ]
+        }
+      }, {
+        "localId" : "666",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "NullIncludes",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "666",
+            "s" : [ {
+              "value" : [ "", "define ", "NullIncludes", ": " ]
+            }, {
+              "r" : "676",
+              "s" : [ {
+                "r" : "667",
+                "value" : [ "null", " ", "properly includes", " " ]
+              }, {
+                "r" : "668",
+                "s" : [ {
+                  "r" : "669",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludes",
+          "localId" : "676",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "680",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "681",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "682",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "683",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "As",
+            "localId" : "677",
+            "annotation" : [ ],
+            "signature" : [ ],
+            "operand" : {
+              "type" : "Null",
+              "localId" : "667",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
+              "annotation" : [ ]
+            },
+            "asTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "678",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "679",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            }
+          }, {
+            "type" : "List",
+            "localId" : "668",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "674",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "675",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "669",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "670",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "671",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "672",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "673",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      } ]
+    }
+  }
+}
+
+/* ProperIncludedIn
+library TestSnippet version '1'
+using Simple version '1.0.0'
+context Patient
+define IsIncluded: {2, 3, 4} properly included in {1, 2, 3, 4, 5}
+define IsIncludedReversed: {4, 3, 2} properly included in {1, 2, 3, 4, 5}
+define IsSame: {1, 2, 3, 4, 5} properly included in {1, 2, 3, 4, 5}
+define IsNotIncluded: {4, 5, 6} properly included in {1, 2, 3, 4, 5}
+define IsIncludedLong: {2L, 3L, 4L} properly included in {1L, 2L, 3L, 4L, 5L}
+define IsIncludedReversedLong: {4L, 3L, 2L} properly included in {1L, 2L, 3L, 4L, 5L}
+define IsSameLong: {1L, 2L, 3L, 4L, 5L} properly included in {1L, 2L, 3L, 4L, 5L}
+define IsNotIncludedLong: {4L, 5L, 6L} properly included in {1L, 2L, 3L, 4L, 5L}
+define TuplesIncluded: {Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} properly included in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
+define TuplesNotIncluded: {Tuple{a:2, b:'d'}, Tuple{a:3, b:'c'}} properly included in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
+define NullIncludes: {1, 2, 3, 4, 5} properly included in null as List<Integer>
+define NullIncluded: (null as List<Integer>) properly included in {1, 2, 3, 4, 5}
+*/
+
+module.exports['ProperIncludedIn'] = {
+  "library" : {
+    "localId" : "0",
+    "annotation" : [ {
+      "type" : "CqlToElmInfo",
+      "translatorVersion" : "4.2.0",
+      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
+      "signatureLevel" : "All"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 4,
+      "startChar" : 20,
+      "endLine" : 4,
+      "endChar" : 28,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 5,
+      "startChar" : 28,
+      "endLine" : 5,
+      "endChar" : 36,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 6,
+      "startChar" : 16,
+      "endLine" : 6,
+      "endChar" : 30,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 7,
+      "startChar" : 23,
+      "endLine" : 7,
+      "endChar" : 31,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 8,
+      "startChar" : 24,
+      "endLine" : 8,
+      "endChar" : 35,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 9,
+      "startChar" : 32,
+      "endLine" : 9,
+      "endChar" : 43,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 10,
+      "startChar" : 20,
+      "endLine" : 10,
+      "endChar" : 39,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 11,
+      "startChar" : 27,
+      "endLine" : 11,
+      "endChar" : 38,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 12,
+      "startChar" : 24,
+      "endLine" : 12,
+      "endChar" : 61,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 13,
+      "startChar" : 27,
+      "endLine" : 13,
+      "endChar" : 64,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 14,
+      "startChar" : 22,
+      "endLine" : 14,
+      "endChar" : 36,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "CqlToElmError",
+      "libraryId" : "TestSnippet",
+      "libraryVersion" : "1",
+      "startLine" : 15,
+      "startChar" : 23,
+      "endLine" : 15,
+      "endChar" : 43,
+      "message" : "List-valued expression was demoted to a singleton.",
+      "errorType" : "semantic",
+      "errorSeverity" : "warning"
+    }, {
+      "type" : "Annotation",
+      "t" : [ ],
+      "s" : {
+        "r" : "669",
+        "s" : [ {
+          "value" : [ "", "library TestSnippet version '1'" ]
+        } ]
+      }
+    } ],
+    "identifier" : {
+      "id" : "TestSnippet",
+      "version" : "1"
+    },
+    "schemaIdentifier" : {
+      "id" : "urn:hl7-org:elm",
+      "version" : "r1"
+    },
+    "usings" : {
+      "def" : [ {
+        "localId" : "1",
+        "localIdentifier" : "System",
+        "uri" : "urn:hl7-org:elm-types:r1",
+        "annotation" : [ ]
+      }, {
+        "localId" : "206",
+        "localIdentifier" : "Simple",
+        "uri" : "https://github.com/cqframework/cql-execution/simple",
+        "version" : "1.0.0",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "206",
+            "s" : [ {
+              "value" : [ "", "using " ]
+            }, {
+              "s" : [ {
+                "value" : [ "Simple" ]
+              } ]
+            }, {
+              "value" : [ " version '1.0.0'" ]
+            } ]
+          }
+        } ]
+      } ]
+    },
+    "contexts" : {
+      "def" : [ {
+        "localId" : "211",
+        "name" : "Patient",
+        "annotation" : [ ]
+      } ]
+    },
+    "statements" : {
+      "def" : [ {
+        "localId" : "209",
+        "name" : "Patient",
+        "context" : "Patient",
+        "annotation" : [ ],
+        "expression" : {
+          "type" : "SingletonFrom",
+          "localId" : "210",
+          "annotation" : [ ],
+          "signature" : [ ],
+          "operand" : {
+            "type" : "Retrieve",
+            "localId" : "208",
+            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+            "annotation" : [ ],
+            "include" : [ ],
+            "codeFilter" : [ ],
+            "dateFilter" : [ ],
+            "otherFilter" : [ ]
+          }
+        }
+      }, {
+        "localId" : "214",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsIncluded",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "214",
+            "s" : [ {
+              "value" : [ "", "define ", "IsIncluded", ": " ]
+            }, {
+              "r" : "229",
+              "s" : [ {
+                "r" : "215",
+                "s" : [ {
+                  "r" : "216",
+                  "value" : [ "{", "2", ", ", "3", ", ", "4", "}" ]
+                } ]
+              }, {
+                "r" : "229",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "221",
+                "s" : [ {
+                  "r" : "222",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "ProperIncludedIn",
+          "localId" : "229",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "230",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "231",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "232",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "233",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "215",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "219",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "220",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "216",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "217",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "218",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "221",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "227",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "228",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "222",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "223",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "224",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "225",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "226",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          } ]
+        }
+      }, {
+        "localId" : "243",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullIncluded",
+        "name" : "IsIncludedReversed",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "523",
+            "r" : "243",
             "s" : [ {
-              "value" : [ "", "define ", "NullIncluded", ": " ]
+              "value" : [ "", "define ", "IsIncludedReversed", ": " ]
             }, {
-              "r" : "541",
+              "r" : "258",
               "s" : [ {
-                "r" : "524",
+                "r" : "244",
                 "s" : [ {
-                  "r" : "525",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "r" : "245",
+                  "value" : [ "{", "4", ", ", "3", ", ", "2", "}" ]
                 } ]
               }, {
-                "r" : "541",
-                "value" : [ " ", "properly includes", " ", "null" ]
+                "r" : "258",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "250",
+                "s" : [ {
+                  "r" : "251",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                } ]
               } ]
             } ]
           }
         } ],
         "expression" : {
-          "type" : "ProperContains",
-          "localId" : "541",
+          "type" : "ProperIncludedIn",
+          "localId" : "258",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "543",
+            "localId" : "259",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "544",
+              "localId" : "260",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
-            "type" : "NamedTypeSpecifier",
-            "localId" : "545",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ]
+            "type" : "ListTypeSpecifier",
+            "localId" : "261",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "262",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "524",
+            "localId" : "244",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "530",
+              "localId" : "248",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "531",
+                "localId" : "249",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "245",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "246",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "247",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "250",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "256",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "257",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "525",
+              "localId" : "251",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "526",
+              "localId" : "252",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "527",
+              "localId" : "253",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "528",
+              "localId" : "254",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "529",
+              "localId" : "255",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
               "annotation" : [ ]
             } ]
-          }, {
-            "type" : "As",
-            "localId" : "542",
-            "asType" : "{urn:hl7-org:elm-types:r1}Integer",
-            "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "532",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            }
           } ]
         }
       }, {
-        "localId" : "548",
+        "localId" : "272",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "NullIncludes",
+        "name" : "IsSame",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "548",
+            "r" : "272",
             "s" : [ {
-              "value" : [ "", "define ", "NullIncludes", ": " ]
+              "value" : [ "", "define ", "IsSame", ": " ]
             }, {
-              "r" : "558",
+              "r" : "289",
               "s" : [ {
-                "r" : "549",
-                "value" : [ "null", " ", "properly includes", " " ]
+                "r" : "273",
+                "s" : [ {
+                  "r" : "274",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                } ]
               }, {
-                "r" : "550",
+                "r" : "289",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "281",
                 "s" : [ {
-                  "r" : "551",
+                  "r" : "282",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               } ]
@@ -26135,99 +30793,128 @@ module.exports['ProperIncludes'] = {
           }
         } ],
         "expression" : {
-          "type" : "ProperIncludes",
-          "localId" : "558",
+          "type" : "ProperIncludedIn",
+          "localId" : "289",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "562",
+            "localId" : "290",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "563",
+              "localId" : "291",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "564",
+            "localId" : "292",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "565",
+              "localId" : "293",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
-            "type" : "As",
-            "localId" : "559",
+            "type" : "List",
+            "localId" : "273",
             "annotation" : [ ],
-            "signature" : [ ],
-            "operand" : {
-              "type" : "Null",
-              "localId" : "549",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
-              "annotation" : [ ]
-            },
-            "asTypeSpecifier" : {
+            "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "560",
+              "localId" : "279",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "561",
+                "localId" : "280",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
-            }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "274",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "275",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "276",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "277",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "278",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
           }, {
             "type" : "List",
-            "localId" : "550",
+            "localId" : "281",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "556",
+              "localId" : "287",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "557",
+                "localId" : "288",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "551",
+              "localId" : "282",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "552",
+              "localId" : "283",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "553",
+              "localId" : "284",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "554",
+              "localId" : "285",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "555",
+              "localId" : "286",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -26235,226 +30922,185 @@ module.exports['ProperIncludes'] = {
             } ]
           } ]
         }
-      } ]
-    }
-  }
-}
-
-/* ProperIncludedIn
-library TestSnippet version '1'
-using Simple version '1.0.0'
-context Patient
-define IsIncluded: {2, 3, 4} properly included in {1, 2, 3, 4, 5}
-define IsIncludedReversed: {4, 3, 2} properly included in {1, 2, 3, 4, 5}
-define IsSame: {1, 2, 3, 4, 5} properly included in {1, 2, 3, 4, 5}
-define IsNotIncluded: {4, 5, 6} properly included in {1, 2, 3, 4, 5}
-define TuplesIncluded: {Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}} properly included in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
-define TuplesNotIncluded: {Tuple{a:2, b:'d'}, Tuple{a:3, b:'c'}} properly included in {Tuple{a:1, b:'d'}, Tuple{a:2, b:'d'}, Tuple{a:2, b:'c'}}
-define NullIncludes: {1, 2, 3, 4, 5} properly included in null as List<Integer>
-define NullIncluded: (null as List<Integer>) properly included in {1, 2, 3, 4, 5}
-*/
-
-module.exports['ProperIncludedIn'] = {
-  "library" : {
-    "localId" : "0",
-    "annotation" : [ {
-      "type" : "CqlToElmInfo",
-      "translatorVersion" : "4.2.0",
-      "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableResultTypes",
-      "signatureLevel" : "All"
-    }, {
-      "type" : "CqlToElmError",
-      "libraryId" : "TestSnippet",
-      "libraryVersion" : "1",
-      "startLine" : 4,
-      "startChar" : 20,
-      "endLine" : 4,
-      "endChar" : 28,
-      "message" : "List-valued expression was demoted to a singleton.",
-      "errorType" : "semantic",
-      "errorSeverity" : "warning"
-    }, {
-      "type" : "CqlToElmError",
-      "libraryId" : "TestSnippet",
-      "libraryVersion" : "1",
-      "startLine" : 5,
-      "startChar" : 28,
-      "endLine" : 5,
-      "endChar" : 36,
-      "message" : "List-valued expression was demoted to a singleton.",
-      "errorType" : "semantic",
-      "errorSeverity" : "warning"
-    }, {
-      "type" : "CqlToElmError",
-      "libraryId" : "TestSnippet",
-      "libraryVersion" : "1",
-      "startLine" : 6,
-      "startChar" : 16,
-      "endLine" : 6,
-      "endChar" : 30,
-      "message" : "List-valued expression was demoted to a singleton.",
-      "errorType" : "semantic",
-      "errorSeverity" : "warning"
-    }, {
-      "type" : "CqlToElmError",
-      "libraryId" : "TestSnippet",
-      "libraryVersion" : "1",
-      "startLine" : 7,
-      "startChar" : 23,
-      "endLine" : 7,
-      "endChar" : 31,
-      "message" : "List-valued expression was demoted to a singleton.",
-      "errorType" : "semantic",
-      "errorSeverity" : "warning"
-    }, {
-      "type" : "CqlToElmError",
-      "libraryId" : "TestSnippet",
-      "libraryVersion" : "1",
-      "startLine" : 8,
-      "startChar" : 24,
-      "endLine" : 8,
-      "endChar" : 61,
-      "message" : "List-valued expression was demoted to a singleton.",
-      "errorType" : "semantic",
-      "errorSeverity" : "warning"
-    }, {
-      "type" : "CqlToElmError",
-      "libraryId" : "TestSnippet",
-      "libraryVersion" : "1",
-      "startLine" : 9,
-      "startChar" : 27,
-      "endLine" : 9,
-      "endChar" : 64,
-      "message" : "List-valued expression was demoted to a singleton.",
-      "errorType" : "semantic",
-      "errorSeverity" : "warning"
-    }, {
-      "type" : "CqlToElmError",
-      "libraryId" : "TestSnippet",
-      "libraryVersion" : "1",
-      "startLine" : 10,
-      "startChar" : 22,
-      "endLine" : 10,
-      "endChar" : 36,
-      "message" : "List-valued expression was demoted to a singleton.",
-      "errorType" : "semantic",
-      "errorSeverity" : "warning"
-    }, {
-      "type" : "CqlToElmError",
-      "libraryId" : "TestSnippet",
-      "libraryVersion" : "1",
-      "startLine" : 11,
-      "startChar" : 23,
-      "endLine" : 11,
-      "endChar" : 43,
-      "message" : "List-valued expression was demoted to a singleton.",
-      "errorType" : "semantic",
-      "errorSeverity" : "warning"
-    }, {
-      "type" : "Annotation",
-      "t" : [ ],
-      "s" : {
-        "r" : "551",
-        "s" : [ {
-          "value" : [ "", "library TestSnippet version '1'" ]
-        } ]
-      }
-    } ],
-    "identifier" : {
-      "id" : "TestSnippet",
-      "version" : "1"
-    },
-    "schemaIdentifier" : {
-      "id" : "urn:hl7-org:elm",
-      "version" : "r1"
-    },
-    "usings" : {
-      "def" : [ {
-        "localId" : "1",
-        "localIdentifier" : "System",
-        "uri" : "urn:hl7-org:elm-types:r1",
-        "annotation" : [ ]
       }, {
-        "localId" : "206",
-        "localIdentifier" : "Simple",
-        "uri" : "https://github.com/cqframework/cql-execution/simple",
-        "version" : "1.0.0",
+        "localId" : "303",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
+        "name" : "IsNotIncluded",
+        "context" : "Patient",
+        "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "206",
+            "r" : "303",
             "s" : [ {
-              "value" : [ "", "using " ]
+              "value" : [ "", "define ", "IsNotIncluded", ": " ]
             }, {
+              "r" : "318",
               "s" : [ {
-                "value" : [ "Simple" ]
+                "r" : "304",
+                "s" : [ {
+                  "r" : "305",
+                  "value" : [ "{", "4", ", ", "5", ", ", "6", "}" ]
+                } ]
+              }, {
+                "r" : "318",
+                "value" : [ " ", "properly included in", " " ]
+              }, {
+                "r" : "310",
+                "s" : [ {
+                  "r" : "311",
+                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                } ]
               } ]
-            }, {
-              "value" : [ " version '1.0.0'" ]
             } ]
           }
-        } ]
-      } ]
-    },
-    "contexts" : {
-      "def" : [ {
-        "localId" : "211",
-        "name" : "Patient",
-        "annotation" : [ ]
-      } ]
-    },
-    "statements" : {
-      "def" : [ {
-        "localId" : "209",
-        "name" : "Patient",
-        "context" : "Patient",
-        "annotation" : [ ],
+        } ],
         "expression" : {
-          "type" : "SingletonFrom",
-          "localId" : "210",
+          "type" : "ProperIncludedIn",
+          "localId" : "318",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
-          "signature" : [ ],
-          "operand" : {
-            "type" : "Retrieve",
-            "localId" : "208",
-            "dataType" : "{https://github.com/cqframework/cql-execution/simple}Patient",
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "319",
             "annotation" : [ ],
-            "include" : [ ],
-            "codeFilter" : [ ],
-            "dateFilter" : [ ],
-            "otherFilter" : [ ]
-          }
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "320",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          }, {
+            "type" : "ListTypeSpecifier",
+            "localId" : "321",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "322",
+              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : [ {
+            "type" : "List",
+            "localId" : "304",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "308",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "309",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "305",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "306",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "307",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "6",
+              "annotation" : [ ]
+            } ]
+          }, {
+            "type" : "List",
+            "localId" : "310",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "316",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "317",
+                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "311",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "312",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "313",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "314",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "315",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "value" : "5",
+              "annotation" : [ ]
+            } ]
+          } ]
         }
       }, {
-        "localId" : "214",
+        "localId" : "332",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsIncluded",
+        "name" : "IsIncludedLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "214",
+            "r" : "332",
             "s" : [ {
-              "value" : [ "", "define ", "IsIncluded", ": " ]
+              "value" : [ "", "define ", "IsIncludedLong", ": " ]
             }, {
-              "r" : "229",
+              "r" : "347",
               "s" : [ {
-                "r" : "215",
+                "r" : "333",
                 "s" : [ {
-                  "r" : "216",
-                  "value" : [ "{", "2", ", ", "3", ", ", "4", "}" ]
+                  "r" : "334",
+                  "value" : [ "{", "2L", ", ", "3L", ", ", "4L", "}" ]
                 } ]
               }, {
-                "r" : "229",
+                "r" : "347",
                 "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "221",
+                "r" : "339",
                 "s" : [ {
-                  "r" : "222",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "r" : "340",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
               } ]
             } ]
@@ -26462,149 +31108,149 @@ module.exports['ProperIncludedIn'] = {
         } ],
         "expression" : {
           "type" : "ProperIncludedIn",
-          "localId" : "229",
+          "localId" : "347",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "230",
+            "localId" : "348",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "231",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "349",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "232",
+            "localId" : "350",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "233",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "351",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "215",
+            "localId" : "333",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "219",
+              "localId" : "337",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "220",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "338",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "216",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "334",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "217",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "335",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "218",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "336",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "221",
+            "localId" : "339",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "227",
+              "localId" : "345",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "228",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "346",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "222",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "340",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "223",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "341",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "224",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "342",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "225",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "343",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "226",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "344",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
-        "localId" : "243",
+        "localId" : "361",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsIncludedReversed",
+        "name" : "IsIncludedReversedLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "243",
+            "r" : "361",
             "s" : [ {
-              "value" : [ "", "define ", "IsIncludedReversed", ": " ]
+              "value" : [ "", "define ", "IsIncludedReversedLong", ": " ]
             }, {
-              "r" : "258",
+              "r" : "376",
               "s" : [ {
-                "r" : "244",
+                "r" : "362",
                 "s" : [ {
-                  "r" : "245",
-                  "value" : [ "{", "4", ", ", "3", ", ", "2", "}" ]
+                  "r" : "363",
+                  "value" : [ "{", "4L", ", ", "3L", ", ", "2L", "}" ]
                 } ]
               }, {
-                "r" : "258",
+                "r" : "376",
                 "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "250",
+                "r" : "368",
                 "s" : [ {
-                  "r" : "251",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "r" : "369",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
               } ]
             } ]
@@ -26612,149 +31258,149 @@ module.exports['ProperIncludedIn'] = {
         } ],
         "expression" : {
           "type" : "ProperIncludedIn",
-          "localId" : "258",
+          "localId" : "376",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "259",
+            "localId" : "377",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "260",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "378",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "261",
+            "localId" : "379",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "262",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "380",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "244",
+            "localId" : "362",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "248",
+              "localId" : "366",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "249",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "367",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "245",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "363",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "246",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "364",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "247",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "365",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "250",
+            "localId" : "368",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "256",
+              "localId" : "374",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "257",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "375",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "251",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "369",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "252",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "370",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "253",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "371",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "254",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "372",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "255",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "373",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
-        "localId" : "272",
+        "localId" : "390",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsSame",
+        "name" : "IsSameLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "272",
+            "r" : "390",
             "s" : [ {
-              "value" : [ "", "define ", "IsSame", ": " ]
+              "value" : [ "", "define ", "IsSameLong", ": " ]
             }, {
-              "r" : "289",
+              "r" : "407",
               "s" : [ {
-                "r" : "273",
+                "r" : "391",
                 "s" : [ {
-                  "r" : "274",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "r" : "392",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
               }, {
-                "r" : "289",
+                "r" : "407",
                 "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "281",
+                "r" : "399",
                 "s" : [ {
-                  "r" : "282",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "r" : "400",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
               } ]
             } ]
@@ -26762,163 +31408,163 @@ module.exports['ProperIncludedIn'] = {
         } ],
         "expression" : {
           "type" : "ProperIncludedIn",
-          "localId" : "289",
+          "localId" : "407",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "290",
+            "localId" : "408",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "291",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "409",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "292",
+            "localId" : "410",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "293",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "411",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "273",
+            "localId" : "391",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "279",
+              "localId" : "397",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "280",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "398",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "274",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "392",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "275",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "393",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "276",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "394",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "277",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "395",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "278",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "396",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "281",
+            "localId" : "399",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "287",
+              "localId" : "405",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "288",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "406",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "282",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "400",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "283",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "401",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "284",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "402",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "285",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "403",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "286",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "404",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
-        "localId" : "303",
+        "localId" : "421",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
-        "name" : "IsNotIncluded",
+        "name" : "IsNotIncludedLong",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "303",
+            "r" : "421",
             "s" : [ {
-              "value" : [ "", "define ", "IsNotIncluded", ": " ]
+              "value" : [ "", "define ", "IsNotIncludedLong", ": " ]
             }, {
-              "r" : "318",
+              "r" : "436",
               "s" : [ {
-                "r" : "304",
+                "r" : "422",
                 "s" : [ {
-                  "r" : "305",
-                  "value" : [ "{", "4", ", ", "5", ", ", "6", "}" ]
+                  "r" : "423",
+                  "value" : [ "{", "4L", ", ", "5L", ", ", "6L", "}" ]
                 } ]
               }, {
-                "r" : "318",
+                "r" : "436",
                 "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "310",
+                "r" : "428",
                 "s" : [ {
-                  "r" : "311",
-                  "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
+                  "r" : "429",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", ", ", "5L", "}" ]
                 } ]
               } ]
             } ]
@@ -26926,122 +31572,122 @@ module.exports['ProperIncludedIn'] = {
         } ],
         "expression" : {
           "type" : "ProperIncludedIn",
-          "localId" : "318",
+          "localId" : "436",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "319",
+            "localId" : "437",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "320",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "438",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "321",
+            "localId" : "439",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "322",
-              "name" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "440",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "304",
+            "localId" : "422",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "308",
+              "localId" : "426",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "309",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "427",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "305",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "423",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "306",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "424",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "307",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "425",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "6",
               "annotation" : [ ]
             } ]
           }, {
             "type" : "List",
-            "localId" : "310",
+            "localId" : "428",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "316",
+              "localId" : "434",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "317",
-                "name" : "{urn:hl7-org:elm-types:r1}Integer",
+                "localId" : "435",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "311",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "429",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "312",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "430",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "313",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "431",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "314",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "432",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "315",
-              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-              "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
+              "localId" : "433",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
               "value" : "5",
               "annotation" : [ ]
             } ]
           } ]
         }
       }, {
-        "localId" : "332",
+        "localId" : "450",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "TuplesIncluded",
         "context" : "Patient",
@@ -27050,22 +31696,22 @@ module.exports['ProperIncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "332",
+            "r" : "450",
             "s" : [ {
               "value" : [ "", "define ", "TuplesIncluded", ": " ]
             }, {
-              "r" : "392",
+              "r" : "510",
               "s" : [ {
-                "r" : "333",
+                "r" : "451",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "334",
+                  "r" : "452",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "335",
+                      "r" : "453",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -27074,7 +31720,7 @@ module.exports['ProperIncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "336",
+                      "r" : "454",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -27085,12 +31731,12 @@ module.exports['ProperIncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "343",
+                  "r" : "461",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "344",
+                      "r" : "462",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -27099,7 +31745,7 @@ module.exports['ProperIncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "345",
+                      "r" : "463",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -27111,19 +31757,19 @@ module.exports['ProperIncludedIn'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "392",
+                "r" : "510",
                 "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "358",
+                "r" : "476",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "359",
+                  "r" : "477",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "360",
+                      "r" : "478",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -27132,7 +31778,7 @@ module.exports['ProperIncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "361",
+                      "r" : "479",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -27143,12 +31789,12 @@ module.exports['ProperIncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "368",
+                  "r" : "486",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "369",
+                      "r" : "487",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -27157,7 +31803,7 @@ module.exports['ProperIncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "370",
+                      "r" : "488",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -27168,12 +31814,12 @@ module.exports['ProperIncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "377",
+                  "r" : "495",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "378",
+                      "r" : "496",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -27182,7 +31828,7 @@ module.exports['ProperIncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "379",
+                      "r" : "497",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -27199,34 +31845,34 @@ module.exports['ProperIncludedIn'] = {
         } ],
         "expression" : {
           "type" : "ProperIncludedIn",
-          "localId" : "392",
+          "localId" : "510",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "393",
+            "localId" : "511",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "394",
+              "localId" : "512",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "395",
+                "localId" : "513",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "396",
+                  "localId" : "514",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "397",
+                "localId" : "515",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "398",
+                  "localId" : "516",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -27234,29 +31880,29 @@ module.exports['ProperIncludedIn'] = {
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "399",
+            "localId" : "517",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "400",
+              "localId" : "518",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "401",
+                "localId" : "519",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "402",
+                  "localId" : "520",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "403",
+                "localId" : "521",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "404",
+                  "localId" : "522",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -27265,33 +31911,33 @@ module.exports['ProperIncludedIn'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "333",
+            "localId" : "451",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "352",
+              "localId" : "470",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "353",
+                "localId" : "471",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "354",
+                  "localId" : "472",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "355",
+                    "localId" : "473",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "356",
+                  "localId" : "474",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "357",
+                    "localId" : "475",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27300,29 +31946,29 @@ module.exports['ProperIncludedIn'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "334",
+              "localId" : "452",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "338",
+                "localId" : "456",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "339",
+                  "localId" : "457",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "340",
+                    "localId" : "458",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "341",
+                  "localId" : "459",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "342",
+                    "localId" : "460",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27332,7 +31978,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "335",
+                  "localId" : "453",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -27342,7 +31988,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "336",
+                  "localId" : "454",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -27351,29 +31997,29 @@ module.exports['ProperIncludedIn'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "343",
+              "localId" : "461",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "347",
+                "localId" : "465",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "348",
+                  "localId" : "466",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "349",
+                    "localId" : "467",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "350",
+                  "localId" : "468",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "351",
+                    "localId" : "469",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27383,7 +32029,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "344",
+                  "localId" : "462",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -27393,7 +32039,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "345",
+                  "localId" : "463",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -27403,33 +32049,33 @@ module.exports['ProperIncludedIn'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "358",
+            "localId" : "476",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "386",
+              "localId" : "504",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "387",
+                "localId" : "505",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "388",
+                  "localId" : "506",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "389",
+                    "localId" : "507",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "390",
+                  "localId" : "508",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "391",
+                    "localId" : "509",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27438,29 +32084,29 @@ module.exports['ProperIncludedIn'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "359",
+              "localId" : "477",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "363",
+                "localId" : "481",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "364",
+                  "localId" : "482",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "365",
+                    "localId" : "483",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "366",
+                  "localId" : "484",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "367",
+                    "localId" : "485",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27470,7 +32116,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "360",
+                  "localId" : "478",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -27480,7 +32126,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "361",
+                  "localId" : "479",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -27489,29 +32135,29 @@ module.exports['ProperIncludedIn'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "368",
+              "localId" : "486",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "372",
+                "localId" : "490",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "373",
+                  "localId" : "491",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "374",
+                    "localId" : "492",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "375",
+                  "localId" : "493",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "376",
+                    "localId" : "494",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27521,7 +32167,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "369",
+                  "localId" : "487",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -27531,7 +32177,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "370",
+                  "localId" : "488",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -27540,29 +32186,29 @@ module.exports['ProperIncludedIn'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "377",
+              "localId" : "495",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "381",
+                "localId" : "499",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "382",
+                  "localId" : "500",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "383",
+                    "localId" : "501",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "384",
+                  "localId" : "502",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "385",
+                    "localId" : "503",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27572,7 +32218,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "378",
+                  "localId" : "496",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -27582,7 +32228,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "379",
+                  "localId" : "497",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -27593,7 +32239,7 @@ module.exports['ProperIncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "426",
+        "localId" : "544",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "TuplesNotIncluded",
         "context" : "Patient",
@@ -27602,22 +32248,22 @@ module.exports['ProperIncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "426",
+            "r" : "544",
             "s" : [ {
               "value" : [ "", "define ", "TuplesNotIncluded", ": " ]
             }, {
-              "r" : "486",
+              "r" : "604",
               "s" : [ {
-                "r" : "427",
+                "r" : "545",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "428",
+                  "r" : "546",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "429",
+                      "r" : "547",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -27626,7 +32272,7 @@ module.exports['ProperIncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "430",
+                      "r" : "548",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -27637,12 +32283,12 @@ module.exports['ProperIncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "437",
+                  "r" : "555",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "438",
+                      "r" : "556",
                       "value" : [ "a", ":", "3" ]
                     } ]
                   }, {
@@ -27651,7 +32297,7 @@ module.exports['ProperIncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "439",
+                      "r" : "557",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -27663,19 +32309,19 @@ module.exports['ProperIncludedIn'] = {
                   "value" : [ "}" ]
                 } ]
               }, {
-                "r" : "486",
+                "r" : "604",
                 "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "452",
+                "r" : "570",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "453",
+                  "r" : "571",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "454",
+                      "r" : "572",
                       "value" : [ "a", ":", "1" ]
                     } ]
                   }, {
@@ -27684,7 +32330,7 @@ module.exports['ProperIncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "455",
+                      "r" : "573",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -27695,12 +32341,12 @@ module.exports['ProperIncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "462",
+                  "r" : "580",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "463",
+                      "r" : "581",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -27709,7 +32355,7 @@ module.exports['ProperIncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "464",
+                      "r" : "582",
                       "s" : [ {
                         "value" : [ "'d'" ]
                       } ]
@@ -27720,12 +32366,12 @@ module.exports['ProperIncludedIn'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "471",
+                  "r" : "589",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "472",
+                      "r" : "590",
                       "value" : [ "a", ":", "2" ]
                     } ]
                   }, {
@@ -27734,7 +32380,7 @@ module.exports['ProperIncludedIn'] = {
                     "s" : [ {
                       "value" : [ "b", ":" ]
                     }, {
-                      "r" : "473",
+                      "r" : "591",
                       "s" : [ {
                         "value" : [ "'c'" ]
                       } ]
@@ -27751,34 +32397,34 @@ module.exports['ProperIncludedIn'] = {
         } ],
         "expression" : {
           "type" : "ProperIncludedIn",
-          "localId" : "486",
+          "localId" : "604",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "487",
+            "localId" : "605",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "488",
+              "localId" : "606",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "489",
+                "localId" : "607",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "490",
+                  "localId" : "608",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "491",
+                "localId" : "609",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "492",
+                  "localId" : "610",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -27786,29 +32432,29 @@ module.exports['ProperIncludedIn'] = {
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "493",
+            "localId" : "611",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "494",
+              "localId" : "612",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "495",
+                "localId" : "613",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "496",
+                  "localId" : "614",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "497",
+                "localId" : "615",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "498",
+                  "localId" : "616",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -27817,33 +32463,33 @@ module.exports['ProperIncludedIn'] = {
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "427",
+            "localId" : "545",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "446",
+              "localId" : "564",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "447",
+                "localId" : "565",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "448",
+                  "localId" : "566",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "449",
+                    "localId" : "567",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "450",
+                  "localId" : "568",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "451",
+                    "localId" : "569",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27852,29 +32498,29 @@ module.exports['ProperIncludedIn'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "428",
+              "localId" : "546",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "432",
+                "localId" : "550",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "433",
+                  "localId" : "551",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "434",
+                    "localId" : "552",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "435",
+                  "localId" : "553",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "436",
+                    "localId" : "554",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27884,7 +32530,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "429",
+                  "localId" : "547",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -27894,7 +32540,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "430",
+                  "localId" : "548",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -27903,29 +32549,29 @@ module.exports['ProperIncludedIn'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "437",
+              "localId" : "555",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "441",
+                "localId" : "559",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "442",
+                  "localId" : "560",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "443",
+                    "localId" : "561",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "444",
+                  "localId" : "562",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "445",
+                    "localId" : "563",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27935,7 +32581,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "438",
+                  "localId" : "556",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -27945,7 +32591,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "439",
+                  "localId" : "557",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -27955,33 +32601,33 @@ module.exports['ProperIncludedIn'] = {
             } ]
           }, {
             "type" : "List",
-            "localId" : "452",
+            "localId" : "570",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "480",
+              "localId" : "598",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "481",
+                "localId" : "599",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "482",
+                  "localId" : "600",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "483",
+                    "localId" : "601",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "484",
+                  "localId" : "602",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "485",
+                    "localId" : "603",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -27990,29 +32636,29 @@ module.exports['ProperIncludedIn'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "453",
+              "localId" : "571",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "457",
+                "localId" : "575",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "458",
+                  "localId" : "576",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "459",
+                    "localId" : "577",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "460",
+                  "localId" : "578",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "461",
+                    "localId" : "579",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -28022,7 +32668,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "454",
+                  "localId" : "572",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -28032,7 +32678,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "455",
+                  "localId" : "573",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -28041,29 +32687,29 @@ module.exports['ProperIncludedIn'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "462",
+              "localId" : "580",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "466",
+                "localId" : "584",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "467",
+                  "localId" : "585",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "468",
+                    "localId" : "586",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "469",
+                  "localId" : "587",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "470",
+                    "localId" : "588",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -28073,7 +32719,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "463",
+                  "localId" : "581",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -28083,7 +32729,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "464",
+                  "localId" : "582",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "d",
@@ -28092,29 +32738,29 @@ module.exports['ProperIncludedIn'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "471",
+              "localId" : "589",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "475",
+                "localId" : "593",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "476",
+                  "localId" : "594",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "477",
+                    "localId" : "595",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "478",
+                  "localId" : "596",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "479",
+                    "localId" : "597",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -28124,7 +32770,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "472",
+                  "localId" : "590",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -28134,7 +32780,7 @@ module.exports['ProperIncludedIn'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "473",
+                  "localId" : "591",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "c",
@@ -28145,7 +32791,7 @@ module.exports['ProperIncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "520",
+        "localId" : "638",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NullIncludes",
         "context" : "Patient",
@@ -28154,31 +32800,31 @@ module.exports['ProperIncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "520",
+            "r" : "638",
             "s" : [ {
               "value" : [ "", "define ", "NullIncludes", ": " ]
             }, {
-              "r" : "537",
+              "r" : "655",
               "s" : [ {
-                "r" : "521",
+                "r" : "639",
                 "s" : [ {
-                  "r" : "522",
+                  "r" : "640",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               }, {
-                "r" : "537",
+                "r" : "655",
                 "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "529",
+                "r" : "647",
                 "s" : [ {
-                  "r" : "530",
+                  "r" : "648",
                   "value" : [ "null", " as " ]
                 }, {
-                  "r" : "531",
+                  "r" : "649",
                   "s" : [ {
                     "value" : [ "List<" ]
                   }, {
-                    "r" : "532",
+                    "r" : "650",
                     "s" : [ {
                       "value" : [ "Integer" ]
                     } ]
@@ -28192,76 +32838,76 @@ module.exports['ProperIncludedIn'] = {
         } ],
         "expression" : {
           "type" : "ProperIncludedIn",
-          "localId" : "537",
+          "localId" : "655",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "538",
+            "localId" : "656",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "539",
+              "localId" : "657",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "540",
+            "localId" : "658",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "541",
+              "localId" : "659",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "List",
-            "localId" : "521",
+            "localId" : "639",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "527",
+              "localId" : "645",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "528",
+                "localId" : "646",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "522",
+              "localId" : "640",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "523",
+              "localId" : "641",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "524",
+              "localId" : "642",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "525",
+              "localId" : "643",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "526",
+              "localId" : "644",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -28269,16 +32915,16 @@ module.exports['ProperIncludedIn'] = {
             } ]
           }, {
             "type" : "As",
-            "localId" : "529",
+            "localId" : "647",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "535",
+              "localId" : "653",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "536",
+                "localId" : "654",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -28286,28 +32932,28 @@ module.exports['ProperIncludedIn'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "530",
+              "localId" : "648",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "531",
+              "localId" : "649",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "533",
+                "localId" : "651",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "534",
+                  "localId" : "652",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "532",
+                "localId" : "650",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
@@ -28316,7 +32962,7 @@ module.exports['ProperIncludedIn'] = {
           } ]
         }
       }, {
-        "localId" : "551",
+        "localId" : "669",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
         "name" : "NullIncluded",
         "context" : "Patient",
@@ -28325,26 +32971,26 @@ module.exports['ProperIncludedIn'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "551",
+            "r" : "669",
             "s" : [ {
               "value" : [ "", "define ", "NullIncluded", ": " ]
             }, {
-              "r" : "570",
+              "r" : "688",
               "s" : [ {
-                "r" : "552",
+                "r" : "670",
                 "s" : [ {
                   "value" : [ "(" ]
                 }, {
-                  "r" : "552",
+                  "r" : "670",
                   "s" : [ {
-                    "r" : "553",
+                    "r" : "671",
                     "value" : [ "null", " as " ]
                   }, {
-                    "r" : "554",
+                    "r" : "672",
                     "s" : [ {
                       "value" : [ "List<" ]
                     }, {
-                      "r" : "555",
+                      "r" : "673",
                       "s" : [ {
                         "value" : [ "Integer" ]
                       } ]
@@ -28356,12 +33002,12 @@ module.exports['ProperIncludedIn'] = {
                   "value" : [ ")" ]
                 } ]
               }, {
-                "r" : "570",
+                "r" : "688",
                 "value" : [ " ", "properly included in", " " ]
               }, {
-                "r" : "562",
+                "r" : "680",
                 "s" : [ {
-                  "r" : "563",
+                  "r" : "681",
                   "value" : [ "{", "1", ", ", "2", ", ", "3", ", ", "4", ", ", "5", "}" ]
                 } ]
               } ]
@@ -28370,42 +33016,42 @@ module.exports['ProperIncludedIn'] = {
         } ],
         "expression" : {
           "type" : "ProperIncludedIn",
-          "localId" : "570",
+          "localId" : "688",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "571",
+            "localId" : "689",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "572",
+              "localId" : "690",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
             "type" : "ListTypeSpecifier",
-            "localId" : "573",
+            "localId" : "691",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "574",
+              "localId" : "692",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : [ {
             "type" : "As",
-            "localId" : "552",
+            "localId" : "670",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "560",
+              "localId" : "678",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "561",
+                "localId" : "679",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -28413,28 +33059,28 @@ module.exports['ProperIncludedIn'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "553",
+              "localId" : "671",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "554",
+              "localId" : "672",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "556",
+                "localId" : "674",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "557",
+                  "localId" : "675",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "555",
+                "localId" : "673",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
@@ -28442,50 +33088,50 @@ module.exports['ProperIncludedIn'] = {
             }
           }, {
             "type" : "List",
-            "localId" : "562",
+            "localId" : "680",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "568",
+              "localId" : "686",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "569",
+                "localId" : "687",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "563",
+              "localId" : "681",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "564",
+              "localId" : "682",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "565",
+              "localId" : "683",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "566",
+              "localId" : "684",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "567",
+              "localId" : "685",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
@@ -29052,6 +33698,7 @@ library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
 define LotsOfDups: distinct {1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 4, 3, 2, 1}
+define LotsOfLongDups: distinct {1L, 2L, 2L, 3L, 3L, 3L, 4L, 4L, 4L, 4L, 5L, 5L, 5L, 5L, 5L, 4L, 3L, 2L, 1L}
 define NoDups: distinct {2, 4, 6, 8, 10}
 define DupsTuples: distinct { Tuple{ hello: 'world' }, Tuple{ hello: 'cleveland' }, Tuple{ hello: 'world' }, Tuple{ hello: 'dolly' } }
 define NoDupsTuples: distinct { Tuple{ hello: 'world' }, Tuple{ hello: 'cleveland' } }
@@ -29070,7 +33717,7 @@ module.exports['Distinct'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "342",
+        "r" : "374",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -29358,7 +34005,7 @@ module.exports['Distinct'] = {
         }
       }, {
         "localId" : "246",
-        "name" : "NoDups",
+        "name" : "LotsOfLongDups",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -29367,7 +34014,7 @@ module.exports['Distinct'] = {
           "s" : {
             "r" : "246",
             "s" : [ {
-              "value" : [ "", "define ", "NoDups", ": " ]
+              "value" : [ "", "define ", "LotsOfLongDups", ": " ]
             }, {
               "r" : "247",
               "s" : [ {
@@ -29376,7 +34023,7 @@ module.exports['Distinct'] = {
                 "r" : "248",
                 "s" : [ {
                   "r" : "249",
-                  "value" : [ "{", "2", ", ", "4", ", ", "6", ", ", "8", ", ", "10", "}" ]
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "2L", ", ", "3L", ", ", "3L", ", ", "3L", ", ", "4L", ", ", "4L", ", ", "4L", ", ", "4L", ", ", "5L", ", ", "5L", ", ", "5L", ", ", "5L", ", ", "5L", ", ", "4L", ", ", "3L", ", ", "2L", ", ", "1L", "}" ]
                 } ]
               } ]
             } ]
@@ -29384,12 +34031,12 @@ module.exports['Distinct'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "260",
+          "localId" : "274",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "261",
-            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "localId" : "275",
+            "name" : "{urn:hl7-org:elm-types:r1}Long",
             "annotation" : [ ]
           }
         },
@@ -29399,72 +34046,286 @@ module.exports['Distinct'] = {
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "258",
+            "localId" : "272",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "273",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          },
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "270",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
+              "localId" : "271",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "List",
+            "localId" : "248",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "268",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "269",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "249",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "250",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "251",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "252",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "253",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "254",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "255",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "256",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "257",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "258",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
               "localId" : "259",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "260",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "261",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "262",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "263",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "5",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "264",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "265",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "266",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "267",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "278",
+        "name" : "NoDups",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "278",
+            "s" : [ {
+              "value" : [ "", "define ", "NoDups", ": " ]
+            }, {
+              "r" : "279",
+              "s" : [ {
+                "value" : [ "distinct " ]
+              }, {
+                "r" : "280",
+                "s" : [ {
+                  "r" : "281",
+                  "value" : [ "{", "2", ", ", "4", ", ", "6", ", ", "8", ", ", "10", "}" ]
+                } ]
+              } ]
+            } ]
+          }
+        } ],
+        "resultTypeSpecifier" : {
+          "type" : "ListTypeSpecifier",
+          "localId" : "292",
+          "annotation" : [ ],
+          "elementType" : {
+            "type" : "NamedTypeSpecifier",
+            "localId" : "293",
+            "name" : "{urn:hl7-org:elm-types:r1}Integer",
+            "annotation" : [ ]
+          }
+        },
+        "expression" : {
+          "type" : "Distinct",
+          "localId" : "279",
+          "annotation" : [ ],
+          "resultTypeSpecifier" : {
+            "type" : "ListTypeSpecifier",
+            "localId" : "290",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "291",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "256",
+            "localId" : "288",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "257",
+              "localId" : "289",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "List",
-            "localId" : "248",
+            "localId" : "280",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "254",
+              "localId" : "286",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "255",
+                "localId" : "287",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "249",
+              "localId" : "281",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "250",
+              "localId" : "282",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "251",
+              "localId" : "283",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "6",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "252",
+              "localId" : "284",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "8",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "253",
+              "localId" : "285",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "10",
@@ -29473,7 +34334,7 @@ module.exports['Distinct'] = {
           }
         }
       }, {
-        "localId" : "264",
+        "localId" : "296",
         "name" : "DupsTuples",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -29481,26 +34342,26 @@ module.exports['Distinct'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "264",
+            "r" : "296",
             "s" : [ {
               "value" : [ "", "define ", "DupsTuples", ": " ]
             }, {
-              "r" : "265",
+              "r" : "297",
               "s" : [ {
                 "value" : [ "distinct " ]
               }, {
-                "r" : "266",
+                "r" : "298",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "267",
+                  "r" : "299",
                   "s" : [ {
                     "value" : [ "Tuple{ " ]
                   }, {
                     "s" : [ {
                       "value" : [ "hello", ": " ]
                     }, {
-                      "r" : "268",
+                      "r" : "300",
                       "s" : [ {
                         "value" : [ "'world'" ]
                       } ]
@@ -29511,14 +34372,14 @@ module.exports['Distinct'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "273",
+                  "r" : "305",
                   "s" : [ {
                     "value" : [ "Tuple{ " ]
                   }, {
                     "s" : [ {
                       "value" : [ "hello", ": " ]
                     }, {
-                      "r" : "274",
+                      "r" : "306",
                       "s" : [ {
                         "value" : [ "'cleveland'" ]
                       } ]
@@ -29529,14 +34390,14 @@ module.exports['Distinct'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "279",
+                  "r" : "311",
                   "s" : [ {
                     "value" : [ "Tuple{ " ]
                   }, {
                     "s" : [ {
                       "value" : [ "hello", ": " ]
                     }, {
-                      "r" : "280",
+                      "r" : "312",
                       "s" : [ {
                         "value" : [ "'world'" ]
                       } ]
@@ -29547,14 +34408,14 @@ module.exports['Distinct'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "285",
+                  "r" : "317",
                   "s" : [ {
                     "value" : [ "Tuple{ " ]
                   }, {
                     "s" : [ {
                       "value" : [ "hello", ": " ]
                     }, {
-                      "r" : "286",
+                      "r" : "318",
                       "s" : [ {
                         "value" : [ "'dolly'" ]
                       } ]
@@ -29571,19 +34432,19 @@ module.exports['Distinct'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "303",
+          "localId" : "335",
           "annotation" : [ ],
           "elementType" : {
             "type" : "TupleTypeSpecifier",
-            "localId" : "304",
+            "localId" : "336",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "305",
+              "localId" : "337",
               "name" : "hello",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "306",
+                "localId" : "338",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -29592,23 +34453,23 @@ module.exports['Distinct'] = {
         },
         "expression" : {
           "type" : "Distinct",
-          "localId" : "265",
+          "localId" : "297",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "299",
+            "localId" : "331",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "300",
+              "localId" : "332",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "301",
+                "localId" : "333",
                 "name" : "hello",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "302",
+                  "localId" : "334",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -29617,19 +34478,19 @@ module.exports['Distinct'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "295",
+            "localId" : "327",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "296",
+              "localId" : "328",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "297",
+                "localId" : "329",
                 "name" : "hello",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "298",
+                  "localId" : "330",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -29638,23 +34499,23 @@ module.exports['Distinct'] = {
           } ],
           "operand" : {
             "type" : "List",
-            "localId" : "266",
+            "localId" : "298",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "291",
+              "localId" : "323",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "292",
+                "localId" : "324",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "293",
+                  "localId" : "325",
                   "name" : "hello",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "294",
+                    "localId" : "326",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -29663,19 +34524,19 @@ module.exports['Distinct'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "267",
+              "localId" : "299",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "270",
+                "localId" : "302",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "271",
+                  "localId" : "303",
                   "name" : "hello",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "272",
+                    "localId" : "304",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -29685,7 +34546,7 @@ module.exports['Distinct'] = {
                 "name" : "hello",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "268",
+                  "localId" : "300",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "world",
@@ -29694,19 +34555,19 @@ module.exports['Distinct'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "273",
+              "localId" : "305",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "276",
+                "localId" : "308",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "277",
+                  "localId" : "309",
                   "name" : "hello",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "278",
+                    "localId" : "310",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -29716,7 +34577,7 @@ module.exports['Distinct'] = {
                 "name" : "hello",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "274",
+                  "localId" : "306",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "cleveland",
@@ -29725,19 +34586,19 @@ module.exports['Distinct'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "279",
+              "localId" : "311",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "282",
+                "localId" : "314",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "283",
+                  "localId" : "315",
                   "name" : "hello",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "284",
+                    "localId" : "316",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -29747,7 +34608,7 @@ module.exports['Distinct'] = {
                 "name" : "hello",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "280",
+                  "localId" : "312",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "world",
@@ -29756,19 +34617,19 @@ module.exports['Distinct'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "285",
+              "localId" : "317",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "288",
+                "localId" : "320",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "289",
+                  "localId" : "321",
                   "name" : "hello",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "290",
+                    "localId" : "322",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -29778,7 +34639,7 @@ module.exports['Distinct'] = {
                 "name" : "hello",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "286",
+                  "localId" : "318",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "dolly",
@@ -29789,7 +34650,7 @@ module.exports['Distinct'] = {
           }
         }
       }, {
-        "localId" : "309",
+        "localId" : "341",
         "name" : "NoDupsTuples",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -29797,26 +34658,26 @@ module.exports['Distinct'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "309",
+            "r" : "341",
             "s" : [ {
               "value" : [ "", "define ", "NoDupsTuples", ": " ]
             }, {
-              "r" : "310",
+              "r" : "342",
               "s" : [ {
                 "value" : [ "distinct " ]
               }, {
-                "r" : "311",
+                "r" : "343",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "312",
+                  "r" : "344",
                   "s" : [ {
                     "value" : [ "Tuple{ " ]
                   }, {
                     "s" : [ {
                       "value" : [ "hello", ": " ]
                     }, {
-                      "r" : "313",
+                      "r" : "345",
                       "s" : [ {
                         "value" : [ "'world'" ]
                       } ]
@@ -29827,14 +34688,14 @@ module.exports['Distinct'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "318",
+                  "r" : "350",
                   "s" : [ {
                     "value" : [ "Tuple{ " ]
                   }, {
                     "s" : [ {
                       "value" : [ "hello", ": " ]
                     }, {
-                      "r" : "319",
+                      "r" : "351",
                       "s" : [ {
                         "value" : [ "'cleveland'" ]
                       } ]
@@ -29851,19 +34712,19 @@ module.exports['Distinct'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "336",
+          "localId" : "368",
           "annotation" : [ ],
           "elementType" : {
             "type" : "TupleTypeSpecifier",
-            "localId" : "337",
+            "localId" : "369",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "338",
+              "localId" : "370",
               "name" : "hello",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "339",
+                "localId" : "371",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -29872,23 +34733,23 @@ module.exports['Distinct'] = {
         },
         "expression" : {
           "type" : "Distinct",
-          "localId" : "310",
+          "localId" : "342",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "332",
+            "localId" : "364",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "333",
+              "localId" : "365",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "334",
+                "localId" : "366",
                 "name" : "hello",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "335",
+                  "localId" : "367",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -29897,19 +34758,19 @@ module.exports['Distinct'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "328",
+            "localId" : "360",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "329",
+              "localId" : "361",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "330",
+                "localId" : "362",
                 "name" : "hello",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "331",
+                  "localId" : "363",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -29918,23 +34779,23 @@ module.exports['Distinct'] = {
           } ],
           "operand" : {
             "type" : "List",
-            "localId" : "311",
+            "localId" : "343",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "324",
+              "localId" : "356",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "325",
+                "localId" : "357",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "326",
+                  "localId" : "358",
                   "name" : "hello",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "327",
+                    "localId" : "359",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -29943,19 +34804,19 @@ module.exports['Distinct'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "312",
+              "localId" : "344",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "315",
+                "localId" : "347",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "316",
+                  "localId" : "348",
                   "name" : "hello",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "317",
+                    "localId" : "349",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -29965,7 +34826,7 @@ module.exports['Distinct'] = {
                 "name" : "hello",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "313",
+                  "localId" : "345",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "world",
@@ -29974,19 +34835,19 @@ module.exports['Distinct'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "318",
+              "localId" : "350",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "321",
+                "localId" : "353",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "322",
+                  "localId" : "354",
                   "name" : "hello",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "323",
+                    "localId" : "355",
                     "name" : "{urn:hl7-org:elm-types:r1}String",
                     "annotation" : [ ]
                   }
@@ -29996,7 +34857,7 @@ module.exports['Distinct'] = {
                 "name" : "hello",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "319",
+                  "localId" : "351",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                   "valueType" : "{urn:hl7-org:elm-types:r1}String",
                   "value" : "cleveland",
@@ -30007,7 +34868,7 @@ module.exports['Distinct'] = {
           }
         }
       }, {
-        "localId" : "342",
+        "localId" : "374",
         "name" : "DuplicateNulls",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -30015,17 +34876,17 @@ module.exports['Distinct'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "342",
+            "r" : "374",
             "s" : [ {
               "value" : [ "", "define ", "DuplicateNulls", ": " ]
             }, {
-              "r" : "343",
+              "r" : "375",
               "s" : [ {
                 "value" : [ "distinct " ]
               }, {
-                "r" : "344",
+                "r" : "376",
                 "s" : [ {
-                  "r" : "345",
+                  "r" : "377",
                   "value" : [ "{", "null", ", ", "1", ", ", "2", ", ", "null", ", ", "3", ", ", "4", ", ", "5", ", ", "null", "}" ]
                 } ]
               } ]
@@ -30034,124 +34895,124 @@ module.exports['Distinct'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "362",
+          "localId" : "394",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "363",
+            "localId" : "395",
             "name" : "{urn:hl7-org:elm-types:r1}Integer",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Distinct",
-          "localId" : "343",
+          "localId" : "375",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "360",
+            "localId" : "392",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "361",
+              "localId" : "393",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "358",
+            "localId" : "390",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "359",
+              "localId" : "391",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "List",
-            "localId" : "344",
+            "localId" : "376",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "356",
+              "localId" : "388",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "357",
+                "localId" : "389",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "As",
-              "localId" : "353",
+              "localId" : "385",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "345",
+                "localId" : "377",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
               "type" : "Literal",
-              "localId" : "346",
+              "localId" : "378",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "347",
+              "localId" : "379",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "354",
+              "localId" : "386",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "348",
+                "localId" : "380",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
             }, {
               "type" : "Literal",
-              "localId" : "349",
+              "localId" : "381",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "350",
+              "localId" : "382",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "351",
+              "localId" : "383",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "5",
               "annotation" : [ ]
             }, {
               "type" : "As",
-              "localId" : "355",
+              "localId" : "387",
               "asType" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ],
               "signature" : [ ],
               "operand" : {
                 "type" : "Null",
-                "localId" : "352",
+                "localId" : "384",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
                 "annotation" : [ ]
               }
@@ -30168,6 +35029,7 @@ library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
 define Numbers: First({1, 2, 3, 4})
+define Longs: First({1L, 2L, 3L, 4L})
 define Letters: First({'a', 'b', 'c'})
 define Lists: First({{'a','b','c'},{'d','e','f'}})
 define Tuples: First({ Tuple{a: 1, b: 2, c: 3}, Tuple{a: 24, b: 25, c: 26} })
@@ -30188,7 +35050,7 @@ module.exports['First'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "387",
+        "r" : "404",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -30353,6 +35215,97 @@ module.exports['First'] = {
         }
       }, {
         "localId" : "231",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "Longs",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "231",
+            "s" : [ {
+              "value" : [ "", "define ", "Longs", ": " ]
+            }, {
+              "r" : "243",
+              "s" : [ {
+                "value" : [ "First", "(" ]
+              }, {
+                "r" : "232",
+                "s" : [ {
+                  "r" : "233",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "First",
+          "localId" : "243",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "244",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "245",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "232",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "237",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "238",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "233",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "235",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "248",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
         "name" : "Letters",
         "context" : "Patient",
@@ -30361,33 +35314,33 @@ module.exports['First'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "231",
+            "r" : "248",
             "s" : [ {
               "value" : [ "", "define ", "Letters", ": " ]
             }, {
-              "r" : "245",
+              "r" : "262",
               "s" : [ {
                 "value" : [ "First", "(" ]
               }, {
-                "r" : "232",
+                "r" : "249",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "233",
+                  "r" : "250",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "235",
+                  "r" : "252",
                   "s" : [ {
                     "value" : [ "'b'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "237",
+                  "r" : "254",
                   "s" : [ {
                     "value" : [ "'c'" ]
                   } ]
@@ -30402,52 +35355,52 @@ module.exports['First'] = {
         } ],
         "expression" : {
           "type" : "First",
-          "localId" : "245",
+          "localId" : "262",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "246",
+            "localId" : "263",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "247",
+              "localId" : "264",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "232",
+            "localId" : "249",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "239",
+              "localId" : "256",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "240",
+                "localId" : "257",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "233",
+              "localId" : "250",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "235",
+              "localId" : "252",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "237",
+              "localId" : "254",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "c",
@@ -30456,7 +35409,7 @@ module.exports['First'] = {
           }
         }
       }, {
-        "localId" : "250",
+        "localId" : "267",
         "name" : "Lists",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -30464,37 +35417,37 @@ module.exports['First'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "250",
+            "r" : "267",
             "s" : [ {
               "value" : [ "", "define ", "Lists", ": " ]
             }, {
-              "r" : "278",
+              "r" : "295",
               "s" : [ {
                 "value" : [ "First", "(" ]
               }, {
-                "r" : "251",
+                "r" : "268",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "252",
+                  "r" : "269",
                   "s" : [ {
                     "value" : [ "{" ]
                   }, {
-                    "r" : "253",
+                    "r" : "270",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
                   }, {
                     "value" : [ "," ]
                   }, {
-                    "r" : "255",
+                    "r" : "272",
                     "s" : [ {
                       "value" : [ "'b'" ]
                     } ]
                   }, {
                     "value" : [ "," ]
                   }, {
-                    "r" : "257",
+                    "r" : "274",
                     "s" : [ {
                       "value" : [ "'c'" ]
                     } ]
@@ -30504,25 +35457,25 @@ module.exports['First'] = {
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "261",
+                  "r" : "278",
                   "s" : [ {
                     "value" : [ "{" ]
                   }, {
-                    "r" : "262",
+                    "r" : "279",
                     "s" : [ {
                       "value" : [ "'d'" ]
                     } ]
                   }, {
                     "value" : [ "," ]
                   }, {
-                    "r" : "264",
+                    "r" : "281",
                     "s" : [ {
                       "value" : [ "'e'" ]
                     } ]
                   }, {
                     "value" : [ "," ]
                   }, {
-                    "r" : "266",
+                    "r" : "283",
                     "s" : [ {
                       "value" : [ "'f'" ]
                     } ]
@@ -30540,41 +35493,41 @@ module.exports['First'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "284",
+          "localId" : "301",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "285",
+            "localId" : "302",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "First",
-          "localId" : "278",
+          "localId" : "295",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "282",
+            "localId" : "299",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "283",
+              "localId" : "300",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "279",
+            "localId" : "296",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "280",
+              "localId" : "297",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "281",
+                "localId" : "298",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -30582,19 +35535,19 @@ module.exports['First'] = {
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "251",
+            "localId" : "268",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "270",
+              "localId" : "287",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "271",
+                "localId" : "288",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "272",
+                  "localId" : "289",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -30602,36 +35555,36 @@ module.exports['First'] = {
             },
             "element" : [ {
               "type" : "List",
-              "localId" : "252",
+              "localId" : "269",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "259",
+                "localId" : "276",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "260",
+                  "localId" : "277",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "253",
+                "localId" : "270",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "255",
+                "localId" : "272",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "b",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "257",
+                "localId" : "274",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "c",
@@ -30639,36 +35592,36 @@ module.exports['First'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "261",
+              "localId" : "278",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "268",
+                "localId" : "285",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "269",
+                  "localId" : "286",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "262",
+                "localId" : "279",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "d",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "264",
+                "localId" : "281",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "e",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "266",
+                "localId" : "283",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "f",
@@ -30678,7 +35631,7 @@ module.exports['First'] = {
           }
         }
       }, {
-        "localId" : "288",
+        "localId" : "305",
         "name" : "Tuples",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -30686,38 +35639,38 @@ module.exports['First'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "288",
+            "r" : "305",
             "s" : [ {
               "value" : [ "", "define ", "Tuples", ": " ]
             }, {
-              "r" : "330",
+              "r" : "347",
               "s" : [ {
                 "value" : [ "First", "(" ]
               }, {
-                "r" : "289",
+                "r" : "306",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "290",
+                  "r" : "307",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "291",
+                      "r" : "308",
                       "value" : [ "a", ": ", "1" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "292",
+                      "r" : "309",
                       "value" : [ "b", ": ", "2" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "293",
+                      "r" : "310",
                       "value" : [ "c", ": ", "3" ]
                     } ]
                   }, {
@@ -30726,26 +35679,26 @@ module.exports['First'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "301",
+                  "r" : "318",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "302",
+                      "r" : "319",
                       "value" : [ "a", ": ", "24" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "303",
+                      "r" : "320",
                       "value" : [ "b", ": ", "25" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "304",
+                      "r" : "321",
                       "value" : [ "c", ": ", "26" ]
                     } ]
                   }, {
@@ -30762,35 +35715,35 @@ module.exports['First'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "TupleTypeSpecifier",
-          "localId" : "346",
+          "localId" : "363",
           "annotation" : [ ],
           "element" : [ {
-            "localId" : "347",
+            "localId" : "364",
             "name" : "a",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "348",
+              "localId" : "365",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
-            "localId" : "349",
+            "localId" : "366",
             "name" : "b",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "350",
+              "localId" : "367",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
-            "localId" : "351",
+            "localId" : "368",
             "name" : "c",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "352",
+              "localId" : "369",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
@@ -30798,39 +35751,39 @@ module.exports['First'] = {
         },
         "expression" : {
           "type" : "First",
-          "localId" : "330",
+          "localId" : "347",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "TupleTypeSpecifier",
-            "localId" : "339",
+            "localId" : "356",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "340",
+              "localId" : "357",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "341",
+                "localId" : "358",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "342",
+              "localId" : "359",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "343",
+                "localId" : "360",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "344",
+              "localId" : "361",
               "name" : "c",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "345",
+                "localId" : "362",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -30838,39 +35791,39 @@ module.exports['First'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "331",
+            "localId" : "348",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "332",
+              "localId" : "349",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "333",
+                "localId" : "350",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "334",
+                  "localId" : "351",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "335",
+                "localId" : "352",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "336",
+                  "localId" : "353",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "337",
+                "localId" : "354",
                 "name" : "c",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "338",
+                  "localId" : "355",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
@@ -30879,43 +35832,43 @@ module.exports['First'] = {
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "289",
+            "localId" : "306",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "312",
+              "localId" : "329",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "313",
+                "localId" : "330",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "314",
+                  "localId" : "331",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "315",
+                    "localId" : "332",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "316",
+                  "localId" : "333",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "317",
+                    "localId" : "334",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "318",
+                  "localId" : "335",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "319",
+                    "localId" : "336",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -30924,39 +35877,39 @@ module.exports['First'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "290",
+              "localId" : "307",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "294",
+                "localId" : "311",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "295",
+                  "localId" : "312",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "296",
+                    "localId" : "313",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "297",
+                  "localId" : "314",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "298",
+                    "localId" : "315",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "299",
+                  "localId" : "316",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "300",
+                    "localId" : "317",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -30966,7 +35919,7 @@ module.exports['First'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "291",
+                  "localId" : "308",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -30976,7 +35929,7 @@ module.exports['First'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "292",
+                  "localId" : "309",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -30986,7 +35939,7 @@ module.exports['First'] = {
                 "name" : "c",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "293",
+                  "localId" : "310",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -30995,39 +35948,39 @@ module.exports['First'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "301",
+              "localId" : "318",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "305",
+                "localId" : "322",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "306",
+                  "localId" : "323",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "307",
+                    "localId" : "324",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "308",
+                  "localId" : "325",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "309",
+                    "localId" : "326",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "310",
+                  "localId" : "327",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "311",
+                    "localId" : "328",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -31037,7 +35990,7 @@ module.exports['First'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "302",
+                  "localId" : "319",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "24",
@@ -31047,7 +36000,7 @@ module.exports['First'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "303",
+                  "localId" : "320",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "25",
@@ -31057,7 +36010,7 @@ module.exports['First'] = {
                 "name" : "c",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "304",
+                  "localId" : "321",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "26",
@@ -31068,7 +36021,7 @@ module.exports['First'] = {
           }
         }
       }, {
-        "localId" : "355",
+        "localId" : "372",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "Unordered",
         "context" : "Patient",
@@ -31077,17 +36030,17 @@ module.exports['First'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "355",
+            "r" : "372",
             "s" : [ {
               "value" : [ "", "define ", "Unordered", ": " ]
             }, {
-              "r" : "367",
+              "r" : "384",
               "s" : [ {
                 "value" : [ "First", "(" ]
               }, {
-                "r" : "356",
+                "r" : "373",
                 "s" : [ {
-                  "r" : "357",
+                  "r" : "374",
                   "value" : [ "{", "3", ", ", "1", ", ", "4", ", ", "2", "}" ]
                 } ]
               }, {
@@ -31098,59 +36051,59 @@ module.exports['First'] = {
         } ],
         "expression" : {
           "type" : "First",
-          "localId" : "367",
+          "localId" : "384",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "368",
+            "localId" : "385",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "369",
+              "localId" : "386",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "356",
+            "localId" : "373",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "361",
+              "localId" : "378",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "362",
+                "localId" : "379",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "357",
+              "localId" : "374",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "358",
+              "localId" : "375",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "359",
+              "localId" : "376",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "360",
+              "localId" : "377",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -31159,7 +36112,7 @@ module.exports['First'] = {
           }
         }
       }, {
-        "localId" : "372",
+        "localId" : "389",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "Empty",
         "context" : "Patient",
@@ -31168,19 +36121,19 @@ module.exports['First'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "372",
+            "r" : "389",
             "s" : [ {
               "value" : [ "", "define ", "Empty", ": " ]
             }, {
-              "r" : "382",
+              "r" : "399",
               "s" : [ {
                 "value" : [ "First", "(" ]
               }, {
-                "r" : "374",
+                "r" : "391",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "373",
+                  "r" : "390",
                   "s" : [ {
                     "value" : [ "Integer" ]
                   } ]
@@ -31195,31 +36148,31 @@ module.exports['First'] = {
         } ],
         "expression" : {
           "type" : "First",
-          "localId" : "382",
+          "localId" : "399",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "383",
+            "localId" : "400",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "384",
+              "localId" : "401",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "374",
+            "localId" : "391",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "376",
+              "localId" : "393",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "377",
+                "localId" : "394",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -31228,7 +36181,7 @@ module.exports['First'] = {
           }
         }
       }, {
-        "localId" : "387",
+        "localId" : "404",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "NullValue",
         "context" : "Patient",
@@ -31237,24 +36190,24 @@ module.exports['First'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "387",
+            "r" : "404",
             "s" : [ {
               "value" : [ "", "define ", "NullValue", ": " ]
             }, {
-              "r" : "400",
+              "r" : "417",
               "s" : [ {
                 "value" : [ "First", "(" ]
               }, {
-                "r" : "388",
+                "r" : "405",
                 "s" : [ {
-                  "r" : "389",
+                  "r" : "406",
                   "value" : [ "null", " as " ]
                 }, {
-                  "r" : "390",
+                  "r" : "407",
                   "s" : [ {
                     "value" : [ "List<" ]
                   }, {
-                    "r" : "391",
+                    "r" : "408",
                     "s" : [ {
                       "value" : [ "Integer" ]
                     } ]
@@ -31270,32 +36223,32 @@ module.exports['First'] = {
         } ],
         "expression" : {
           "type" : "First",
-          "localId" : "400",
+          "localId" : "417",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "401",
+            "localId" : "418",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "402",
+              "localId" : "419",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "As",
-            "localId" : "388",
+            "localId" : "405",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "394",
+              "localId" : "411",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "395",
+                "localId" : "412",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -31303,28 +36256,28 @@ module.exports['First'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "389",
+              "localId" : "406",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "390",
+              "localId" : "407",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "392",
+                "localId" : "409",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "393",
+                  "localId" : "410",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "391",
+                "localId" : "408",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
@@ -31342,6 +36295,7 @@ library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
 define Numbers: Last({1, 2, 3, 4})
+define Longs: Last({1L, 2L, 3L, 4L})
 define Letters: Last({'a', 'b', 'c'})
 define Lists: Last({{'a','b','c'},{'d','e','f'}})
 define Tuples: Last({ Tuple{a: 1, b: 2, c: 3}, Tuple{a: 24, b: 25, c: 26} })
@@ -31362,7 +36316,7 @@ module.exports['Last'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "387",
+        "r" : "404",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -31527,6 +36481,97 @@ module.exports['Last'] = {
         }
       }, {
         "localId" : "231",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "Longs",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "231",
+            "s" : [ {
+              "value" : [ "", "define ", "Longs", ": " ]
+            }, {
+              "r" : "243",
+              "s" : [ {
+                "value" : [ "Last", "(" ]
+              }, {
+                "r" : "232",
+                "s" : [ {
+                  "r" : "233",
+                  "value" : [ "{", "1L", ", ", "2L", ", ", "3L", ", ", "4L", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Last",
+          "localId" : "243",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "244",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "245",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "source" : {
+            "type" : "List",
+            "localId" : "232",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "237",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "238",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "233",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "1",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "235",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "3",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "248",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
         "name" : "Letters",
         "context" : "Patient",
@@ -31535,33 +36580,33 @@ module.exports['Last'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "231",
+            "r" : "248",
             "s" : [ {
               "value" : [ "", "define ", "Letters", ": " ]
             }, {
-              "r" : "245",
+              "r" : "262",
               "s" : [ {
                 "value" : [ "Last", "(" ]
               }, {
-                "r" : "232",
+                "r" : "249",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "233",
+                  "r" : "250",
                   "s" : [ {
                     "value" : [ "'a'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "235",
+                  "r" : "252",
                   "s" : [ {
                     "value" : [ "'b'" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "237",
+                  "r" : "254",
                   "s" : [ {
                     "value" : [ "'c'" ]
                   } ]
@@ -31576,52 +36621,52 @@ module.exports['Last'] = {
         } ],
         "expression" : {
           "type" : "Last",
-          "localId" : "245",
+          "localId" : "262",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "246",
+            "localId" : "263",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "247",
+              "localId" : "264",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "232",
+            "localId" : "249",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "239",
+              "localId" : "256",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "240",
+                "localId" : "257",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "233",
+              "localId" : "250",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "a",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "235",
+              "localId" : "252",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "b",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "237",
+              "localId" : "254",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
               "valueType" : "{urn:hl7-org:elm-types:r1}String",
               "value" : "c",
@@ -31630,7 +36675,7 @@ module.exports['Last'] = {
           }
         }
       }, {
-        "localId" : "250",
+        "localId" : "267",
         "name" : "Lists",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -31638,37 +36683,37 @@ module.exports['Last'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "250",
+            "r" : "267",
             "s" : [ {
               "value" : [ "", "define ", "Lists", ": " ]
             }, {
-              "r" : "278",
+              "r" : "295",
               "s" : [ {
                 "value" : [ "Last", "(" ]
               }, {
-                "r" : "251",
+                "r" : "268",
                 "s" : [ {
                   "value" : [ "{" ]
                 }, {
-                  "r" : "252",
+                  "r" : "269",
                   "s" : [ {
                     "value" : [ "{" ]
                   }, {
-                    "r" : "253",
+                    "r" : "270",
                     "s" : [ {
                       "value" : [ "'a'" ]
                     } ]
                   }, {
                     "value" : [ "," ]
                   }, {
-                    "r" : "255",
+                    "r" : "272",
                     "s" : [ {
                       "value" : [ "'b'" ]
                     } ]
                   }, {
                     "value" : [ "," ]
                   }, {
-                    "r" : "257",
+                    "r" : "274",
                     "s" : [ {
                       "value" : [ "'c'" ]
                     } ]
@@ -31678,25 +36723,25 @@ module.exports['Last'] = {
                 }, {
                   "value" : [ "," ]
                 }, {
-                  "r" : "261",
+                  "r" : "278",
                   "s" : [ {
                     "value" : [ "{" ]
                   }, {
-                    "r" : "262",
+                    "r" : "279",
                     "s" : [ {
                       "value" : [ "'d'" ]
                     } ]
                   }, {
                     "value" : [ "," ]
                   }, {
-                    "r" : "264",
+                    "r" : "281",
                     "s" : [ {
                       "value" : [ "'e'" ]
                     } ]
                   }, {
                     "value" : [ "," ]
                   }, {
-                    "r" : "266",
+                    "r" : "283",
                     "s" : [ {
                       "value" : [ "'f'" ]
                     } ]
@@ -31714,41 +36759,41 @@ module.exports['Last'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "ListTypeSpecifier",
-          "localId" : "284",
+          "localId" : "301",
           "annotation" : [ ],
           "elementType" : {
             "type" : "NamedTypeSpecifier",
-            "localId" : "285",
+            "localId" : "302",
             "name" : "{urn:hl7-org:elm-types:r1}String",
             "annotation" : [ ]
           }
         },
         "expression" : {
           "type" : "Last",
-          "localId" : "278",
+          "localId" : "295",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "ListTypeSpecifier",
-            "localId" : "282",
+            "localId" : "299",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "283",
+              "localId" : "300",
               "name" : "{urn:hl7-org:elm-types:r1}String",
               "annotation" : [ ]
             }
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "279",
+            "localId" : "296",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "280",
+              "localId" : "297",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "281",
+                "localId" : "298",
                 "name" : "{urn:hl7-org:elm-types:r1}String",
                 "annotation" : [ ]
               }
@@ -31756,19 +36801,19 @@ module.exports['Last'] = {
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "251",
+            "localId" : "268",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "270",
+              "localId" : "287",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "271",
+                "localId" : "288",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "272",
+                  "localId" : "289",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
@@ -31776,36 +36821,36 @@ module.exports['Last'] = {
             },
             "element" : [ {
               "type" : "List",
-              "localId" : "252",
+              "localId" : "269",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "259",
+                "localId" : "276",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "260",
+                  "localId" : "277",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "253",
+                "localId" : "270",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "a",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "255",
+                "localId" : "272",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "b",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "257",
+                "localId" : "274",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "c",
@@ -31813,36 +36858,36 @@ module.exports['Last'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "261",
+              "localId" : "278",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "268",
+                "localId" : "285",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "269",
+                  "localId" : "286",
                   "name" : "{urn:hl7-org:elm-types:r1}String",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "262",
+                "localId" : "279",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "d",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "264",
+                "localId" : "281",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "e",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "266",
+                "localId" : "283",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
                 "valueType" : "{urn:hl7-org:elm-types:r1}String",
                 "value" : "f",
@@ -31852,7 +36897,7 @@ module.exports['Last'] = {
           }
         }
       }, {
-        "localId" : "288",
+        "localId" : "305",
         "name" : "Tuples",
         "context" : "Patient",
         "accessLevel" : "Public",
@@ -31860,38 +36905,38 @@ module.exports['Last'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "288",
+            "r" : "305",
             "s" : [ {
               "value" : [ "", "define ", "Tuples", ": " ]
             }, {
-              "r" : "330",
+              "r" : "347",
               "s" : [ {
                 "value" : [ "Last", "(" ]
               }, {
-                "r" : "289",
+                "r" : "306",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "290",
+                  "r" : "307",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "291",
+                      "r" : "308",
                       "value" : [ "a", ": ", "1" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "292",
+                      "r" : "309",
                       "value" : [ "b", ": ", "2" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "293",
+                      "r" : "310",
                       "value" : [ "c", ": ", "3" ]
                     } ]
                   }, {
@@ -31900,26 +36945,26 @@ module.exports['Last'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "301",
+                  "r" : "318",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "302",
+                      "r" : "319",
                       "value" : [ "a", ": ", "24" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "303",
+                      "r" : "320",
                       "value" : [ "b", ": ", "25" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "304",
+                      "r" : "321",
                       "value" : [ "c", ": ", "26" ]
                     } ]
                   }, {
@@ -31936,35 +36981,35 @@ module.exports['Last'] = {
         } ],
         "resultTypeSpecifier" : {
           "type" : "TupleTypeSpecifier",
-          "localId" : "346",
+          "localId" : "363",
           "annotation" : [ ],
           "element" : [ {
-            "localId" : "347",
+            "localId" : "364",
             "name" : "a",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "348",
+              "localId" : "365",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
-            "localId" : "349",
+            "localId" : "366",
             "name" : "b",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "350",
+              "localId" : "367",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           }, {
-            "localId" : "351",
+            "localId" : "368",
             "name" : "c",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "352",
+              "localId" : "369",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
@@ -31972,39 +37017,39 @@ module.exports['Last'] = {
         },
         "expression" : {
           "type" : "Last",
-          "localId" : "330",
+          "localId" : "347",
           "annotation" : [ ],
           "resultTypeSpecifier" : {
             "type" : "TupleTypeSpecifier",
-            "localId" : "339",
+            "localId" : "356",
             "annotation" : [ ],
             "element" : [ {
-              "localId" : "340",
+              "localId" : "357",
               "name" : "a",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "341",
+                "localId" : "358",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "342",
+              "localId" : "359",
               "name" : "b",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "343",
+                "localId" : "360",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             }, {
-              "localId" : "344",
+              "localId" : "361",
               "name" : "c",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "345",
+                "localId" : "362",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -32012,39 +37057,39 @@ module.exports['Last'] = {
           },
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "331",
+            "localId" : "348",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "332",
+              "localId" : "349",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "333",
+                "localId" : "350",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "334",
+                  "localId" : "351",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "335",
+                "localId" : "352",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "336",
+                  "localId" : "353",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "337",
+                "localId" : "354",
                 "name" : "c",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "338",
+                  "localId" : "355",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
@@ -32053,43 +37098,43 @@ module.exports['Last'] = {
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "289",
+            "localId" : "306",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "312",
+              "localId" : "329",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "313",
+                "localId" : "330",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "314",
+                  "localId" : "331",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "315",
+                    "localId" : "332",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "316",
+                  "localId" : "333",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "317",
+                    "localId" : "334",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "318",
+                  "localId" : "335",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "319",
+                    "localId" : "336",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -32098,39 +37143,39 @@ module.exports['Last'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "290",
+              "localId" : "307",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "294",
+                "localId" : "311",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "295",
+                  "localId" : "312",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "296",
+                    "localId" : "313",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "297",
+                  "localId" : "314",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "298",
+                    "localId" : "315",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "299",
+                  "localId" : "316",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "300",
+                    "localId" : "317",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -32140,7 +37185,7 @@ module.exports['Last'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "291",
+                  "localId" : "308",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -32150,7 +37195,7 @@ module.exports['Last'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "292",
+                  "localId" : "309",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -32160,7 +37205,7 @@ module.exports['Last'] = {
                 "name" : "c",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "293",
+                  "localId" : "310",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -32169,39 +37214,39 @@ module.exports['Last'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "301",
+              "localId" : "318",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "305",
+                "localId" : "322",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "306",
+                  "localId" : "323",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "307",
+                    "localId" : "324",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "308",
+                  "localId" : "325",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "309",
+                    "localId" : "326",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "310",
+                  "localId" : "327",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "311",
+                    "localId" : "328",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -32211,7 +37256,7 @@ module.exports['Last'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "302",
+                  "localId" : "319",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "24",
@@ -32221,7 +37266,7 @@ module.exports['Last'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "303",
+                  "localId" : "320",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "25",
@@ -32231,7 +37276,7 @@ module.exports['Last'] = {
                 "name" : "c",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "304",
+                  "localId" : "321",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "26",
@@ -32242,7 +37287,7 @@ module.exports['Last'] = {
           }
         }
       }, {
-        "localId" : "355",
+        "localId" : "372",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "Unordered",
         "context" : "Patient",
@@ -32251,17 +37296,17 @@ module.exports['Last'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "355",
+            "r" : "372",
             "s" : [ {
               "value" : [ "", "define ", "Unordered", ": " ]
             }, {
-              "r" : "367",
+              "r" : "384",
               "s" : [ {
                 "value" : [ "Last", "(" ]
               }, {
-                "r" : "356",
+                "r" : "373",
                 "s" : [ {
-                  "r" : "357",
+                  "r" : "374",
                   "value" : [ "{", "3", ", ", "1", ", ", "4", ", ", "2", "}" ]
                 } ]
               }, {
@@ -32272,59 +37317,59 @@ module.exports['Last'] = {
         } ],
         "expression" : {
           "type" : "Last",
-          "localId" : "367",
+          "localId" : "384",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "368",
+            "localId" : "385",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "369",
+              "localId" : "386",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "356",
+            "localId" : "373",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "361",
+              "localId" : "378",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "362",
+                "localId" : "379",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
             },
             "element" : [ {
               "type" : "Literal",
-              "localId" : "357",
+              "localId" : "374",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "3",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "358",
+              "localId" : "375",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "1",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "359",
+              "localId" : "376",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "4",
               "annotation" : [ ]
             }, {
               "type" : "Literal",
-              "localId" : "360",
+              "localId" : "377",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
               "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
               "value" : "2",
@@ -32333,7 +37378,7 @@ module.exports['Last'] = {
           }
         }
       }, {
-        "localId" : "372",
+        "localId" : "389",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "Empty",
         "context" : "Patient",
@@ -32342,19 +37387,19 @@ module.exports['Last'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "372",
+            "r" : "389",
             "s" : [ {
               "value" : [ "", "define ", "Empty", ": " ]
             }, {
-              "r" : "382",
+              "r" : "399",
               "s" : [ {
                 "value" : [ "Last", "(" ]
               }, {
-                "r" : "374",
+                "r" : "391",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "373",
+                  "r" : "390",
                   "s" : [ {
                     "value" : [ "Integer" ]
                   } ]
@@ -32369,31 +37414,31 @@ module.exports['Last'] = {
         } ],
         "expression" : {
           "type" : "Last",
-          "localId" : "382",
+          "localId" : "399",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "383",
+            "localId" : "400",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "384",
+              "localId" : "401",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "List",
-            "localId" : "374",
+            "localId" : "391",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "376",
+              "localId" : "393",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "377",
+                "localId" : "394",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -32402,7 +37447,7 @@ module.exports['Last'] = {
           }
         }
       }, {
-        "localId" : "387",
+        "localId" : "404",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "NullValue",
         "context" : "Patient",
@@ -32411,24 +37456,24 @@ module.exports['Last'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "387",
+            "r" : "404",
             "s" : [ {
               "value" : [ "", "define ", "NullValue", ": " ]
             }, {
-              "r" : "400",
+              "r" : "417",
               "s" : [ {
                 "value" : [ "Last", "(" ]
               }, {
-                "r" : "388",
+                "r" : "405",
                 "s" : [ {
-                  "r" : "389",
+                  "r" : "406",
                   "value" : [ "null", " as " ]
                 }, {
-                  "r" : "390",
+                  "r" : "407",
                   "s" : [ {
                     "value" : [ "List<" ]
                   }, {
-                    "r" : "391",
+                    "r" : "408",
                     "s" : [ {
                       "value" : [ "Integer" ]
                     } ]
@@ -32444,32 +37489,32 @@ module.exports['Last'] = {
         } ],
         "expression" : {
           "type" : "Last",
-          "localId" : "400",
+          "localId" : "417",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "401",
+            "localId" : "418",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "402",
+              "localId" : "419",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "source" : {
             "type" : "As",
-            "localId" : "388",
+            "localId" : "405",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "394",
+              "localId" : "411",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "395",
+                "localId" : "412",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -32477,28 +37522,28 @@ module.exports['Last'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "389",
+              "localId" : "406",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "390",
+              "localId" : "407",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "392",
+                "localId" : "409",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "393",
+                  "localId" : "410",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "391",
+                "localId" : "408",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
@@ -32516,6 +37561,7 @@ library TestSnippet version '1'
 using Simple version '1.0.0'
 context Patient
 define Numbers: Length({2, 4, 6, 8, 10})
+define Longs: Length({2L, 4L, 6L, 8L, 10L})
 define Lists: Length({ {1, 2, 3}, {4, 5, 6}, {7, 8, 9}, {10, 11, 12}})
 define Tuples: Length({ Tuple{a: 1, b: 2, c: 3}, Tuple{a: 24, b: 25, c: 26} })
 define Empty: Length(List<Integer>{})
@@ -32534,7 +37580,7 @@ module.exports['Length'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "340",
+        "r" : "358",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -32707,7 +37753,7 @@ module.exports['Length'] = {
       }, {
         "localId" : "232",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
-        "name" : "Lists",
+        "name" : "Longs",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -32716,43 +37762,141 @@ module.exports['Length'] = {
           "s" : {
             "r" : "232",
             "s" : [ {
-              "value" : [ "", "define ", "Lists", ": " ]
+              "value" : [ "", "define ", "Longs", ": " ]
             }, {
-              "r" : "266",
+              "r" : "245",
               "s" : [ {
                 "value" : [ "Length", "(" ]
               }, {
                 "r" : "233",
+                "s" : [ {
+                  "r" : "234",
+                  "value" : [ "{", "2L", ", ", "4L", ", ", "6L", ", ", "8L", ", ", "10L", "}" ]
+                } ]
+              }, {
+                "value" : [ ")" ]
+              } ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Length",
+          "localId" : "245",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+          "annotation" : [ ],
+          "signature" : [ {
+            "type" : "ListTypeSpecifier",
+            "localId" : "246",
+            "annotation" : [ ],
+            "elementType" : {
+              "type" : "NamedTypeSpecifier",
+              "localId" : "247",
+              "name" : "{urn:hl7-org:elm-types:r1}Long",
+              "annotation" : [ ]
+            }
+          } ],
+          "operand" : {
+            "type" : "List",
+            "localId" : "233",
+            "annotation" : [ ],
+            "resultTypeSpecifier" : {
+              "type" : "ListTypeSpecifier",
+              "localId" : "239",
+              "annotation" : [ ],
+              "elementType" : {
+                "type" : "NamedTypeSpecifier",
+                "localId" : "240",
+                "name" : "{urn:hl7-org:elm-types:r1}Long",
+                "annotation" : [ ]
+              }
+            },
+            "element" : [ {
+              "type" : "Literal",
+              "localId" : "234",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "2",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "235",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "4",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "236",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "6",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "237",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "8",
+              "annotation" : [ ]
+            }, {
+              "type" : "Literal",
+              "localId" : "238",
+              "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+              "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+              "value" : "10",
+              "annotation" : [ ]
+            } ]
+          }
+        }
+      }, {
+        "localId" : "250",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
+        "name" : "Lists",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "250",
+            "s" : [ {
+              "value" : [ "", "define ", "Lists", ": " ]
+            }, {
+              "r" : "284",
+              "s" : [ {
+                "value" : [ "Length", "(" ]
+              }, {
+                "r" : "251",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "234",
+                  "r" : "252",
                   "s" : [ {
-                    "r" : "235",
+                    "r" : "253",
                     "value" : [ "{", "1", ", ", "2", ", ", "3", "}" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "240",
+                  "r" : "258",
                   "s" : [ {
-                    "r" : "241",
+                    "r" : "259",
                     "value" : [ "{", "4", ", ", "5", ", ", "6", "}" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "246",
+                  "r" : "264",
                   "s" : [ {
-                    "r" : "247",
+                    "r" : "265",
                     "value" : [ "{", "7", ", ", "8", ", ", "9", "}" ]
                   } ]
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "252",
+                  "r" : "270",
                   "s" : [ {
-                    "r" : "253",
+                    "r" : "271",
                     "value" : [ "{", "10", ", ", "11", ", ", "12", "}" ]
                   } ]
                 }, {
@@ -32766,20 +37910,20 @@ module.exports['Length'] = {
         } ],
         "expression" : {
           "type" : "Length",
-          "localId" : "266",
+          "localId" : "284",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "267",
+            "localId" : "285",
             "annotation" : [ ],
             "elementType" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "268",
+              "localId" : "286",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "269",
+                "localId" : "287",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -32787,19 +37931,19 @@ module.exports['Length'] = {
           } ],
           "operand" : {
             "type" : "List",
-            "localId" : "233",
+            "localId" : "251",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "258",
+              "localId" : "276",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "259",
+                "localId" : "277",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "260",
+                  "localId" : "278",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
@@ -32807,36 +37951,36 @@ module.exports['Length'] = {
             },
             "element" : [ {
               "type" : "List",
-              "localId" : "234",
+              "localId" : "252",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "238",
+                "localId" : "256",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "239",
+                  "localId" : "257",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "235",
+                "localId" : "253",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "1",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "236",
+                "localId" : "254",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "2",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "237",
+                "localId" : "255",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "3",
@@ -32844,36 +37988,36 @@ module.exports['Length'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "240",
+              "localId" : "258",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "244",
+                "localId" : "262",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "245",
+                  "localId" : "263",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "241",
+                "localId" : "259",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "4",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "242",
+                "localId" : "260",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "5",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "243",
+                "localId" : "261",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "6",
@@ -32881,36 +38025,36 @@ module.exports['Length'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "246",
+              "localId" : "264",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "250",
+                "localId" : "268",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "251",
+                  "localId" : "269",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "247",
+                "localId" : "265",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "7",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "248",
+                "localId" : "266",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "8",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "249",
+                "localId" : "267",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "9",
@@ -32918,36 +38062,36 @@ module.exports['Length'] = {
               } ]
             }, {
               "type" : "List",
-              "localId" : "252",
+              "localId" : "270",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "256",
+                "localId" : "274",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "257",
+                  "localId" : "275",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "element" : [ {
                 "type" : "Literal",
-                "localId" : "253",
+                "localId" : "271",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "10",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "254",
+                "localId" : "272",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "11",
                 "annotation" : [ ]
               }, {
                 "type" : "Literal",
-                "localId" : "255",
+                "localId" : "273",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                 "value" : "12",
@@ -32957,7 +38101,7 @@ module.exports['Length'] = {
           }
         }
       }, {
-        "localId" : "272",
+        "localId" : "290",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "Tuples",
         "context" : "Patient",
@@ -32966,38 +38110,38 @@ module.exports['Length'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "272",
+            "r" : "290",
             "s" : [ {
               "value" : [ "", "define ", "Tuples", ": " ]
             }, {
-              "r" : "314",
+              "r" : "332",
               "s" : [ {
                 "value" : [ "Length", "(" ]
               }, {
-                "r" : "273",
+                "r" : "291",
                 "s" : [ {
                   "value" : [ "{ " ]
                 }, {
-                  "r" : "274",
+                  "r" : "292",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "275",
+                      "r" : "293",
                       "value" : [ "a", ": ", "1" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "276",
+                      "r" : "294",
                       "value" : [ "b", ": ", "2" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "277",
+                      "r" : "295",
                       "value" : [ "c", ": ", "3" ]
                     } ]
                   }, {
@@ -33006,26 +38150,26 @@ module.exports['Length'] = {
                 }, {
                   "value" : [ ", " ]
                 }, {
-                  "r" : "285",
+                  "r" : "303",
                   "s" : [ {
                     "value" : [ "Tuple{" ]
                   }, {
                     "s" : [ {
-                      "r" : "286",
+                      "r" : "304",
                       "value" : [ "a", ": ", "24" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "287",
+                      "r" : "305",
                       "value" : [ "b", ": ", "25" ]
                     } ]
                   }, {
                     "value" : [ ", " ]
                   }, {
                     "s" : [ {
-                      "r" : "288",
+                      "r" : "306",
                       "value" : [ "c", ": ", "26" ]
                     } ]
                   }, {
@@ -33042,44 +38186,44 @@ module.exports['Length'] = {
         } ],
         "expression" : {
           "type" : "Length",
-          "localId" : "314",
+          "localId" : "332",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "315",
+            "localId" : "333",
             "annotation" : [ ],
             "elementType" : {
               "type" : "TupleTypeSpecifier",
-              "localId" : "316",
+              "localId" : "334",
               "annotation" : [ ],
               "element" : [ {
-                "localId" : "317",
+                "localId" : "335",
                 "name" : "a",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "318",
+                  "localId" : "336",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "319",
+                "localId" : "337",
                 "name" : "b",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "320",
+                  "localId" : "338",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               }, {
-                "localId" : "321",
+                "localId" : "339",
                 "name" : "c",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "322",
+                  "localId" : "340",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
@@ -33088,43 +38232,43 @@ module.exports['Length'] = {
           } ],
           "operand" : {
             "type" : "List",
-            "localId" : "273",
+            "localId" : "291",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "296",
+              "localId" : "314",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "297",
+                "localId" : "315",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "298",
+                  "localId" : "316",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "299",
+                    "localId" : "317",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "300",
+                  "localId" : "318",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "301",
+                    "localId" : "319",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "302",
+                  "localId" : "320",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "303",
+                    "localId" : "321",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -33133,39 +38277,39 @@ module.exports['Length'] = {
             },
             "element" : [ {
               "type" : "Tuple",
-              "localId" : "274",
+              "localId" : "292",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "278",
+                "localId" : "296",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "279",
+                  "localId" : "297",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "280",
+                    "localId" : "298",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "281",
+                  "localId" : "299",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "282",
+                    "localId" : "300",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "283",
+                  "localId" : "301",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "284",
+                    "localId" : "302",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -33175,7 +38319,7 @@ module.exports['Length'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "275",
+                  "localId" : "293",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "1",
@@ -33185,7 +38329,7 @@ module.exports['Length'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "276",
+                  "localId" : "294",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "2",
@@ -33195,7 +38339,7 @@ module.exports['Length'] = {
                 "name" : "c",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "277",
+                  "localId" : "295",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "3",
@@ -33204,39 +38348,39 @@ module.exports['Length'] = {
               } ]
             }, {
               "type" : "Tuple",
-              "localId" : "285",
+              "localId" : "303",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "TupleTypeSpecifier",
-                "localId" : "289",
+                "localId" : "307",
                 "annotation" : [ ],
                 "element" : [ {
-                  "localId" : "290",
+                  "localId" : "308",
                   "name" : "a",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "291",
+                    "localId" : "309",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "292",
+                  "localId" : "310",
                   "name" : "b",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "293",
+                    "localId" : "311",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
                 }, {
-                  "localId" : "294",
+                  "localId" : "312",
                   "name" : "c",
                   "annotation" : [ ],
                   "elementType" : {
                     "type" : "NamedTypeSpecifier",
-                    "localId" : "295",
+                    "localId" : "313",
                     "name" : "{urn:hl7-org:elm-types:r1}Integer",
                     "annotation" : [ ]
                   }
@@ -33246,7 +38390,7 @@ module.exports['Length'] = {
                 "name" : "a",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "286",
+                  "localId" : "304",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "24",
@@ -33256,7 +38400,7 @@ module.exports['Length'] = {
                 "name" : "b",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "287",
+                  "localId" : "305",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "25",
@@ -33266,7 +38410,7 @@ module.exports['Length'] = {
                 "name" : "c",
                 "value" : {
                   "type" : "Literal",
-                  "localId" : "288",
+                  "localId" : "306",
                   "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                   "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
                   "value" : "26",
@@ -33277,7 +38421,7 @@ module.exports['Length'] = {
           }
         }
       }, {
-        "localId" : "325",
+        "localId" : "343",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "Empty",
         "context" : "Patient",
@@ -33286,19 +38430,19 @@ module.exports['Length'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "325",
+            "r" : "343",
             "s" : [ {
               "value" : [ "", "define ", "Empty", ": " ]
             }, {
-              "r" : "335",
+              "r" : "353",
               "s" : [ {
                 "value" : [ "Length", "(" ]
               }, {
-                "r" : "327",
+                "r" : "345",
                 "s" : [ {
                   "value" : [ "List<" ]
                 }, {
-                  "r" : "326",
+                  "r" : "344",
                   "s" : [ {
                     "value" : [ "Integer" ]
                   } ]
@@ -33313,31 +38457,31 @@ module.exports['Length'] = {
         } ],
         "expression" : {
           "type" : "Length",
-          "localId" : "335",
+          "localId" : "353",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "336",
+            "localId" : "354",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "337",
+              "localId" : "355",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "List",
-            "localId" : "327",
+            "localId" : "345",
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "329",
+              "localId" : "347",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "330",
+                "localId" : "348",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -33346,7 +38490,7 @@ module.exports['Length'] = {
           }
         }
       }, {
-        "localId" : "340",
+        "localId" : "358",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
         "name" : "NullValue",
         "context" : "Patient",
@@ -33355,24 +38499,24 @@ module.exports['Length'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "340",
+            "r" : "358",
             "s" : [ {
               "value" : [ "", "define ", "NullValue", ": " ]
             }, {
-              "r" : "353",
+              "r" : "371",
               "s" : [ {
                 "value" : [ "Length", "(" ]
               }, {
-                "r" : "341",
+                "r" : "359",
                 "s" : [ {
-                  "r" : "342",
+                  "r" : "360",
                   "value" : [ "null", " as " ]
                 }, {
-                  "r" : "343",
+                  "r" : "361",
                   "s" : [ {
                     "value" : [ "List<" ]
                   }, {
-                    "r" : "344",
+                    "r" : "362",
                     "s" : [ {
                       "value" : [ "Integer" ]
                     } ]
@@ -33388,32 +38532,32 @@ module.exports['Length'] = {
         } ],
         "expression" : {
           "type" : "Length",
-          "localId" : "353",
+          "localId" : "371",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
           "annotation" : [ ],
           "signature" : [ {
             "type" : "ListTypeSpecifier",
-            "localId" : "354",
+            "localId" : "372",
             "annotation" : [ ],
             "elementType" : {
               "type" : "NamedTypeSpecifier",
-              "localId" : "355",
+              "localId" : "373",
               "name" : "{urn:hl7-org:elm-types:r1}Integer",
               "annotation" : [ ]
             }
           } ],
           "operand" : {
             "type" : "As",
-            "localId" : "341",
+            "localId" : "359",
             "strict" : false,
             "annotation" : [ ],
             "resultTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "347",
+              "localId" : "365",
               "annotation" : [ ],
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "348",
+                "localId" : "366",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
               }
@@ -33421,28 +38565,28 @@ module.exports['Length'] = {
             "signature" : [ ],
             "operand" : {
               "type" : "Null",
-              "localId" : "342",
+              "localId" : "360",
               "resultTypeName" : "{urn:hl7-org:elm-types:r1}Any",
               "annotation" : [ ]
             },
             "asTypeSpecifier" : {
               "type" : "ListTypeSpecifier",
-              "localId" : "343",
+              "localId" : "361",
               "annotation" : [ ],
               "resultTypeSpecifier" : {
                 "type" : "ListTypeSpecifier",
-                "localId" : "345",
+                "localId" : "363",
                 "annotation" : [ ],
                 "elementType" : {
                   "type" : "NamedTypeSpecifier",
-                  "localId" : "346",
+                  "localId" : "364",
                   "name" : "{urn:hl7-org:elm-types:r1}Integer",
                   "annotation" : [ ]
                 }
               },
               "elementType" : {
                 "type" : "NamedTypeSpecifier",
-                "localId" : "344",
+                "localId" : "362",
                 "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer",
                 "name" : "{urn:hl7-org:elm-types:r1}Integer",
                 "annotation" : [ ]
diff --git a/test/elm/list/list-test.ts b/test/elm/list/list-test.ts
index 4121c5ffb..3a0281bb3 100644
--- a/test/elm/list/list-test.ts
+++ b/test/elm/list/list-test.ts
@@ -12,6 +12,10 @@ describe('List', () => {
     (await this.intList.exec(this.ctx)).should.eql([9, 7, 8]);
   });
 
+  it('should execute to an array (longs)', async function () {
+    (await this.longList.exec(this.ctx)).should.eql([9n, 7n, 8n]);
+  });
+
   it('should execute to an array (strings)', async function () {
     (await this.stringList.exec(this.ctx)).should.eql(['a', 'bee', 'see']);
   });
@@ -75,6 +79,14 @@ describe('Equal', () => {
     (await this.unequalIntList.exec(this.ctx)).should.be.false();
   });
 
+  it('should identify equal lists of longs', async function () {
+    (await this.equalLongList.exec(this.ctx)).should.be.true();
+  });
+
+  it('should identify unequal lists of longs', async function () {
+    (await this.unequalLongList.exec(this.ctx)).should.be.false();
+  });
+
   it('should identify re-ordered lists of integers as unequal', async function () {
     (await this.reverseIntList.exec(this.ctx)).should.be.false();
   });
@@ -123,6 +135,14 @@ describe('NotEqual', () => {
     (await this.unequalIntList.exec(this.ctx)).should.be.true();
   });
 
+  it('should identify equal lists of longs', async function () {
+    (await this.equalLongList.exec(this.ctx)).should.be.false();
+  });
+
+  it('should identify unequal lists of longs', async function () {
+    (await this.unequalLongList.exec(this.ctx)).should.be.true();
+  });
+
   it('should identify re-ordered lists of integers as unequal', async function () {
     (await this.reverseIntList.exec(this.ctx)).should.be.true();
   });
@@ -157,6 +177,10 @@ describe('Union', () => {
     (await this.oneToFiveOverlapped.exec(this.ctx)).should.eql([1, 2, 3, 4, 5]);
   });
 
+  it('should remove duplicate long elements (according to CQL 1.2 spec)', async function () {
+    (await this.oneToFiveLongOverlapped.exec(this.ctx)).should.eql([1n, 2n, 3n, 4n, 5n]);
+  });
+
   it('should remove duplicate null elements', async function () {
     (await this.oneToFiveOverlappedWithNulls.exec(this.ctx)).should.eql([1, null, 2, 3, 4, 5]);
   });
@@ -190,6 +214,10 @@ describe('Except', () => {
     (await this.exceptThreeFour.exec(this.ctx)).should.eql([1, 2, 5]);
   });
 
+  it('should remove items in second list', async function () {
+    (await this.exceptThreeFourLong.exec(this.ctx)).should.eql([1n, 2n, 5n]);
+  });
+
   it('should not be commutative', async function () {
     (await this.threeFourExcept.exec(this.ctx)).should.eql([]);
   });
@@ -244,6 +272,10 @@ describe('Intersect', () => {
     (await this.intersectOnFive.exec(this.ctx)).should.eql([5]);
   });
 
+  it('should intersect two lists with a single common long element', async function () {
+    (await this.intersectOnFiveLong.exec(this.ctx)).should.eql([5n]);
+  });
+
   it('should intersect two lists with a single common element even with duplicates', async function () {
     (await this.intersectionOnFourDuplicates.exec(this.ctx)).should.eql([4]);
   });
@@ -288,6 +320,10 @@ describe('IndexOf', () => {
     this.ctx.rootContext().localId_context[this.indexOfSecond.element.localId].should.not.be.null();
   });
 
+  it('should return the correct 0-based index when a long item is in the list', async function () {
+    (await this.indexOfSecondLong.exec(this.ctx)).should.equal(1);
+  });
+
   it('should work with complex types like tuples', async function () {
     (await this.indexOfThirdTuple.exec(this.ctx)).should.equal(2);
   });
@@ -333,6 +369,10 @@ describe('Indexer', () => {
     (await this.secondItem.exec(this.ctx)).should.equal('b');
   });
 
+  it('should return the correct long item based on the 0-based index', async function () {
+    (await this.secondItemLong.exec(this.ctx)).should.equal(34n);
+  });
+
   it('should NOT return null when accessing index 0', async function () {
     should(await this.zeroIndex.exec(this.ctx)).not.be.null();
   });
@@ -360,6 +400,14 @@ describe('In', () => {
     (await this.isNotIn.exec(this.ctx)).should.be.false();
   });
 
+  it('should execute to true when long item is in list', async function () {
+    (await this.isInLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to false when long item is not in list', async function () {
+    (await this.isNotInLong.exec(this.ctx)).should.be.false();
+  });
+
   it('should execute to true when tuple is in list', async function () {
     (await this.tupleIsIn.exec(this.ctx)).should.be.true();
   });
@@ -394,6 +442,14 @@ describe('Contains', () => {
     (await this.isNotIn.exec(this.ctx)).should.be.false();
   });
 
+  it('should execute to true when long item is in list', async function () {
+    (await this.isInLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to false when long item is not in list', async function () {
+    (await this.isNotInLong.exec(this.ctx)).should.be.false();
+  });
+
   it('should execute to true when tuple is in list', async function () {
     (await this.tupleIsIn.exec(this.ctx)).should.be.true();
   });
@@ -436,6 +492,22 @@ describe('Includes', () => {
     (await this.isNotIncluded.exec(this.ctx)).should.be.false();
   });
 
+  it('should execute to true when sublist of longs is in list', async function () {
+    (await this.isIncludedLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to true when sublist of longs is in list in different order', async function () {
+    (await this.isIncludedReversedLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to true when lists of longs are the same', async function () {
+    (await this.isSameLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to false when sublist of longs is not in list', async function () {
+    (await this.isNotIncludedLong.exec(this.ctx)).should.be.false();
+  });
+
   it('should execute to true when tuple sublist is in list', async function () {
     (await this.tuplesIncluded.exec(this.ctx)).should.be.true();
   });
@@ -485,6 +557,22 @@ describe('IncludedIn', () => {
     (await this.isNotIncluded.exec(this.ctx)).should.be.false();
   });
 
+  it('should execute to true when sublist of longs is in list', async function () {
+    (await this.isIncludedLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to true when sublist of longs is in list in different order', async function () {
+    (await this.isIncludedReversedLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to true when lists of longs are the same', async function () {
+    (await this.isSameLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to false when sublist of longs is not in list', async function () {
+    (await this.isNotIncludedLong.exec(this.ctx)).should.be.false();
+  });
+
   it('should execute to true when tuple sublist is in list', async function () {
     (await this.tuplesIncluded.exec(this.ctx)).should.be.true();
   });
@@ -534,6 +622,22 @@ describe('ProperIncludes', () => {
     (await this.isNotIncluded.exec(this.ctx)).should.be.false();
   });
 
+  it('should execute to true when sublist of longs is in list', async function () {
+    (await this.isIncludedLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to true when sublist of longs is in list in different order', async function () {
+    (await this.isIncludedReversedLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to false when lists of longs are the same', async function () {
+    (await this.isSameLong.exec(this.ctx)).should.be.false();
+  });
+
+  it('should execute to false when sublist of longs is not in list', async function () {
+    (await this.isNotIncludedLong.exec(this.ctx)).should.be.false();
+  });
+
   it('should execute to true when tuple sublist is in list', async function () {
     (await this.tuplesIncluded.exec(this.ctx)).should.be.true();
   });
@@ -570,6 +674,22 @@ describe('ProperIncludedIn', () => {
     (await this.isNotIncluded.exec(this.ctx)).should.be.false();
   });
 
+  it('should execute to true when sublist of longs is in list', async function () {
+    (await this.isIncludedLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to true when sublist of longs is in list in different order', async function () {
+    (await this.isIncludedReversedLong.exec(this.ctx)).should.be.true();
+  });
+
+  it('should execute to false when lists of longs are the same', async function () {
+    (await this.isSameLong.exec(this.ctx)).should.be.false();
+  });
+
+  it('should execute to false when sublist of longs is not in list', async function () {
+    (await this.isNotIncludedLong.exec(this.ctx)).should.be.false();
+  });
+
   it('should execute to true when tuple sublist is in list', async function () {
     (await this.tuplesIncluded.exec(this.ctx)).should.be.true();
   });
@@ -609,6 +729,10 @@ describe('Distinct', () => {
     (await this.lotsOfDups.exec(this.ctx)).should.eql([1, 2, 3, 4, 5]);
   });
 
+  it('should remove long duplicates', async function () {
+    (await this.lotsOfLongDups.exec(this.ctx)).should.eql([1n, 2n, 3n, 4n, 5n]);
+  });
+
   it('should do nothing to an already distinct array', async function () {
     (await this.noDups.exec(this.ctx)).should.eql([2, 4, 6, 8, 10]);
   });
@@ -645,6 +769,12 @@ describe('First', () => {
     should(this.ctx.localId_context[listLocalId]).not.be.undefined();
   });
 
+  it('should get first of a list of longs and the localId should exist on the root context', async function () {
+    (await this.longs.exec(this.ctx)).should.equal(1n);
+    const listLocalId = getLocalIdByPath(data, 'First', 'Longs', 'source');
+    should(this.ctx.localId_context[listLocalId]).not.be.undefined();
+  });
+
   it('should get first of a list of letters and the localId should exist on the root context', async function () {
     (await this.letters.exec(this.ctx)).should.equal('a');
     const listLocalId = getLocalIdByPath(data, 'First', 'Letters', 'source');
@@ -693,6 +823,12 @@ describe('Last', () => {
     should(this.ctx.localId_context[listLocalId]).not.be.undefined();
   });
 
+  it('should get last of a list of longs and the localId should exist on the root context', async function () {
+    (await this.longs.exec(this.ctx)).should.equal(4n);
+    const listLocalId = getLocalIdByPath(data, 'Last', 'Longs', 'source');
+    should(this.ctx.localId_context[listLocalId]).not.be.undefined();
+  });
+
   it('should get last of a list of letters and the localId should exist on the root context', async function () {
     (await this.letters.exec(this.ctx)).should.equal('c');
     const listLocalId = getLocalIdByPath(data, 'Last', 'Letters', 'source');
@@ -739,6 +875,10 @@ describe('Length', () => {
     (await this.numbers.exec(this.ctx)).should.equal(5);
   });
 
+  it('should get length of a list of longs', async function () {
+    (await this.longs.exec(this.ctx)).should.equal(5);
+  });
+
   it('should get length of a list of lists', async function () {
     (await this.lists.exec(this.ctx)).should.equal(4);
   });
diff --git a/test/elm/literal/data.cql b/test/elm/literal/data.cql
index 5dde4e750..d706f3cb4 100644
--- a/test/elm/literal/data.cql
+++ b/test/elm/literal/data.cql
@@ -2,6 +2,7 @@
 define BoolTrue: true
 define BoolFalse: false
 define IntOne: 1
+define LongOne: 1L
 define DecimalTenth: 0.1
 define StringTrue: 'true'
 define DateTimeX: @2012-02-15T12:10:59.456Z
diff --git a/test/elm/literal/data.js b/test/elm/literal/data.js
index c17db7b35..521e89bf8 100644
--- a/test/elm/literal/data.js
+++ b/test/elm/literal/data.js
@@ -15,6 +15,7 @@ context Patient
 define BoolTrue: true
 define BoolFalse: false
 define IntOne: 1
+define LongOne: 1L
 define DecimalTenth: 0.1
 define StringTrue: 'true'
 define DateTimeX: @2012-02-15T12:10:59.456Z
@@ -33,7 +34,7 @@ module.exports['Literal'] = {
       "type" : "Annotation",
       "t" : [ ],
       "s" : {
-        "r" : "247",
+        "r" : "251",
         "s" : [ {
           "value" : [ "", "library TestSnippet version '1'" ]
         } ]
@@ -182,8 +183,8 @@ module.exports['Literal'] = {
         }
       }, {
         "localId" : "226",
-        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
-        "name" : "DecimalTenth",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+        "name" : "LongOne",
         "context" : "Patient",
         "accessLevel" : "Public",
         "annotation" : [ {
@@ -193,20 +194,45 @@ module.exports['Literal'] = {
             "r" : "226",
             "s" : [ {
               "r" : "227",
-              "value" : [ "", "define ", "DecimalTenth", ": ", "0.1" ]
+              "value" : [ "", "define ", "LongOne", ": ", "1L" ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Literal",
           "localId" : "227",
+          "resultTypeName" : "{urn:hl7-org:elm-types:r1}Long",
+          "valueType" : "{urn:hl7-org:elm-types:r1}Long",
+          "value" : "1",
+          "annotation" : [ ]
+        }
+      }, {
+        "localId" : "230",
+        "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
+        "name" : "DecimalTenth",
+        "context" : "Patient",
+        "accessLevel" : "Public",
+        "annotation" : [ {
+          "type" : "Annotation",
+          "t" : [ ],
+          "s" : {
+            "r" : "230",
+            "s" : [ {
+              "r" : "231",
+              "value" : [ "", "define ", "DecimalTenth", ": ", "0.1" ]
+            } ]
+          }
+        } ],
+        "expression" : {
+          "type" : "Literal",
+          "localId" : "231",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Decimal",
           "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
           "value" : "0.1",
           "annotation" : [ ]
         }
       }, {
-        "localId" : "230",
+        "localId" : "234",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
         "name" : "StringTrue",
         "context" : "Patient",
@@ -215,11 +241,11 @@ module.exports['Literal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "230",
+            "r" : "234",
             "s" : [ {
               "value" : [ "", "define ", "StringTrue", ": " ]
             }, {
-              "r" : "231",
+              "r" : "235",
               "s" : [ {
                 "value" : [ "'true'" ]
               } ]
@@ -228,14 +254,14 @@ module.exports['Literal'] = {
         } ],
         "expression" : {
           "type" : "Literal",
-          "localId" : "231",
+          "localId" : "235",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}String",
           "valueType" : "{urn:hl7-org:elm-types:r1}String",
           "value" : "true",
           "annotation" : [ ]
         }
       }, {
-        "localId" : "235",
+        "localId" : "239",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
         "name" : "DateTimeX",
         "context" : "Patient",
@@ -244,78 +270,78 @@ module.exports['Literal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "235",
+            "r" : "239",
             "s" : [ {
-              "r" : "236",
+              "r" : "240",
               "value" : [ "", "define ", "DateTimeX", ": ", "@2012-02-15T12:10:59.456Z" ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "DateTime",
-          "localId" : "236",
+          "localId" : "240",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}DateTime",
           "annotation" : [ ],
           "signature" : [ ],
           "year" : {
             "type" : "Literal",
-            "localId" : "237",
+            "localId" : "241",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "2012",
             "annotation" : [ ]
           },
           "month" : {
             "type" : "Literal",
-            "localId" : "238",
+            "localId" : "242",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "2",
             "annotation" : [ ]
           },
           "day" : {
             "type" : "Literal",
-            "localId" : "239",
+            "localId" : "243",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "15",
             "annotation" : [ ]
           },
           "hour" : {
             "type" : "Literal",
-            "localId" : "240",
+            "localId" : "244",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "12",
             "annotation" : [ ]
           },
           "minute" : {
             "type" : "Literal",
-            "localId" : "241",
+            "localId" : "245",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "10",
             "annotation" : [ ]
           },
           "second" : {
             "type" : "Literal",
-            "localId" : "242",
+            "localId" : "246",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "59",
             "annotation" : [ ]
           },
           "millisecond" : {
             "type" : "Literal",
-            "localId" : "243",
+            "localId" : "247",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "456",
             "annotation" : [ ]
           },
           "timezoneOffset" : {
             "type" : "Literal",
-            "localId" : "244",
+            "localId" : "248",
             "valueType" : "{urn:hl7-org:elm-types:r1}Decimal",
             "value" : "0.0",
             "annotation" : [ ]
           }
         }
       }, {
-        "localId" : "247",
+        "localId" : "251",
         "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
         "name" : "TimeX",
         "context" : "Patient",
@@ -324,43 +350,43 @@ module.exports['Literal'] = {
           "type" : "Annotation",
           "t" : [ ],
           "s" : {
-            "r" : "247",
+            "r" : "251",
             "s" : [ {
-              "r" : "248",
+              "r" : "252",
               "value" : [ "", "define ", "TimeX", ": ", "@T12:10:59.456" ]
             } ]
           }
         } ],
         "expression" : {
           "type" : "Time",
-          "localId" : "248",
+          "localId" : "252",
           "resultTypeName" : "{urn:hl7-org:elm-types:r1}Time",
           "annotation" : [ ],
           "signature" : [ ],
           "hour" : {
             "type" : "Literal",
-            "localId" : "249",
+            "localId" : "253",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "12",
             "annotation" : [ ]
           },
           "minute" : {
             "type" : "Literal",
-            "localId" : "250",
+            "localId" : "254",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "10",
             "annotation" : [ ]
           },
           "second" : {
             "type" : "Literal",
-            "localId" : "251",
+            "localId" : "255",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "59",
             "annotation" : [ ]
           },
           "millisecond" : {
             "type" : "Literal",
-            "localId" : "252",
+            "localId" : "256",
             "valueType" : "{urn:hl7-org:elm-types:r1}Integer",
             "value" : "456",
             "annotation" : [ ]
diff --git a/test/elm/literal/literal-test.ts b/test/elm/literal/literal-test.ts
index 2ce16fcc3..e46dc7228 100644
--- a/test/elm/literal/literal-test.ts
+++ b/test/elm/literal/literal-test.ts
@@ -31,6 +31,14 @@ describe('Literal', () => {
     (await this.intOne.exec(this.ctx)).should.equal(1);
   });
 
+  it('should convert 1L to 1n', function () {
+    this.longOne.value.should.equal(1n);
+  });
+
+  it('should execute 1L as 1n', async function () {
+    (await this.longOne.exec(this.ctx)).should.equal(1n);
+  });
+
   it('should convert .1 to decimal .1', function () {
     this.decimalTenth.value.should.equal(0.1);
   });
diff --git a/test/elm/string/string-test.ts b/test/elm/string/string-test.ts
index 8ab28fde5..42eeeebc6 100644
--- a/test/elm/string/string-test.ts
+++ b/test/elm/string/string-test.ts
@@ -65,7 +65,7 @@ describe('Combine', () => {
     setup(this, data);
   });
 
-  it.skip('should be a Combine', function () {
+  it('should be a Combine', function () {
     this.separator.should.be.an.instanceOf(str.Combine);
   });
 
@@ -99,7 +99,7 @@ describe('Split', () => {
     setup(this, data);
   });
 
-  it.skip('should be a Split', function () {
+  it('should be a Split', function () {
     this.commaSeparated.should.be.an.instanceOf(str.Split);
   });
 
@@ -181,7 +181,7 @@ describe('Length', () => {
     setup(this, data);
   });
 
-  it.skip('should be a Length', function () {
+  it('should be a Length', function () {
     this.elevenLetters.should.be.an.instanceOf(overloaded.Length);
   });
 
@@ -199,7 +199,7 @@ describe('Upper', () => {
     setup(this, data);
   });
 
-  it.skip('should be an Upper', function () {
+  it('should be an Upper', function () {
     this.upperC.should.be.an.instanceOf(str.Upper);
   });
 
@@ -225,7 +225,7 @@ describe('Lower', () => {
     setup(this, data);
   });
 
-  it.skip('should be a Lower', function () {
+  it('should be a Lower', function () {
     this.lowerC.should.be.an.instanceOf(str.Lower);
   });
 
@@ -330,7 +330,7 @@ describe('Substring', () => {
     setup(this, data);
   });
 
-  it.skip('should be a Substring', function () {
+  it('should be a Substring', function () {
     this.world.should.be.an.instanceOf(str.Substring);
   });
 
diff --git a/test/generator/build.gradle b/test/generator/build.gradle
index e98e4d073..028ed6a39 100644
--- a/test/generator/build.gradle
+++ b/test/generator/build.gradle
@@ -30,5 +30,5 @@ task watchTestData (dependsOn: 'classes', type: JavaExec) {
 task generateSpecTestData(dependsOn: 'classes', type: JavaExec) {
   classpath = sourceSets.main.runtimeClasspath
   mainClass = 'org.cqframework.cql.cql2elm.cli.Main'
-  args '--input', "${projectDir}/../spec-tests/cql", '--format', 'JSON'
+  args '--input', "${projectDir}/../spec-tests/cql", '--result-types', '--format', 'JSON'
 }
diff --git a/test/spec-tests/cql/CqlAggregateFunctionsTest.cql b/test/spec-tests/cql/CqlAggregateFunctionsTest.cql
index 1f2057d07..1cb789ef4 100644
--- a/test/spec-tests/cql/CqlAggregateFunctionsTest.cql
+++ b/test/spec-tests/cql/CqlAggregateFunctionsTest.cql
@@ -89,11 +89,9 @@ define "Avg": Tuple{
 
 define "Product": Tuple{
   "ProductLong": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: Product({5L, 4L, 5L}),
     output: 100L
-    */  }
+  }
 }
 
 define "Count": Tuple{
@@ -226,11 +224,9 @@ define "Sum": Tuple{
     output: 20.0
   },
   "SumTestLong": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: Sum({ 6L, 2L, 3L, 4L, 5L }),
     output: 20L
-    */  },
+  },
   "SumTestQuantity": Tuple{
     expression: Sum({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'}),
     output: 15 'ml'
diff --git a/test/spec-tests/cql/CqlAggregateFunctionsTest.json b/test/spec-tests/cql/CqlAggregateFunctionsTest.json
index e35d4724a..2ec869af2 100644
--- a/test/spec-tests/cql/CqlAggregateFunctionsTest.json
+++ b/test/spec-tests/cql/CqlAggregateFunctionsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,34 +66,530 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "AllTrueAllTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AllTrueTrueFirst",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AllTrueFalseFirst",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AllTrueAllTrueFalseTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AllTrueAllFalseTrueFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AllTrueNullFirst",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AllTrueEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AllTrueIsTrueWhenNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "AllTrueAllTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AllTrueTrueFirst",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AllTrueFalseFirst",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AllTrueAllTrueFalseTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AllTrueAllFalseTrueFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AllTrueNullFirst",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AllTrueEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AllTrueIsTrueWhenNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "AllTrueAllTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AllTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -106,6 +602,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -119,25 +616,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AllTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
@@ -150,6 +683,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -163,25 +697,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AllTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -194,6 +764,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -207,31 +778,68 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "AllTrue",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "AllTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -244,6 +852,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -257,31 +866,68 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AllTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
@@ -294,6 +940,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -307,16 +954,50 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AllTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "As",
@@ -325,17 +1006,20 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -346,10 +1030,411 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AllTrueEmptyList",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "AllTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "source": {
+                          "type": "Query",
+                          "annotation": [],
+                          "source": [
+                            {
+                              "alias": "X",
+                              "annotation": [],
+                              "expression": {
+                                "type": "List",
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "ListTypeSpecifier",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
+                                "element": []
+                              }
+                            }
+                          ],
+                          "let": [],
+                          "relationship": [],
+                          "return": {
+                            "distinct": false,
+                            "annotation": [],
+                            "expression": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "AliasRef",
+                                "name": "X",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AllTrueIsTrueWhenNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "AllTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "source": {
+                          "type": "As",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "AnyTrue",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "AnyTrueAllTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AnyTrueAllFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AnyTrueAllTrueFalseTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AnyTrueAllFalseTrueFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AnyTrueTrueFirst",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AnyTrueFalseFirst",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AnyTrueNullFirstThenTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AnyTrueNullFirstThenFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -357,57 +1442,27 @@
                 }
               },
               {
-                "name": "AllTrueEmptyList",
-                "value": {
-                  "type": "Tuple",
+                "name": "AnyTrueEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "AllTrue",
-                        "annotation": [],
-                        "signature": [],
-                        "source": {
-                          "type": "Query",
-                          "annotation": [],
-                          "source": [
-                            {
-                              "alias": "X",
-                              "annotation": [],
-                              "expression": {
-                                "type": "List",
-                                "annotation": [],
-                                "element": []
-                              }
-                            }
-                          ],
-                          "let": [],
-                          "relationship": [],
-                          "return": {
-                            "distinct": false,
-                            "annotation": [],
-                            "expression": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "AliasRef",
-                                "name": "X",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -415,43 +1470,27 @@
                 }
               },
               {
-                "name": "AllTrueIsTrueWhenNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "AnyTrueIsFalseWhenNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "AllTrue",
-                        "annotation": [],
-                        "signature": [],
-                        "source": {
-                          "type": "As",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          },
-                          "asTypeSpecifier": {
-                            "type": "ListTypeSpecifier",
-                            "annotation": [],
-                            "elementType": {
-                              "type": "NamedTypeSpecifier",
-                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
-                              "annotation": []
-                            }
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -459,41 +1498,357 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "AnyTrue",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "AnyTrueAllTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AnyTrueAllFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AnyTrueAllTrueFalseTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AnyTrueAllFalseTrueFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AnyTrueTrueFirst",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AnyTrueFalseFirst",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AnyTrueNullFirstThenTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AnyTrueNullFirstThenFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AnyTrueEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AnyTrueIsFalseWhenNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "AnyTrueAllTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AnyTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -506,6 +1861,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -519,25 +1875,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AnyTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
@@ -550,6 +1942,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -563,31 +1956,68 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AnyTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -600,6 +2030,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -613,31 +2044,68 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AnyTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
@@ -650,6 +2118,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -663,25 +2132,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AnyTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
@@ -694,6 +2199,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -707,25 +2213,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AnyTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -738,6 +2280,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -751,16 +2294,50 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AnyTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "As",
@@ -769,11 +2346,13 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -786,6 +2365,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -799,16 +2379,50 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AnyTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "As",
@@ -817,11 +2431,13 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
@@ -834,6 +2450,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -847,11 +2464,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AnyTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
@@ -864,6 +2506,15 @@
                               "expression": {
                                 "type": "List",
                                 "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "ListTypeSpecifier",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
                                 "element": []
                               }
                             }
@@ -892,6 +2543,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -905,11 +2557,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "AnyTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "source": {
@@ -918,6 +2595,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           "asTypeSpecifier": {
@@ -936,6 +2614,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -952,46 +2631,152 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "AvgTest1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "AvgTest1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "AvgTest1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Avg",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "2.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "3.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "6.0",
                               "annotation": []
@@ -1002,40 +2787,303 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "3.0",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "3.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Product",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ProductLong",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ProductLong",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "ProductLong",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Product",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "source": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Long",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "100",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Count",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "CountTest1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CountTestDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CountTestTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Product",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "ProductLong",
-                "value": {
-                  "type": "Tuple",
+                "name": "CountTestNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -1043,47 +3091,196 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Count",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "CountTest1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CountTestDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CountTestTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CountTestNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "CountTest1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Count",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "15",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "99",
                               "annotation": []
@@ -1095,11 +3292,13 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -1112,6 +3311,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "4",
                         "annotation": []
@@ -1125,23 +3325,59 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Count",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2014",
                                 "annotation": []
@@ -1149,10 +3385,12 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2001",
                                 "annotation": []
@@ -1160,10 +3398,12 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2010",
                                 "annotation": []
@@ -1177,6 +3417,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "3",
                         "annotation": []
@@ -1190,19 +3431,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Count",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -1232,6 +3508,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -1261,6 +3538,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -1296,6 +3574,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "3",
                         "annotation": []
@@ -1309,16 +3588,50 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Count",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
                           "element": []
                         }
                       }
@@ -1327,6 +3640,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "0",
                         "annotation": []
@@ -1343,70 +3657,404 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "MaxTestInteger",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MaxTestLong",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MaxTestString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MaxTestDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MaxTestTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "MaxTestInteger",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MaxTestLong",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MaxTestString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MaxTestDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MaxTestTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "MaxTestInteger",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Max",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "12",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "15",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "90",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "44",
                               "annotation": []
@@ -1419,6 +4067,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "90",
                         "annotation": []
@@ -1432,61 +4081,103 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Max",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Long",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "5",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "12",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "15",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "4",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "90",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "44",
                               "annotation": []
@@ -1499,6 +4190,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                         "valueType": "{urn:hl7-org:elm-types:r1}Long",
                         "value": "90",
                         "annotation": []
@@ -1512,31 +4204,68 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Max",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "hi",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "bye",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "zebra",
                               "annotation": []
@@ -1549,6 +4278,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "zebra",
                         "annotation": []
@@ -1562,35 +4292,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Max",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -1598,22 +4366,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "9",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -1621,22 +4393,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "6",
                                 "annotation": []
@@ -1650,6 +4426,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -1680,19 +4457,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Max",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -1722,6 +4534,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -1751,6 +4564,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -1786,6 +4600,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -1825,58 +4640,166 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "MedianTestDecimal",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "MedianTestDecimal",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "MedianTestDecimal",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Median",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "6.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "5.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "3.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "2.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
@@ -1884,91 +4807,426 @@
                           ]
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "3.5",
-                        "annotation": []
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "3.5",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Min",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "MinTestInteger",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MinTestLong",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MinTestString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MinTestDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MinTestTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "MinTestInteger",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MinTestLong",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MinTestString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MinTestDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
+                },
+                {
+                  "name": "MinTestTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Min",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "MinTestInteger",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Min",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "12",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "15",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "90",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "44",
                               "annotation": []
@@ -1981,6 +5239,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "0",
                         "annotation": []
@@ -1994,61 +5253,103 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Min",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Long",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "5",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "12",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "15",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "4",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "90",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                               "valueType": "{urn:hl7-org:elm-types:r1}Long",
                               "value": "44",
                               "annotation": []
@@ -2061,6 +5362,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                         "valueType": "{urn:hl7-org:elm-types:r1}Long",
                         "value": "0",
                         "annotation": []
@@ -2074,31 +5376,68 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Min",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "hi",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "bye",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "zebra",
                               "annotation": []
@@ -2111,6 +5450,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "bye",
                         "annotation": []
@@ -2124,35 +5464,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Min",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -2160,22 +5538,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "9",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -2183,22 +5565,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "6",
                                 "annotation": []
@@ -2212,6 +5598,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -2242,19 +5629,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Min",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -2284,6 +5706,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -2313,6 +5736,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -2348,6 +5772,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -2387,70 +5812,348 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ModeTestInteger",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ModeTestDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ModeTestDateTime2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ModeTestTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ModeTestInteger",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ModeTestDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ModeTestDateTime2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ModeTestTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "ModeTestInteger",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Mode",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "8",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "9",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "9",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "9",
                               "annotation": []
@@ -2463,6 +6166,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "9",
                         "annotation": []
@@ -2476,35 +6180,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Mode",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -2512,22 +6254,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "9",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -2535,22 +6281,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "6",
                                 "annotation": []
@@ -2558,22 +6308,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "9",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -2587,6 +6341,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -2617,35 +6372,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Mode",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -2653,22 +6446,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -2676,22 +6473,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "6",
                                 "annotation": []
@@ -2699,22 +6500,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "9",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -2728,6 +6533,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -2758,19 +6564,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Mode",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -2800,6 +6641,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -2829,6 +6671,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -2858,6 +6701,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -2893,6 +6737,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -2932,52 +6777,215 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "PopStdDevTest1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PopulationStdDevIsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "PopStdDevTest1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PopulationStdDevIsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "PopStdDevTest1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "PopulationStdDev",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "2.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "3.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "5.0",
                               "annotation": []
@@ -2990,6 +6998,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "1.41421356",
                         "annotation": []
@@ -3003,58 +7012,101 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "PopulationStdDev",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
@@ -3067,6 +7119,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3081,52 +7134,215 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "PopVarianceTest1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PopVarianceIsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "PopVarianceTest1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PopVarianceIsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "PopVarianceTest1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "PopulationVariance",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "2.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "3.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "5.0",
                               "annotation": []
@@ -3139,6 +7355,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "2.0",
                         "annotation": []
@@ -3152,58 +7369,101 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "PopulationVariance",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
@@ -3216,6 +7476,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3230,52 +7491,215 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "StdDevTest1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StdDevIsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "StdDevTest1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StdDevIsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "StdDevTest1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "StdDev",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "2.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "3.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "5.0",
                               "annotation": []
@@ -3288,6 +7712,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "1.58113883",
                         "annotation": []
@@ -3301,58 +7726,101 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "StdDev",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
@@ -3365,6 +7833,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3379,52 +7848,327 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "SumTest1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SumTestLong",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SumTestQuantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SumTestNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SumTest1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SumTestLong",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SumTestQuantity",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SumTestNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "SumTest1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Sum",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "6.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "2.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "3.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "5.0",
                               "annotation": []
@@ -3437,6 +8181,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "20.0",
                         "annotation": []
@@ -3450,13 +8195,97 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
+                      "value": {
+                        "type": "Sum",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "source": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Long",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "6",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "20",
                         "annotation": []
                       }
                     }
@@ -3468,43 +8297,82 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Sum",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 1,
                               "unit": "ml",
                               "annotation": []
                             },
                             {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 2,
                               "unit": "ml",
                               "annotation": []
                             },
                             {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 3,
                               "unit": "ml",
                               "annotation": []
                             },
                             {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 4,
                               "unit": "ml",
                               "annotation": []
                             },
                             {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 5,
                               "unit": "ml",
                               "annotation": []
@@ -3517,6 +8385,7 @@
                       "name": "output",
                       "value": {
                         "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "value": 15,
                         "unit": "ml",
                         "annotation": []
@@ -3530,16 +8399,50 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Sum",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "As",
@@ -3548,11 +8451,13 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -3564,6 +8469,7 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             }
@@ -3575,6 +8481,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -3591,52 +8498,159 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "VarianceTest1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "VarianceTest1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "VarianceTest1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Variance",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "2.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "3.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "5.0",
                               "annotation": []
@@ -3649,6 +8663,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "2.5",
                         "annotation": []
diff --git a/test/spec-tests/cql/CqlAggregateTest.json b/test/spec-tests/cql/CqlAggregateTest.json
index 5b9c5a1b8..5eb955711 100644
--- a/test/spec-tests/cql/CqlAggregateTest.json
+++ b/test/spec-tests/cql/CqlAggregateTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,55 +66,601 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "FactorialOfFive",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RolledOutIntervals",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AggregateSumWithStart",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AggregateSumWithNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AggregateSumAll",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AggregateSumDistinct",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Multi",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MegaMulti",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MegaMultiDistinct",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "FactorialOfFive",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "RolledOutIntervals",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AggregateSumWithStart",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AggregateSumWithNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AggregateSumAll",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AggregateSumDistinct",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Multi",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MegaMulti",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MegaMultiDistinct",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "FactorialOfFive",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "Num",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -126,20 +672,24 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "Result",
                           "annotation": [],
                           "expression": {
                             "type": "Multiply",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "QueryLetRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "Result",
                                 "annotation": []
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "Num",
                                 "annotation": []
                               }
@@ -147,6 +697,7 @@
                           },
                           "starting": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -158,6 +709,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "120",
                         "annotation": []
@@ -171,11 +723,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "CQL adds an integer to a date (\"S + duration in days of X\"). Should be \"S + Quantity{ value: duration in days of X, unit: 'days' }\". Translator translates it, but probably shouldn't.",
                         "annotation": []
@@ -189,46 +757,94 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "Num",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -240,20 +856,24 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "Result",
                           "annotation": [],
                           "expression": {
                             "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "QueryLetRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "Result",
                                 "annotation": []
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "Num",
                                 "annotation": []
                               }
@@ -261,6 +881,7 @@
                           },
                           "starting": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -272,6 +893,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "16",
                         "annotation": []
@@ -285,46 +907,94 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "Num",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -336,10 +1006,12 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "Result",
                           "annotation": [],
                           "expression": {
                             "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
@@ -350,16 +1022,19 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Coalesce",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": [],
                                   "signature": [],
                                   "operand": [
                                     {
                                       "type": "QueryLetRef",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                       "name": "Result",
                                       "annotation": []
                                     },
                                     {
                                       "type": "Literal",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                       "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                       "value": "0",
                                       "annotation": []
@@ -369,6 +1044,7 @@
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "Num",
                                 "annotation": []
                               }
@@ -376,6 +1052,7 @@
                           },
                           "starting": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -385,6 +1062,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "15",
                         "annotation": []
@@ -398,70 +1076,122 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "Num",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -473,11 +1203,13 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "Result",
                           "distinct": false,
                           "annotation": [],
                           "expression": {
                             "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
@@ -488,16 +1220,19 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Coalesce",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": [],
                                   "signature": [],
                                   "operand": [
                                     {
                                       "type": "QueryLetRef",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                       "name": "Result",
                                       "annotation": []
                                     },
                                     {
                                       "type": "Literal",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                       "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                       "value": "0",
                                       "annotation": []
@@ -507,6 +1242,7 @@
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "Num",
                                 "annotation": []
                               }
@@ -514,6 +1250,7 @@
                           },
                           "starting": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -523,6 +1260,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "24",
                         "annotation": []
@@ -536,70 +1274,122 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "Num",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -611,11 +1401,13 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "Result",
                           "distinct": true,
                           "annotation": [],
                           "expression": {
                             "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
@@ -626,16 +1418,19 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Coalesce",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": [],
                                   "signature": [],
                                   "operand": [
                                     {
                                       "type": "QueryLetRef",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                       "name": "Result",
                                       "annotation": []
                                     },
                                     {
                                       "type": "Literal",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                       "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                       "value": "0",
                                       "annotation": []
@@ -645,6 +1440,7 @@
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "Num",
                                 "annotation": []
                               }
@@ -652,6 +1448,7 @@
                           },
                           "starting": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -661,6 +1458,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "15",
                         "annotation": []
@@ -674,22 +1472,66 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "X",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
@@ -700,12 +1542,31 @@
                           {
                             "alias": "Y",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
@@ -716,12 +1577,31 @@
                           {
                             "alias": "Z",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
@@ -733,20 +1613,24 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "Agg",
                           "annotation": [],
                           "expression": {
                             "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "Add",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": [],
                                 "signature": [],
                                 "operand": [
                                   {
                                     "type": "Add",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "annotation": [],
                                     "signature": [],
                                     "operand": [
@@ -757,16 +1641,19 @@
                                         "signature": [],
                                         "operand": {
                                           "type": "Coalesce",
+                                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                           "annotation": [],
                                           "signature": [],
                                           "operand": [
                                             {
                                               "type": "QueryLetRef",
+                                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                               "name": "Agg",
                                               "annotation": []
                                             },
                                             {
                                               "type": "Literal",
+                                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                               "value": "0",
                                               "annotation": []
@@ -776,6 +1663,7 @@
                                       },
                                       {
                                         "type": "AliasRef",
+                                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                         "name": "X",
                                         "annotation": []
                                       }
@@ -783,6 +1671,7 @@
                                   },
                                   {
                                     "type": "AliasRef",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "name": "Y",
                                     "annotation": []
                                   }
@@ -790,6 +1679,7 @@
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "Z",
                                 "annotation": []
                               }
@@ -797,6 +1687,7 @@
                           },
                           "starting": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -806,6 +1697,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "6",
                         "annotation": []
@@ -819,28 +1711,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "X",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
@@ -851,18 +1788,38 @@
                           {
                             "alias": "Y",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
@@ -873,18 +1830,38 @@
                           {
                             "alias": "Z",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
@@ -896,30 +1873,36 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "Agg",
                           "annotation": [],
                           "expression": {
                             "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "Add",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": [],
                                 "signature": [],
                                 "operand": [
                                   {
                                     "type": "Add",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "annotation": [],
                                     "signature": [],
                                     "operand": [
                                       {
                                         "type": "QueryLetRef",
+                                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                         "name": "Agg",
                                         "annotation": []
                                       },
                                       {
                                         "type": "AliasRef",
+                                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                         "name": "X",
                                         "annotation": []
                                       }
@@ -927,6 +1910,7 @@
                                   },
                                   {
                                     "type": "AliasRef",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "name": "Y",
                                     "annotation": []
                                   }
@@ -934,6 +1918,7 @@
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "Z",
                                 "annotation": []
                               }
@@ -941,6 +1926,7 @@
                           },
                           "starting": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "0",
                             "annotation": []
@@ -952,6 +1938,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "36",
                         "annotation": []
@@ -965,40 +1952,87 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "X",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
@@ -1009,30 +2043,52 @@
                           {
                             "alias": "Y",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
@@ -1043,30 +2099,52 @@
                           {
                             "alias": "Z",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
@@ -1078,31 +2156,37 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "Agg",
                           "distinct": true,
                           "annotation": [],
                           "expression": {
                             "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "Add",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": [],
                                 "signature": [],
                                 "operand": [
                                   {
                                     "type": "Add",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "annotation": [],
                                     "signature": [],
                                     "operand": [
                                       {
                                         "type": "QueryLetRef",
+                                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                         "name": "Agg",
                                         "annotation": []
                                       },
                                       {
                                         "type": "AliasRef",
+                                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                         "name": "X",
                                         "annotation": []
                                       }
@@ -1110,6 +2194,7 @@
                                   },
                                   {
                                     "type": "AliasRef",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "name": "Y",
                                     "annotation": []
                                   }
@@ -1117,6 +2202,7 @@
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "Z",
                                 "annotation": []
                               }
@@ -1124,6 +2210,7 @@
                           },
                           "starting": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -1135,6 +2222,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "37",
                         "annotation": []
diff --git a/test/spec-tests/cql/CqlArithmeticFunctionsTest.cql b/test/spec-tests/cql/CqlArithmeticFunctionsTest.cql
index 926ca05ab..85a57481f 100644
--- a/test/spec-tests/cql/CqlArithmeticFunctionsTest.cql
+++ b/test/spec-tests/cql/CqlArithmeticFunctionsTest.cql
@@ -28,11 +28,9 @@ define "Abs": Tuple{
     output: 1.0'cm'
   },
   "AbsLong": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: Abs(-1L),
     output: 1L
-    */  }
+  }
 }
 
 define "Add": Tuple{
@@ -45,11 +43,9 @@ define "Add": Tuple{
     output: 2
   },
   "Add1L2L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: 1L + 2L,
     output: 3L
-    */  },
+  },
   "Add1D1D": Tuple{
     expression: 1.0 + 1.0,
     output: 2.0
@@ -63,11 +59,9 @@ define "Add": Tuple{
     output: 3.0
   },
   "Add1L1L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: 1L + 1L,
     output: 2L
-    */  }
+  }
 }
 
 define "Ceiling": Tuple{
@@ -356,11 +350,9 @@ define "MinValue": Tuple{
     output: -2147483648
   },
   "LongMinValue": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: minimum Long,
     output: -9223372036854775808L
-    */  },
+  },
   "DecimalMinValue": Tuple{
     expression: minimum Decimal,
     output: -99999999999999999999.99999999
@@ -389,11 +381,9 @@ define "MaxValue": Tuple{
     output: 2147483647
   },
   "LongMaxValue": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: maximum Long,
     output: 9223372036854775807L
-    */  },
+  },
   "DecimalMaxValue": Tuple{
     expression: maximum Decimal,
     output: 99999999999999999999.99999999
@@ -430,11 +420,9 @@ define "Modulo": Tuple{
     output: 0
   },
   "Modulo4LBy2L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: 4L mod 2L,
     output: 0L
-    */  },
+  },
   "Modulo4DBy2D": Tuple{
     expression: 4.0 mod 2.0,
     output: 0.0
@@ -483,21 +471,17 @@ define "Multiply": Tuple{
     output: 1
   },
   "Multiply2LBy3L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: 2L * 3L,
     output: 6L
-    */  },
+  },
   "Multiply1DBy2D": Tuple{
     expression: 1.0 * 2.0,
     output: 2.0
   },
   "Multiply1By1L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: 1 * 1L,
     output: 1L
-    */  },
+  },
   "Multiply1IBy2D": Tuple{
     expression: 1 * 2.0,
     output: 2.0
@@ -538,11 +522,9 @@ define "Negate": Tuple{
     output: 1
   },
   "NegateNeg1L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: -(-1L),
     output: 1L
-    */  },
+  },
   "Negate0D": Tuple{
     expression: -(0.0),
     output: 0.0
@@ -604,27 +586,21 @@ define "Predecessor": Tuple{
     output: 0
   },
   "PredecessorOf1L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: predecessor of 1L,
     output: 0L
-    */  },
+  },
   "PredecessorOf1D": Tuple{
-    skipped: 'Wrong answer (doesn\'t recognize 1.0 as decimal)'
-    /*
     expression: predecessor of 1.0,
     output: 0.99999999
-    */  },
+  },
   "PredecessorOf101D": Tuple{
     expression: predecessor of 1.01,
     output: 1.00999999
   },
   "PredecessorOf1QCM": Tuple{
-    skipped: 'Wrong answer (doesn\'t recognize 1.0 as decimal)'
-    /*
     expression: predecessor of 1.0 'cm',
     output: 0.99999999'cm'
-    */  },
+  },
   "PredecessorOfJan12000": Tuple{
     expression: predecessor of DateTime(2000,1,1),
     output: @1999-12-31T
@@ -665,11 +641,9 @@ define "Power": Tuple{
     output: 0.25
   },
   "Power2LTo2L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: Power(2L, 2L),
     output: 4L
-    */  },
+  },
   "Power2DTo2D": Tuple{
     expression: Power(2.0, 2.0),
     output: 4.0
@@ -695,11 +669,9 @@ define "Power": Tuple{
     output: 16
   },
   "Power2LTo3L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: 2L^3L,
     output: 8L
-    */  },
+  },
   "Power2DTo4D": Tuple{
     expression: 2.0^4.0,
     output: 16.0
@@ -767,11 +739,9 @@ define "Subtract": Tuple{
     output: 0
   },
   "Subtract1LAnd1L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: 1L - 1L,
     output: 0L
-    */  },
+  },
   "Subtract1DAnd2D": Tuple{
     expression: 1.0 - 2.0,
     output: -1.0
@@ -800,17 +770,13 @@ define "Successor": Tuple{
     output: 2
   },
   "SuccessorOf1L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: successor of 1L,
     output: 2L
-    */  },
+  },
   "SuccessorOf1D": Tuple{
-    skipped: 'Wrong answer (doesn\'t recognize 1.0 as decimal)'
-    /*
     expression: successor of 1.0,
     output: 1.00000001
-    */  },
+  },
   "SuccessorOf101D": Tuple{
     expression: successor of 1.01,
     output: 1.01000001
@@ -902,11 +868,9 @@ define "Truncated Divide": Tuple{
     output: 3
   },
   "TruncatedDivide10LBy3L": Tuple{
-    skipped: 'Long not implemented'
-    /*
     expression: 10L div 3L,
     output: 3L
-    */  },
+  },
   "TruncatedDivide10LBy0L": Tuple{
     expression: 10L div 0L,
     output: null
diff --git a/test/spec-tests/cql/CqlArithmeticFunctionsTest.json b/test/spec-tests/cql/CqlArithmeticFunctionsTest.json
index 5a898b491..fe1b271b4 100644
--- a/test/spec-tests/cql/CqlArithmeticFunctionsTest.json
+++ b/test/spec-tests/cql/CqlArithmeticFunctionsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,33 +66,465 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "AbsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Abs0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AbsNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AbsNeg1Dec",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Abs0Dec",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Abs1cm",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AbsLong",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "AbsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Abs0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AbsNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AbsNeg1Dec",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Abs0Dec",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Abs1cm",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AbsLong",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "AbsNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Abs",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "As",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "strict": false,
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           "asTypeSpecifier": {
                             "type": "NamedTypeSpecifier",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
                           }
@@ -103,6 +535,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -114,15 +547,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Abs",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "0",
                           "annotation": []
@@ -133,6 +592,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "0",
                         "annotation": []
@@ -146,19 +606,46 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Abs",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -170,6 +657,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -183,19 +671,46 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Abs",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "1.0",
                             "annotation": []
@@ -207,6 +722,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "1.0",
                         "annotation": []
@@ -220,15 +736,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Abs",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "0.0",
                           "annotation": []
@@ -239,6 +781,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.0",
                         "annotation": []
@@ -252,19 +795,46 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Abs",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 1,
                             "unit": "cm",
                             "annotation": []
@@ -276,6 +846,7 @@
                       "name": "output",
                       "value": {
                         "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "value": 1,
                         "unit": "cm",
                         "annotation": []
@@ -289,13 +860,60 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
+                      "value": {
+                        "type": "Abs",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "1",
                         "annotation": []
                       }
                     }
@@ -310,25 +928,455 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
                 "name": "AddNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Add11",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Add1L2L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Add1D1D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Add1Q1Q",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AddIAndD",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Add1L1L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "AddNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Add11",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Add1L2L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Add1D1D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Add1Q1Q",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AddIAndD",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Add1L1L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "AddNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -340,6 +1388,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -350,6 +1399,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -361,22 +1411,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -388,6 +1465,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -401,13 +1479,63 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
+                      "value": {
+                        "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "2",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "3",
                         "annotation": []
                       }
                     }
@@ -419,22 +1547,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "1.0",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "1.0",
                             "annotation": []
@@ -446,6 +1601,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "2.0",
                         "annotation": []
@@ -459,22 +1615,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 1,
                             "unit": "g/cm3",
                             "annotation": []
                           },
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 1,
                             "unit": "g/cm3",
                             "annotation": []
@@ -486,6 +1669,7 @@
                       "name": "output",
                       "value": {
                         "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "value": 2,
                         "unit": "g/cm3",
                         "annotation": []
@@ -499,11 +1683,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -513,6 +1722,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -520,6 +1730,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "2.0",
                             "annotation": []
@@ -531,6 +1742,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "3.0",
                         "annotation": []
@@ -544,13 +1756,63 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "2",
                         "annotation": []
                       }
                     }
@@ -565,33 +1827,465 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "CeilingNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Ceiling1D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Ceiling1D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CeilingNegD1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CeilingNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CeilingNeg1D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Ceiling1I",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "CeilingNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Ceiling1D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Ceiling1D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CeilingNegD1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CeilingNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CeilingNeg1D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Ceiling1I",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "CeilingNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Ceiling",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "As",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "strict": false,
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           "asTypeSpecifier": {
                             "type": "NamedTypeSpecifier",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "name": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": []
                           }
@@ -602,6 +2296,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -613,15 +2308,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Ceiling",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "1.0",
                           "annotation": []
@@ -632,6 +2353,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -645,15 +2367,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Ceiling",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "1.1",
                           "annotation": []
@@ -664,6 +2412,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -677,19 +2426,46 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Ceiling",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "0.1",
                             "annotation": []
@@ -701,6 +2477,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "0",
                         "annotation": []
@@ -714,19 +2491,46 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Ceiling",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "1.0",
                             "annotation": []
@@ -738,10 +2542,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
@@ -756,19 +2562,46 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Ceiling",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ceiling",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
                         "operand": {
                           "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "1.1",
                             "annotation": []
@@ -780,10 +2613,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
@@ -798,11 +2633,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Ceiling",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
@@ -811,6 +2671,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -822,6 +2683,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -838,51 +2700,32 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
                 "name": "DivideNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Divide",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -891,46 +2734,26 @@
               },
               {
                 "name": "Divide10",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Divide",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -939,48 +2762,26 @@
               },
               {
                 "name": "Divide01",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Divide",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -989,48 +2790,26 @@
               },
               {
                 "name": "Divide11",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Divide",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -1039,48 +2818,26 @@
               },
               {
                 "name": "Divide1L1L",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Divide",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -1089,38 +2846,26 @@
               },
               {
                 "name": "Divide1d1d",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Divide",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -1129,59 +2874,26 @@
               },
               {
                 "name": "Divide103",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Divide",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "ToDecimal",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              }
-                            },
-                            {
-                              "type": "ToDecimal",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "3",
-                                "annotation": []
-                              }
-                            }
-                          ]
-                        },
-                        "precision": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "8",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "3.33333333",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -1190,43 +2902,26 @@
               },
               {
                 "name": "Divide1Q1",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Divide",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "g/cm3",
-                            "annotation": []
-                          },
-                          {
-                            "type": "ToQuantity",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Quantity",
-                        "value": 1,
-                        "unit": "g/cm3",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": []
                       }
                     }
@@ -1235,38 +2930,26 @@
               },
               {
                 "name": "Divide1Q1Q",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Divide",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "g/cm3",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "g/cm3",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Quantity",
-                        "value": 1,
-                        "unit": "1",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": []
                       }
                     }
@@ -1275,14 +2958,471 @@
               },
               {
                 "name": "Divide10I5D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Divide10I5I",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Divide10Q5I",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "DivideNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide10",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide01",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide11",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide1L1L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide1d1d",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide103",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide1Q1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide1Q1Q",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide10I5D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide10I5I",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Divide10Q5I",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "DivideNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -1292,16 +3432,22 @@
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "1",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "5.0",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -1309,9 +3455,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2.0",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1319,15 +3464,40 @@
                 }
               },
               {
-                "name": "Divide10I5I",
+                "name": "Divide10",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -1337,8 +3507,9 @@
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "1",
                               "annotation": []
                             }
                           },
@@ -1348,8 +3519,9 @@
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                              "value": "0",
                               "annotation": []
                             }
                           }
@@ -1359,9 +3531,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2.0",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1369,32 +3540,64 @@
                 }
               },
               {
-                "name": "Divide10Q5I",
+                "name": "Divide01",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Quantity",
-                            "value": 10,
-                            "unit": "g",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "ToQuantity",
+                            "type": "ToDecimal",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                              "value": "1",
                               "annotation": []
                             }
                           }
@@ -1404,60 +3607,88 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Quantity",
-                        "value": 2,
-                        "unit": "g",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Floor",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "FloorNull",
+                "name": "Divide11",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Floor",
+                        "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "strict": false,
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
+                        "operand": [
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           },
-                          "asTypeSpecifier": {
-                            "type": "NamedTypeSpecifier",
-                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "annotation": []
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     }
@@ -1465,36 +3696,77 @@
                 }
               },
               {
-                "name": "Floor1",
+                "name": "Divide1L1L",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Floor",
+                        "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "ToDecimal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
+                        "operand": [
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "1",
+                              "annotation": []
+                            }
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     }
@@ -1502,31 +3774,67 @@
                 }
               },
               {
-                "name": "Floor1D",
+                "name": "Divide1d1d",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Floor",
+                        "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
-                          "annotation": []
-                        }
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     }
@@ -1534,21 +3842,79 @@
                 }
               },
               {
-                "name": "Floor1D1",
+                "name": "Divide103",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Floor",
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
+                          "type": "Divide",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "ToDecimal",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
+                            },
+                            {
+                              "type": "ToDecimal",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "3",
+                                "annotation": []
+                              }
+                            }
+                          ]
+                        },
+                        "precision": {
                           "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.1",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "8",
                           "annotation": []
                         }
                       }
@@ -1557,8 +3923,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "3.33333333",
                         "annotation": []
                       }
                     }
@@ -1566,162 +3933,364 @@
                 }
               },
               {
-                "name": "FloorNegD1",
+                "name": "Divide1Q1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Floor",
+                        "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.1",
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "g/cm3",
                             "annotation": []
-                          }
-                        }
-                      }
+                          },
+                          {
+                            "type": "ToQuantity",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                        "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "value": 1,
+                        "unit": "g/cm3",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "FloorNeg1",
+                "name": "Divide1Q1Q",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Floor",
+                        "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "g/cm3",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "g/cm3",
                             "annotation": []
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                        "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "value": 1,
+                        "unit": "1",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "FloorNeg1D1",
+                "name": "Divide10I5D",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Floor",
+                        "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
+                        "operand": [
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.1",
+                            "value": "5.0",
                             "annotation": []
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Negate",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "2.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Divide10I5I",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": []
                         }
                       }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "2.0",
+                        "annotation": []
+                      }
                     }
                   ]
                 }
               },
               {
-                "name": "Floor2I",
+                "name": "Divide10Q5I",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Floor",
+                        "type": "Divide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "ToDecimal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 10,
+                            "unit": "g",
                             "annotation": []
+                          },
+                          {
+                            "type": "ToQuantity",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            }
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2",
+                        "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "value": 2,
+                        "unit": "g",
                         "annotation": []
                       }
                     }
@@ -1732,47 +4301,36 @@
           }
         },
         {
-          "name": "Exp",
+          "name": "Floor",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "ExpNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "FloorNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Exp",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "strict": false,
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          },
-                          "asTypeSpecifier": {
-                            "type": "NamedTypeSpecifier",
-                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1780,36 +4338,27 @@
                 }
               },
               {
-                "name": "Exp0",
-                "value": {
-                  "type": "Tuple",
+                "name": "Floor1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Exp",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "ToDecimal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -1817,41 +4366,27 @@
                 }
               },
               {
-                "name": "ExpNeg0",
-                "value": {
-                  "type": "Tuple",
+                "name": "Floor1D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Exp",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "ToDecimal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -1859,47 +4394,27 @@
                 }
               },
               {
-                "name": "Exp1",
-                "value": {
-                  "type": "Tuple",
+                "name": "Floor1D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Exp",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        },
-                        "precision": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "8",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2.71828183",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -1907,47 +4422,27 @@
                 }
               },
               {
-                "name": "Exp1L",
-                "value": {
-                  "type": "Tuple",
+                "name": "FloorNegD1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Exp",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        },
-                        "precision": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "8",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2.71828183",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -1955,52 +4450,27 @@
                 }
               },
               {
-                "name": "ExpNeg1",
-                "value": {
-                  "type": "Tuple",
+                "name": "FloorNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Exp",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Negate",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        },
-                        "precision": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "8",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.36787944",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -2008,36 +4478,27 @@
                 }
               },
               {
-                "name": "Exp1000",
-                "value": {
-                  "type": "Tuple",
+                "name": "FloorNeg1D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Exp",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "ToDecimal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1000",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
-                      "name": "invalid",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -2045,31 +4506,27 @@
                 }
               },
               {
-                "name": "Exp1000D",
-                "value": {
-                  "type": "Tuple",
+                "name": "Floor2I",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Exp",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1000.0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
-                      "name": "invalid",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -2077,141 +4534,367 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "HighBoundary",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
-            "element": [
-              {
-                "name": "HighBoundaryDecimal",
-                "value": {
-                  "type": "Tuple",
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "FloorNull",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "HighBoundary not implemented",
-                        "annotation": []
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "HighBoundaryDateMonth",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "Floor1",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "HighBoundary not implemented",
-                        "annotation": []
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "HighBoundaryDateTimeMillisecond",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "Floor1D",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "HighBoundary not implemented",
-                        "annotation": []
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
+                },
+                {
+                  "name": "Floor1D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FloorNegD1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FloorNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FloorNeg1D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Floor2I",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "HighBoundaryTimeMillisecond",
+                "name": "FloorNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "HighBoundary not implemented",
+                        "type": "Floor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "strict": false,
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "NamedTypeSpecifier",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Log",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "LogNullNull",
+                "name": "Floor1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Log",
+                        "type": "Floor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
+                        "operand": {
+                          "type": "ToDecimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
                         "annotation": []
                       }
                     }
@@ -2219,46 +4902,58 @@
                 }
               },
               {
-                "name": "Log1BaseNull",
+                "name": "Floor1D",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Log",
+                        "type": "Floor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
                         "annotation": []
                       }
                     }
@@ -2266,47 +4961,58 @@
                 }
               },
               {
-                "name": "Log1Base1",
+                "name": "Floor1D1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Log",
+                        "type": "Floor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.1",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
                         "annotation": []
                       }
                     }
@@ -2314,247 +5020,316 @@
                 }
               },
               {
-                "name": "Log2Base1",
+                "name": "FloorNegD1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Log",
+                        "type": "Floor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.1",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
-                        "annotation": []
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "Log1Base2",
+                "name": "FloorNeg1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Log",
+                        "type": "Floor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
-                        "annotation": []
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "Log1Base100",
+                "name": "FloorNeg1D1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Log",
+                        "type": "Floor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "100",
-                              "annotation": []
-                            }
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.1",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
-                        "annotation": []
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "Log1Base100L",
+                "name": "Floor2I",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Log",
+                        "type": "Floor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
-                              "value": "100",
-                              "annotation": []
-                            }
+                        "operand": {
+                          "type": "ToDecimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              },
+              }
+            ]
+          }
+        },
+        {
+          "name": "Exp",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
               {
-                "name": "Log16Base2",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Log",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "16",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "4.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2562,79 +5337,55 @@
                 }
               },
               {
-                "name": "LogD125Base2",
-                "value": {
-                  "type": "Tuple",
+                "name": "Exp0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Log",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.125",
-                            "annotation": []
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "3.0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "LowBoundary",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "LowBoundaryDecimal",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpNeg0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "LowBoundary not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -2642,17 +5393,27 @@
                 }
               },
               {
-                "name": "LowBoundaryDateMonth",
-                "value": {
-                  "type": "Tuple",
+                "name": "Exp1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "LowBoundary not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -2660,17 +5421,27 @@
                 }
               },
               {
-                "name": "LowBoundaryDateTimeMillisecond",
-                "value": {
-                  "type": "Tuple",
+                "name": "Exp1L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "LowBoundary not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -2678,17 +5449,83 @@
                 }
               },
               {
-                "name": "LowBoundaryTimeMillisecond",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "LowBoundary not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Exp1000",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Exp1000D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2696,36 +5533,293 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Ln",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ExpNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Exp0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpNeg0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Exp1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Exp1L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Exp1000",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Exp1000D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
-                "name": "LnNull",
+                "name": "ExpNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Ln",
+                        "type": "Exp",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "As",
-                          "asType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "strict": false,
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "NamedTypeSpecifier",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": []
                           }
                         }
@@ -2735,6 +5829,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2742,15 +5837,40 @@
                 }
               },
               {
-                "name": "Ln0",
+                "name": "Exp0",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Ln",
+                        "type": "Exp",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
@@ -2759,6 +5879,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "0",
                             "annotation": []
@@ -2767,11 +5888,12 @@
                       }
                     },
                     {
-                      "name": "invalid",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     }
@@ -2779,15 +5901,40 @@
                 }
               },
               {
-                "name": "LnNeg0",
+                "name": "ExpNeg0",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
                       "value": {
-                        "type": "Ln",
+                        "type": "Exp",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
@@ -2796,10 +5943,12 @@
                           "signature": [],
                           "operand": {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "0",
                               "annotation": []
@@ -2809,11 +5958,12 @@
                       }
                     },
                     {
-                      "name": "invalid",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     }
@@ -2821,27 +5971,66 @@
                 }
               },
               {
-                "name": "Ln1",
+                "name": "Exp1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Ln",
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "ToDecimal",
+                          "type": "Exp",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": [],
                           "signature": [],
                           "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           }
+                        },
+                        "precision": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "8",
+                          "annotation": []
                         }
                       }
                     },
@@ -2849,8 +6038,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                        "value": "2.71828183",
                         "annotation": []
                       }
                     }
@@ -2858,27 +6048,66 @@
                 }
               },
               {
-                "name": "Ln1L",
+                "name": "Exp1L",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Ln",
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "ToDecimal",
+                          "type": "Exp",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": [],
                           "signature": [],
                           "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
-                            "value": "1",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "1",
+                              "annotation": []
+                            }
                           }
+                        },
+                        "precision": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "8",
+                          "annotation": []
                         }
                       }
                     },
@@ -2886,8 +6115,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                        "value": "2.71828183",
                         "annotation": []
                       }
                     }
@@ -2895,39 +6125,82 @@
                 }
               },
               {
-                "name": "LnNeg1",
+                "name": "ExpNeg1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Ln",
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "ToDecimal",
+                          "type": "Exp",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": [],
                           "signature": [],
                           "operand": {
-                            "type": "Negate",
+                            "type": "ToDecimal",
                             "annotation": [],
                             "signature": [],
                             "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                              "type": "Negate",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
                             }
                           }
+                        },
+                        "precision": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "8",
+                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.36787944",
                         "annotation": []
                       }
                     }
@@ -2935,47 +6208,63 @@
                 }
               },
               {
-                "name": "Ln1000",
+                "name": "Exp1000",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Round",
+                        "type": "Exp",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Ln",
+                          "type": "ToDecimal",
                           "annotation": [],
                           "signature": [],
                           "operand": {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1000",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1000",
+                            "annotation": []
                           }
-                        },
-                        "precision": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "8",
-                          "annotation": []
                         }
                       }
                     },
                     {
-                      "name": "output",
+                      "name": "invalid",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "6.90775528",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -2983,42 +6272,58 @@
                 }
               },
               {
-                "name": "Ln1000D",
+                "name": "Exp1000D",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Round",
+                        "type": "Exp",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Ln",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1000.0",
-                            "annotation": []
-                          }
-                        },
-                        "precision": {
                           "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "8",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1000.0",
                           "annotation": []
                         }
                       }
                     },
                     {
-                      "name": "output",
+                      "name": "invalid",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "6.90775528",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -3029,57 +6334,46 @@
           }
         },
         {
-          "name": "MinValue",
+          "name": "HighBoundary",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "IntegerMinValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "HighBoundaryDecimal",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "MinValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2147483648",
-                          "annotation": []
-                        }
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "LongMinValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "HighBoundaryDateMonth",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -3087,221 +6381,261 @@
                 }
               },
               {
-                "name": "DecimalMinValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "HighBoundaryDateTimeMillisecond",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "MinValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "99999999999999999999.99999999",
-                          "annotation": []
-                        }
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "DateTimeMinValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "HighBoundaryTimeMillisecond",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "MinValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}DateTime",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "DateTime",
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "HighBoundaryDecimal",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "year": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        },
-                        "month": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        },
-                        "day": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        },
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "HighBoundaryDateMonth",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "HighBoundaryDateTimeMillisecond",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": []
-                        },
-                        "timezoneOffset": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "0.0",
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "HighBoundaryTimeMillisecond",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": []
                         }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "DateMinValue",
+                "name": "HighBoundaryDecimal",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "expression",
+                      "name": "skipped",
                       "value": {
-                        "type": "MinValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Date",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "HighBoundary not implemented",
                         "annotation": []
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Date",
-                        "annotation": [],
-                        "signature": [],
-                        "year": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        },
-                        "month": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        },
-                        "day": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "TimeMinValue",
+                "name": "HighBoundaryDateMonth",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "expression",
+                      "name": "skipped",
                       "value": {
-                        "type": "MinValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Time",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "HighBoundary not implemented",
                         "annotation": []
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Time",
-                        "annotation": [],
-                        "signature": [],
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        }
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "BooleanMinValue",
+                "name": "HighBoundaryDateTimeMillisecond",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "expression",
+                      "name": "skipped",
                       "value": {
-                        "type": "MinValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "HighBoundary not implemented",
                         "annotation": []
                       }
-                    },
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "HighBoundaryTimeMillisecond",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "invalid",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "HighBoundary not implemented",
                         "annotation": []
                       }
                     }
@@ -3312,34 +6646,36 @@
           }
         },
         {
-          "name": "MaxValue",
+          "name": "Log",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "IntegerMaxValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "LogNullNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MaxValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2147483647",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3347,17 +6683,27 @@
                 }
               },
               {
-                "name": "LongMaxValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "Log1BaseNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3365,25 +6711,27 @@
                 }
               },
               {
-                "name": "DecimalMaxValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "Log1Base1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MaxValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "99999999999999999999.99999999",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3391,244 +6739,111 @@
                 }
               },
               {
-                "name": "DateTimeMaxValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "Log2Base1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MaxValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}DateTime",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "DateTime",
-                        "annotation": [],
-                        "signature": [],
-                        "year": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "9999",
-                          "annotation": []
-                        },
-                        "month": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "12",
-                          "annotation": []
-                        },
-                        "day": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "31",
-                          "annotation": []
-                        },
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "23",
-                          "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "59",
-                          "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "59",
-                          "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "999",
-                          "annotation": []
-                        },
-                        "timezoneOffset": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "0.0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DateMaxValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "Log1Base2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MaxValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Date",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Date",
-                        "annotation": [],
-                        "signature": [],
-                        "year": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "9999",
-                          "annotation": []
-                        },
-                        "month": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "12",
-                          "annotation": []
-                        },
-                        "day": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "31",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "TimeMaxValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "Log1Base100",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MaxValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Time",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Time",
-                        "annotation": [],
-                        "signature": [],
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "23",
-                          "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "59",
-                          "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "59",
-                          "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "999",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "BooleanMaxValue",
-                "value": {
-                  "type": "Tuple",
+                "name": "Log1Base100L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MaxValue",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "annotation": []
-                      }
-                    },
-                    {
-                      "name": "invalid",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Modulo",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "ModuloNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Modulo",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -3636,37 +6851,27 @@
                 }
               },
               {
-                "name": "Modulo0By0",
-                "value": {
-                  "type": "Tuple",
+                "name": "Log16Base2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Modulo",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -3674,87 +6879,356 @@
                 }
               },
               {
-                "name": "Modulo4By2",
-                "value": {
-                  "type": "Tuple",
+                "name": "LogD125Base2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Modulo",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "4",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              },
-              {
-                "name": "Modulo4LBy2L",
-                "value": {
-                  "type": "Tuple",
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "LogNullNull",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
-                        "annotation": []
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "Modulo4DBy2D",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "Log1BaseNull",
                   "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Log1Base1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Log2Base1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Log1Base2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Log1Base100",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Log1Base100L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Log16Base2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LogD125Base2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "LogNullNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Modulo",
+                        "type": "Log",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "4.0",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -3762,9 +7236,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3772,29 +7245,65 @@
                 }
               },
               {
-                "name": "Modulo10By3",
+                "name": "Log1BaseNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Modulo",
+                        "type": "Log",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "3",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -3802,9 +7311,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3812,29 +7320,66 @@
                 }
               },
               {
-                "name": "Modulo10DBy3D",
+                "name": "Log1Base1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Modulo",
+                        "type": "Log",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "10.0",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "3.0",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -3842,9 +7387,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3852,15 +7396,40 @@
                 }
               },
               {
-                "name": "Modulo10IBy3D",
+                "name": "Log2Base1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Modulo",
+                        "type": "Log",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3870,16 +7439,23 @@
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "2",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "3.0",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -3887,9 +7463,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3897,23 +7472,54 @@
                 }
               },
               {
-                "name": "ModuloDResult",
+                "name": "Log1Base2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Modulo",
+                        "type": "Log",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "3.5",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           },
                           {
                             "type": "ToDecimal",
@@ -3921,8 +7527,9 @@
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
+                              "value": "2",
                               "annotation": []
                             }
                           }
@@ -3933,8 +7540,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.5",
+                        "value": "0.0",
                         "annotation": []
                       }
                     }
@@ -3942,35 +7550,77 @@
                 }
               },
               {
-                "name": "ModuloQuantity",
+                "name": "Log1Base100",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Modulo not implemented for Quantity",
-                        "annotation": []
+                        "type": "Log",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "100",
+                              "annotation": []
+                            }
+                          }
+                        ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "Modulo10By3Quantity",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Modulo not implemented for Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
                         "annotation": []
                       }
                     }
@@ -3978,29 +7628,66 @@
                 }
               },
               {
-                "name": "Modulo10By0Quantity",
+                "name": "Log1Base100L",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Modulo",
+                        "type": "Log",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Quantity",
-                            "value": 10,
-                            "unit": "g",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "1",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "g",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                              "value": "100",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -4008,51 +7695,75 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Multiply",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "MultiplyNull",
+                "name": "Log16Base2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Multiply",
+                        "type": "Log",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "16",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "type": "ToDecimal",
                             "annotation": [],
                             "signature": [],
                             "operand": {
-                              "type": "Null",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
                               "annotation": []
                             }
                           }
@@ -4062,7 +7773,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "4.0",
                         "annotation": []
                       }
                     }
@@ -4070,29 +7784,61 @@
                 }
               },
               {
-                "name": "Multiply1By1",
+                "name": "LogD125Base2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Multiply",
+                        "type": "Log",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.125",
                             "annotation": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -4100,27 +7846,47 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
-                        "annotation": []
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "3.0",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
-              },
+              }
+            ]
+          }
+        },
+        {
+          "name": "LowBoundary",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
               {
-                "name": "Multiply2LBy3L",
-                "value": {
-                  "type": "Tuple",
+                "name": "LowBoundaryDecimal",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -4128,39 +7894,18 @@
                 }
               },
               {
-                "name": "Multiply1DBy2D",
-                "value": {
-                  "type": "Tuple",
+                "name": "LowBoundaryDateMonth",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Multiply",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2.0",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -4168,17 +7913,18 @@
                 }
               },
               {
-                "name": "Multiply1By1L",
-                "value": {
-                  "type": "Tuple",
+                "name": "LowBoundaryDateTimeMillisecond",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -4186,44 +7932,140 @@
                 }
               },
               {
-                "name": "Multiply1IBy2D",
-                "value": {
-                  "type": "Tuple",
+                "name": "LowBoundaryTimeMillisecond",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Multiply",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          }
-                        ]
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
-                    },
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "LowBoundaryDecimal",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LowBoundaryDateMonth",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LowBoundaryDateTimeMillisecond",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LowBoundaryTimeMillisecond",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "LowBoundaryDecimal",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2.0",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "LowBoundary not implemented",
                         "annotation": []
                       }
                     }
@@ -4231,39 +8073,101 @@
                 }
               },
               {
-                "name": "Multiply1CMBy2CM",
+                "name": "LowBoundaryDateMonth",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "expression",
+                      "name": "skipped",
                       "value": {
-                        "type": "Multiply",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "LowBoundary not implemented",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LowBoundaryDateTimeMillisecond",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 2,
-                            "unit": "cm",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
-                        "type": "Quantity",
-                        "value": 2,
-                        "unit": "cm2",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "LowBoundary not implemented",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LowBoundaryTimeMillisecond",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "LowBoundary not implemented",
                         "annotation": []
                       }
                     }
@@ -4274,47 +8178,36 @@
           }
         },
         {
-          "name": "Negate",
+          "name": "Ln",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "NegateNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "LnNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "strict": false,
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          },
-                          "asTypeSpecifier": {
-                            "type": "NamedTypeSpecifier",
-                            "name": "{urn:hl7-org:elm-types:r1}Integer",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -4322,31 +8215,27 @@
                 }
               },
               {
-                "name": "Negate0",
-                "value": {
-                  "type": "Tuple",
+                "name": "Ln0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4354,36 +8243,27 @@
                 }
               },
               {
-                "name": "NegateNeg0",
-                "value": {
-                  "type": "Tuple",
+                "name": "LnNeg0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4391,147 +8271,111 @@
                 }
               },
               {
-                "name": "Negate1",
-                "value": {
-                  "type": "Tuple",
+                "name": "Ln1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "Negate1L",
-                "value": {
-                  "type": "Tuple",
+                "name": "Ln1L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
-                          "value": "1",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
-                          "value": "1",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "NegateMaxLong",
-                "value": {
-                  "type": "Tuple",
+                "name": "LnNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
-                          "value": "9223372036854775807",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
-                          "value": "9223372036854775807",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "NegateNeg1",
-                "value": {
-                  "type": "Tuple",
+                "name": "Ln1000",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -4539,49 +8383,324 @@
                 }
               },
               {
-                "name": "NegateNeg1L",
-                "value": {
-                  "type": "Tuple",
+                "name": "Ln1000D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              },
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "LnNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Ln0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LnNeg0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Ln1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Ln1L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LnNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Ln1000",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Ln1000D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
               {
-                "name": "Negate0D",
+                "name": "LnNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Negate",
+                        "type": "Ln",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "0.0",
-                          "annotation": []
+                          "type": "As",
+                          "asType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
                         }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -4589,36 +8708,63 @@
                 }
               },
               {
-                "name": "NegateNeg0D",
+                "name": "Ln0",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Negate",
+                        "type": "Ln",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Negate",
+                          "type": "ToDecimal",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
                             "annotation": []
                           }
                         }
                       }
                     },
                     {
-                      "name": "output",
+                      "name": "invalid",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -4626,62 +8772,121 @@
                 }
               },
               {
-                "name": "Negate1D",
+                "name": "LnNeg0",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Negate",
+                        "type": "Ln",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
-                          "annotation": []
+                          "type": "ToDecimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
                         }
                       }
                     },
                     {
-                      "name": "output",
+                      "name": "invalid",
                       "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
-                          "annotation": []
-                        }
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "NegateNeg1D",
+                "name": "Ln1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Negate",
+                        "type": "Ln",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Negate",
+                          "type": "ToDecimal",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
                             "annotation": []
                           }
                         }
@@ -4691,8 +8896,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                        "value": "0.0",
                         "annotation": []
                       }
                     }
@@ -4700,92 +8906,51 @@
                 }
               },
               {
-                "name": "Negate1CM",
+                "name": "Ln1L",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Negate",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Quantity",
-                          "value": 1,
-                          "unit": "cm",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": []
                         }
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Negate",
+                      },
+                      {
+                        "name": "output",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Quantity",
-                          "value": 1,
-                          "unit": "cm",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": []
                         }
                       }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Precision",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "PrecisionDecimal",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Precision for Decimal not implemented",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "PrecisionYear",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Precision",
+                        "type": "Ln",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Date",
+                          "type": "ToDecimal",
                           "annotation": [],
                           "signature": [],
-                          "year": {
+                          "operand": {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2014",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "1",
                             "annotation": []
                           }
                         }
@@ -4795,8 +8960,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "4",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
                         "annotation": []
                       }
                     }
@@ -4804,62 +8970,58 @@
                 }
               },
               {
-                "name": "PrecisionDateTimeMilliseconds",
+                "name": "LnNeg1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Precision",
+                        "type": "Ln",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "DateTime",
+                          "type": "ToDecimal",
                           "annotation": [],
                           "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2014",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "5",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "30",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                          "operand": {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           }
                         }
                       }
@@ -4867,9 +9029,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "17",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -4877,33 +9038,66 @@
                 }
               },
               {
-                "name": "PrecisionTimeMinutes",
+                "name": "Ln1000",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Precision",
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Time",
+                          "type": "Ln",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": [],
                           "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "30",
-                            "annotation": []
+                          "operand": {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1000",
+                              "annotation": []
+                            }
                           }
+                        },
+                        "precision": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "8",
+                          "annotation": []
                         }
                       }
                     },
@@ -4911,8 +9105,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "4",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "6.90775528",
                         "annotation": []
                       }
                     }
@@ -4920,45 +9115,61 @@
                 }
               },
               {
-                "name": "PrecisionTimeMilliseconds",
+                "name": "Ln1000D",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Precision",
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Time",
+                          "type": "Ln",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": [],
                           "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "30",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "millisecond": {
+                          "operand": {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1000.0",
                             "annotation": []
                           }
+                        },
+                        "precision": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "8",
+                          "annotation": []
                         }
                       }
                     },
@@ -4966,8 +9177,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "9",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "6.90775528",
                         "annotation": []
                       }
                     }
@@ -4978,47 +9190,36 @@
           }
         },
         {
-          "name": "Predecessor",
+          "name": "MinValue",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "PredecessorNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerMinValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Predecessor",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "strict": false,
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          },
-                          "asTypeSpecifier": {
-                            "type": "NamedTypeSpecifier",
-                            "name": "{urn:hl7-org:elm-types:r1}Integer",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -5026,68 +9227,55 @@
                 }
               },
               {
-                "name": "PredecessorOf0",
-                "value": {
-                  "type": "Tuple",
+                "name": "LongMinValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Predecessor",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "PredecessorOf1",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalMinValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Predecessor",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -5095,17 +9283,27 @@
                 }
               },
               {
-                "name": "PredecessorOf1L",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeMinValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": []
                       }
                     }
@@ -5113,17 +9311,27 @@
                 }
               },
               {
-                "name": "PredecessorOf1D",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateMinValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (doesn't recognize 1.0 as decimal)",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Date",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Date",
                         "annotation": []
                       }
                     }
@@ -5131,31 +9339,27 @@
                 }
               },
               {
-                "name": "PredecessorOf101D",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeMinValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Predecessor",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.01",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.00999999",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": []
                       }
                     }
@@ -5163,82 +9367,292 @@
                 }
               },
               {
-                "name": "PredecessorOf1QCM",
-                "value": {
-                  "type": "Tuple",
+                "name": "BooleanMinValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (doesn't recognize 1.0 as decimal)",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              },
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerMinValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LongMinValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalMinValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeMinValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateMinValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Date",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Date",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeMinValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "BooleanMinValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
               {
-                "name": "PredecessorOfJan12000",
+                "name": "IntegerMinValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Predecessor",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2000",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        }
+                        "type": "MinValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "DateTime",
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "year": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1999",
-                          "annotation": []
-                        },
-                        "month": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "12",
-                          "annotation": []
-                        },
-                        "day": {
+                        "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "31",
+                          "value": "2147483648",
                           "annotation": []
                         }
                       }
@@ -5247,76 +9661,213 @@
                 }
               },
               {
-                "name": "PredecessorOfNoon",
+                "name": "LongMinValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Predecessor",
+                        "type": "MinValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Time",
-                          "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                          "value": "9223372036854775808",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalMinValue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
                         }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MinValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Time",
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "99999999999999999999.99999999",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMinValue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MinValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "valueType": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
+                        "year": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "month": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "day": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
                         "hour": {
                           "type": "Literal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "11",
+                          "value": "0",
                           "annotation": []
                         },
                         "minute": {
                           "type": "Literal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "59",
+                          "value": "0",
                           "annotation": []
                         },
                         "second": {
                           "type": "Literal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "59",
+                          "value": "0",
                           "annotation": []
                         },
                         "millisecond": {
                           "type": "Literal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "999",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "timezoneOffset": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "0.0",
                           "annotation": []
                         }
                       }
@@ -5325,125 +9876,193 @@
                 }
               },
               {
-                "name": "PredecessorUnderflowDt",
+                "name": "DateMinValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Date",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Date",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Predecessor",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0001",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        }
+                        "type": "MinValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Date",
+                        "annotation": []
                       }
                     },
                     {
-                      "name": "invalid",
+                      "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "type": "Date",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                        "annotation": [],
+                        "signature": [],
+                        "year": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "month": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "day": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "PredecessorUnderflowT",
+                "name": "TimeMinValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Predecessor",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Time",
-                          "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        }
+                        "type": "MinValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "BooleanMinValue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MinValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -5456,64 +10075,36 @@
           }
         },
         {
-          "name": "Power",
+          "name": "MaxValue",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "PowerNullToNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerMaxValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "strict": false,
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "asTypeSpecifier": {
-                              "type": "NamedTypeSpecifier",
-                              "name": "{urn:hl7-org:elm-types:r1}Integer",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "strict": false,
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "asTypeSpecifier": {
-                              "type": "NamedTypeSpecifier",
-                              "name": "{urn:hl7-org:elm-types:r1}Integer",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -5521,39 +10112,27 @@
                 }
               },
               {
-                "name": "Power0To0",
-                "value": {
-                  "type": "Tuple",
+                "name": "LongMaxValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": []
                       }
                     }
@@ -5561,39 +10140,27 @@
                 }
               },
               {
-                "name": "Power2To2",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalMaxValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "4",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -5601,44 +10168,27 @@
                 }
               },
               {
-                "name": "PowerNeg2To2",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeMaxValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "4",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": []
                       }
                     }
@@ -5646,44 +10196,27 @@
                 }
               },
               {
-                "name": "Power2ToNeg2",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateMaxValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Date",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.25",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Date",
                         "annotation": []
                       }
                     }
@@ -5691,17 +10224,27 @@
                 }
               },
               {
-                "name": "Power2LTo2L",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeMaxValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": []
                       }
                     }
@@ -5709,129 +10252,287 @@
                 }
               },
               {
-                "name": "Power2DTo2D",
-                "value": {
-                  "type": "Tuple",
+                "name": "BooleanMaxValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "4.0",
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              },
-              {
-                "name": "PowerNeg2DTo2D",
-                "value": {
-                  "type": "Tuple",
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerMaxValue",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Power",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "2.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "4.0",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "LongMaxValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalMaxValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeMaxValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateMaxValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Date",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Date",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeMaxValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "BooleanMaxValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "Power2DToNeg2D",
+                "name": "IntegerMaxValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "2.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "type": "MaxValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.25",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2147483647",
                         "annotation": []
                       }
                     }
@@ -5839,44 +10540,51 @@
                 }
               },
               {
-                "name": "Power2DTo2",
+                "name": "LongMaxValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "type": "MaxValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "4.0",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "9223372036854775807",
                         "annotation": []
                       }
                     }
@@ -5884,44 +10592,51 @@
                 }
               },
               {
-                "name": "Power2To2D",
+                "name": "DecimalMaxValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          }
-                        ]
+                        "type": "MaxValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "4.0",
+                        "value": "99999999999999999999.99999999",
                         "annotation": []
                       }
                     }
@@ -5929,158 +10644,292 @@
                 }
               },
               {
-                "name": "Power2To4",
+                "name": "DateTimeMaxValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "4",
-                            "annotation": []
-                          }
-                        ]
+                        "type": "MaxValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "valueType": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "16",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "Power2LTo3L",
+                        "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "year": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "9999",
+                          "annotation": []
+                        },
+                        "month": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "12",
+                          "annotation": []
+                        },
+                        "day": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "31",
+                          "annotation": []
+                        },
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "23",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "59",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "59",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "999",
+                          "annotation": []
+                        },
+                        "timezoneOffset": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "0.0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateMaxValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Date",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Date",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                        "type": "MaxValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Date",
                         "annotation": []
                       }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Date",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                        "annotation": [],
+                        "signature": [],
+                        "year": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "9999",
+                          "annotation": []
+                        },
+                        "month": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "12",
+                          "annotation": []
+                        },
+                        "day": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "31",
+                          "annotation": []
+                        }
+                      }
                     }
                   ]
                 }
               },
               {
-                "name": "Power2DTo4D",
+                "name": "TimeMaxValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "4.0",
-                            "annotation": []
-                          }
-                        ]
+                        "type": "MaxValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "16.0",
-                        "annotation": []
+                        "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "23",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "59",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "59",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "999",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "Power2DToNeg2DEquivalence",
+                "name": "BooleanMaxValue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Power",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": [
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Negate",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "operand": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2",
-                                    "annotation": []
-                                  }
-                                }
-                              ]
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.25",
-                            "annotation": []
-                          }
-                        ]
+                        "type": "MaxValue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
-                      "name": "output",
+                      "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -6093,47 +10942,36 @@
           }
         },
         {
-          "name": "Round",
+          "name": "Modulo",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "RoundNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "ModuloNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "strict": false,
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          },
-                          "asTypeSpecifier": {
-                            "type": "NamedTypeSpecifier",
-                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -6141,36 +10979,27 @@
                 }
               },
               {
-                "name": "Round1",
-                "value": {
-                  "type": "Tuple",
+                "name": "Modulo0By0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "ToDecimal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -6178,31 +11007,27 @@
                 }
               },
               {
-                "name": "Round0D5",
-                "value": {
-                  "type": "Tuple",
+                "name": "Modulo4By2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "0.5",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -6210,31 +11035,27 @@
                 }
               },
               {
-                "name": "Round0D4",
-                "value": {
-                  "type": "Tuple",
+                "name": "Modulo4LBy2L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "0.4",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": []
                       }
                     }
@@ -6242,37 +11063,27 @@
                 }
               },
               {
-                "name": "Round3D14159",
-                "value": {
-                  "type": "Tuple",
+                "name": "Modulo4DBy2D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "3.14159",
-                          "annotation": []
-                        },
-                        "precision": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "3.14",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -6280,36 +11091,27 @@
                 }
               },
               {
-                "name": "RoundNeg0D5",
-                "value": {
-                  "type": "Tuple",
+                "name": "Modulo10By3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.5",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -6317,36 +11119,27 @@
                 }
               },
               {
-                "name": "RoundNeg0D4",
-                "value": {
-                  "type": "Tuple",
+                "name": "Modulo10DBy3D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.4",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -6354,200 +11147,498 @@
                 }
               },
               {
-                "name": "RoundNeg0D6",
-                "value": {
-                  "type": "Tuple",
+                "name": "Modulo10IBy3D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.6",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "RoundNeg1D1",
-                "value": {
-                  "type": "Tuple",
+                "name": "ModuloDResult",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.1",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "RoundNeg1D5",
-                "value": {
-                  "type": "Tuple",
+                "name": "ModuloQuantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.5",
-                            "annotation": []
-                          }
-                        }
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
-                    },
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Modulo10By3Quantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
                     {
-                      "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
-                          "annotation": []
-                        }
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "RoundNeg1D6",
-                "value": {
-                  "type": "Tuple",
+                "name": "Modulo10By0Quantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Round",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.6",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "2.0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Subtract",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ModuloNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Modulo0By0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Modulo4By2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Modulo4LBy2L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Modulo4DBy2D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Modulo10By3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Modulo10DBy3D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Modulo10IBy3D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ModuloDResult",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ModuloQuantity",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Modulo10By3Quantity",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Modulo10By0Quantity",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
-                "name": "SubtractNull",
+                "name": "ModuloNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Subtract",
+                        "type": "Modulo",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -6559,6 +11650,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -6569,6 +11661,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -6576,28 +11669,55 @@
                 }
               },
               {
-                "name": "Subtract1And1",
+                "name": "Modulo0By0",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Subtract",
+                        "type": "Modulo",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
+                            "value": "0",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
+                            "value": "0",
                             "annotation": []
                           }
                         ]
@@ -6606,9 +11726,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -6616,46 +11735,55 @@
                 }
               },
               {
-                "name": "Subtract1LAnd1L",
+                "name": "Modulo4By2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
-                        "annotation": []
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "Subtract1DAnd2D",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Subtract",
+                        "type": "Modulo",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "4",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
                             "annotation": []
                           }
                         ]
@@ -6664,43 +11792,66 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
-                          "annotation": []
-                        }
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "Subtract1CMAnd2CM",
+                "name": "Modulo4LBy2L",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Subtract",
+                        "type": "Modulo",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "4",
                             "annotation": []
                           },
                           {
-                            "type": "Quantity",
-                            "value": 2,
-                            "unit": "cm",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "2",
                             "annotation": []
                           }
                         ]
@@ -6709,48 +11860,66 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Quantity",
-                          "value": 1,
-                          "unit": "cm",
-                          "annotation": []
-                        }
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "0",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "Subtract2And11D",
+                "name": "Modulo4DBy2D",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Subtract",
+                        "type": "Modulo",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "4.0",
+                            "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.1",
+                            "value": "2.0",
                             "annotation": []
                           }
                         ]
@@ -6760,59 +11929,77 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.9",
+                        "value": "0.0",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Successor",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "SuccessorNull",
+                "name": "Modulo10By3",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Successor",
+                        "type": "Modulo",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "strict": false,
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
                             "annotation": []
                           },
-                          "asTypeSpecifier": {
-                            "type": "NamedTypeSpecifier",
-                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "3",
                             "annotation": []
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
                         "annotation": []
                       }
                     }
@@ -6820,31 +12007,67 @@
                 }
               },
               {
-                "name": "SuccessorOf0",
+                "name": "Modulo10DBy3D",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Successor",
+                        "type": "Modulo",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        }
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "10.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "3.0",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     }
@@ -6852,31 +12075,72 @@
                 }
               },
               {
-                "name": "SuccessorOf1",
+                "name": "Modulo10IBy3D",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Successor",
+                        "type": "Modulo",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                        "operand": [
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "3.0",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     }
@@ -6884,17 +12148,72 @@
                 }
               },
               {
-                "name": "SuccessorOf1L",
+                "name": "ModuloDResult",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
+                      "value": {
+                        "type": "Modulo",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "3.5",
+                            "annotation": []
+                          },
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.5",
                         "annotation": []
                       }
                     }
@@ -6902,17 +12221,33 @@
                 }
               },
               {
-                "name": "SuccessorOf1D",
+                "name": "ModuloQuantity",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (doesn't recognize 1.0 as decimal)",
+                        "value": "Modulo not implemented for Quantity",
                         "annotation": []
                       }
                     }
@@ -6920,31 +12255,33 @@
                 }
               },
               {
-                "name": "SuccessorOf101D",
+                "name": "Modulo10By3Quantity",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Successor",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.01",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": []
                         }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.01000001",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Modulo not implemented for Quantity",
                         "annotation": []
                       }
                     }
@@ -6952,216 +12289,133 @@
                 }
               },
               {
-                "name": "SuccessorOfJan12000",
+                "name": "Modulo10By0Quantity",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Successor",
+                        "type": "Modulo",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2000",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 10,
+                            "unit": "g",
                             "annotation": []
                           },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "g",
                             "annotation": []
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "DateTime",
-                        "annotation": [],
-                        "signature": [],
-                        "year": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2000",
-                          "annotation": []
-                        },
-                        "month": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        },
-                        "day": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2",
-                          "annotation": []
-                        }
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
                       }
                     }
                   ]
                 }
-              },
+              }
+            ]
+          }
+        },
+        {
+          "name": "Multiply",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
               {
-                "name": "SuccessorOfNoon",
-                "value": {
-                  "type": "Tuple",
+                "name": "MultiplyNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Successor",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Time",
-                          "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Time",
-                        "annotation": [],
-                        "signature": [],
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "12",
-                          "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "SuccessorOverflowDt",
-                "value": {
-                  "type": "Tuple",
+                "name": "Multiply1By1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Successor",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "9999",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "31",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "23",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "999",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
-                      "name": "invalid",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -7169,105 +12423,55 @@
                 }
               },
               {
-                "name": "SuccessorOverflowT",
-                "value": {
-                  "type": "Tuple",
+                "name": "Multiply2LBy3L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Successor",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Time",
-                          "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "23",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "999",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
                       }
                     },
                     {
-                      "name": "invalid",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Truncate",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TruncateNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "Multiply1DBy2D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Truncate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "strict": false,
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          },
-                          "asTypeSpecifier": {
-                            "type": "NamedTypeSpecifier",
-                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -7275,36 +12479,27 @@
                 }
               },
               {
-                "name": "Truncate0",
-                "value": {
-                  "type": "Tuple",
+                "name": "Multiply1By1L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Truncate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "ToDecimal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": []
                       }
                     }
@@ -7312,31 +12507,27 @@
                 }
               },
               {
-                "name": "Truncate0D0",
-                "value": {
-                  "type": "Tuple",
+                "name": "Multiply1IBy2D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Truncate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "0.0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -7344,68 +12535,305 @@
                 }
               },
               {
-                "name": "Truncate0D1",
-                "value": {
-                  "type": "Tuple",
+                "name": "Multiply1CMBy2CM",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Truncate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "0.1",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              },
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "MultiplyNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Multiply1By1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Multiply2LBy3L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Multiply1DBy2D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Multiply1By1L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Multiply1IBy2D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Multiply1CMBy2CM",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
               {
-                "name": "Truncate1",
+                "name": "MultiplyNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Truncate",
+                        "type": "Multiply",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "ToDecimal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
+                        "operand": [
+                          {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -7413,29 +12841,65 @@
                 }
               },
               {
-                "name": "Truncate1D0",
+                "name": "Multiply1By1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Truncate",
+                        "type": "Multiply",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
-                          "annotation": []
-                        }
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -7445,31 +12909,67 @@
                 }
               },
               {
-                "name": "Truncate1D1",
+                "name": "Multiply2LBy3L",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Truncate",
+                        "type": "Multiply",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.1",
-                          "annotation": []
-                        }
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "2",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "3",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "6",
                         "annotation": []
                       }
                     }
@@ -7477,31 +12977,67 @@
                 }
               },
               {
-                "name": "Truncate1D9",
+                "name": "Multiply1DBy2D",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Truncate",
+                        "type": "Multiply",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.9",
-                          "annotation": []
-                        }
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "2.0",
                         "annotation": []
                       }
                     }
@@ -7509,229 +13045,12107 @@
                 }
               },
               {
-                "name": "TruncateNeg1",
+                "name": "Multiply1By1L",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Truncate",
+                        "type": "Multiply",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "ToDecimal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Negate",
+                        "operand": [
+                          {
+                            "type": "ToLong",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "1",
+                            "annotation": []
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "1",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "TruncateNeg1D0",
+                "name": "Multiply1IBy2D",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Truncate",
+                        "type": "Multiply",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
+                        "operand": [
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          },
+                          {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
+                            "value": "2.0",
                             "annotation": []
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Negate",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "2.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Multiply1CMBy2CM",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
                           "annotation": []
                         }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Multiply",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 2,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "value": 2,
+                        "unit": "cm2",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Negate",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "NegateNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "TruncateNeg1D1",
-                "value": {
-                  "type": "Tuple",
+                "name": "Negate0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateNeg0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate1L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateMaxLong",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateNeg1L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate0D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateNeg0D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate1D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateNeg1D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate1CM",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "NegateNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Negate0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NegateNeg0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Negate1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Negate1L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NegateMaxLong",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NegateNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NegateNeg1L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Negate0D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NegateNeg0D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Negate1D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NegateNeg1D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Negate1CM",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "NegateNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "strict": false,
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "NamedTypeSpecifier",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateNeg0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate1L",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateMaxLong",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                          "value": "9223372036854775807",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                          "value": "9223372036854775807",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateNeg1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateNeg1L",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate0D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "0.0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateNeg0D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate1D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NegateNeg1D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Negate1CM",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "value": 1,
+                          "unit": "cm",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "value": 1,
+                          "unit": "cm",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Precision",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "PrecisionDecimal",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PrecisionYear",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PrecisionDateTimeMilliseconds",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PrecisionTimeMinutes",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PrecisionTimeMilliseconds",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "PrecisionDecimal",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PrecisionYear",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PrecisionDateTimeMilliseconds",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PrecisionTimeMinutes",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PrecisionTimeMilliseconds",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "PrecisionDecimal",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Precision for Decimal not implemented",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PrecisionYear",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Precision",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Date",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2014",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "4",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PrecisionDateTimeMilliseconds",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Precision",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2014",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "5",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "30",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "17",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PrecisionTimeMinutes",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Precision",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "30",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "4",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PrecisionTimeMilliseconds",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Precision",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "30",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "9",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Predecessor",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "PredecessorNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf1L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf1D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf101D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf1QCM",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOfJan12000",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOfNoon",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorUnderflowDt",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorUnderflowT",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "PredecessorNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PredecessorOf0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PredecessorOf1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PredecessorOf1L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PredecessorOf1D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PredecessorOf101D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PredecessorOf1QCM",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PredecessorOfJan12000",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PredecessorOfNoon",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PredecessorUnderflowDt",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PredecessorUnderflowT",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "PredecessorNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "strict": false,
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "NamedTypeSpecifier",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf1L",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf1D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.99999999",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf101D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.01",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.00999999",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOf1QCM",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "value": 1,
+                          "unit": "cm",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "value": 0.99999999,
+                        "unit": "cm",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOfJan12000",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2000",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "year": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1999",
+                          "annotation": []
+                        },
+                        "month": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "12",
+                          "annotation": []
+                        },
+                        "day": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "31",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorOfNoon",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "11",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "59",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "59",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "999",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorUnderflowDt",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0001",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PredecessorUnderflowT",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Predecessor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Power",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "PowerNullToNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power0To0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2To2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PowerNeg2To2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2ToNeg2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2LTo2L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2DTo2D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PowerNeg2DTo2D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2DToNeg2D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2DTo2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2To2D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2To4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2LTo3L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2DTo4D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2DToNeg2DEquivalence",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "PowerNullToNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power0To0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2To2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PowerNeg2To2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2ToNeg2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2LTo2L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2DTo2D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PowerNeg2DTo2D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2DToNeg2D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2DTo2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2To2D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2To4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2LTo3L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2DTo4D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Power2DToNeg2DEquivalence",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "PowerNullToNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "strict": false,
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "NamedTypeSpecifier",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "As",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "strict": false,
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "NamedTypeSpecifier",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power0To0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2To2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "4",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PowerNeg2To2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "4",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2ToNeg2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.25",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2LTo2L",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "2",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "2",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "4",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2DTo2D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "4.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PowerNeg2DTo2D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "2.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "4.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2DToNeg2D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "2.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.25",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2DTo2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "4.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2To2D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "4.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2To4",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "4",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "16",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2LTo3L",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "2",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "3",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "8",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2DTo4D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "4.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "16.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Power2DToNeg2DEquivalence",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Power",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": [
+                                {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                },
+                                {
+                                  "type": "Negate",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "operand": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.25",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Round",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "RoundNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Round1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Round0D5",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Round0D4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Round3D14159",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg0D5",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg0D4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg0D6",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg1D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg1D5",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg1D6",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "RoundNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Round1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Round0D5",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Round0D4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Round3D14159",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "RoundNeg0D5",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "RoundNeg0D4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "RoundNeg0D6",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "RoundNeg1D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "RoundNeg1D5",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "RoundNeg1D6",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "RoundNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "strict": false,
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "NamedTypeSpecifier",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Round1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "ToDecimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Round0D5",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "0.5",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Round0D4",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "0.4",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Round3D14159",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "3.14159",
+                          "annotation": []
+                        },
+                        "precision": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "3.14",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg0D5",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.5",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg0D4",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.4",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg0D6",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.6",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg1D1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.1",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg1D5",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.5",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "RoundNeg1D6",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Round",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.6",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "2.0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Subtract",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "SubtractNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Subtract1And1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Subtract1LAnd1L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Subtract1DAnd2D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Subtract1CMAnd2CM",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Subtract2And11D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SubtractNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Subtract1And1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Subtract1LAnd1L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Subtract1DAnd2D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Subtract1CMAnd2CM",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Subtract2And11D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "SubtractNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Subtract1And1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Subtract1LAnd1L",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Subtract1DAnd2D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Subtract1CMAnd2CM",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 2,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "value": 1,
+                          "unit": "cm",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Subtract2And11D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.9",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Successor",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "SuccessorNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOf0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOf1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOf1L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOf1D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOf101D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOfJan12000",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOfNoon",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOverflowDt",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOverflowT",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SuccessorNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SuccessorOf0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SuccessorOf1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SuccessorOf1L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SuccessorOf1D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SuccessorOf101D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SuccessorOfJan12000",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SuccessorOfNoon",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SuccessorOverflowDt",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SuccessorOverflowT",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "SuccessorNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Successor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "strict": false,
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "NamedTypeSpecifier",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOf0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Successor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOf1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Successor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOf1L",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Successor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "2",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOf1D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Successor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.00000001",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOf101D",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Successor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.01",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.01000001",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOfJan12000",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Successor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2000",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "year": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2000",
+                          "annotation": []
+                        },
+                        "month": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "day": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOfNoon",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Successor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "12",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOverflowDt",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Successor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "9999",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "31",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "23",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "999",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SuccessorOverflowT",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Successor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "23",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "999",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Truncate",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TruncateNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate0D0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate0D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate1D0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate1D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate1D9",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncateNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncateNeg1D0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncateNeg1D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncateNeg1D9",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TruncateNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Truncate0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Truncate0D0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Truncate0D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Truncate1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Truncate1D0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Truncate1D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Truncate1D9",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncateNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncateNeg1D0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncateNeg1D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncateNeg1D9",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TruncateNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "strict": false,
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "NamedTypeSpecifier",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "ToDecimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate0D0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "0.0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate0D1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "0.1",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "ToDecimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate1D0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate1D1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.1",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Truncate1D9",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.9",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncateNeg1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "ToDecimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncateNeg1D0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncateNeg1D1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.1",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncateNeg1D9",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Truncate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.9",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Truncated Divide",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TruncatedDivideNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide2By1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide2By0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10By3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10LBy3L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10LBy0L",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10d1By3D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10D1By0D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivideNeg2ByNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivideNeg10ByNeg3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivideNeg10d1ByNeg3D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivideNeg2By1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivideNeg10By3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivideNeg10d1By3D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide2ByNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10ByNeg3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10d1ByNeg3D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10By5D",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10d1ByNeg3D1Quantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10By5DQuantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide414By206DQuantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TruncatedDivide10By0DQuantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TruncatedDivideNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide2By1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide2By0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10By3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10LBy3L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10LBy0L",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10d1By3D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10D1By0D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivideNeg2ByNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivideNeg10ByNeg3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivideNeg10d1ByNeg3D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivideNeg2By1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivideNeg10By3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivideNeg10d1By3D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide2ByNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10ByNeg3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10d1ByNeg3D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10By5D",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10d1ByNeg3D1Quantity",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Truncate",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.1",
-                            "annotation": []
-                          }
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Negate",
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10By5DQuantity",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": []
                         }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TruncateNeg1D9",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide414By206DQuantity",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Truncate",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Negate",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.9",
-                            "annotation": []
-                          }
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Negate",
+                    ]
+                  }
+                },
+                {
+                  "name": "TruncatedDivide10By0DQuantity",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
                           "annotation": []
                         }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Truncated Divide",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "TruncatedDivideNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "As",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "strict": false,
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
                               "type": "NamedTypeSpecifier",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "name": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": []
                             }
                           },
                           {
                             "type": "As",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "strict": false,
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
                               "type": "NamedTypeSpecifier",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "name": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": []
                             }
@@ -7743,6 +25157,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -7754,22 +25169,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -7781,6 +25223,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -7794,22 +25237,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "0",
                             "annotation": []
@@ -7821,6 +25291,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -7832,22 +25303,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "10",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
@@ -7859,6 +25357,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "3",
                         "annotation": []
@@ -7872,13 +25371,63 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
+                      "value": {
+                        "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "10",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                            "value": "3",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Long not implemented",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Long",
+                        "value": "3",
                         "annotation": []
                       }
                     }
@@ -7890,22 +25439,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Long",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                             "valueType": "{urn:hl7-org:elm-types:r1}Long",
                             "value": "10",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Long",
                             "valueType": "{urn:hl7-org:elm-types:r1}Long",
                             "value": "0",
                             "annotation": []
@@ -7917,6 +25493,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -7928,22 +25505,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "10.1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "3.1",
                             "annotation": []
@@ -7955,6 +25559,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "3.0",
                         "annotation": []
@@ -7968,22 +25573,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "10.1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "0.0",
                             "annotation": []
@@ -7995,6 +25627,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -8006,20 +25639,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -8027,10 +25687,12 @@
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -8043,6 +25705,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -8056,20 +25719,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -8077,10 +25767,12 @@
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
@@ -8093,6 +25785,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "3",
                         "annotation": []
@@ -8106,20 +25799,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.1",
                               "annotation": []
@@ -8127,10 +25847,12 @@
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "3.1",
                               "annotation": []
@@ -8143,6 +25865,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "3.0",
                         "annotation": []
@@ -8156,20 +25879,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -8177,6 +25927,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -8188,10 +25939,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "2",
                           "annotation": []
@@ -8206,20 +25959,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -8227,6 +26007,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
@@ -8238,10 +26019,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "3",
                           "annotation": []
@@ -8256,20 +26039,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.1",
                               "annotation": []
@@ -8277,6 +26087,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "3.1",
                             "annotation": []
@@ -8288,10 +26099,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "3.0",
                           "annotation": []
@@ -8306,26 +26119,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -8338,10 +26179,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "2",
                           "annotation": []
@@ -8356,26 +26199,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "10",
                             "annotation": []
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
@@ -8388,10 +26259,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "3",
                           "annotation": []
@@ -8406,26 +26279,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "10.1",
                             "annotation": []
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "3.1",
                               "annotation": []
@@ -8438,10 +26339,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "3.0",
                           "annotation": []
@@ -8456,11 +26359,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -8470,6 +26398,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -8477,6 +26406,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "5.0",
                             "annotation": []
@@ -8488,6 +26418,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "2.0",
                         "annotation": []
@@ -8501,11 +26432,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Truncated divide not implemented for Quantity",
                         "annotation": []
@@ -8519,11 +26466,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Truncated divide not implemented for Quantity",
                         "annotation": []
@@ -8537,11 +26500,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Truncated divide not implemented for Quantity",
                         "annotation": []
@@ -8555,22 +26534,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "TruncatedDivide",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 10,
                             "unit": "g",
                             "annotation": []
                           },
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 0,
                             "unit": "g",
                             "annotation": []
@@ -8582,6 +26588,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
diff --git a/test/spec-tests/cql/CqlComparisonOperatorsTest.json b/test/spec-tests/cql/CqlComparisonOperatorsTest.json
index 9a5863388..f0250760d 100644
--- a/test/spec-tests/cql/CqlComparisonOperatorsTest.json
+++ b/test/spec-tests/cql/CqlComparisonOperatorsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,20 +66,113 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "BetweenIntTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "BetweenIntTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "BetweenIntTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -90,12 +183,14 @@
                             "operand": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -109,12 +204,14 @@
                             "operand": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "6",
                                 "annotation": []
@@ -128,6 +225,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -144,44 +242,32 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
                 "name": "SimpleEqTrueTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -190,38 +276,26 @@
               },
               {
                 "name": "SimpleEqTrueFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -230,38 +304,26 @@
               },
               {
                 "name": "SimpleEqFalseFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -270,38 +332,26 @@
               },
               {
                 "name": "SimpleEqFalseTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -310,49 +360,26 @@
               },
               {
                 "name": "SimpleEqNullNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "strict": false,
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "asTypeSpecifier": {
-                              "type": "NamedTypeSpecifier",
-                              "name": "{urn:hl7-org:elm-types:r1}String",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}String",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -361,40 +388,26 @@
               },
               {
                 "name": "SimpleEqTrueNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -403,40 +416,26 @@
               },
               {
                 "name": "SimpleEqNullTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -445,38 +444,26 @@
               },
               {
                 "name": "SimpleEqInt1Int1",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -485,38 +472,26 @@
               },
               {
                 "name": "SimpleEqInt1Int2",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -525,38 +500,26 @@
               },
               {
                 "name": "SimpleEqStringAStringA",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -565,38 +528,26 @@
               },
               {
                 "name": "SimpleEqStringAStringB",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -605,38 +556,26 @@
               },
               {
                 "name": "SimpleEqFloat1Float1",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -645,38 +584,26 @@
               },
               {
                 "name": "SimpleEqFloat1Float2",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -685,43 +612,26 @@
               },
               {
                 "name": "SimpleEqFloat1Int1",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -730,43 +640,26 @@
               },
               {
                 "name": "SimpleEqFloat1Int2",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -775,38 +668,26 @@
               },
               {
                 "name": "QuantityEqCM1CM1",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -815,38 +696,26 @@
               },
               {
                 "name": "QuantityEqCM1M01",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 0.01,
-                            "unit": "m",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -855,38 +724,26 @@
               },
               {
                 "name": "QuantityEqDiffPrecision",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 2,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 2,
-                            "unit": "cm",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -895,74 +752,26 @@
               },
               {
                 "name": "TupleEqJohnJohn",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -971,74 +780,26 @@
               },
               {
                 "name": "TupleEqJohnJane",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "Jane",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1047,74 +808,26 @@
               },
               {
                 "name": "TupleEqJohn1John2",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1123,72 +836,26 @@
               },
               {
                 "name": "TupleEqJohn1John2WithNullName",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1197,72 +864,26 @@
               },
               {
                 "name": "TupleEqDifferentNamesWithOneNullId",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "James",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1271,70 +892,26 @@
               },
               {
                 "name": "TupleEqJohn1John1WithBothNamesNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1343,70 +920,26 @@
               },
               {
                 "name": "TupleEqJohnJohnWithBothIdsNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1415,70 +948,26 @@
               },
               {
                 "name": "TupleEqJohn1John1WithNullName",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1487,156 +976,26 @@
               },
               {
                 "name": "TupleEqDateTimeTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "dateId",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Date",
-                                "value": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "dateId",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Date",
-                                "value": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1645,156 +1004,26 @@
               },
               {
                 "name": "TupleEqDateTimeFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "dateId",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Date",
-                                "value": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "dateId",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Date",
-                                "value": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1803,120 +1032,26 @@
               },
               {
                 "name": "TupleEqTimeTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "timeId",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "55",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "TheTime",
-                                "value": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "541",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "timeId",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "55",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "TheTime",
-                                "value": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "541",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1925,120 +1060,26 @@
               },
               {
                 "name": "TupleEqTimeFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "timeId",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "55",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "TheTime",
-                                "value": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "541",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "timeId",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "55",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "TheTime",
-                                "value": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "540",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2047,36 +1088,26 @@
               },
               {
                 "name": "DateTimeEqTodayToday",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Today",
-                            "annotation": [],
-                            "signature": []
-                          },
-                          {
-                            "type": "Today",
-                            "annotation": [],
-                            "signature": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2085,49 +1116,26 @@
               },
               {
                 "name": "DateTimeEqTodayYesterday",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Today",
-                            "annotation": [],
-                            "signature": []
-                          },
-                          {
-                            "type": "Subtract",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": [
-                              {
-                                "type": "Today",
-                                "annotation": [],
-                                "signature": []
-                              },
-                              {
-                                "type": "Quantity",
-                                "value": 1,
-                                "unit": "days",
-                                "annotation": []
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2136,142 +1144,26 @@
               },
               {
                 "name": "DateTimeEqJanJan",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "timezoneOffset": {
-                              "type": "ToDecimal",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "timezoneOffset": {
-                              "type": "ToDecimal",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2280,43 +1172,12710 @@
               },
               {
                 "name": "DateTimeEqJanJuly",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEqNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeUTC",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeDayCompare",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEq10A10A",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEq10A10P",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SimpleEqTrueTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqTrueFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqFalseFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqFalseTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqNullNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqTrueNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqNullTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqInt1Int1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqInt1Int2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqStringAStringA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqStringAStringB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqFloat1Float1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqFloat1Float2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqFloat1Int1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleEqFloat1Int2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityEqCM1CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityEqCM1M01",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityEqDiffPrecision",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqJohnJohn",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqJohnJane",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqJohn1John2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqJohn1John2WithNullName",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqDifferentNamesWithOneNullId",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqJohn1John1WithBothNamesNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqJohnJohnWithBothIdsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqJohn1John1WithNullName",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqDateTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqDateTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleEqTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEqTodayToday",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEqTodayYesterday",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEqJanJan",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEqJanJuly",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEqNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeUTC",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeDayCompare",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeEq10A10A",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeEq10A10P",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "SimpleEqTrueTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqTrueFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqFalseFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqFalseTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqNullNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "strict": false,
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "NamedTypeSpecifier",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqTrueNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqNullTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqInt1Int1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqInt1Int2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqStringAStringA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqStringAStringB",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqFloat1Float1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqFloat1Float2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqFloat1Int1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleEqFloat1Int2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityEqCM1CM1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityEqCM1M01",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0.01,
+                            "unit": "m",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityEqDiffPrecision",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 2,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 2,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqJohnJohn",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqJohnJane",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "Jane",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqJohn1John2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqJohn1John2WithNullName",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqDifferentNamesWithOneNullId",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "James",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqJohn1John1WithBothNamesNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqJohnJohnWithBothIdsNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqJohn1John1WithNullName",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqDateTimeTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "dateId",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Date",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "dateId",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Date",
+                                "value": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "hour": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "dateId",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Date",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "dateId",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Date",
+                                "value": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "hour": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqDateTimeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "dateId",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Date",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "dateId",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Date",
+                                "value": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "hour": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "dateId",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Date",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "dateId",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Date",
+                                "value": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "hour": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqTimeTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "timeId",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "TheTime",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "timeId",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "55",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "TheTime",
+                                "value": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "541",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "timeId",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "TheTime",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "timeId",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "55",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "TheTime",
+                                "value": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "541",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleEqTimeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "timeId",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "TheTime",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "timeId",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "55",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "TheTime",
+                                "value": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "541",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "timeId",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "TheTime",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "timeId",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "55",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "TheTime",
+                                "value": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "540",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEqTodayToday",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Today",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                            "annotation": [],
+                            "signature": []
+                          },
+                          {
+                            "type": "Today",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                            "annotation": [],
+                            "signature": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEqTodayYesterday",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Today",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                            "annotation": [],
+                            "signature": []
+                          },
+                          {
+                            "type": "Subtract",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Today",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": []
+                              },
+                              {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 1,
+                                "unit": "days",
+                                "annotation": []
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEqJanJan",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "timezoneOffset": {
+                              "type": "ToDecimal",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "timezoneOffset": {
+                              "type": "ToDecimal",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEqJanJuly",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "timezoneOffset": {
+                              "type": "ToDecimal",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
                             },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "timezoneOffset": {
+                              "type": "ToDecimal",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEqNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (true vs null - due to not evaluating DateTime(null) as null)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeUTC",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "25",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "14",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "30",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "14",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "559",
+                              "annotation": []
+                            },
+                            "timezoneOffset": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "25",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "14",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "30",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "14",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "559",
+                              "annotation": []
+                            },
+                            "timezoneOffset": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeDayCompare",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "SameAs",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Day",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2022",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "22",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "timezoneOffset": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "-5.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2022",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "22",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "timezoneOffset": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "0.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEq10A10A",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEq10A10P",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "22",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Greater",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "GreaterZZ",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterZ1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterZNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterDecZZ",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterDecZ1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterDecZNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterDec1Int2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterCM0CM0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterCM0CM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterCM0NegCM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterM1CM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterM1CM10",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterAA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterBA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterAThanAA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterAAThanA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterJackJill",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeGreaterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeGreaterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeGreaterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeGreaterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "GreaterZZ",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterZ1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterZNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterDecZZ",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterDecZ1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterDecZNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterDec1Int2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterCM0CM0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterCM0CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterCM0NegCM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterM1CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterM1CM10",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterAA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterBA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterAThanAA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterAAThanA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterJackJill",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeGreaterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeGreaterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeGreaterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeGreaterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyGreaterNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyGreaterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyGreaterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "GreaterZZ",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterZ1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterZNeg1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterDecZZ",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterDecZ1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterDecZNeg1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterDec1Int2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterCM0CM0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterCM0CM1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterCM0NegCM1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "cm",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterM1CM1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "m",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterM1CM10",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "m",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 10,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterAA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterAB",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterBA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterAThanAA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "aa",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterAAThanA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "aa",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterJackJill",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Jack",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Jill",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeGreaterTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeGreaterFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "13",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeGreaterTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeGreaterFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2015",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2013",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Greater Or Equal",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "GreaterOrEqualZZ",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualZ1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualZNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualDecZZ",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualDecZ1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualDecZNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualDec1Int2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualCM0CM0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualCM0CM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualCM0NegCM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualM1CM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualM1CM10",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualAA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualBA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualAThanAA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualAAThanA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualJackJill",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeGreaterEqTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeGreaterEqTrue2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeGreaterEqFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeGreaterEqTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeGreaterEqTrue2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeGreaterEqFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterEqualNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "GreaterOrEqualZZ",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualZ1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualZNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualDecZZ",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualDecZ1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualDecZNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualDec1Int2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualCM0CM0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualCM0CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualCM0NegCM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualM1CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualM1CM10",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualAA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualBA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualAThanAA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualAAThanA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "GreaterOrEqualJackJill",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeGreaterEqTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeGreaterEqTrue2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeGreaterEqFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeGreaterEqTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeGreaterEqTrue2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeGreaterEqFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyGreaterEqualNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyGreaterEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyGreaterEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "GreaterOrEqualZZ",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualZ1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualZNeg1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualDecZZ",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualDecZ1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualDecZNeg1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualDec1Int2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualCM0CM0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualCM0CM1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualCM0NegCM1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "cm",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualM1CM1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "m",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualM1CM10",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "m",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 10,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualAA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualAB",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualBA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualAThanAA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "aa",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualAAThanA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "aa",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "GreaterOrEqualJackJill",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Jack",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Jill",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeGreaterEqTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeGreaterEqTrue2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeGreaterEqFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "13",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeGreaterEqTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeGreaterEqTrue2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
                             "hour": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeGreaterEqFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             },
                             "minute": {
@@ -2334,77 +13893,288 @@
                             "millisecond": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterEqualNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterEqualTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2015",
                               "annotation": []
-                            },
-                            "timezoneOffset": {
-                              "type": "ToDecimal",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
                             }
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2014",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
+                              "value": "2",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                              "value": "15",
                               "annotation": []
-                            },
-                            "hour": {
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyGreaterEqualFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                              "value": "2013",
                               "annotation": []
-                            },
-                            "minute": {
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
+                              "value": "2014",
                               "annotation": []
                             },
-                            "second": {
+                            "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
+                              "value": "2",
                               "annotation": []
                             },
-                            "millisecond": {
+                            "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
+                              "value": "15",
                               "annotation": []
-                            },
-                            "timezoneOffset": {
-                              "type": "ToDecimal",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
                             }
                           }
                         ]
@@ -2412,10 +14182,219 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Less",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "LessZZ",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessZ1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessZNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessDecZZ",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessDecZ1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessDecZNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessDec1Int2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2423,17 +14402,27 @@
                 }
               },
               {
-                "name": "DateTimeEqNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessCM0CM0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (true vs null - due to not evaluating DateTime(null) as null)",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2441,133 +14430,223 @@
                 }
               },
               {
-                "name": "DateTimeUTC",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessCM0CM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "25",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "14",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "30",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "14",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "559",
-                              "annotation": []
-                            },
-                            "timezoneOffset": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "25",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "14",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "30",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "14",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "559",
-                              "annotation": []
-                            },
-                            "timezoneOffset": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessCM0NegCM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessM1CM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessM1CM10",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessAA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessBA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessAThanAA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2575,134 +14654,27 @@
                 }
               },
               {
-                "name": "DateTimeDayCompare",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessAAThanA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "SameAs",
-                        "precision": "Day",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2022",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "22",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "timezoneOffset": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "-5.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2022",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "22",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "timezoneOffset": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "0.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2710,85 +14682,139 @@
                 }
               },
               {
-                "name": "TimeEq10A10A",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessJackJill",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeLessTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeLessFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeLessTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeLessFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2796,85 +14822,83 @@
                 }
               },
               {
-                "name": "TimeEq10A10P",
-                "value": {
-                  "type": "Tuple",
+                "name": "UncertaintyLessNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "22",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyLessTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyLessFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -2882,205 +14906,767 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Greater",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
-            "element": [
-              {
-                "name": "GreaterZZ",
-                "value": {
-                  "type": "Tuple",
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "LessZZ",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Greater",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessZ1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessZNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessDecZZ",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessDecZ1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessDecZNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessDec1Int2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessCM0CM0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessCM0CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessCM0NegCM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessM1CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessM1CM10",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessAA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessBA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessAThanAA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessAAThanA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessJackJill",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeLessTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "GreaterZ1",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeLessFalse",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Greater",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeLessTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "GreaterZNeg1",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeLessFalse",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Greater",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyLessNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "GreaterDecZZ",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyLessTrue",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Greater",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyLessFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "GreaterDecZ1",
+                "name": "LessZZ",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
                             "annotation": []
                           }
                         ]
@@ -3090,6 +15676,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3099,34 +15686,56 @@
                 }
               },
               {
-                "name": "GreaterDecZNeg1",
+                "name": "LessZ1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
                             "annotation": []
                           },
                           {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
                           }
                         ]
                       }
@@ -3135,6 +15744,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3144,74 +15754,62 @@
                 }
               },
               {
-                "name": "GreaterDec1Int2",
+                "name": "LessZNeg1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Greater",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "GreaterCM0CM0",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
                             "annotation": []
                           },
                           {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
-                            "annotation": []
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -3220,6 +15818,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3229,28 +15828,55 @@
                 }
               },
               {
-                "name": "GreaterCM0CM1",
+                "name": "LessDecZZ",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
                             "annotation": []
                           },
                           {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
                             "annotation": []
                           }
                         ]
@@ -3260,6 +15886,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3269,34 +15896,56 @@
                 }
               },
               {
-                "name": "GreaterCM0NegCM1",
+                "name": "LessDecZ1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
                             "annotation": []
                           },
                           {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "cm",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
                           }
                         ]
                       }
@@ -3305,6 +15954,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3314,29 +15964,62 @@
                 }
               },
               {
-                "name": "GreaterM1CM1",
+                "name": "LessDecZNeg1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "m",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "0.0",
                             "annotation": []
                           },
                           {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -3345,8 +16028,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -3354,29 +16038,61 @@
                 }
               },
               {
-                "name": "GreaterM1CM10",
+                "name": "LessDec1Int2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "m",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
                             "annotation": []
                           },
                           {
-                            "type": "Quantity",
-                            "value": 10,
-                            "unit": "cm",
-                            "annotation": []
+                            "type": "ToDecimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -3385,6 +16101,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3394,28 +16111,55 @@
                 }
               },
               {
-                "name": "GreaterAA",
+                "name": "LessCM0CM0",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
                             "annotation": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
                             "annotation": []
                           }
                         ]
@@ -3425,6 +16169,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3434,28 +16179,55 @@
                 }
               },
               {
-                "name": "GreaterAB",
+                "name": "LessCM0CM1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
                             "annotation": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
                             "annotation": []
                           }
                         ]
@@ -3465,8 +16237,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -3474,29 +16247,62 @@
                 }
               },
               {
-                "name": "GreaterBA",
+                "name": "LessCM0NegCM1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0,
+                            "unit": "cm",
                             "annotation": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "cm",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -3505,8 +16311,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -3514,28 +16321,55 @@
                 }
               },
               {
-                "name": "GreaterAThanAA",
+                "name": "LessM1CM1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "m",
                             "annotation": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "aa",
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
                             "annotation": []
                           }
                         ]
@@ -3545,6 +16379,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3554,28 +16389,55 @@
                 }
               },
               {
-                "name": "GreaterAAThanA",
+                "name": "LessM1CM10",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "aa",
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "m",
                             "annotation": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 10,
+                            "unit": "cm",
                             "annotation": []
                           }
                         ]
@@ -3585,8 +16447,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -3594,28 +16457,55 @@
                 }
               },
               {
-                "name": "GreaterJackJill",
+                "name": "LessAA",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Jack",
+                            "value": "a",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Jill",
+                            "value": "a",
                             "annotation": []
                           }
                         ]
@@ -3625,6 +16515,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3634,63 +16525,56 @@
                 }
               },
               {
-                "name": "DateTimeGreaterTrue",
+                "name": "LessAB",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
                           },
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
                           }
                         ]
                       }
@@ -3699,6 +16583,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3708,63 +16593,56 @@
                 }
               },
               {
-                "name": "DateTimeGreaterFalse",
+                "name": "LessBA",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
                           },
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "13",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
                           }
                         ]
                       }
@@ -3773,6 +16651,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3782,75 +16661,56 @@
                 }
               },
               {
-                "name": "TimeGreaterTrue",
+                "name": "LessAThanAA",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
                           },
                           {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "aa",
+                            "annotation": []
                           }
                         ]
                       }
@@ -3859,6 +16719,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3868,75 +16729,56 @@
                 }
               },
               {
-                "name": "TimeGreaterFalse",
+                "name": "LessAAThanA",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "aa",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
                           }
                         ]
                       }
@@ -3945,6 +16787,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3954,51 +16797,56 @@
                 }
               },
               {
-                "name": "UncertaintyGreaterNull",
+                "name": "LessJackJill",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Jack",
+                            "annotation": []
                           },
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Jill",
+                            "annotation": []
                           }
                         ]
                       }
@@ -4006,7 +16854,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -4014,49 +16865,94 @@
                 }
               },
               {
-                "name": "UncertaintyGreaterTrue",
+                "name": "DateTimeLessTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2015",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
                               "annotation": []
                             }
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
+                              "value": "2012",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
+                              "value": "10",
                               "annotation": []
                             }
                           }
@@ -4067,6 +16963,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -4076,49 +16973,94 @@
                 }
               },
               {
-                "name": "UncertaintyGreaterFalse",
+                "name": "DateTimeLessFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Greater",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2013",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "14",
                               "annotation": []
                             }
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
+                              "value": "2012",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
+                              "value": "13",
                               "annotation": []
                             }
                           }
@@ -4129,6 +17071,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -4136,126 +17079,102 @@
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Greater Or Equal",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "GreaterOrEqualZZ",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
               },
               {
-                "name": "GreaterOrEqualZ1",
+                "name": "TimeLessTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "GreaterOrEqualZNeg1",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "GreaterOrEqual",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Negate",
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
-                            "operand": {
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
                               "annotation": []
                             }
                           }
@@ -4266,6 +17185,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -4275,29 +17195,102 @@
                 }
               },
               {
-                "name": "GreaterOrEqualDecZZ",
+                "name": "TimeLessFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "GreaterOrEqual",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
-                            "annotation": []
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
-                            "annotation": []
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -4306,8 +17299,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -4315,29 +17309,82 @@
                 }
               },
               {
-                "name": "GreaterOrEqualDecZ1",
+                "name": "UncertaintyLessNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "GreaterOrEqual",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
-                            "annotation": []
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -4345,9 +17392,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -4355,32 +17401,80 @@
                 }
               },
               {
-                "name": "GreaterOrEqualDecZNeg1",
+                "name": "UncertaintyLessTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "GreaterOrEqual",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
-                            "annotation": []
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2013",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Negate",
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
-                            "operand": {
+                            "year": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
                               "annotation": []
                             }
                           }
@@ -4391,6 +17485,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -4400,33 +17495,81 @@
                 }
               },
               {
-                "name": "GreaterOrEqualDec1Int2",
+                "name": "UncertaintyLessFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "GreaterOrEqual",
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2015",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "ToDecimal",
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
-                            "operand": {
+                            "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2014",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
                             }
                           }
                         ]
@@ -4436,6 +17579,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -4443,41 +17587,69 @@
                     }
                   ]
                 }
-              },
+              }
+            ]
+          }
+        },
+        {
+          "name": "Less Or Equal",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
               {
-                "name": "GreaterOrEqualCM0CM0",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualZZ",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessOrEqualZ1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4485,39 +17657,27 @@
                 }
               },
               {
-                "name": "GreaterOrEqualCM0CM1",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualZNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4525,44 +17685,27 @@
                 }
               },
               {
-                "name": "GreaterOrEqualCM0NegCM1",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualDecZZ",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "cm",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4570,39 +17713,27 @@
                 }
               },
               {
-                "name": "GreaterOrEqualM1CM1",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualDecZ1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "m",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4610,39 +17741,27 @@
                 }
               },
               {
-                "name": "GreaterOrEqualM1CM10",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualDecZNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "m",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 10,
-                            "unit": "cm",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4650,39 +17769,27 @@
                 }
               },
               {
-                "name": "GreaterOrEqualAA",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualDec1Int2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4690,39 +17797,27 @@
                 }
               },
               {
-                "name": "GreaterOrEqualAB",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualCM0CM0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4730,39 +17825,27 @@
                 }
               },
               {
-                "name": "GreaterOrEqualBA",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualCM0CM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4770,39 +17853,27 @@
                 }
               },
               {
-                "name": "GreaterOrEqualAThanAA",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualCM0NegCM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "aa",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4810,39 +17881,27 @@
                 }
               },
               {
-                "name": "GreaterOrEqualAAThanA",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualM1CM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "aa",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          }
-                        ]
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4850,39 +17909,27 @@
                 }
               },
               {
-                "name": "GreaterOrEqualJackJill",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualM1CM10",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Jack",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Jill",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4890,121 +17937,27 @@
                 }
               },
               {
-                "name": "DateTimeGreaterEqTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualAA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -5012,121 +17965,55 @@
                 }
               },
               {
-                "name": "DateTimeGreaterEqTrue2",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessOrEqualBA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -5134,121 +18021,27 @@
                 }
               },
               {
-                "name": "DateTimeGreaterEqFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualAThanAA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "13",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -5256,85 +18049,139 @@
                 }
               },
               {
-                "name": "TimeGreaterEqTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "LessOrEqualAAThanA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LessOrEqualJackJill",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeLessEqTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeLessEqTrue2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeLessEqFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -5342,85 +18189,27 @@
                 }
               },
               {
-                "name": "TimeGreaterEqTrue2",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeLessEqTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -5428,85 +18217,27 @@
                 }
               },
               {
-                "name": "TimeGreaterEqFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeLessEqTrue2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -5514,59 +18245,27 @@
                 }
               },
               {
-                "name": "UncertaintyGreaterEqualNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeLessEqFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -5574,61 +18273,55 @@
                 }
               },
               {
-                "name": "UncertaintyGreaterEqualTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "UncertaintyLessEqualNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2015",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UncertaintyLessEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -5636,61 +18329,27 @@
                 }
               },
               {
-                "name": "UncertaintyGreaterEqualFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "UncertaintyLessEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "GreaterOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2013",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -5698,38 +18357,821 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Less",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "LessOrEqualZZ",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualZ1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualZNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualDecZZ",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualDecZ1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualDecZNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualDec1Int2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualCM0CM0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualCM0CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualCM0NegCM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualM1CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualM1CM10",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualAA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualBA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualAThanAA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualAAThanA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LessOrEqualJackJill",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeLessEqTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeLessEqTrue2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeLessEqFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeLessEqTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeLessEqTrue2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeLessEqFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyLessEqualNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyLessEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UncertaintyLessEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
-                "name": "LessZZ",
+                "name": "LessOrEqualZZ",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "0",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "0",
                             "annotation": []
@@ -5741,8 +19183,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -5750,26 +19193,53 @@
                 }
               },
               {
-                "name": "LessZ1",
+                "name": "LessOrEqualZ1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "0",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -5781,6 +19251,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -5790,30 +19261,58 @@
                 }
               },
               {
-                "name": "LessZNeg1",
+                "name": "LessOrEqualZNeg1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "0",
                             "annotation": []
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -5826,6 +19325,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -5835,26 +19335,53 @@
                 }
               },
               {
-                "name": "LessDecZZ",
+                "name": "LessOrEqualDecZZ",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "0.0",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "0.0",
                             "annotation": []
@@ -5866,8 +19393,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -5875,26 +19403,53 @@
                 }
               },
               {
-                "name": "LessDecZ1",
+                "name": "LessOrEqualDecZ1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "0.0",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "1.0",
                             "annotation": []
@@ -5906,6 +19461,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -5915,30 +19471,58 @@
                 }
               },
               {
-                "name": "LessDecZNeg1",
+                "name": "LessOrEqualDecZNeg1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "0.0",
                             "annotation": []
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
@@ -5951,6 +19535,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -5960,20 +19545,46 @@
                 }
               },
               {
-                "name": "LessDec1Int2",
+                "name": "LessOrEqualDec1Int2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "1.0",
                             "annotation": []
@@ -5984,6 +19595,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -5996,6 +19608,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -6005,26 +19618,53 @@
                 }
               },
               {
-                "name": "LessCM0CM0",
+                "name": "LessOrEqualCM0CM0",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 0,
                             "unit": "cm",
                             "annotation": []
                           },
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 0,
                             "unit": "cm",
                             "annotation": []
@@ -6036,8 +19676,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -6045,26 +19686,53 @@
                 }
               },
               {
-                "name": "LessCM0CM1",
+                "name": "LessOrEqualCM0CM1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 0,
                             "unit": "cm",
                             "annotation": []
                           },
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 1,
                             "unit": "cm",
                             "annotation": []
@@ -6076,6 +19744,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -6085,30 +19754,58 @@
                 }
               },
               {
-                "name": "LessCM0NegCM1",
+                "name": "LessOrEqualCM0NegCM1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 0,
                             "unit": "cm",
                             "annotation": []
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 1,
                               "unit": "cm",
                               "annotation": []
@@ -6121,6 +19818,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -6130,26 +19828,53 @@
                 }
               },
               {
-                "name": "LessM1CM1",
+                "name": "LessOrEqualM1CM1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 1,
                             "unit": "m",
                             "annotation": []
                           },
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 1,
                             "unit": "cm",
                             "annotation": []
@@ -6161,6 +19886,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -6170,26 +19896,53 @@
                 }
               },
               {
-                "name": "LessM1CM10",
+                "name": "LessOrEqualM1CM10",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 1,
                             "unit": "m",
                             "annotation": []
                           },
                           {
                             "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                             "value": 10,
                             "unit": "cm",
                             "annotation": []
@@ -6201,6 +19954,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -6210,26 +19964,53 @@
                 }
               },
               {
-                "name": "LessAA",
+                "name": "LessOrEqualAA",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
@@ -6241,8 +20022,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -6250,26 +20032,53 @@
                 }
               },
               {
-                "name": "LessAB",
+                "name": "LessOrEqualAB",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "b",
                             "annotation": []
@@ -6281,6 +20090,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -6290,26 +20100,53 @@
                 }
               },
               {
-                "name": "LessBA",
+                "name": "LessOrEqualBA",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "b",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
@@ -6321,6 +20158,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -6330,26 +20168,53 @@
                 }
               },
               {
-                "name": "LessAThanAA",
+                "name": "LessOrEqualAThanAA",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "aa",
                             "annotation": []
@@ -6361,6 +20226,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -6370,26 +20236,53 @@
                 }
               },
               {
-                "name": "LessAAThanA",
+                "name": "LessOrEqualAAThanA",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "aa",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
@@ -6401,6 +20294,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -6410,26 +20304,53 @@
                 }
               },
               {
-                "name": "LessJackJill",
+                "name": "LessOrEqualJackJill",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Jack",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Jill",
                             "annotation": []
@@ -6441,6 +20362,171 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeLessEqTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -6450,61 +20536,150 @@
                 }
               },
               {
-                "name": "DateTimeLessTrue",
+                "name": "DateTimeLessEqTrue2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2012",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             }
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2012",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             }
                           }
@@ -6515,6 +20690,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -6524,61 +20700,150 @@
                 }
               },
               {
-                "name": "DateTimeLessFalse",
+                "name": "DateTimeLessEqFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2012",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "14",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             }
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2012",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "13",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             }
                           }
@@ -6589,6 +20854,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -6598,20 +20864,46 @@
                 }
               },
               {
-                "name": "TimeLessTrue",
+                "name": "TimeLessEqTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -6641,6 +20933,7 @@
                           },
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -6675,6 +20968,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -6684,20 +20978,46 @@
                 }
               },
               {
-                "name": "TimeLessFalse",
+                "name": "TimeLessEqTrue2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -6707,11 +21027,41 @@
                               "annotation": []
                             },
                             "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
                             "second": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
@@ -6724,9 +21074,94 @@
                               "value": "0",
                               "annotation": []
                             }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeLessEqFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
                           },
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -6761,6 +21196,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -6770,24 +21206,51 @@
                 }
               },
               {
-                "name": "UncertaintyLessNull",
+                "name": "UncertaintyLessEqualNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2014",
                               "annotation": []
@@ -6795,22 +21258,26 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2014",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "15",
                               "annotation": []
@@ -6823,6 +21290,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -6830,24 +21298,51 @@
                 }
               },
               {
-                "name": "UncertaintyLessTrue",
+                "name": "UncertaintyLessEqualTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2013",
                               "annotation": []
@@ -6855,22 +21350,26 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2014",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "15",
                               "annotation": []
@@ -6883,6 +21382,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -6892,24 +21392,51 @@
                 }
               },
               {
-                "name": "UncertaintyLessFalse",
+                "name": "UncertaintyLessEqualFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2015",
                               "annotation": []
@@ -6917,22 +21444,26 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2014",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "15",
                               "annotation": []
@@ -6945,6 +21476,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -6957,48 +21489,428 @@
           }
         },
         {
-          "name": "Less Or Equal",
+          "name": "Equivalent",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "LessOrEqualZZ",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivTrueTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivTrueFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivFalseFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivFalseTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivNullNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivTrueNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivNullTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivInt1Int1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivInt1Int2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivStringAStringA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivStringAStringB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivFloat1Float1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivFloat1Float2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivFloat1Int1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivFloat1Int2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -7006,39 +21918,27 @@
                 }
               },
               {
-                "name": "LessOrEqualZ1",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivEqCM1CM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -7046,44 +21946,27 @@
                 }
               },
               {
-                "name": "LessOrEqualZNeg1",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivEqCM1M01",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -7091,39 +21974,27 @@
                 }
               },
               {
-                "name": "LessOrEqualDecZZ",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivTupleJohnJohn",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -7131,39 +22002,27 @@
                 }
               },
               {
-                "name": "LessOrEqualDecZ1",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivTupleJohnJohnWithNulls",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -7171,44 +22030,27 @@
                 }
               },
               {
-                "name": "LessOrEqualDecZNeg1",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivTupleJohnJane",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "0.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -7216,44 +22058,27 @@
                 }
               },
               {
-                "name": "LessOrEqualDec1Int2",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivTupleJohn1John2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -7261,39 +22086,27 @@
                 }
               },
               {
-                "name": "LessOrEqualCM0CM0",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivDateTimeTodayToday",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -7301,39 +22114,27 @@
                 }
               },
               {
-                "name": "LessOrEqualCM0CM1",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivDateTimeTodayYesterday",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
-                          }
-                        ]
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -7341,44 +22142,27 @@
                 }
               },
               {
-                "name": "LessOrEqualCM0NegCM1",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivTime10A10A",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 0,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "cm",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -7386,28 +22170,795 @@
                 }
               },
               {
-                "name": "LessOrEqualM1CM1",
+                "name": "EquivTime10A10P",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "EquivTrueTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivTrueFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivFalseFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivFalseTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivNullNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivTrueNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivNullTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivInt1Int1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivInt1Int2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivStringAStringA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivStringAStringB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivFloat1Float1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivFloat1Float2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivFloat1Int1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivFloat1Int2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivEqCM1CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivEqCM1M01",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivTupleJohnJohn",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivTupleJohnJohnWithNulls",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivTupleJohnJane",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivTupleJohn1John2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivDateTimeTodayToday",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivDateTimeTodayYesterday",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivTime10A10A",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivTime10A10P",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "EquivTrueTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "m",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
                             "annotation": []
                           },
                           {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
                             "annotation": []
                           }
                         ]
@@ -7417,8 +22968,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -7426,28 +22978,55 @@
                 }
               },
               {
-                "name": "LessOrEqualM1CM10",
+                "name": "EquivTrueFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "m",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
                             "annotation": []
                           },
                           {
-                            "type": "Quantity",
-                            "value": 10,
-                            "unit": "cm",
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
                             "annotation": []
                           }
                         ]
@@ -7457,6 +23036,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -7466,28 +23046,55 @@
                 }
               },
               {
-                "name": "LessOrEqualAA",
+                "name": "EquivFalseFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
                             "annotation": []
                           }
                         ]
@@ -7497,6 +23104,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7506,28 +23114,55 @@
                 }
               },
               {
-                "name": "LessOrEqualAB",
+                "name": "EquivFalseTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
                             "annotation": []
                           }
                         ]
@@ -7537,8 +23172,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -7546,29 +23182,71 @@
                 }
               },
               {
-                "name": "LessOrEqualBA",
+                "name": "EquivNullNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
-                            "annotation": []
+                            "type": "As",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "strict": false,
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "NamedTypeSpecifier",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -7577,8 +23255,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -7586,29 +23265,60 @@
                 }
               },
               {
-                "name": "LessOrEqualAThanAA",
+                "name": "EquivTrueNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
                             "annotation": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "aa",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -7617,8 +23327,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -7626,28 +23337,59 @@
                 }
               },
               {
-                "name": "LessOrEqualAAThanA",
+                "name": "EquivNullTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "aa",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
                             "annotation": []
                           }
                         ]
@@ -7657,6 +23399,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -7666,28 +23409,55 @@
                 }
               },
               {
-                "name": "LessOrEqualJackJill",
+                "name": "EquivInt1Int1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Jack",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Jill",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
                             "annotation": []
                           }
                         ]
@@ -7697,6 +23467,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7706,111 +23477,124 @@
                 }
               },
               {
-                "name": "DateTimeLessEqTrue",
+                "name": "EquivInt1Int2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
                           },
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivStringAStringA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
                           }
                         ]
                       }
@@ -7819,6 +23603,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7828,111 +23613,56 @@
                 }
               },
               {
-                "name": "DateTimeLessEqTrue2",
+                "name": "EquivStringAStringB",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
                           },
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
                           }
                         ]
                       }
@@ -7941,8 +23671,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -7950,111 +23681,56 @@
                 }
               },
               {
-                "name": "DateTimeLessEqFalse",
+                "name": "EquivFloat1Float1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
                           },
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
                           }
                         ]
                       }
@@ -8063,8 +23739,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -8072,75 +23749,56 @@
                 }
               },
               {
-                "name": "TimeLessEqTrue",
+                "name": "EquivFloat1Float2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
                           },
                           {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.0",
+                            "annotation": []
                           }
                         ]
                       }
@@ -8149,8 +23807,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -8158,73 +23817,59 @@
                 }
               },
               {
-                "name": "TimeLessEqTrue2",
+                "name": "EquivFloat1Int1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
                           },
                           {
-                            "type": "Time",
+                            "type": "ToDecimal",
                             "annotation": [],
                             "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
+                            "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
+                              "value": "1",
                               "annotation": []
                             }
                           }
@@ -8235,6 +23880,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8244,73 +23890,59 @@
                 }
               },
               {
-                "name": "TimeLessEqFalse",
+                "name": "EquivFloat1Int2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
                           },
                           {
-                            "type": "Time",
+                            "type": "ToDecimal",
                             "annotation": [],
                             "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
+                            "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "2",
                               "annotation": []
                             }
                           }
@@ -8321,6 +23953,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -8330,51 +23963,124 @@
                 }
               },
               {
-                "name": "UncertaintyLessEqualNull",
+                "name": "EquivEqCM1CM1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivEqCM1M01",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            }
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "cm",
+                            "annotation": []
                           },
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            }
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 0.01,
+                            "unit": "m",
+                            "annotation": []
                           }
                         ]
                       }
@@ -8382,7 +24088,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -8390,51 +24099,142 @@
                 }
               },
               {
-                "name": "UncertaintyLessEqualTrue",
+                "name": "EquivTupleJohnJohn",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
+                            "type": "Tuple",
                             "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2013",
-                              "annotation": []
-                            }
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
                           },
                           {
-                            "type": "DateTime",
+                            "type": "Tuple",
                             "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
                             },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            }
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
                           }
                         ]
                       }
@@ -8443,6 +24243,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8452,51 +24253,176 @@
                 }
               },
               {
-                "name": "UncertaintyLessEqualFalse",
+                "name": "EquivTupleJohnJohnWithNulls",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LessOrEqual",
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
+                            "type": "Tuple",
                             "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2015",
-                              "annotation": []
-                            }
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Position",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Position",
+                                "value": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            ]
                           },
                           {
-                            "type": "DateTime",
+                            "type": "Tuple",
                             "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2014",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            }
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Position",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Position",
+                                "value": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            ]
                           }
                         ]
                       }
@@ -8505,50 +24431,152 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Equivalent",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "EquivTrueTrue",
+                "name": "EquivTupleJohnJane",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "Jane",
+                                  "annotation": []
+                                }
+                              }
+                            ]
                           }
                         ]
                       }
@@ -8557,8 +24585,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -8566,29 +24595,142 @@
                 }
               },
               {
-                "name": "EquivTrueFalse",
+                "name": "EquivTupleJohn1John2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
+                            "type": "Tuple",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "Id",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "Name",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}String",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
+                            "element": [
+                              {
+                                "name": "Id",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "Name",
+                                "value": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "John",
+                                  "annotation": []
+                                }
+                              }
+                            ]
                           }
                         ]
                       }
@@ -8597,6 +24739,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -8606,29 +24749,54 @@
                 }
               },
               {
-                "name": "EquivFalseFalse",
+                "name": "EquivDateTimeTodayToday",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
+                            "type": "Today",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                            "annotation": [],
+                            "signature": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
+                            "type": "Today",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                            "annotation": [],
+                            "signature": []
                           }
                         ]
                       }
@@ -8637,6 +24805,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8646,29 +24815,69 @@
                 }
               },
               {
-                "name": "EquivFalseTrue",
+                "name": "EquivDateTimeTodayYesterday",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
+                            "type": "Today",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                            "annotation": [],
+                            "signature": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
+                            "type": "Subtract",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Today",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": []
+                              },
+                              {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 1,
+                                "unit": "days",
+                                "annotation": []
+                              }
+                            ]
                           }
                         ]
                       }
@@ -8677,6 +24886,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -8686,40 +24896,100 @@
                 }
               },
               {
-                "name": "EquivNullNull",
+                "name": "EquivTime10A10A",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "As",
-                            "strict": false,
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
-                            "operand": {
-                              "type": "Null",
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             },
-                            "asTypeSpecifier": {
-                              "type": "NamedTypeSpecifier",
-                              "name": "{urn:hl7-org:elm-types:r1}String",
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}String",
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
-                            "operand": {
-                              "type": "Null",
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             }
                           }
@@ -8730,6 +25000,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8739,31 +25010,100 @@
                 }
               },
               {
-                "name": "EquivTrueNull",
+                "name": "EquivTime10A10P",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
-                            "operand": {
-                              "type": "Null",
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "22",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             }
                           }
@@ -8774,6 +25114,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -8781,45 +25122,153 @@
                     }
                   ]
                 }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Not Equal",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "SimpleNotEqTrueTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
               },
               {
-                "name": "EquivNullTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "SimpleNotEqTrueFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleNotEqFalseFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleNotEqFalseTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleNotEqNullNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -8827,39 +25276,27 @@
                 }
               },
               {
-                "name": "EquivInt1Int1",
-                "value": {
-                  "type": "Tuple",
+                "name": "SimpleNotEqTrueNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -8867,39 +25304,27 @@
                 }
               },
               {
-                "name": "EquivInt1Int2",
-                "value": {
-                  "type": "Tuple",
+                "name": "SimpleNotEqNullTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -8907,39 +25332,27 @@
                 }
               },
               {
-                "name": "EquivStringAStringA",
-                "value": {
-                  "type": "Tuple",
+                "name": "SimpleNotEqInt1Int1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -8947,39 +25360,27 @@
                 }
               },
               {
-                "name": "EquivStringAStringB",
-                "value": {
-                  "type": "Tuple",
+                "name": "SimpleNotEqInt1Int2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -8987,39 +25388,27 @@
                 }
               },
               {
-                "name": "EquivFloat1Float1",
-                "value": {
-                  "type": "Tuple",
+                "name": "SimpleNotEqStringAStringA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9027,39 +25416,27 @@
                 }
               },
               {
-                "name": "EquivFloat1Float2",
-                "value": {
-                  "type": "Tuple",
+                "name": "SimpleNotEqStringAStringB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9067,44 +25444,27 @@
                 }
               },
               {
-                "name": "EquivFloat1Int1",
-                "value": {
-                  "type": "Tuple",
+                "name": "SimpleNotEqFloat1Float1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9112,44 +25472,27 @@
                 }
               },
               {
-                "name": "EquivFloat1Int2",
-                "value": {
-                  "type": "Tuple",
+                "name": "SimpleNotEqFloat1Float2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          {
-                            "type": "ToDecimal",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9157,39 +25500,55 @@
                 }
               },
               {
-                "name": "EquivEqCM1CM1",
-                "value": {
-                  "type": "Tuple",
+                "name": "SimpleNotEqFloat1Int1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SimpleNotEqFloat1Int2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9197,39 +25556,27 @@
                 }
               },
               {
-                "name": "EquivEqCM1M01",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityNotEqCM1CM1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "cm",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 0.01,
-                            "unit": "m",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9237,75 +25584,27 @@
                 }
               },
               {
-                "name": "EquivTupleJohnJohn",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityNotEqCM1M01",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9313,89 +25612,27 @@
                 }
               },
               {
-                "name": "EquivTupleJohnJohnWithNulls",
-                "value": {
-                  "type": "Tuple",
+                "name": "TupleNotEqJohnJohn",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Position",
-                                "value": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Position",
-                                "value": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9403,75 +25640,55 @@
                 }
               },
               {
-                "name": "EquivTupleJohnJane",
-                "value": {
-                  "type": "Tuple",
+                "name": "TupleNotEqJohnJane",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "Jane",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleNotEqJohn1John2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9479,75 +25696,27 @@
                 }
               },
               {
-                "name": "EquivTupleJohn1John2",
-                "value": {
-                  "type": "Tuple",
+                "name": "TupleNotEqJohn1John2WithNullName",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Tuple",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "name": "Id",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "name": "Name",
-                                "value": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "John",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9555,37 +25724,27 @@
                 }
               },
               {
-                "name": "EquivDateTimeTodayToday",
-                "value": {
-                  "type": "Tuple",
+                "name": "TupleNotEqDifferingNamesWithOneNullId",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Today",
-                            "annotation": [],
-                            "signature": []
-                          },
-                          {
-                            "type": "Today",
-                            "annotation": [],
-                            "signature": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9593,50 +25752,27 @@
                 }
               },
               {
-                "name": "EquivDateTimeTodayYesterday",
-                "value": {
-                  "type": "Tuple",
+                "name": "TupleNotEqJohn1John1WithBothNamesNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Today",
-                            "annotation": [],
-                            "signature": []
-                          },
-                          {
-                            "type": "Subtract",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": [
-                              {
-                                "type": "Today",
-                                "annotation": [],
-                                "signature": []
-                              },
-                              {
-                                "type": "Quantity",
-                                "value": 1,
-                                "unit": "days",
-                                "annotation": []
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9644,85 +25780,111 @@
                 }
               },
               {
-                "name": "EquivTime10A10A",
-                "value": {
-                  "type": "Tuple",
+                "name": "TupleNotEqMatchingNamesWithNullIDs",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TupleNotEqJohn1John1WithNullName",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeNotEqTodayToday",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeNotEqTodayYesterday",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -9730,128 +25892,938 @@
                 }
               },
               {
-                "name": "EquivTime10A10P",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeNotEq10A10A",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeNotEq10A10P",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SimpleNotEqTrueTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "22",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqTrueFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqFalseFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqFalseTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqNullNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqTrueNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqNullTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqInt1Int1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqInt1Int2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqStringAStringA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqStringAStringB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqFloat1Float1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqFloat1Float2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqFloat1Int1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SimpleNotEqFloat1Int2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityNotEqCM1CM1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityNotEqCM1M01",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleNotEqJohnJohn",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleNotEqJohnJane",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleNotEqJohn1John2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleNotEqJohn1John2WithNullName",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleNotEqDifferingNamesWithOneNullId",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleNotEqJohn1John1WithBothNamesNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleNotEqMatchingNamesWithNullIDs",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TupleNotEqJohn1John1WithNullName",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeNotEqTodayToday",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeNotEqTodayYesterday",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeNotEq10A10A",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeNotEq10A10P",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Not Equal",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "SimpleNotEqTrueTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -9864,6 +26836,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -9877,26 +26850,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
@@ -9909,6 +26910,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -9922,26 +26924,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
@@ -9954,6 +26984,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -9967,26 +26998,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "false",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -9999,6 +27058,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -10012,29 +27072,58 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "name": "{urn:hl7-org:elm-types:r1}String",
                                 "annotation": []
                               }
@@ -10046,6 +27135,7 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             }
@@ -10057,6 +27147,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -10068,20 +27159,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -10093,6 +27211,7 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             }
@@ -10104,6 +27223,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -10115,15 +27235,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
@@ -10134,11 +27280,13 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                               "value": "true",
                               "annotation": []
@@ -10151,6 +27299,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -10162,26 +27311,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -10194,6 +27371,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -10207,26 +27385,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -10239,6 +27445,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -10252,26 +27459,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "a",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "a",
                               "annotation": []
@@ -10284,6 +27519,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -10297,26 +27533,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "a",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "b",
                               "annotation": []
@@ -10329,6 +27593,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -10342,26 +27607,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
@@ -10374,6 +27667,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -10387,26 +27681,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "2.0",
                               "annotation": []
@@ -10419,6 +27741,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -10432,20 +27755,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
@@ -10456,6 +27806,7 @@
                               "signature": [],
                               "operand": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
@@ -10469,6 +27820,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -10482,20 +27834,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
@@ -10506,6 +27885,7 @@
                               "signature": [],
                               "operand": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -10519,6 +27899,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -10532,26 +27913,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 1,
                               "unit": "cm",
                               "annotation": []
                             },
                             {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 1,
                               "unit": "cm",
                               "annotation": []
@@ -10564,6 +27973,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -10577,26 +27987,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 1,
                               "unit": "cm",
                               "annotation": []
                             },
                             {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 0.01,
                               "unit": "m",
                               "annotation": []
@@ -10609,6 +28047,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -10622,26 +28061,77 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
@@ -10651,6 +28141,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "John",
                                     "annotation": []
@@ -10661,11 +28152,36 @@
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
@@ -10675,6 +28191,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "John",
                                     "annotation": []
@@ -10690,6 +28207,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -10703,26 +28221,77 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
@@ -10732,6 +28301,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "John",
                                     "annotation": []
@@ -10742,11 +28312,36 @@
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2",
                                     "annotation": []
@@ -10756,6 +28351,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "Jane",
                                     "annotation": []
@@ -10771,6 +28367,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -10784,26 +28381,77 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
@@ -10813,6 +28461,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "John",
                                     "annotation": []
@@ -10823,11 +28472,36 @@
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2",
                                     "annotation": []
@@ -10837,6 +28511,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "John",
                                     "annotation": []
@@ -10852,6 +28527,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -10865,26 +28541,77 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
@@ -10894,6 +28621,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "John",
                                     "annotation": []
@@ -10904,11 +28632,36 @@
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2",
                                     "annotation": []
@@ -10918,6 +28671,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                     "annotation": []
                                   }
                                 }
@@ -10931,6 +28685,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -10944,26 +28699,77 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                     "annotation": []
                                   }
                                 },
@@ -10971,6 +28777,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "John",
                                     "annotation": []
@@ -10981,11 +28788,36 @@
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
@@ -10995,6 +28827,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "Joe",
                                     "annotation": []
@@ -11010,6 +28843,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -11023,26 +28857,77 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
@@ -11052,6 +28937,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                     "annotation": []
                                   }
                                 }
@@ -11060,11 +28946,36 @@
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
@@ -11074,6 +28985,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                     "annotation": []
                                   }
                                 }
@@ -11087,6 +28999,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -11100,26 +29013,77 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                     "annotation": []
                                   }
                                 },
@@ -11127,6 +29091,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "John",
                                     "annotation": []
@@ -11137,11 +29102,36 @@
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                     "annotation": []
                                   }
                                 },
@@ -11149,6 +29139,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "John",
                                     "annotation": []
@@ -11164,6 +29155,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -11177,26 +29169,77 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}String",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
@@ -11206,6 +29249,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                     "valueType": "{urn:hl7-org:elm-types:r1}String",
                                     "value": "John",
                                     "annotation": []
@@ -11216,11 +29260,36 @@
                             {
                               "type": "Tuple",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "TupleTypeSpecifier",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "Id",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  {
+                                    "name": "Name",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              },
                               "element": [
                                 {
                                   "name": "Id",
                                   "value": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
@@ -11230,6 +29299,7 @@
                                   "name": "Name",
                                   "value": {
                                     "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                     "annotation": []
                                   }
                                 }
@@ -11243,6 +29313,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -11254,25 +29325,53 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Today",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": []
                             },
                             {
                               "type": "Today",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": []
                             }
@@ -11284,6 +29383,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -11297,35 +29397,65 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Today",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": []
                             },
                             {
                               "type": "Subtract",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Today",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                                   "annotation": [],
                                   "signature": []
                                 },
                                 {
                                   "type": "Quantity",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                                   "value": 1,
                                   "unit": "days",
                                   "annotation": []
@@ -11340,6 +29470,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -11353,20 +29484,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -11396,6 +29554,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -11431,6 +29590,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -11444,20 +29604,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -11487,6 +29674,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -11522,6 +29710,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
diff --git a/test/spec-tests/cql/CqlConditionalOperatorsTest.json b/test/spec-tests/cql/CqlConditionalOperatorsTest.json
index 3bb4e3e49..3c483461b 100644
--- a/test/spec-tests/cql/CqlConditionalOperatorsTest.json
+++ b/test/spec-tests/cql/CqlConditionalOperatorsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,34 +66,242 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IfTrue1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IfFalse1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IfNull1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IfTrue1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IfFalse1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IfNull1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "IfTrue1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "If",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "condition": {
                           "type": "Greater",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -102,12 +310,14 @@
                         },
                         "then": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "5",
                           "annotation": []
                         },
                         "else": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "10",
                           "annotation": []
@@ -118,6 +328,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "5",
                         "annotation": []
@@ -131,25 +342,53 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "If",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "condition": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -158,17 +397,20 @@
                         },
                         "then": {
                           "type": "Add",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -177,17 +419,20 @@
                         },
                         "else": {
                           "type": "Subtract",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -200,6 +445,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "5",
                         "annotation": []
@@ -213,19 +459,46 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "If",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "condition": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -237,6 +510,7 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             }
@@ -244,12 +518,14 @@
                         },
                         "then": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "5",
                           "annotation": []
                         },
                         "else": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "10",
                           "annotation": []
@@ -260,6 +536,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "10",
                         "annotation": []
@@ -276,37 +553,245 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "StandardCase1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StandardCase2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StandardCase3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "StandardCase1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StandardCase2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StandardCase3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "StandardCase1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Case",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "caseItem": [
                           {
                             "annotation": [],
                             "when": {
                               "type": "Greater",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -315,6 +800,7 @@
                             },
                             "then": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -324,17 +810,20 @@
                             "annotation": [],
                             "when": {
                               "type": "Greater",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -343,6 +832,7 @@
                             },
                             "then": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -356,6 +846,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -365,6 +856,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "5",
                         "annotation": []
@@ -378,28 +870,56 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Case",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "caseItem": [
                           {
                             "annotation": [],
                             "when": {
                               "type": "Greater",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -408,17 +928,20 @@
                             },
                             "then": {
                               "type": "Add",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -430,17 +953,20 @@
                             "annotation": [],
                             "when": {
                               "type": "Equal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -449,6 +975,7 @@
                             },
                             "then": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -457,17 +984,20 @@
                         ],
                         "else": {
                           "type": "Subtract",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -480,6 +1010,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "5",
                         "annotation": []
@@ -493,17 +1024,43 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Case",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "caseItem": [
                           {
                             "annotation": [],
                             "when": {
                               "type": "Equivalent",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "annotation": [],
                               "signature": [],
                               "operand": [
@@ -514,11 +1071,13 @@
                                   "signature": [],
                                   "operand": {
                                     "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                     "annotation": []
                                   }
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -527,6 +1086,7 @@
                             },
                             "then": {
                               "type": "Add",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": [
@@ -537,11 +1097,13 @@
                                   "signature": [],
                                   "operand": {
                                     "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                     "annotation": []
                                   }
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -553,6 +1115,7 @@
                             "annotation": [],
                             "when": {
                               "type": "Equivalent",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                               "annotation": [],
                               "signature": [],
                               "operand": [
@@ -563,11 +1126,13 @@
                                   "signature": [],
                                   "operand": {
                                     "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                     "annotation": []
                                   }
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -576,6 +1141,7 @@
                             },
                             "then": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -584,17 +1150,20 @@
                         ],
                         "else": {
                           "type": "Add",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -607,6 +1176,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "15",
                         "annotation": []
@@ -623,23 +1193,229 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "SelectedCase1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SelectedCase2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SelectedCase3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SelectedCase1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SelectedCase2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SelectedCase3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "SelectedCase1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Case",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "comparand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "5",
                           "annotation": []
@@ -649,12 +1425,14 @@
                             "annotation": [],
                             "when": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
                             },
                             "then": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "12",
                               "annotation": []
@@ -664,23 +1442,27 @@
                             "annotation": [],
                             "when": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             "then": {
                               "type": "Add",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -691,17 +1473,20 @@
                         ],
                         "else": {
                           "type": "Subtract",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -714,6 +1499,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "12",
                         "annotation": []
@@ -727,14 +1513,40 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Case",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "comparand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "10",
                           "annotation": []
@@ -744,12 +1556,14 @@
                             "annotation": [],
                             "when": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
                             },
                             "then": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "12",
                               "annotation": []
@@ -759,23 +1573,27 @@
                             "annotation": [],
                             "when": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             "then": {
                               "type": "Add",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -786,17 +1604,20 @@
                         ],
                         "else": {
                           "type": "Subtract",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -809,6 +1630,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "15",
                         "annotation": []
@@ -822,25 +1644,53 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Case",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "comparand": {
                           "type": "Add",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -852,12 +1702,14 @@
                             "annotation": [],
                             "when": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
                             },
                             "then": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "12",
                               "annotation": []
@@ -867,23 +1719,27 @@
                             "annotation": [],
                             "when": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             "then": {
                               "type": "Add",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -894,17 +1750,20 @@
                         ],
                         "else": {
                           "type": "Subtract",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -917,6 +1776,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "5",
                         "annotation": []
diff --git a/test/spec-tests/cql/CqlErrorsAndMessagingOperatorsTest.json b/test/spec-tests/cql/CqlErrorsAndMessagingOperatorsTest.json
index 7327356d6..693821c02 100644
--- a/test/spec-tests/cql/CqlErrorsAndMessagingOperatorsTest.json
+++ b/test/spec-tests/cql/CqlErrorsAndMessagingOperatorsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,48 +66,330 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestMessageInfo",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestMessageWarn",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestMessageTrace",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestMessageError",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestMessageInfo",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestMessageWarn",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestMessageTrace",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestMessageError",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "TestMessageInfo",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Message",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
                         },
                         "condition": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                           "value": "true",
                           "annotation": []
                         },
                         "code": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "100",
                           "annotation": []
                         },
                         "severity": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "Message",
                           "annotation": []
                         },
                         "message": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "Test Message",
                           "annotation": []
@@ -118,6 +400,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -131,39 +414,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Message",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "2",
                           "annotation": []
                         },
                         "condition": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                           "value": "true",
                           "annotation": []
                         },
                         "code": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "200",
                           "annotation": []
                         },
                         "severity": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "Warning",
                           "annotation": []
                         },
                         "message": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "You have been warned!",
                           "annotation": []
@@ -174,6 +487,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -187,31 +501,84 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Message",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -220,24 +587,28 @@
                         },
                         "condition": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                           "value": "true",
                           "annotation": []
                         },
                         "code": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "300",
                           "annotation": []
                         },
                         "severity": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "Trace",
                           "annotation": []
                         },
                         "message": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "This is a trace",
                           "annotation": []
@@ -249,21 +620,33 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "4",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "5",
                             "annotation": []
@@ -279,26 +662,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Message",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "Add",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -307,24 +718,28 @@
                         },
                         "condition": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                           "value": "true",
                           "annotation": []
                         },
                         "code": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "400",
                           "annotation": []
                         },
                         "severity": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "Error",
                           "annotation": []
                         },
                         "message": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "This is an error!",
                           "annotation": []
@@ -335,6 +750,7 @@
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
diff --git a/test/spec-tests/cql/CqlIntervalOperatorsTest.cql b/test/spec-tests/cql/CqlIntervalOperatorsTest.cql
index 0b2b0e4ad..5a9d02bc2 100644
--- a/test/spec-tests/cql/CqlIntervalOperatorsTest.cql
+++ b/test/spec-tests/cql/CqlIntervalOperatorsTest.cql
@@ -572,7 +572,7 @@ define "Except": Tuple{
     output: null
   },
   "DecimalIntervalExcept1to3": Tuple{
-    skipped: '(Sort of) wrong answer (is open 4 end boundary 3 or 3.99999999?)'
+    skipped: 'Expected Interval[1.0, 3.99999999] but got Interval[1.0, 4) (closed boundary vs equivalent open boundary)'
     /*
     expression: Interval[1.0, 10.0] except Interval[4.0, 10.0],
     output: Interval [ 1.0, 3.99999999 ]
@@ -582,11 +582,9 @@ define "Except": Tuple{
     output: null
   },
   "QuantityIntervalExcept1to4": Tuple{
-    skipped: '(Sort of) wrong answer (is open 5 end boundary 4 or 4.99999999?)'
-    /*
     expression: Interval[1.0 'g', 10.0 'g'] except Interval[5.0 'g', 10.0 'g'],
     output: Interval [ 1.0 'g', 4.99999999 'g' ]
-    */  },
+  },
   "Except12": Tuple{
     expression: Interval[1, 4] except Interval[3, 6],
     output: Interval [ 1, 2 ]
diff --git a/test/spec-tests/cql/CqlIntervalOperatorsTest.json b/test/spec-tests/cql/CqlIntervalOperatorsTest.json
index 0ed0932e3..1fcc27897 100644
--- a/test/spec-tests/cql/CqlIntervalOperatorsTest.json
+++ b/test/spec-tests/cql/CqlIntervalOperatorsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,112 +66,32 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
                 "name": "TestAfterNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "As",
-                                "strict": false,
-                                "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Null",
-                                  "annotation": []
-                                },
-                                "asTypeSpecifier": {
-                                  "type": "NamedTypeSpecifier",
-                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "annotation": []
-                                }
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "As",
-                                "strict": false,
-                                "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Null",
-                                  "annotation": []
-                                },
-                                "asTypeSpecifier": {
-                                  "type": "NamedTypeSpecifier",
-                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "As",
-                                "strict": false,
-                                "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Null",
-                                  "annotation": []
-                                },
-                                "asTypeSpecifier": {
-                                  "type": "NamedTypeSpecifier",
-                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "annotation": []
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -180,62 +100,26 @@
               },
               {
                 "name": "IntegerIntervalAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -244,62 +128,26 @@
               },
               {
                 "name": "IntegerIntervalAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -308,81 +156,26 @@
               },
               {
                 "name": "IntegerIntervalPointAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -391,81 +184,26 @@
               },
               {
                 "name": "IntegerIntervalPointAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -474,81 +212,26 @@
               },
               {
                 "name": "IntegerIntervalAfterPointTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -557,81 +240,26 @@
               },
               {
                 "name": "IntegerIntervalAfterPointFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -640,62 +268,26 @@
               },
               {
                 "name": "DecimalIntervalAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -704,62 +296,26 @@
               },
               {
                 "name": "DecimalIntervalAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -768,81 +324,26 @@
               },
               {
                 "name": "DecimalIntervalPointAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "12.0",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "12.0",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "12.0",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -851,81 +352,26 @@
               },
               {
                 "name": "DecimalIntervalPointAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "9.0",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "9.0",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "9.0",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -934,81 +380,26 @@
               },
               {
                 "name": "DecimalIntervalAfterPointTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "5.0",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "5.0",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "5.0",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1017,81 +408,26 @@
               },
               {
                 "name": "DecimalIntervalAfterPointFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "12.0",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "12.0",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "12.0",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1100,62 +436,26 @@
               },
               {
                 "name": "QuantityIntervalAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1164,62 +464,26 @@
               },
               {
                 "name": "QuantityIntervalAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1228,81 +492,26 @@
               },
               {
                 "name": "QuantityIntervalPointAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1311,34 +520,932 @@
               },
               {
                 "name": "QuantityIntervalPointAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "After",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Quantity",
-                                "value": 9,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalAfterPointTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalAfterPointFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestAfterNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalPointAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalPointAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalAfterPointTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalAfterPointFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalPointAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalPointAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalAfterPointTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalAfterPointFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalPointAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalPointAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalAfterPointTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalAfterPointFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestAfterNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "If",
+                            "annotation": [],
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "As",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "strict": false,
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "asTypeSpecifier": {
+                                  "type": "NamedTypeSpecifier",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -1346,16 +1453,40 @@
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "Quantity",
-                                "value": 9,
-                                "unit": "g",
-                                "annotation": []
+                                "type": "As",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "strict": false,
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "asTypeSpecifier": {
+                                  "type": "NamedTypeSpecifier",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
                               },
                               "high": {
-                                "type": "Quantity",
-                                "value": 9,
-                                "unit": "g",
-                                "annotation": []
+                                "type": "As",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "strict": false,
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "asTypeSpecifier": {
+                                  "type": "NamedTypeSpecifier",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
                               }
                             }
                           },
@@ -1364,16 +1495,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             }
                           }
@@ -1383,9 +1525,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1393,15 +1534,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalAfterPointTrue",
+                "name": "IntegerIntervalAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -1410,54 +1576,57 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Quantity",
-                                "value": 5,
-                                "unit": "g",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
                               "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 5,
-                                "unit": "g",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 5,
-                                "unit": "g",
-                                "annotation": []
-                              }
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -1467,6 +1636,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1476,15 +1646,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalAfterPointFalse",
+                "name": "IntegerIntervalAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -1493,19 +1688,113 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             }
                           },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalPointAfterTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
                             "type": "If",
                             "annotation": [],
@@ -1514,15 +1803,25 @@
                               "annotation": [],
                               "signature": [],
                               "operand": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
                                 "annotation": []
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -1530,17 +1829,48 @@
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
                                 "annotation": []
                               },
                               "high": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -1550,8 +1880,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -1559,68 +1890,202 @@
                 }
               },
               {
-                "name": "DateTimeAfterTrue",
+                "name": "IntegerIntervalPointAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "year": {
+                              "operand": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "9",
                                 "annotation": []
-                              },
-                              "month": {
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "9",
                                 "annotation": []
                               },
-                              "day": {
+                              "high": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "9",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalAfterPointTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
                             }
                           },
                           {
@@ -1631,32 +2096,25 @@
                               "annotation": [],
                               "signature": [],
                               "operand": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2011",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "31",
-                                  "annotation": []
-                                }
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -1664,50 +2122,18 @@
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2011",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "31",
-                                  "annotation": []
-                                }
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
                               },
                               "high": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2011",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "31",
-                                  "annotation": []
-                                }
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
                               }
                             }
                           }
@@ -1718,6 +2144,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1727,15 +2154,40 @@
                 }
               },
               {
-                "name": "DateTimeAfterFalse",
+                "name": "IntegerIntervalAfterPointFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -1744,51 +2196,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
                             }
                           },
                           {
@@ -1799,32 +2228,25 @@
                               "annotation": [],
                               "signature": [],
                               "operand": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "31",
-                                  "annotation": []
-                                }
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -1832,50 +2254,18 @@
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "31",
-                                  "annotation": []
-                                }
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
                               },
                               "high": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "31",
-                                  "annotation": []
-                                }
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
                               }
                             }
                           }
@@ -1886,6 +2276,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -1895,15 +2286,40 @@
                 }
               },
               {
-                "name": "TimeAfterTrue",
+                "name": "DecimalIntervalAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -1912,169 +2328,57 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
                             }
                           },
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
                               "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              }
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
                             }
                           }
                         ]
@@ -2084,6 +2388,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -2093,15 +2398,40 @@
                 }
               },
               {
-                "name": "TimeAfterFalse",
+                "name": "DecimalIntervalAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -2110,169 +2440,57 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
                             }
                           },
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "17",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
                               "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "17",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "17",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              }
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
                             }
                           }
                         ]
@@ -2282,6 +2500,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -2289,29 +2508,42 @@
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Before",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestBeforeNull",
+                "name": "DecimalIntervalPointAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -2323,59 +2555,44 @@
                               "annotation": [],
                               "signature": [],
                               "operand": {
-                                "type": "As",
-                                "strict": false,
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "12.0",
+                                "annotation": []
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
                                 "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Null",
-                                  "annotation": []
-                                },
-                                "asTypeSpecifier": {
+                                "pointType": {
                                   "type": "NamedTypeSpecifier",
-                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                   "annotation": []
                                 }
                               }
                             },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
                             "else": {
                               "type": "Interval",
                               "lowClosed": true,
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "As",
-                                "strict": false,
-                                "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Null",
-                                  "annotation": []
-                                },
-                                "asTypeSpecifier": {
-                                  "type": "NamedTypeSpecifier",
-                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "annotation": []
-                                }
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "12.0",
+                                "annotation": []
                               },
                               "high": {
-                                "type": "As",
-                                "strict": false,
-                                "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Null",
-                                  "annotation": []
-                                },
-                                "asTypeSpecifier": {
-                                  "type": "NamedTypeSpecifier",
-                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "annotation": []
-                                }
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "12.0",
+                                "annotation": []
                               }
                             }
                           },
@@ -2384,16 +2601,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
                               "annotation": []
                             }
                           }
@@ -2403,7 +2631,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -2411,51 +2642,118 @@
                 }
               },
               {
-                "name": "IntegerIntervalBeforeFalse",
+                "name": "DecimalIntervalPointAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
+                          {
+                            "type": "If",
+                            "annotation": [],
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "9.0",
+                                "annotation": []
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "9.0",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "9.0",
+                                "annotation": []
+                              }
+                            }
+                          },
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
                               "annotation": []
                             }
                           }
@@ -2466,6 +2764,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -2475,263 +2774,69 @@
                 }
               },
               {
-                "name": "IntegerIntervalBeforeTrue",
+                "name": "DecimalIntervalAfterPointTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Before",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "IntegerIntervalPointBeforeTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              }
-                            }
-                          },
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "IntegerIntervalPointBeforeFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Before",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "IntegerIntervalBeforePointTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Before",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
                               "annotation": []
                             }
                           },
@@ -2744,14 +2849,24 @@
                               "signature": [],
                               "operand": {
                                 "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "5.0",
                                 "annotation": []
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -2760,14 +2875,16 @@
                               "annotation": [],
                               "low": {
                                 "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "5.0",
                                 "annotation": []
                               },
                               "high": {
                                 "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "5.0",
                                 "annotation": []
                               }
                             }
@@ -2779,6 +2896,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -2788,15 +2906,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalBeforePointFalse",
+                "name": "DecimalIntervalAfterPointFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -2805,16 +2948,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
                               "annotation": []
                             }
                           },
@@ -2827,14 +2981,24 @@
                               "signature": [],
                               "operand": {
                                 "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "8",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "12.0",
                                 "annotation": []
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -2843,14 +3007,16 @@
                               "annotation": [],
                               "low": {
                                 "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "8",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "12.0",
                                 "annotation": []
                               },
                               "high": {
                                 "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "8",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "12.0",
                                 "annotation": []
                               }
                             }
@@ -2862,6 +3028,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -2871,15 +3038,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalBeforeFalse",
+                "name": "QuantityIntervalAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -2888,16 +3080,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
@@ -2906,16 +3109,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           }
@@ -2926,8 +3140,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -2935,15 +3150,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalBeforeTrue",
+                "name": "QuantityIntervalAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -2952,16 +3192,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
@@ -2970,16 +3221,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
                               "annotation": []
                             }
                           }
@@ -2990,8 +3252,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -2999,15 +3262,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalPointBeforeTrue",
+                "name": "QuantityIntervalPointAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3019,15 +3307,25 @@
                               "annotation": [],
                               "signature": [],
                               "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "9.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
                                 "annotation": []
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -3035,15 +3333,17 @@
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "9.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
                                 "annotation": []
                               },
                               "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "9.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
                                 "annotation": []
                               }
                             }
@@ -3053,16 +3353,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           }
@@ -3073,6 +3384,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3082,15 +3394,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalPointBeforeFalse",
+                "name": "QuantityIntervalPointAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3102,15 +3439,25 @@
                               "annotation": [],
                               "signature": [],
                               "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "9.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 9,
+                                "unit": "g",
                                 "annotation": []
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -3118,15 +3465,17 @@
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "9.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 9,
+                                "unit": "g",
                                 "annotation": []
                               },
                               "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "9.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 9,
+                                "unit": "g",
                                 "annotation": []
                               }
                             }
@@ -3136,16 +3485,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           }
@@ -3156,6 +3516,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3165,15 +3526,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalBeforePointTrue",
+                "name": "QuantityIntervalAfterPointTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3182,16 +3568,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
@@ -3203,15 +3600,25 @@
                               "annotation": [],
                               "signature": [],
                               "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "11.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 5,
+                                "unit": "g",
                                 "annotation": []
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -3219,15 +3626,17 @@
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "11.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 5,
+                                "unit": "g",
                                 "annotation": []
                               },
                               "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "11.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 5,
+                                "unit": "g",
                                 "annotation": []
                               }
                             }
@@ -3239,6 +3648,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3248,15 +3658,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalBeforePointFalse",
+                "name": "QuantityIntervalAfterPointFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3265,16 +3700,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
@@ -3286,15 +3732,25 @@
                               "annotation": [],
                               "signature": [],
                               "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "8.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
                                 "annotation": []
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -3302,15 +3758,17 @@
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "8.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
                                 "annotation": []
                               },
                               "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "8.0",
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
                                 "annotation": []
                               }
                             }
@@ -3322,6 +3780,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3331,15 +3790,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalBeforeTrue",
+                "name": "DateTimeAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3348,35 +3832,177 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
                             }
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2011",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "12",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "31",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2011",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "12",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "31",
+                                  "annotation": []
+                                }
+                              },
+                              "high": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2011",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "12",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "31",
+                                  "annotation": []
+                                }
+                              }
                             }
                           }
                         ]
@@ -3386,6 +4012,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3395,15 +4022,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalBeforeFalse",
+                "name": "DateTimeAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3412,35 +4064,177 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
                             }
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "12",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "31",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "12",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "31",
+                                  "annotation": []
+                                }
+                              },
+                              "high": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "12",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "31",
+                                  "annotation": []
+                                }
+                              }
                             }
                           }
                         ]
@@ -3450,6 +4244,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3459,15 +4254,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalPointBeforeTrue",
+                "name": "TimeAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3476,381 +4296,72 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "QuantityIntervalPointBeforeFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Before",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Quantity",
-                                "value": 9,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 9,
-                                "unit": "g",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 9,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "QuantityIntervalBeforePointTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Before",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Quantity",
-                                "value": 5,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 5,
-                                "unit": "g",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 5,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
                             "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "QuantityIntervalBeforePointFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Before",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
-                              "operand": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
                                 "annotation": []
                               },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 12,
-                                "unit": "g",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DateTimeBeforeTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Before",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
+                              "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "59",
                                 "annotation": []
                               },
-                              "month": {
+                              "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
                                 "annotation": []
                               },
-                              "day": {
+                              "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "999",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "DateTime",
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
-                              "year": {
+                              "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "20",
                                 "annotation": []
                               },
-                              "month": {
+                              "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
                                 "annotation": []
                               },
-                              "day": {
+                              "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
                                 "annotation": []
                               }
                             }
@@ -3863,32 +4374,48 @@
                               "annotation": [],
                               "signature": [],
                               "operand": {
-                                "type": "DateTime",
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
-                                "year": {
+                                "hour": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
+                                  "value": "12",
                                   "annotation": []
                                 },
-                                "month": {
+                                "minute": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
+                                  "value": "59",
                                   "annotation": []
                                 },
-                                "day": {
+                                "second": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "27",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
                                   "annotation": []
                                 }
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -3896,48 +4423,62 @@
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "DateTime",
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
-                                "year": {
+                                "hour": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
+                                  "value": "12",
                                   "annotation": []
                                 },
-                                "month": {
+                                "minute": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
+                                  "value": "59",
                                   "annotation": []
                                 },
-                                "day": {
+                                "second": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "27",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
                                   "annotation": []
                                 }
                               },
                               "high": {
-                                "type": "DateTime",
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
-                                "year": {
+                                "hour": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
+                                  "value": "12",
                                   "annotation": []
                                 },
-                                "month": {
+                                "minute": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
+                                  "value": "59",
                                   "annotation": []
                                 },
-                                "day": {
+                                "second": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "27",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
                                   "annotation": []
                                 }
                               }
@@ -3950,6 +4491,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3959,15 +4501,40 @@
                 }
               },
               {
-                "name": "DateTimeBeforeFalse",
+                "name": "TimeAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Before",
+                        "type": "After",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3976,49 +4543,72 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "DateTime",
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
-                              "year": {
+                              "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "15",
                                 "annotation": []
                               },
-                              "month": {
+                              "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
                                 "annotation": []
                               },
-                              "day": {
+                              "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "DateTime",
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
-                              "year": {
+                              "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "20",
                                 "annotation": []
                               },
-                              "month": {
+                              "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
                                 "annotation": []
                               },
-                              "day": {
+                              "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
                                 "annotation": []
                               }
                             }
@@ -4031,32 +4621,48 @@
                               "annotation": [],
                               "signature": [],
                               "operand": {
-                                "type": "DateTime",
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
-                                "year": {
+                                "hour": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2011",
+                                  "value": "17",
                                   "annotation": []
                                 },
-                                "month": {
+                                "minute": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
+                                  "value": "59",
                                   "annotation": []
                                 },
-                                "day": {
+                                "second": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "31",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
                                   "annotation": []
                                 }
                               }
                             },
                             "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "else": {
                               "type": "Interval",
@@ -4064,199 +4670,14 @@
                               "highClosed": true,
                               "annotation": [],
                               "low": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2011",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "31",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2011",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "31",
-                                  "annotation": []
-                                }
-                              }
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeBeforeTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Before",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "22",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Time",
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "22",
+                                  "value": "17",
                                   "annotation": []
                                 },
                                 "minute": {
@@ -4280,12 +4701,13 @@
                               },
                               "high": {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
                                   "type": "Literal",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "22",
+                                  "value": "17",
                                   "annotation": []
                                 },
                                 "minute": {
@@ -4316,236 +4738,77 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              },
+              }
+            ]
+          }
+        },
+        {
+          "name": "Before",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
               {
-                "name": "TimeBeforeFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TestBeforeNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Before",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Collapse",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestCollapseNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (Interval(null, null) vs null)",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -4553,2005 +4816,307 @@
                 }
               },
               {
-                "name": "IntegerIntervalCollapse",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Collapse",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "5",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "3",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "7",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "12",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "19",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "7",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "19",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "IntegerIntervalCollapse2",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalPointBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Collapse",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "3",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "7",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "19",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "7",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "19",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "IntegerIntervalCollapse3",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalPointBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Collapse",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "4",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "6",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "7",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "8",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "8",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalCollapse",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalBeforePointTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Collapse",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "1.0",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "5.0",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "3.0",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "7.0",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "12.0",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "19.0",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "7.0",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "10.0",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "12.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "19.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalCollapse2",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalBeforePointFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Collapse",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "4.0",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "6.0",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "6.00000001",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "8.0",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "8.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "QuantityIntervalCollapse",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Collapse",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Quantity",
-                                  "value": 1,
-                                  "unit": "g",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Quantity",
-                                  "value": 5,
-                                  "unit": "g",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Quantity",
-                                  "value": 3,
-                                  "unit": "g",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Quantity",
-                                  "value": 7,
-                                  "unit": "g",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Quantity",
-                                  "value": 12,
-                                  "unit": "g",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Quantity",
-                                  "value": 19,
-                                  "unit": "g",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Quantity",
-                                  "value": 7,
-                                  "unit": "g",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Quantity",
-                                  "value": 10,
-                                  "unit": "g",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 12,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 19,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DateTimeCollapse",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Collapse",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  }
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "25",
-                                    "annotation": []
-                                  }
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "25",
-                                    "annotation": []
-                                  }
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "20",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "30",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "30",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DateTimeCollapse2",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalPointBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Collapse",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  }
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "16",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "25",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "TimeCollapse",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalPointBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Collapse",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "8",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "17",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "20",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "18",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "22",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "17",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "22",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "TimeCollapse2",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalBeforePointTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Collapse",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                }
-                              },
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "11",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "15",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "second": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "59",
-                                    "annotation": []
-                                  },
-                                  "millisecond": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "999",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Expand",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "ExpandNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalBeforePointFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Expand",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "asTypeSpecifier": {
-                              "type": "IntervalTypeSpecifier",
-                              "annotation": [],
-                              "pointType": {
-                                "type": "NamedTypeSpecifier",
-                                "name": "{urn:hl7-org:elm-types:r1}Any",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -6559,17 +5124,27 @@
                 }
               },
               {
-                "name": "ExpandEmptyList",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (should be empty list)",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -6577,17 +5152,27 @@
                 }
               },
               {
-                "name": "ExpandListWithNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (should be empty list due to removing nulls)",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -6595,140 +5180,1002 @@
                 }
               },
               {
-                "name": "ExpandPerDay",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalPointBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Expand",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Date",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2018",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Date",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2018",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "4",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "day",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalPointBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalBeforePointTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalBeforePointFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestBeforeNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalPointBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalPointBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalBeforePointTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalBeforePointFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalPointBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalPointBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalBeforePointTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalBeforePointFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalPointBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalPointBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalBeforePointTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalBeforePointFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestBeforeNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "If",
+                            "annotation": [],
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "As",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "strict": false,
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "asTypeSpecifier": {
+                                  "type": "NamedTypeSpecifier",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "Date",
+                            "then": {
+                              "type": "Null",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "As",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "strict": false,
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "asTypeSpecifier": {
+                                  "type": "NamedTypeSpecifier",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
+                              "high": {
+                                "type": "As",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "strict": false,
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "asTypeSpecifier": {
+                                  "type": "NamedTypeSpecifier",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
                               }
                             }
                           },
@@ -6737,103 +6184,109 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Date",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
-                          },
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalBeforeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Date",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "3",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "3",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
                             }
                           },
                           {
@@ -6841,71 +6294,40 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Date",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandPerDayIntervalOverload",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -6913,141 +6335,70 @@
                 }
               },
               {
-                "name": "ExpandPer2Days",
+                "name": "IntegerIntervalBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Expand",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Date",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2018",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Date",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2018",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "4",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 2,
-                            "unit": "days",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "expression",
                       "value": {
-                        "type": "List",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
-                        "element": [
+                        "signature": [],
+                        "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Date",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           },
                           {
@@ -7055,71 +6406,40 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Date",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "3",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2018",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
                             }
                           }
                         ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandPer2DaysIntervalOverload",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -7127,131 +6447,88 @@
                 }
               },
               {
-                "name": "ExpandPerHour",
+                "name": "IntegerIntervalPointBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Expand",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "12",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "30",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "hour",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
+                              "operand": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "9",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "Time",
+                            "then": {
+                              "type": "Null",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
                               }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
+                              "low": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
+                                "value": "9",
                                 "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
+                              },
+                              "high": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
+                                "value": "9",
                                 "annotation": []
                               }
                             }
@@ -7261,47 +6538,40 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
                             }
                           }
                         ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandPerHourIntervalOverload",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -7309,103 +6579,88 @@
                 }
               },
               {
-                "name": "ExpandPerHourOpen",
+                "name": "IntegerIntervalPointBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Expand",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": false,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "0",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "12",
-                                    "annotation": []
-                                  },
-                                  "minute": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "30",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "hour",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
+                              "operand": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "9",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "Time",
+                            "then": {
+                              "type": "Null",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
                                 "annotation": []
                               }
                             }
@@ -7415,75 +6670,172 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
-                          },
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalBeforePointTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Time",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "If",
+                            "annotation": [],
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
+                              "operand": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "11",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "Time",
+                            "then": {
+                              "type": "Null",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "11",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "11",
                                 "annotation": []
                               }
                             }
                           }
                         ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandPerHourOpenIntervalOverload",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -7491,129 +6843,131 @@
                 }
               },
               {
-                "name": "ExpandPer1",
+                "name": "IntegerIntervalBeforePointFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Expand",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "10.0",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "12.5",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "1",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "8",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "8",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "8",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandPer1IntervalOverload",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -7621,90 +6975,69 @@
                 }
               },
               {
-                "name": "ExpandPer1Open",
+                "name": "DecimalIntervalBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Expand",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": false,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "10.0",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "12.5",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "1",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
                               "annotation": []
                             }
                           },
@@ -7713,37 +7046,40 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
                               "annotation": []
                             }
                           }
                         ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandPer1OpenIntervalOverload",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -7751,57 +7087,100 @@
                 }
               },
               {
-                "name": "ExpandPerMinute",
+                "name": "DecimalIntervalBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Expand",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "List",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  }
-                                },
-                                "high": {
-                                  "type": "Time",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  }
-                                }
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
                               }
-                            ]
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "minute",
-                            "annotation": []
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -7809,87 +7188,142 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": []
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "ExpandPerMinuteIntervalOverload",
+                "name": "DecimalIntervalPointBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Expand",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
+                              "operand": {
                                 "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "9.0",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "Time",
+                            "then": {
+                              "type": "Null",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "9.0",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "9.0",
+                                "annotation": []
                               }
                             }
                           },
                           {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "minute",
-                            "annotation": []
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandPer0D1",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Translation Error: Could not resolve call to operator Expand with signature (list<interval<System.Integer>>,System.Decimal).",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -7897,178 +7331,465 @@
                 }
               },
               {
-                "name": "ExpandPer0D1IntervalOverload",
+                "name": "DecimalIntervalPointBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
-                        "annotation": []
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandInterval",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Expand",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "List",
+                            "type": "If",
                             "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "9.0",
+                                "annotation": []
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
                                 "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                   "annotation": []
                                 }
                               }
-                            ]
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "9.0",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "9.0",
+                                "annotation": []
+                              }
+                            }
                           },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
                               "annotation": []
                             }
-                          },
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalBeforePointTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "11.0",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "11.0",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "11.0",
+                                "annotation": []
+                              }
                             }
-                          },
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalBeforePointFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "8.0",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "8.0",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "8.0",
+                                "annotation": []
+                              }
                             }
-                          },
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalBeforeTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "6",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "6",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
@@ -8077,34 +7798,110 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
                               "annotation": []
                             }
-                          },
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalBeforeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "8",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "8",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
@@ -8113,55 +7910,40 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           }
                         ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandIntegerIntervalOverload",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -8169,235 +7951,131 @@
                 }
               },
               {
-                "name": "ExpandIntervalOpen",
+                "name": "QuantityIntervalPointBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Expand",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": false,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            }
-                          },
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "6",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "6",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "8",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "8",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandIntegerOpenIntervalOverload",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -8405,165 +8083,131 @@
                 }
               },
               {
-                "name": "ExpandIntervalPer2",
+                "name": "QuantityIntervalPointBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Expand",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 2,
-                            "unit": "1",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          },
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "6",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 9,
+                                "unit": "g",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "8",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 9,
+                                "unit": "g",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 9,
+                                "unit": "g",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandIntervalPer2IntervalOverload",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -8571,109 +8215,90 @@
                 }
               },
               {
-                "name": "ExpandIntervalOpenPer2",
+                "name": "QuantityIntervalBeforePointTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Expand",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "List",
+                            "type": "If",
                             "annotation": [],
-                            "element": [
-                              {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": false,
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 5,
+                                "unit": "g",
+                                "annotation": []
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
                                 "annotation": [],
-                                "low": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                   "annotation": []
                                 }
                               }
-                            ]
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 2,
-                            "unit": "1",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "6",
-                              "annotation": []
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 5,
+                                "unit": "g",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 5,
+                                "unit": "g",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -8681,93 +8306,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "8",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExpandIntervalOpenPer2IntervalOverload",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (single interval overload should return list of points)",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Contains",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "TestContainsNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
                               "annotation": []
                             }
                           }
@@ -8777,7 +8336,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -8785,97 +8347,120 @@
                 }
               },
               {
-                "name": "TestNullElement1",
+                "name": "QuantityIntervalBeforePointFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Contains",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "As",
+                            "type": "If",
                             "annotation": [],
-                            "signature": [],
-                            "operand": {
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
+                                "annotation": []
+                              }
+                            },
+                            "then": {
                               "type": "Null",
-                              "annotation": []
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "asTypeSpecifier": {
-                              "type": "IntervalTypeSpecifier",
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "pointType": {
-                                "type": "NamedTypeSpecifier",
-                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "low": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 12,
+                                "unit": "g",
                                 "annotation": []
                               }
                             }
                           },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "5",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TestNullElement2",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
                               "annotation": []
                             }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
                           }
                         ]
                       }
@@ -8884,6 +8469,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -8893,15 +8479,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalContainsTrue",
+                "name": "DateTimeBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Contains",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -8910,24 +8521,178 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
                             }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "5",
-                            "annotation": []
+                            "type": "If",
+                            "annotation": [],
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "27",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "27",
+                                  "annotation": []
+                                }
+                              },
+                              "high": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "27",
+                                  "annotation": []
+                                }
+                              }
+                            }
                           }
                         ]
                       }
@@ -8936,6 +8701,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8945,15 +8711,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalContainsFalse",
+                "name": "DateTimeBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Contains",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -8962,284 +8753,37 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "25",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DecimalIntervalContainsTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "8.0",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DecimalIntervalContainsFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "255.0",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "QuantityIntervalContainsTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 2,
-                            "unit": "g",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "QuantityIntervalContainsFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 100,
-                            "unit": "g",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DateTimeContainsTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
@@ -9247,22 +8791,26 @@
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "15",
                                 "annotation": []
@@ -9270,129 +8818,112 @@
                             }
                           },
                           {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DateTimeContainsFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
+                              "operand": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2011",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "12",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "31",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
+                            "then": {
+                              "type": "Null",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
                               }
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
                             },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "16",
-                              "annotation": []
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2011",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "12",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "31",
+                                  "annotation": []
+                                }
+                              },
+                              "high": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2011",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "12",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "31",
+                                  "annotation": []
+                                }
+                              }
                             }
                           }
                         ]
@@ -9402,6 +8933,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -9411,15 +8943,40 @@
                 }
               },
               {
-                "name": "TimeContainsTrue",
+                "name": "TimeBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Contains",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -9428,14 +8985,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "15",
                                 "annotation": []
                               },
                               "minute": {
@@ -9459,12 +9026,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "20",
                                 "annotation": []
                               },
                               "minute": {
@@ -9488,32 +9056,121 @@
                             }
                           },
                           {
-                            "type": "Time",
+                            "type": "If",
                             "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "22",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "22",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              },
+                              "high": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "22",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              }
                             }
                           }
                         ]
@@ -9523,6 +9180,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -9532,15 +9190,40 @@
                 }
               },
               {
-                "name": "TimeContainsFalse",
+                "name": "TimeBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Contains",
+                        "type": "Before",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -9549,14 +9232,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "15",
                                 "annotation": []
                               },
                               "minute": {
@@ -9580,12 +9273,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "20",
                                 "annotation": []
                               },
                               "minute": {
@@ -9609,32 +9303,121 @@
                             }
                           },
                           {
-                            "type": "Time",
+                            "type": "If",
                             "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              },
+                              "high": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              }
                             }
                           }
                         ]
@@ -9644,6 +9427,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -9656,41 +9440,52 @@
           }
         },
         {
-          "name": "End",
+          "name": "Collapse",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "IntegerIntervalEnd",
-                "value": {
-                  "type": "Tuple",
+                "name": "TestCollapseNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalCollapse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "End",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "high": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
                           }
                         }
@@ -9698,43 +9493,43 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "10",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalEnd",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalCollapse2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "End",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          "high": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "10.0",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
                           }
                         }
@@ -9742,43 +9537,43 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "10.0",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "QuantityIntervalEnd",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalCollapse3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "End",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "g",
-                            "annotation": []
-                          },
-                          "high": {
-                            "type": "Quantity",
-                            "value": 10,
-                            "unit": "g",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
                           }
                         }
@@ -9786,177 +9581,62 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Quantity",
-                        "value": 10,
-                        "unit": "g",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DateTimeIntervalEnd",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalCollapse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "End",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2016",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          "high": {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2016",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
                           }
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "DateTime",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "year": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2016",
-                          "annotation": []
-                        },
-                        "month": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "5",
-                          "annotation": []
-                        },
-                        "day": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2",
-                          "annotation": []
-                        },
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
                         }
                       }
                     }
@@ -9964,580 +9644,768 @@
                 }
               },
               {
-                "name": "TimeIntervalEnd",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalCollapse2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "End",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          "high": {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "23",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "599",
-                              "annotation": []
-                            }
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
                           }
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Time",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "23",
-                          "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "59",
-                          "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "59",
-                          "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "599",
-                          "annotation": []
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
                         }
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Ends",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestEndsNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalCollapse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Ends",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "annotation": [],
-                            "low": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Property",
-                                "path": "low",
-                                "annotation": [],
-                                "source": {
-                                  "type": "Interval",
-                                  "lowClosed": false,
-                                  "highClosed": false,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            },
-                            "lowClosedExpression": {
-                              "type": "Property",
-                              "path": "lowClosed",
-                              "annotation": [],
-                              "source": {
-                                "type": "Interval",
-                                "lowClosed": false,
-                                "highClosed": false,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Null",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
-                            },
-                            "high": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Property",
-                                "path": "high",
-                                "annotation": [],
-                                "source": {
-                                  "type": "Interval",
-                                  "lowClosed": false,
-                                  "highClosed": false,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            },
-                            "highClosedExpression": {
-                              "type": "Property",
-                              "path": "highClosed",
-                              "annotation": [],
-                              "source": {
-                                "type": "Interval",
-                                "lowClosed": false,
-                                "highClosed": false,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Null",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
-                            }
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "IntegerIntervalEndsTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeCollapse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Ends",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "IntegerIntervalEndsFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeCollapse2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Ends",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "44",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "50",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalEndsTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeCollapse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Ends",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalEndsFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeCollapse2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Ends",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
-              },
-              {
-                "name": "QuantityIntervalEndsTrue",
-                "value": {
-                  "type": "Tuple",
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestCollapseNull",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Ends",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalCollapse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 5,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": []
                             }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalCollapse2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": []
                             }
                           }
-                        ]
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
                       }
-                    },
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalCollapse3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalCollapse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalCollapse2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalCollapse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeCollapse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeCollapse2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeCollapse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeCollapse2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestCollapseNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (Interval(null, null) vs null)",
                         "annotation": []
                       }
                     }
@@ -10545,33 +10413,259 @@
                 }
               },
               {
-                "name": "QuantityIntervalEndsFalse",
+                "name": "IntegerIntervalCollapse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Ends",
+                        "type": "Collapse",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
                         "signature": [],
                         "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "5",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "3",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "7",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "12",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "19",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "7",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             }
                           },
@@ -10580,438 +10674,709 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "19",
                               "annotation": []
                             }
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "DateTimeEndsTrue",
+                "name": "IntegerIntervalCollapse2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Ends",
+                        "type": "Collapse",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "List",
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
-                            }
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "3",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "7",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "19",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "7",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                }
+                              }
+                            ]
                           },
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "19",
+                              "annotation": []
                             }
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "DateTimeEndsFalse",
+                "name": "IntegerIntervalCollapse3",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Ends",
+                        "type": "Collapse",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "List",
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "4",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "6",
+                                  "annotation": []
+                                }
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "7",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "8",
+                                  "annotation": []
+                                }
                               }
-                            }
+                            ]
                           },
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "16",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "8",
+                              "annotation": []
                             }
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "TimeEndsTrue",
+                "name": "DecimalIntervalCollapse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Ends",
+                        "type": "Collapse",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "List",
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "1.0",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "5.0",
+                                  "annotation": []
+                                }
                               },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "3.0",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "7.0",
+                                  "annotation": []
+                                }
                               },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "12.0",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "19.0",
+                                  "annotation": []
+                                }
                               },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "7.0",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "10.0",
+                                  "annotation": []
+                                }
                               }
-                            }
+                            ]
+                          },
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
                           }
                         ]
                       }
@@ -11019,90 +11384,49 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeEndsFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Ends",
+                        "type": "List",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
                             }
                           },
                           {
@@ -11110,214 +11434,183 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "12.0",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "19.0",
+                              "annotation": []
                             }
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Equal",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestEqualNull",
+                "name": "DecimalIntervalCollapse2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Equal",
+                        "type": "Collapse",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
                               "annotation": []
                             }
-                          },
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
                           {
-                            "type": "Interval",
+                            "type": "List",
                             "annotation": [],
-                            "low": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Property",
-                                "path": "low",
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
                                 "annotation": [],
-                                "source": {
-                                  "type": "Interval",
-                                  "lowClosed": false,
-                                  "highClosed": false,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  }
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
                                 }
                               }
                             },
-                            "lowClosedExpression": {
-                              "type": "Property",
-                              "path": "lowClosed",
-                              "annotation": [],
-                              "source": {
+                            "element": [
+                              {
                                 "type": "Interval",
-                                "lowClosed": false,
-                                "highClosed": false,
+                                "lowClosed": true,
+                                "highClosed": true,
                                 "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "annotation": []
+                                  }
+                                },
                                 "low": {
-                                  "type": "Null",
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "4.0",
                                   "annotation": []
                                 },
                                 "high": {
-                                  "type": "Null",
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "6.0",
                                   "annotation": []
                                 }
-                              }
-                            },
-                            "high": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Property",
-                                "path": "high",
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
                                 "annotation": [],
-                                "source": {
-                                  "type": "Interval",
-                                  "lowClosed": false,
-                                  "highClosed": false,
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
                                   "annotation": [],
-                                  "low": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "Null",
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                     "annotation": []
                                   }
-                                }
-                              }
-                            },
-                            "highClosedExpression": {
-                              "type": "Property",
-                              "path": "highClosed",
-                              "annotation": [],
-                              "source": {
-                                "type": "Interval",
-                                "lowClosed": false,
-                                "highClosed": false,
-                                "annotation": [],
+                                },
                                 "low": {
-                                  "type": "Null",
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "6.00000001",
                                   "annotation": []
                                 },
                                 "high": {
-                                  "type": "Null",
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "8.0",
                                   "annotation": []
                                 }
                               }
-                            }
+                            ]
+                          },
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
                           }
                         ]
                       }
@@ -11325,253 +11618,262 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "IntegerIntervalEqualTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Equal",
+                        "type": "List",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
                               "annotation": []
                             }
-                          },
+                          }
+                        },
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "4.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "8.0",
                               "annotation": []
                             }
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "IntegerIntervalEqualFalse",
+                "name": "QuantityIntervalCollapse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Equal",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
                               "annotation": []
                             }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
                               "annotation": []
                             }
                           }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DecimalIntervalEqualTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Equal",
+                        "type": "Collapse",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
                               "annotation": []
                             }
                           }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DecimalIntervalEqualFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Equal",
-                        "annotation": [],
+                        },
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "List",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Quantity",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "value": 1,
+                                  "unit": "g",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Quantity",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "value": 5,
+                                  "unit": "g",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Quantity",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "value": 3,
+                                  "unit": "g",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Quantity",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "value": 7,
+                                  "unit": "g",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Quantity",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "value": 12,
+                                  "unit": "g",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Quantity",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "value": 19,
+                                  "unit": "g",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Quantity",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "value": 7,
+                                  "unit": "g",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Quantity",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "value": 10,
+                                  "unit": "g",
+                                  "annotation": []
+                                }
+                              }
+                            ]
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
-                              "annotation": []
-                            }
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
                           }
                         ]
                       }
@@ -11579,41 +11881,46 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "QuantityIntervalEqualTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Equal",
+                        "type": "List",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 1,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 10,
                               "unit": "g",
                               "annotation": []
@@ -11624,310 +11931,401 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
-                              "value": 1,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 12,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
-                              "value": 10,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 19,
                               "unit": "g",
                               "annotation": []
                             }
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "QuantityIntervalEqualFalse",
+                "name": "DateTimeCollapse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Equal",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": []
                             }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": []
                             }
                           }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DateTimeEqualTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Equal",
+                        "type": "Collapse",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "List",
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  }
+                                }
                               },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "25",
+                                    "annotation": []
+                                  }
+                                }
                               },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "25",
+                                    "annotation": []
+                                  }
+                                }
                               },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "20",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "30",
+                                    "annotation": []
+                                  }
+                                }
                               }
-                            }
+                            ]
+                          },
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
                           }
                         ]
                       }
@@ -11935,35 +12333,39 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DateTimeEqualFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Equal",
+                        "type": "List",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
@@ -11981,36 +12383,13 @@
                               "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "1",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
@@ -12028,31 +12407,7 @@
                               "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "25",
                                 "annotation": []
                               }
                             }
@@ -12062,8 +12417,18 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
@@ -12073,44 +12438,21 @@
                                 "annotation": []
                               },
                               "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
                               },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
+                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "10",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
@@ -12122,196 +12464,250 @@
                               "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "5",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "16",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "30",
                                 "annotation": []
                               }
                             }
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "TimeEqualTrue",
+                "name": "DateTimeCollapse2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Equal",
+                        "type": "Collapse",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "List",
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  }
+                                }
                               },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "16",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "25",
+                                    "annotation": []
+                                  }
+                                }
                               }
-                            }
+                            ]
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
                           }
                         ]
                       }
@@ -12319,303 +12715,480 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeEqualFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Equal",
+                        "type": "List",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
                             "low": {
-                              "type": "Time",
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
+                              "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "2012",
                                 "annotation": []
                               },
-                              "second": {
+                              "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "1",
                                 "annotation": []
                               },
-                              "millisecond": {
+                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "1",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "Time",
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
+                              "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "58",
+                                "value": "2012",
                                 "annotation": []
                               },
-                              "second": {
+                              "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "5",
                                 "annotation": []
                               },
-                              "millisecond": {
+                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "25",
                                 "annotation": []
                               }
                             }
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Except",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "NullInterval",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (Interval(null, null) vs null)",
-                        "annotation": []
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "TestExceptNull",
+                "name": "TimeCollapse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Except",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Null",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": []
                             }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Null",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": []
                             }
                           }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "IntegerIntervalExcept1to3",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Except",
+                        "type": "Collapse",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": []
                             }
-                          },
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "List",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "8",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "17",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "20",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "18",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "22",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
                           }
                         ]
                       }
@@ -12623,56 +13196,95 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                        "type": "List",
                         "annotation": [],
-                        "low": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
                         },
-                        "high": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "3",
-                          "annotation": []
-                        }
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "IntegerIntervalExceptNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Except",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -12680,178 +13292,321 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "17",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "22",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalExcept1to3",
+                "name": "TimeCollapse2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "(Sort of) wrong answer (is open 4 end boundary 3 or 3.99999999?)",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DecimalIntervalExceptNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Except",
+                        "type": "Collapse",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "3.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "7.0",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": []
                             }
                           }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "QuantityIntervalExcept1to4",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "(Sort of) wrong answer (is open 5 end boundary 4 or 4.99999999?)",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "Except12",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Except",
-                        "annotation": [],
+                        },
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "List",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            }
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "11",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "15",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "second": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "59",
+                                    "annotation": []
+                                  },
+                                  "millisecond": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "999",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "6",
-                              "annotation": []
-                            }
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
                           }
                         ]
                       }
@@ -12859,197 +13614,221 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                        "type": "List",
                         "annotation": [],
-                        "low": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
                         },
-                        "high": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2",
-                          "annotation": []
-                        }
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ExceptDateTimeInterval",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Except",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
+                              "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
+                              "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "59",
                                 "annotation": []
                               },
-                              "month": {
+                              "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
                                 "annotation": []
                               },
-                              "day": {
+                              "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
+                                "value": "999",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "DateTime",
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
-                              "year": {
+                              "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "15",
                                 "annotation": []
                               },
-                              "month": {
+                              "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
                                 "annotation": []
                               },
-                              "day": {
+                              "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
                                 "annotation": []
                               }
                             }
                           }
                         ]
                       }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Expand",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ExpandNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandListWithNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerDay",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "low": {
-                          "type": "DateTime",
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2012",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "5",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Date",
                             "annotation": []
                           }
-                        },
-                        "high": {
-                          "type": "DateTime",
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2012",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "6",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Date",
                             "annotation": []
                           }
                         }
@@ -13059,175 +13838,123 @@
                 }
               },
               {
-                "name": "ExceptDateTime2",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandPerDayIntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Except",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "16",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              }
-                            }
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer2Days",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Date",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "low": {
-                          "type": "DateTime",
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2012",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "13",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Date",
                             "annotation": []
                           }
-                        },
-                        "high": {
-                          "type": "DateTime",
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer2DaysIntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerHour",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2012",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "16",
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": []
                           }
                         }
@@ -13237,457 +13964,302 @@
                 }
               },
               {
-                "name": "ExceptTimeInterval",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandPerHourIntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerHourOpen",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Except",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "8",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "low": {
-                          "type": "Time",
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "5",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "999",
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerHourOpenIntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": []
                           }
-                        },
-                        "high": {
-                          "type": "Time",
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "8",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer1IntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer1Open",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "998",
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer1OpenIntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerMinute",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": []
                           }
                         }
                       }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
                     }
                   ]
                 }
               },
               {
-                "name": "ExceptTime2",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandPerMinuteIntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Except",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "8",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "low": {
-                          "type": "Time",
-                          "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "11",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        },
-                        "high": {
-                          "type": "Time",
-                          "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "11",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "999",
-                            "annotation": []
-                          }
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
                         }
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "In",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestInNullBoundaries",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandPer0D1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong output: According to spec, comparison against null closed boundaries should result in true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -13695,51 +14267,18 @@
                 }
               },
               {
-                "name": "IntegerIntervalInTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandPer0D1IntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "In",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "5",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -13747,51 +14286,62 @@
                 }
               },
               {
-                "name": "IntegerIntervalInFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandInterval",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "In",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "500",
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandIntegerIntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -13799,108 +14349,62 @@
                 }
               },
               {
-                "name": "DecimalIntervalInTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandIntervalOpen",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "In",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "9.0",
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalInFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandIntegerOpenIntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "In",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "2.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -13908,51 +14412,62 @@
                 }
               },
               {
-                "name": "QuantityIntervalInTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandIntervalPer2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "In",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "g",
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandIntervalPer2IntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -13960,247 +14475,967 @@
                 }
               },
               {
-                "name": "QuantityIntervalInFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandIntervalOpenPer2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "In",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Quantity",
-                            "value": 55,
-                            "unit": "g",
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DateTimeInTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "ExpandIntervalOpenPer2IntervalOverload",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "In",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ExpandNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandListWithNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPerDay",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPerDayIntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPer2Days",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": []
                             }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": []
                             }
                           }
-                        ]
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPer2DaysIntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPerHour",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPerHourIntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPerHourOpen",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPerHourOpenIntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPer1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPer1IntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPer1Open",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPer1OpenIntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPerMinute",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPerMinuteIntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPer0D1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandPer0D1IntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandInterval",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandIntegerIntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandIntervalOpen",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandIntegerOpenIntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandIntervalPer2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandIntervalPer2IntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandIntervalOpenPer2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExpandIntervalOpenPer2IntervalOverload",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "DateTimeInFalse",
+                "name": "ExpandNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "In",
+                        "type": "Expand",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
+                            "type": "As",
                             "annotation": [],
                             "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "17",
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
                             },
-                            "high": {
-                              "type": "DateTime",
+                            "asTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             }
+                          },
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
                           }
                         ]
                       }
@@ -14208,9 +15443,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -14218,54 +15452,272 @@
                 }
               },
               {
-                "name": "DateTimeInNullTrue",
+                "name": "ExpandEmptyList",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
                       "value": {
-                        "type": "In",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (should be empty list)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandListWithNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (should be empty list due to removing nulls)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerDay",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Expand",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": []
+                            }
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
-                            "type": "DateTime",
+                            "type": "List",
                             "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": []
+                                }
+                              }
                             },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Date",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Date",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2018",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "Date",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2018",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "4",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Quantity",
+                            "value": 1,
+                            "unit": "day",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": []
                             }
-                          },
+                          }
+                        },
+                        "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "2018",
                                 "annotation": []
                               },
                               "month": {
@@ -14277,372 +15729,258 @@
                               "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "1",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
-                              "operand": {
-                                "type": "Null",
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2018",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
                                 "annotation": []
                               }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeInTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "In",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "7",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
                           },
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Time",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
+                              "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "2018",
                                 "annotation": []
                               },
-                              "second": {
+                              "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "1",
                                 "annotation": []
                               },
-                              "millisecond": {
+                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "2",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "Time",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
+                              "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "2018",
                                 "annotation": []
                               },
-                              "second": {
+                              "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "1",
                                 "annotation": []
                               },
-                              "millisecond": {
+                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "2",
                                 "annotation": []
                               }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeInFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "In",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "17",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
                           },
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Time",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
+                              "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "2018",
                                 "annotation": []
                               },
-                              "second": {
+                              "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "1",
                                 "annotation": []
                               },
-                              "millisecond": {
+                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "3",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "Time",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
+                              "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "2018",
                                 "annotation": []
                               },
-                              "second": {
+                              "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "1",
                                 "annotation": []
                               },
-                              "millisecond": {
+                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "3",
                                 "annotation": []
                               }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeInNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "In",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Time",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
                           },
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Time",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
+                              "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "2018",
                                 "annotation": []
                               },
-                              "second": {
+                              "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "1",
                                 "annotation": []
                               },
-                              "millisecond": {
+                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "4",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "Time",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
-                              "hour": {
+                              "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "2018",
                                 "annotation": []
                               },
-                              "minute": {
+                              "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "1",
                                 "annotation": []
                               },
-                              "second": {
+                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "4",
                                 "annotation": []
                               }
                             }
                           }
                         ]
                       }
-                    },
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerDayIntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
                         "annotation": []
                       }
                     }
@@ -14650,884 +15988,34626 @@
                 }
               },
               {
-                "name": "TestPeriod1",
+                "name": "ExpandPer2Days",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                        "type": "Expand",
                         "annotation": [],
-                        "low": {
-                          "type": "DateTime",
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2017",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "20",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "11",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": []
+                            }
                           }
                         },
-                        "high": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2017",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "21",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "21",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Date",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Date",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2018",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "Date",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2018",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "4",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
                           },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 2,
+                            "unit": "days",
                             "annotation": []
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                        "type": "List",
                         "annotation": [],
-                        "low": {
-                          "type": "DateTime",
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2017",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "20",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "11",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": []
+                            }
                           }
                         },
-                        "high": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2017",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "21",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "21",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                        "element": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2018",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2018",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              }
+                            }
                           },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2018",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "3",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2018",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              }
+                            }
                           }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer2DaysIntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
                         }
                       }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "annotation": []
+                      }
                     }
                   ]
                 }
               },
               {
-                "name": "TestPeriod2",
+                "name": "ExpandPerHour",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                        "type": "Expand",
                         "annotation": [],
-                        "low": {
-                          "type": "DateTime",
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2017",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "20",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "30",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
                           }
                         },
-                        "high": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2017",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "20",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "12",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "30",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
                           },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
+                          {
+                            "type": "Quantity",
+                            "value": 1,
+                            "unit": "hour",
                             "annotation": []
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                        "type": "List",
                         "annotation": [],
-                        "low": {
-                          "type": "DateTime",
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2017",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "20",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "30",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
                           }
                         },
-                        "high": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2017",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "20",
-                            "annotation": []
-                          },
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "12",
-                            "annotation": []
+                        "element": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
+                            }
                           },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "11",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "11",
+                                "annotation": []
+                              }
+                            }
                           },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              }
+                            }
                           }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerHourIntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
                         }
                       }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "annotation": []
+                      }
                     }
                   ]
                 }
               },
               {
-                "name": "Issue32Interval",
+                "name": "ExpandPerHourOpen",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "And",
+                        "type": "Expand",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
-                            "type": "In",
-                            "precision": "Day",
+                            "type": "List",
                             "annotation": [],
-                            "signature": [],
-                            "operand": [
-                              {
-                                "type": "Start",
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
                                 "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": true,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "DateTime",
-                                    "annotation": [],
-                                    "signature": [],
-                                    "year": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "2017",
-                                      "annotation": []
-                                    },
-                                    "month": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "12",
-                                      "annotation": []
-                                    },
-                                    "day": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "20",
-                                      "annotation": []
-                                    },
-                                    "hour": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "10",
-                                      "annotation": []
-                                    },
-                                    "minute": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "30",
-                                      "annotation": []
-                                    },
-                                    "second": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "0",
-                                      "annotation": []
-                                    }
-                                  },
-                                  "high": {
-                                    "type": "DateTime",
-                                    "annotation": [],
-                                    "signature": [],
-                                    "year": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "2017",
-                                      "annotation": []
-                                    },
-                                    "month": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "12",
-                                      "annotation": []
-                                    },
-                                    "day": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "20",
-                                      "annotation": []
-                                    },
-                                    "hour": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "12",
-                                      "annotation": []
-                                    },
-                                    "minute": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "0",
-                                      "annotation": []
-                                    },
-                                    "second": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "0",
-                                      "annotation": []
-                                    }
-                                  }
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
                                 }
-                              },
+                              }
+                            },
+                            "element": [
                               {
                                 "type": "Interval",
                                 "lowClosed": true,
-                                "highClosed": true,
+                                "highClosed": false,
                                 "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                },
                                 "low": {
-                                  "type": "Start",
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                   "annotation": [],
                                   "signature": [],
-                                  "operand": {
-                                    "type": "Interval",
-                                    "lowClosed": true,
-                                    "highClosed": true,
-                                    "annotation": [],
-                                    "low": {
-                                      "type": "DateTime",
-                                      "annotation": [],
-                                      "signature": [],
-                                      "year": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "2017",
-                                        "annotation": []
-                                      },
-                                      "month": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "12",
-                                        "annotation": []
-                                      },
-                                      "day": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "20",
-                                        "annotation": []
-                                      },
-                                      "hour": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "11",
-                                        "annotation": []
-                                      },
-                                      "minute": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "0",
-                                        "annotation": []
-                                      },
-                                      "second": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "0",
-                                        "annotation": []
-                                      }
-                                    },
-                                    "high": {
-                                      "type": "DateTime",
-                                      "annotation": [],
-                                      "signature": [],
-                                      "year": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "2017",
-                                        "annotation": []
-                                      },
-                                      "month": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "12",
-                                        "annotation": []
-                                      },
-                                      "day": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "21",
-                                        "annotation": []
-                                      },
-                                      "hour": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "21",
-                                        "annotation": []
-                                      },
-                                      "minute": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "0",
-                                        "annotation": []
-                                      },
-                                      "second": {
-                                        "type": "Literal",
-                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                        "value": "0",
-                                        "annotation": []
-                                      }
-                                    }
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "0",
+                                    "annotation": []
                                   }
                                 },
                                 "high": {
-                                  "type": "Add",
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                   "annotation": [],
                                   "signature": [],
-                                  "operand": [
-                                    {
-                                      "type": "Start",
-                                      "annotation": [],
-                                      "signature": [],
-                                      "operand": {
-                                        "type": "Interval",
-                                        "lowClosed": true,
-                                        "highClosed": true,
-                                        "annotation": [],
-                                        "low": {
-                                          "type": "DateTime",
-                                          "annotation": [],
-                                          "signature": [],
-                                          "year": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "2017",
-                                            "annotation": []
-                                          },
-                                          "month": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "12",
-                                            "annotation": []
-                                          },
-                                          "day": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "20",
-                                            "annotation": []
-                                          },
-                                          "hour": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "11",
-                                            "annotation": []
-                                          },
-                                          "minute": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "0",
-                                            "annotation": []
-                                          },
-                                          "second": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "0",
-                                            "annotation": []
-                                          }
-                                        },
-                                        "high": {
-                                          "type": "DateTime",
-                                          "annotation": [],
-                                          "signature": [],
-                                          "year": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "2017",
-                                            "annotation": []
-                                          },
-                                          "month": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "12",
-                                            "annotation": []
-                                          },
-                                          "day": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "21",
-                                            "annotation": []
-                                          },
-                                          "hour": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "21",
-                                            "annotation": []
-                                          },
-                                          "minute": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "0",
-                                            "annotation": []
-                                          },
-                                          "second": {
-                                            "type": "Literal",
-                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                            "value": "0",
-                                            "annotation": []
-                                          }
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "type": "Quantity",
-                                      "value": 1,
-                                      "unit": "day",
-                                      "annotation": []
-                                    }
-                                  ]
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "12",
+                                    "annotation": []
+                                  },
+                                  "minute": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "30",
+                                    "annotation": []
+                                  }
                                 }
                               }
                             ]
                           },
                           {
-                            "type": "Not",
+                            "type": "Quantity",
+                            "value": 1,
+                            "unit": "hour",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "IsNull",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
-                              "operand": {
-                                "type": "Start",
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "11",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "11",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerHourOpenIntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Expand",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
                                 "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": true,
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
                                   "annotation": [],
-                                  "low": {
-                                    "type": "DateTime",
-                                    "annotation": [],
-                                    "signature": [],
-                                    "year": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "2017",
-                                      "annotation": []
-                                    },
-                                    "month": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "12",
-                                      "annotation": []
-                                    },
-                                    "day": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "20",
-                                      "annotation": []
-                                    },
-                                    "hour": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "11",
-                                      "annotation": []
-                                    },
-                                    "minute": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "0",
-                                      "annotation": []
-                                    },
-                                    "second": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "0",
-                                      "annotation": []
-                                    }
-                                  },
-                                  "high": {
-                                    "type": "DateTime",
-                                    "annotation": [],
-                                    "signature": [],
-                                    "year": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "2017",
-                                      "annotation": []
-                                    },
-                                    "month": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "12",
-                                      "annotation": []
-                                    },
-                                    "day": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "21",
-                                      "annotation": []
-                                    },
-                                    "hour": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "21",
-                                      "annotation": []
-                                    },
-                                    "minute": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "0",
-                                      "annotation": []
-                                    },
-                                    "second": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "0",
-                                      "annotation": []
-                                    }
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "annotation": []
                                   }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "10.0",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "12.5",
+                                  "annotation": []
                                 }
                               }
-                            }
+                            ]
+                          },
+                          {
+                            "type": "Quantity",
+                            "value": 1,
+                            "unit": "1",
+                            "annotation": []
                           }
                         ]
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer1IntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer1Open",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Expand",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": false,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "10.0",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "12.5",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Quantity",
+                            "value": 1,
+                            "unit": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer1OpenIntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerMinute",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Expand",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Time",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  }
+                                },
+                                "high": {
+                                  "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "hour": {
+                                    "type": "Literal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Quantity",
+                            "value": 1,
+                            "unit": "minute",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "element": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPerMinuteIntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Expand",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Quantity",
+                            "value": 1,
+                            "unit": "minute",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "element": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer0D1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Translation Error: Could not resolve call to operator Expand with signature (list<interval<System.Integer>>,System.Decimal).",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandPer0D1IntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandInterval",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Expand",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "6",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "6",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "8",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "8",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandIntegerIntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandIntervalOpen",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Expand",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": false,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "6",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "6",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "8",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "8",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandIntegerOpenIntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandIntervalPer2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Expand",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Quantity",
+                            "value": 2,
+                            "unit": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "6",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "8",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandIntervalPer2IntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandIntervalOpenPer2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Expand",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": false,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Quantity",
+                            "value": 2,
+                            "unit": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "6",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "8",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExpandIntervalOpenPer2IntervalOverload",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (single interval overload should return list of points)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Contains",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestContainsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestNullElement1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestNullElement2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalContainsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalContainsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalContainsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalContainsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalContainsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalContainsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeContainsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeContainsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeContainsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeContainsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestContainsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestNullElement1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestNullElement2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalContainsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalContainsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalContainsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalContainsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalContainsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalContainsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeContainsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeContainsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeContainsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeContainsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestContainsNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestNullElement1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "5",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestNullElement2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalContainsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "5",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalContainsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "25",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalContainsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "8.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalContainsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "255.0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalContainsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 2,
+                            "unit": "g",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalContainsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 100,
+                            "unit": "g",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeContainsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeContainsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "16",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeContainsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeContainsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "End",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IntegerIntervalEnd",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEnd",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEnd",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIntervalEnd",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIntervalEnd",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerIntervalEnd",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalEnd",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalEnd",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIntervalEnd",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeIntervalEnd",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "IntegerIntervalEnd",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "End",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "high": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "10",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEnd",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "End",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          "high": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "10.0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "10.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEnd",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "End",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "g",
+                            "annotation": []
+                          },
+                          "high": {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 10,
+                            "unit": "g",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "value": 10,
+                        "unit": "g",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIntervalEnd",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "End",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2016",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          "high": {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2016",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "year": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2016",
+                          "annotation": []
+                        },
+                        "month": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "5",
+                          "annotation": []
+                        },
+                        "day": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2",
+                          "annotation": []
+                        },
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIntervalEnd",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "End",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            }
+                          },
+                          "high": {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "23",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "599",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "23",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "59",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "59",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "599",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Ends",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestEndsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalEndsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalEndsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEndsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEndsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEndsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEndsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEndsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEndsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEndsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEndsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestEndsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalEndsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalEndsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalEndsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalEndsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalEndsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalEndsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEndsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEndsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeEndsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeEndsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestEndsNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "annotation": [],
+                            "low": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Property",
+                                "path": "low",
+                                "annotation": [],
+                                "source": {
+                                  "type": "Interval",
+                                  "lowClosed": false,
+                                  "highClosed": false,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            },
+                            "lowClosedExpression": {
+                              "type": "Property",
+                              "path": "lowClosed",
+                              "annotation": [],
+                              "source": {
+                                "type": "Interval",
+                                "lowClosed": false,
+                                "highClosed": false,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "high": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Property",
+                                "path": "high",
+                                "annotation": [],
+                                "source": {
+                                  "type": "Interval",
+                                  "lowClosed": false,
+                                  "highClosed": false,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            },
+                            "highClosedExpression": {
+                              "type": "Property",
+                              "path": "highClosed",
+                              "annotation": [],
+                              "source": {
+                                "type": "Interval",
+                                "lowClosed": false,
+                                "highClosed": false,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalEndsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalEndsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "44",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "50",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEndsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "4.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEndsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEndsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEndsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEndsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEndsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "16",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEndsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEndsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Ends",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "11",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Equal",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestEqualNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestEqualNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestEqualNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "annotation": [],
+                            "low": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Property",
+                                "path": "low",
+                                "annotation": [],
+                                "source": {
+                                  "type": "Interval",
+                                  "lowClosed": false,
+                                  "highClosed": false,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            },
+                            "lowClosedExpression": {
+                              "type": "Property",
+                              "path": "lowClosed",
+                              "annotation": [],
+                              "source": {
+                                "type": "Interval",
+                                "lowClosed": false,
+                                "highClosed": false,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "high": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Property",
+                                "path": "high",
+                                "annotation": [],
+                                "source": {
+                                  "type": "Interval",
+                                  "lowClosed": false,
+                                  "highClosed": false,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            },
+                            "highClosedExpression": {
+                              "type": "Property",
+                              "path": "highClosed",
+                              "annotation": [],
+                              "source": {
+                                "type": "Interval",
+                                "lowClosed": false,
+                                "highClosed": false,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalEqualTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalEqualFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEqualTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEqualFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEqualTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEqualFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEqualTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEqualFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "16",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEqualTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEqualFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "58",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Except",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "NullInterval",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestExceptNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExcept1to3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExceptNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalExcept1to3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalExceptNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalExcept1to4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Except12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptDateTimeInterval",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptDateTime2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptTimeInterval",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptTime2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "NullInterval",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestExceptNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExcept1to3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExceptNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalExcept1to3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalExceptNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalExcept1to4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Except12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExceptDateTimeInterval",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExceptDateTime2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExceptTimeInterval",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExceptTime2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "NullInterval",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (Interval(null, null) vs null)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestExceptNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Except",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExcept1to3",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Except",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "high": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "3",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExceptNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Except",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalExcept1to3",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Expected Interval[1.0, 3.99999999] but got Interval[1.0, 4) (closed boundary vs equivalent open boundary)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalExceptNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Except",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "3.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "7.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalExcept1to4",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Except",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "value": 1,
+                          "unit": "g",
+                          "annotation": []
+                        },
+                        "high": {
+                          "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "value": 4.99999999,
+                          "unit": "g",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Except12",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Except",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "6",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "high": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptDateTimeInterval",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Except",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2012",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "5",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2012",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "6",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptDateTime2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Except",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "16",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2012",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "13",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2012",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "16",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptTimeInterval",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Except",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "8",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "5",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "999",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "8",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "998",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptTime2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Except",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "8",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "11",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "11",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "11",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "999",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "In",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestInNullBoundaries",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeInNullTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeInNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestPeriod1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestPeriod2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Issue32Interval",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestInNullBoundaries",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeInNullTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeInNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestPeriod1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestPeriod2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Issue32Interval",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestInNullBoundaries",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong output: According to spec, comparison against null closed boundaries should result in true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "5",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalInFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "500",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "9.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalInFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "2.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "g",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalInFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 55,
+                            "unit": "g",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeInFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "17",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeInNullTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "7",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeInFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "17",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeInNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestPeriod1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2017",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "20",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "11",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2017",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "21",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "21",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2017",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "20",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "11",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2017",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "21",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "21",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestPeriod2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2017",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "20",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "30",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2017",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "20",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2017",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "20",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "30",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2017",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "20",
+                            "annotation": []
+                          },
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "12",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Issue32Interval",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "In",
+                            "precision": "Day",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Start",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": true,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "DateTime",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": [],
+                                    "signature": [],
+                                    "year": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "2017",
+                                      "annotation": []
+                                    },
+                                    "month": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "12",
+                                      "annotation": []
+                                    },
+                                    "day": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "20",
+                                      "annotation": []
+                                    },
+                                    "hour": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "10",
+                                      "annotation": []
+                                    },
+                                    "minute": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "30",
+                                      "annotation": []
+                                    },
+                                    "second": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "0",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "high": {
+                                    "type": "DateTime",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": [],
+                                    "signature": [],
+                                    "year": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "2017",
+                                      "annotation": []
+                                    },
+                                    "month": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "12",
+                                      "annotation": []
+                                    },
+                                    "day": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "20",
+                                      "annotation": []
+                                    },
+                                    "hour": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "12",
+                                      "annotation": []
+                                    },
+                                    "minute": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "0",
+                                      "annotation": []
+                                    },
+                                    "second": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "0",
+                                      "annotation": []
+                                    }
+                                  }
+                                }
+                              },
+                              {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Start",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "operand": {
+                                    "type": "Interval",
+                                    "lowClosed": true,
+                                    "highClosed": true,
+                                    "annotation": [],
+                                    "resultTypeSpecifier": {
+                                      "type": "IntervalTypeSpecifier",
+                                      "annotation": [],
+                                      "pointType": {
+                                        "type": "NamedTypeSpecifier",
+                                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                        "annotation": []
+                                      }
+                                    },
+                                    "low": {
+                                      "type": "DateTime",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                      "annotation": [],
+                                      "signature": [],
+                                      "year": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "2017",
+                                        "annotation": []
+                                      },
+                                      "month": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "12",
+                                        "annotation": []
+                                      },
+                                      "day": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "20",
+                                        "annotation": []
+                                      },
+                                      "hour": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "11",
+                                        "annotation": []
+                                      },
+                                      "minute": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "0",
+                                        "annotation": []
+                                      },
+                                      "second": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "0",
+                                        "annotation": []
+                                      }
+                                    },
+                                    "high": {
+                                      "type": "DateTime",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                      "annotation": [],
+                                      "signature": [],
+                                      "year": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "2017",
+                                        "annotation": []
+                                      },
+                                      "month": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "12",
+                                        "annotation": []
+                                      },
+                                      "day": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "21",
+                                        "annotation": []
+                                      },
+                                      "hour": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "21",
+                                        "annotation": []
+                                      },
+                                      "minute": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "0",
+                                        "annotation": []
+                                      },
+                                      "second": {
+                                        "type": "Literal",
+                                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                        "value": "0",
+                                        "annotation": []
+                                      }
+                                    }
+                                  }
+                                },
+                                "high": {
+                                  "type": "Add",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "operand": [
+                                    {
+                                      "type": "Start",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                      "annotation": [],
+                                      "signature": [],
+                                      "operand": {
+                                        "type": "Interval",
+                                        "lowClosed": true,
+                                        "highClosed": true,
+                                        "annotation": [],
+                                        "resultTypeSpecifier": {
+                                          "type": "IntervalTypeSpecifier",
+                                          "annotation": [],
+                                          "pointType": {
+                                            "type": "NamedTypeSpecifier",
+                                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                            "annotation": []
+                                          }
+                                        },
+                                        "low": {
+                                          "type": "DateTime",
+                                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                          "annotation": [],
+                                          "signature": [],
+                                          "year": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "2017",
+                                            "annotation": []
+                                          },
+                                          "month": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "12",
+                                            "annotation": []
+                                          },
+                                          "day": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "20",
+                                            "annotation": []
+                                          },
+                                          "hour": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "11",
+                                            "annotation": []
+                                          },
+                                          "minute": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "0",
+                                            "annotation": []
+                                          },
+                                          "second": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "0",
+                                            "annotation": []
+                                          }
+                                        },
+                                        "high": {
+                                          "type": "DateTime",
+                                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                          "annotation": [],
+                                          "signature": [],
+                                          "year": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "2017",
+                                            "annotation": []
+                                          },
+                                          "month": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "12",
+                                            "annotation": []
+                                          },
+                                          "day": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "21",
+                                            "annotation": []
+                                          },
+                                          "hour": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "21",
+                                            "annotation": []
+                                          },
+                                          "minute": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "0",
+                                            "annotation": []
+                                          },
+                                          "second": {
+                                            "type": "Literal",
+                                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                            "value": "0",
+                                            "annotation": []
+                                          }
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "type": "Quantity",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                      "value": 1,
+                                      "unit": "day",
+                                      "annotation": []
+                                    }
+                                  ]
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Not",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Start",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": true,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "DateTime",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": [],
+                                    "signature": [],
+                                    "year": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "2017",
+                                      "annotation": []
+                                    },
+                                    "month": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "12",
+                                      "annotation": []
+                                    },
+                                    "day": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "20",
+                                      "annotation": []
+                                    },
+                                    "hour": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "11",
+                                      "annotation": []
+                                    },
+                                    "minute": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "0",
+                                      "annotation": []
+                                    },
+                                    "second": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "0",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "high": {
+                                    "type": "DateTime",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                    "annotation": [],
+                                    "signature": [],
+                                    "year": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "2017",
+                                      "annotation": []
+                                    },
+                                    "month": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "12",
+                                      "annotation": []
+                                    },
+                                    "day": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "21",
+                                      "annotation": []
+                                    },
+                                    "hour": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "21",
+                                      "annotation": []
+                                    },
+                                    "minute": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "0",
+                                      "annotation": []
+                                    },
+                                    "second": {
+                                      "type": "Literal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "0",
+                                      "annotation": []
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Includes",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestIncludesNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIncludesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIncludesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIncludesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIncludesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIncludesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIncludesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIncludesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIncludesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestIncludesNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalIncludesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalIncludesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalIncludesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalIncludesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalIncludesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalIncludesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIncludesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIncludesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeIncludesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeIncludesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestIncludesNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIncludesTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIncludesFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "44",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "50",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIncludesTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "4.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIncludesFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIncludesTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIncludesFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludesTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludesFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIncludesTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "6",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIncludesFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Included In",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestIncludedInNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIncludedInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIncludedInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIncludedInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIncludedInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIncludedInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIncludedInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludedInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludedInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIncludedInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIncludedInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludedInNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludedInPrecisionTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludedInPrecisionNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestIncludedInNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalIncludedInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalIncludedInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalIncludedInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalIncludedInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalIncludedInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalIncludedInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIncludedInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIncludedInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeIncludedInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeIncludedInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIncludedInNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIncludedInPrecisionTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIncludedInPrecisionNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestIncludedInNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIncludedInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIncludedInFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "44",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "50",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIncludedInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "4.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIncludedInFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIncludedInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIncludedInFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludedInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludedInFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIncludedInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "6",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIncludedInFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludedInNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "30",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "23",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludedInPrecisionTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Day",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "30",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "23",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIncludedInPrecisionNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Millisecond",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2017",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "30",
+                                "annotation": []
+                              },
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "23",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Intersect",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestIntersectNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestIntersectNull1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestIntersectNull2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestIntersectNull3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestIntersectNull4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIntersectTest4to10",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIntersectTestNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIntersectTest4to10",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIntersectTestNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIntersectTest5to10",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIntersectTestNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIntersect",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIntersect",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestIntersectNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestIntersectNull1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestIntersectNull2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestIntersectNull3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestIntersectNull4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalIntersectTest4to10",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalIntersectTestNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalIntersectTest4to10",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalIntersectTestNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalIntersectTest5to10",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalIntersectTestNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIntersect",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeIntersect",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestIntersectNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (Interval[5, 10] vs Interval[5, null))",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestIntersectNull1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "LessOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Start",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Intersect",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              "signature": [],
+                              "operand": [
+                                {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": true,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": false,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "As",
+                                    "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": [],
+                                    "signature": [],
+                                    "operand": {
+                                      "type": "Null",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestIntersectNull2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "GreaterOrEqual",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Start",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Intersect",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              "signature": [],
+                              "operand": [
+                                {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": true,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": false,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "As",
+                                    "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": [],
+                                    "signature": [],
+                                    "operand": {
+                                      "type": "Null",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "5",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestIntersectNull3",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Greater",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Start",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Intersect",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              "signature": [],
+                              "operand": [
+                                {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": true,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": false,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "As",
+                                    "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": [],
+                                    "signature": [],
+                                    "operand": {
+                                      "type": "Null",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestIntersectNull4",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Less",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Start",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Intersect",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              "signature": [],
+                              "operand": [
+                                {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": true,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": false,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "As",
+                                    "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": [],
+                                    "signature": [],
+                                    "operand": {
+                                      "type": "Null",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "5",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIntersectTest4to10",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Intersect",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "4",
+                          "annotation": []
+                        },
+                        "high": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "10",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalIntersectTestNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Intersect",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIntersectTest4to10",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Intersect",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "4.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "4.0",
+                          "annotation": []
+                        },
+                        "high": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "10.0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalIntersectTestNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Intersect",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIntersectTest5to10",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Intersect",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "value": 5,
+                          "unit": "g",
+                          "annotation": []
+                        },
+                        "high": {
+                          "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "value": 10,
+                          "unit": "g",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalIntersectTestNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Intersect",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeIntersect",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Intersect",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2012",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "7",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2012",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeIntersect",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Intersect",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "6",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "4",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "999",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "6",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "999",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Equivalent",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IntegerIntervalEquivalentTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalEquivalentFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEquivalentTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEquivalentFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEquivalentTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEquivalentFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEquivalentTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEquivalentFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEquivalentTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEquivalentFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerIntervalEquivalentTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalEquivalentFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalEquivalentTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalEquivalentFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalEquivalentTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalEquivalentFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEquivalentTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeEquivalentFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeEquivalentTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeEquivalentFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "IntegerIntervalEquivalentTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalEquivalentFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "44",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "50",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEquivalentTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalEquivalentFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEquivalentTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalEquivalentFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEquivalentTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeEquivalentFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEquivalentTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeEquivalentFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "58",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Meets",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestMeetsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestMeetsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalMeetsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalMeetsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalMeetsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalMeetsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalMeetsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalMeetsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeMeetsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeMeetsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeMeetsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeMeetsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestMeetsNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": false,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "44",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "50",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "3.01",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "5.00000001",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "5.00000002",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "8.50",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "3.01",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "5.00000001",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "5.5",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "8.50",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 3.01,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5.00000001,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5.00000002,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 8.5,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 3.01,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5.00000001,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5.5,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 8.5,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "20",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "19",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "19",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "MeetsBefore",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestMeetsBeforeNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestMeetsBeforeNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalMeetsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalMeetsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalMeetsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalMeetsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalMeetsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalMeetsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeMeetsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeMeetsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeMeetsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeMeetsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestMeetsBeforeNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "25",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsBeforeTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsBeforeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "44",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "50",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsBeforeTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "3.50000001",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "5.00000011",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "5.00000012",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "8.50",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsBeforeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "8.01",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "15.00000001",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "15.00000000",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "18.50",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsBeforeTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 3.50000001,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5.00000011,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5.00000012,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 8.5,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsBeforeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 8.01,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 15.00000001,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 15,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 18.5,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsBeforeTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsBeforeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "20",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsBeforeTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "19",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsBeforeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "19",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "MeetsAfter",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestMeetsAfterNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestMeetsAfterNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalMeetsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalMeetsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalMeetsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalMeetsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalMeetsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalMeetsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeMeetsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeMeetsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeMeetsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeMeetsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestMeetsAfterNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": false,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsAfterTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalMeetsAfterFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "44",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "50",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsAfterTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "55.00000123",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "128.032156",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "12.00258",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "55.00000122",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalMeetsAfterFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "55.00000124",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "150.222222",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "12.00258",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "55.00000122",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsAfterTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 55.00000123,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 128.032156,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 12.00258,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 55.00000122,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalMeetsAfterFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "MeetsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 55.00000124,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 150.222222,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 12.00258,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 55.00000122,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsAfterTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeMeetsAfterFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "20",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "14",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsAfterTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "19",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeMeetsAfterFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Meets",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "19",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "4",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "NotEqual",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IntegerIntervalNotEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalNotEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalNotEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalNotEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalNotEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalNotEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Includes",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestIncludesNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeNotEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -15535,63 +50615,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalIncludesTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeNotEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Includes",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -15599,63 +50643,465 @@
                 }
               },
               {
-                "name": "IntegerIntervalIncludesFalse",
+                "name": "TimeNotEqualTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeNotEqualFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerIntervalNotEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalNotEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalNotEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalNotEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalNotEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalNotEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeNotEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeNotEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeNotEqualTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeNotEqualFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "IntegerIntervalNotEqualTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Includes",
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "44",
-                              "annotation": []
+                        "operand": {
+                          "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "50",
-                              "annotation": []
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "11",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "20",
+                                "annotation": []
+                              }
                             }
-                          }
-                        ]
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -15663,63 +51109,117 @@
                 }
               },
               {
-                "name": "DecimalIntervalIncludesTrue",
+                "name": "IntegerIntervalNotEqualFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Includes",
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
-                              "annotation": []
+                        "operand": {
+                          "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
                             }
-                          }
-                        ]
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -15727,63 +51227,117 @@
                 }
               },
               {
-                "name": "DecimalIntervalIncludesFalse",
+                "name": "DecimalIntervalNotEqualTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Includes",
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
-                              "annotation": []
+                        "operand": {
+                          "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              },
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "1.0",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "10.0",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
-                              "annotation": []
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              },
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "11.0",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "20.0",
+                                "annotation": []
+                              }
                             }
-                          }
-                        ]
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -15791,63 +51345,117 @@
                 }
               },
               {
-                "name": "QuantityIntervalIncludesTrue",
+                "name": "DecimalIntervalNotEqualFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Includes",
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 5,
-                              "unit": "g",
-                              "annotation": []
+                        "operand": {
+                          "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              },
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "1.0",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "10.0",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              },
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "1.0",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "10.0",
+                                "annotation": []
+                              }
                             }
-                          }
-                        ]
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -15855,63 +51463,117 @@
                 }
               },
               {
-                "name": "QuantityIntervalIncludesFalse",
+                "name": "QuantityIntervalNotEqualTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Includes",
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
+                        "operand": {
+                          "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              },
+                              "low": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 1,
+                                "unit": "g",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 10,
+                                "unit": "g",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              },
+                              "low": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 11,
+                                "unit": "g",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 20,
+                                "unit": "g",
+                                "annotation": []
+                              }
                             }
-                          }
-                        ]
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -15919,129 +51581,425 @@
                 }
               },
               {
-                "name": "DateTimeIncludesTrue",
+                "name": "QuantityIntervalNotEqualFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Includes",
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                        "operand": {
+                          "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
                               },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                              "low": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 1,
+                                "unit": "g",
                                 "annotation": []
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                              "high": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 10,
+                                "unit": "g",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
                               },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                              "low": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 1,
+                                "unit": "g",
                                 "annotation": []
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                              "high": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 10,
+                                "unit": "g",
                                 "annotation": []
                               }
                             }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeNotEqualTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
                               },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
+                              "low": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                },
+                                "hour": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
-                                "annotation": []
+                              "high": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "25",
+                                  "annotation": []
+                                },
+                                "hour": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
                               },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
+                              "low": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                },
+                                "hour": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
+                              "high": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "25",
+                                  "annotation": []
+                                },
+                                "hour": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "22",
+                                  "annotation": []
+                                }
                               }
                             }
-                          }
-                        ]
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -16051,129 +52009,307 @@
                 }
               },
               {
-                "name": "DateTimeIncludesFalse",
+                "name": "DateTimeNotEqualFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Includes",
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                        "operand": {
+                          "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
                               },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
+                              "low": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                },
+                                "hour": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
+                              "high": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "25",
+                                  "annotation": []
+                                },
+                                "hour": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
                               },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
+                              "low": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                },
+                                "hour": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
+                              "high": {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "25",
+                                  "annotation": []
+                                },
+                                "hour": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               }
                             }
-                          }
-                        ]
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -16183,153 +52319,207 @@
                 }
               },
               {
-                "name": "TimeIncludesTrue",
+                "name": "TimeNotEqualTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Includes",
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
+                        "operand": {
+                          "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "6",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
                               },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                              "low": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
+                              "high": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "19",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "Time",
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
                               },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                              "low": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
+                              "high": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "19",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
                               }
                             }
-                          }
-                        ]
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -16339,153 +52529,207 @@
                 }
               },
               {
-                "name": "TimeIncludesFalse",
+                "name": "TimeNotEqualFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Includes",
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
+                        "operand": {
+                          "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
                               },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                              "low": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
+                              "high": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "19",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "Time",
+                            {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
                               },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
+                              "low": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "0",
+                                  "annotation": []
+                                }
                               },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
+                              "high": {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "19",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
                               }
                             }
-                          }
-                        ]
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -16498,62 +52742,36 @@
           }
         },
         {
-          "name": "Included In",
+          "name": "OnOrAfter",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "TestIncludedInNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "TestOnOrAfterNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "In",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -16561,63 +52779,55 @@
                 }
               },
               {
-                "name": "IntegerIntervalIncludedInTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "TestOnOrAfterDateTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "IncludedIn",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrAfterDateFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -16625,63 +52835,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalIncludedInFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TestOnOrAfterTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "IncludedIn",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "44",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "50",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -16689,63 +52863,27 @@
                 }
               },
               {
-                "name": "DecimalIntervalIncludedInTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "TestOnOrAfterTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "IncludedIn",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -16753,63 +52891,27 @@
                 }
               },
               {
-                "name": "DecimalIntervalIncludedInFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TestOnOrAfterIntegerTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "IncludedIn",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -16817,63 +52919,27 @@
                 }
               },
               {
-                "name": "QuantityIntervalIncludedInTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "TestOnOrAfterDecimalFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "IncludedIn",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 5,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -16881,79 +52947,304 @@
                 }
               },
               {
-                "name": "QuantityIntervalIncludedInFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TestOnOrAfterQuantityTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "IncludedIn",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              },
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestOnOrAfterNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrAfterDateTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrAfterDateFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrAfterTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrAfterTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrAfterIntegerTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrAfterDecimalFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrAfterQuantityTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
               {
-                "name": "DateTimeIncludedInTrue",
+                "name": "TestOnOrAfterNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "IncludedIn",
+                        "type": "SameOrAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -16962,8 +53253,18 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
@@ -16975,47 +53276,152 @@
                               "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "12",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
+                                "value": "1",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "2013",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "12",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
+                                "value": "1",
                                 "annotation": []
                               }
                             }
                           },
+                          {
+                            "type": "As",
+                            "strict": false,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "localId": "9884",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "localId": "9885",
+                                  "name": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": []
+                                }
+                              },
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrAfterDateTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "SameOrAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Month",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
@@ -17027,37 +53433,138 @@
                               "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "12",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "1",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "2013",
                                 "annotation": []
                               },
                               "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              },
+                              "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "If",
+                            "annotation": [],
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                }
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
+                              "high": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                }
                               }
                             }
                           }
@@ -17068,6 +53575,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -17077,67 +53585,141 @@
                 }
               },
               {
-                "name": "DateTimeIncludedInFalse",
+                "name": "TestOnOrAfterDateFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "IncludedIn",
+                        "type": "SameOrAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Month",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
+                              "operand": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                }
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
+                            "then": {
+                              "type": "Null",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                }
                               },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
+                              "high": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                }
                               }
                             }
                           },
@@ -17146,8 +53728,18 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
@@ -17159,36 +53751,37 @@
                               "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "12",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "1",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "2013",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "12",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                                "value": "1",
                                 "annotation": []
                               }
                             }
@@ -17200,6 +53793,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -17209,15 +53803,41 @@
                 }
               },
               {
-                "name": "TimeIncludedInTrue",
+                "name": "TestOnOrAfterTimeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "IncludedIn",
+                        "type": "SameOrAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Hour",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -17226,43 +53846,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "6",
+                                "value": "10",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "0",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
+                                "value": "19",
                                 "annotation": []
                               },
                               "minute": {
@@ -17290,43 +53921,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "8",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "0",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "9",
                                 "annotation": []
                               },
                               "minute": {
@@ -17356,6 +53998,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -17365,15 +54008,41 @@
                 }
               },
               {
-                "name": "TimeIncludedInFalse",
+                "name": "TestOnOrAfterTimeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "IncludedIn",
+                        "type": "SameOrAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Hour",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -17382,43 +54051,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
+                                "value": "10",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "0",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
+                                "value": "19",
                                 "annotation": []
                               },
                               "minute": {
@@ -17446,43 +54126,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "8",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "0",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "11",
                                 "annotation": []
                               },
                               "minute": {
@@ -17512,6 +54203,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -17521,15 +54213,40 @@
                 }
               },
               {
-                "name": "DateTimeIncludedInNull",
+                "name": "TestOnOrAfterIntegerTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "IncludedIn",
+                        "type": "SameOrAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -17538,187 +54255,209 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "6",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "If",
+                            "annotation": [],
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "hour": {
+                              "operand": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "6",
                                 "annotation": []
-                              },
-                              "minute": {
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "6",
                                 "annotation": []
                               },
-                              "second": {
+                              "high": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "6",
                                 "annotation": []
                               }
                             }
-                          },
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrAfterDecimalFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "SameOrAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
+                              "operand": {
                                 "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "2.5",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "30",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "23",
-                                "annotation": []
-                              },
-                              "minute": {
+                              "low": {
                                 "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "2.5",
                                 "annotation": []
                               },
-                              "second": {
+                              "high": {
                                 "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "2.5",
                                 "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              }
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.666",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "2.50000001",
+                              "annotation": []
                             }
                           }
                         ]
@@ -17727,7 +54466,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -17735,103 +54477,88 @@
                 }
               },
               {
-                "name": "DateTimeIncludedInPrecisionTrue",
+                "name": "TestOnOrAfterQuantityTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "IncludedIn",
-                        "precision": "Day",
+                        "type": "SameOrAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "operand": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 2.5,
+                                "unit": "mg",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "DateTime",
+                            "then": {
+                              "type": "Null",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 2.5,
+                                "unit": "mg",
                                 "annotation": []
                               },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "high": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 2.5,
+                                "unit": "mg",
                                 "annotation": []
                               }
                             }
@@ -17841,99 +54568,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1.666,
+                              "unit": "mg",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "30",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "23",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 2.5,
+                              "unit": "mg",
+                              "annotation": []
                             }
                           }
                         ]
@@ -17943,25 +54599,522 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
                       }
-                    }
-                  ]
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "OnOrBefore",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestOnOrBeforeNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrBeforeDateTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrBeforeDateFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrBeforeTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrBeforeTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrBeforeIntegerTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrBeforeDecimalFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrBeforeQuantityTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestOnOrBeforeNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrBeforeDateTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrBeforeDateFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrBeforeTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrBeforeTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrBeforeIntegerTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrBeforeDecimalFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestOnOrBeforeQuantityTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "DateTimeIncludedInPrecisionNull",
+                "name": "TestOnOrBeforeNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "IncludedIn",
-                        "precision": "Millisecond",
+                        "type": "SameOrBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -17970,20 +55123,30 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
+                                "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
+                                "value": "12",
                                 "annotation": []
                               },
                               "day": {
@@ -17991,40 +55154,23 @@
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
                               }
                             },
                             "high": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
+                                "value": "2013",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
+                                "value": "12",
                                 "annotation": []
                               },
                               "day": {
@@ -18032,46 +55178,132 @@
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              }
+                            }
+                          },
+                          {
+                            "type": "As",
+                            "strict": false,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
                                 "annotation": []
+                              }
+                            },
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "localId": "10209",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "localId": "10210",
+                                  "name": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": []
+                                }
                               },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
                                 "annotation": []
                               }
                             }
-                          },
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestOnOrBeforeDateTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "SameOrBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Month",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
+                                "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
+                                "value": "10",
                                 "annotation": []
                               },
                               "day": {
@@ -18079,193 +55311,132 @@
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
                               }
                             },
                             "high": {
-                              "type": "DateTime",
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2017",
+                                "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "11",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "30",
-                                "annotation": []
-                              },
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "23",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "1",
                                 "annotation": []
                               }
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Intersect",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "TestIntersectNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (Interval[5, 10] vs Interval[5, null))",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TestIntersectNull1",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "LessOrEqual",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
+                          },
                           {
-                            "type": "Start",
+                            "type": "If",
                             "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Intersect",
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "operand": [
-                                {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": true,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  }
+                              "operand": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
                                 },
-                                {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": false,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "As",
-                                    "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "annotation": [],
-                                    "signature": [],
-                                    "operand": {
-                                      "type": "Null",
-                                      "annotation": []
-                                    }
-                                  }
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
                                 }
-                              ]
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                }
+                              },
+                              "high": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                }
+                              }
                             }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
                           }
                         ]
                       }
@@ -18274,6 +55445,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -18283,161 +55455,206 @@
                 }
               },
               {
-                "name": "TestIntersectNull2",
+                "name": "TestOnOrBeforeDateFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "GreaterOrEqual",
+                        "type": "SameOrBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Month",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Start",
+                            "type": "If",
                             "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Intersect",
+                            "condition": {
+                              "type": "IsNull",
                               "annotation": [],
                               "signature": [],
-                              "operand": [
-                                {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": true,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  }
+                              "operand": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Date",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                }
+                              },
+                              "high": {
+                                "type": "Date",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "11",
+                                  "annotation": []
                                 },
-                                {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": false,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "As",
-                                    "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "annotation": [],
-                                    "signature": [],
-                                    "operand": {
-                                      "type": "Null",
-                                      "annotation": []
-                                    }
-                                  }
+                                "day": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
                                 }
-                              ]
+                              }
                             }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "5",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TestIntersectNull3",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Greater",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Start",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Intersect",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
-                              "operand": [
-                                {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": true,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  }
-                                },
-                                {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": false,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "As",
-                                    "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "annotation": [],
-                                    "signature": [],
-                                    "operand": {
-                                      "type": "Null",
-                                      "annotation": []
-                                    }
-                                  }
-                                }
-                              ]
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2013",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
                             }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
                           }
                         ]
                       }
@@ -18446,6 +55663,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -18455,75 +55673,193 @@
                 }
               },
               {
-                "name": "TestIntersectNull4",
+                "name": "TestOnOrBeforeTimeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Less",
+                        "type": "SameOrBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Hour",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Start",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Intersect",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
-                              "operand": [
-                                {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": true,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  }
-                                },
-                                {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": false,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "As",
-                                    "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "annotation": [],
-                                    "signature": [],
-                                    "operand": {
-                                      "type": "Null",
-                                      "annotation": []
-                                    }
-                                  }
-                                }
-                              ]
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "7",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             }
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "5",
-                            "annotation": []
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "8",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
+                            },
+                            "high": {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "9",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
                           }
                         ]
                       }
@@ -18532,8 +55868,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -18541,15 +55878,41 @@
                 }
               },
               {
-                "name": "IntegerIntervalIntersectTest4to10",
+                "name": "TestOnOrBeforeTimeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Intersect",
+                        "type": "SameOrBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "precision": "Hour",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -18558,17 +55921,74 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "19",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -18576,17 +55996,74 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "8",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "11",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
@@ -18595,37 +56072,51 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
-                        "annotation": [],
-                        "low": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "4",
-                          "annotation": []
-                        },
-                        "high": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "10",
-                          "annotation": []
-                        }
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "IntegerIntervalIntersectTestNull",
+                "name": "TestOnOrBeforeIntegerTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Intersect",
+                        "type": "SameOrBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -18634,35 +56125,77 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "6",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "6",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "6",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "6",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
@@ -18671,7 +56204,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -18679,34 +56215,90 @@
                 }
               },
               {
-                "name": "DecimalIntervalIntersectTest4to10",
+                "name": "TestOnOrBeforeDecimalFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Intersect",
+                        "type": "SameOrBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "1.6667",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "1.6667",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "1.6667",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -18714,16 +56306,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
+                              "value": "1.666",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "value": "2.50000001",
                               "annotation": []
                             }
                           }
@@ -18733,56 +56336,101 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
-                        "annotation": [],
-                        "low": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "4.0",
-                          "annotation": []
-                        },
-                        "high": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "10.0",
-                          "annotation": []
-                        }
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalIntersectTestNull",
+                "name": "TestOnOrBeforeQuantityTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Intersect",
+                        "type": "SameOrBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                            "type": "If",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
+                            "condition": {
+                              "type": "IsNull",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 1.666,
+                                "unit": "mg",
+                                "annotation": []
+                              }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
+                            "then": {
+                              "type": "Null",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "IntervalTypeSpecifier",
+                                "annotation": [],
+                                "pointType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                  "annotation": []
+                                }
+                              }
+                            },
+                            "else": {
+                              "type": "Interval",
+                              "lowClosed": true,
+                              "highClosed": true,
+                              "annotation": [],
+                              "low": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 1.666,
+                                "unit": "mg",
+                                "annotation": []
+                              },
+                              "high": {
+                                "type": "Quantity",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "value": 1.666,
+                                "unit": "mg",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -18790,16 +56438,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1.666,
+                              "unit": "mg",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 2.5,
+                              "unit": "mg",
                               "annotation": []
                             }
                           }
@@ -18808,8 +56467,406 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Overlaps",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestOverlapsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalOverlapsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalOverlapsTrue2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalOverlapsTrue3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalOverlapsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsTrue2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsTrue3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsTrue4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsFalse2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsFalse3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsFalse4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalOverlapsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -18817,137 +56874,55 @@
                 }
               },
               {
-                "name": "QuantityIntervalIntersectTest5to10",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalOverlapsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Intersect",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 5,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
-                        "annotation": [],
-                        "low": {
-                          "type": "Quantity",
-                          "value": 5,
-                          "unit": "g",
-                          "annotation": []
-                        },
-                        "high": {
-                          "type": "Quantity",
-                          "value": 10,
-                          "unit": "g",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "QuantityIntervalIntersectTestNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalOverlapsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Intersect",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -18955,467 +56930,111 @@
                 }
               },
               {
-                "name": "DateTimeIntersect",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalOverlapsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Intersect",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
-                        "annotation": [],
-                        "low": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2012",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "7",
-                            "annotation": []
-                          }
-                        },
-                        "high": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2012",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "TimeIntersect",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeOverlapsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Intersect",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "6",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
-                        "annotation": [],
-                        "low": {
-                          "type": "Time",
-                          "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "4",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "999",
-                            "annotation": []
-                          }
-                        },
-                        "high": {
-                          "type": "Time",
-                          "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "6",
-                            "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
-                            "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "999",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeOverlapsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Equivalent",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "IntegerIntervalEquivalentTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeOverlapsPrecisionLeftPossiblyStartsDuringRight",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -19423,63 +57042,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalEquivalentFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeOverlapsPrecisioLeftPossiblyEndsDuringRight",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "44",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "50",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -19487,63 +57070,27 @@
                 }
               },
               {
-                "name": "DecimalIntervalEquivalentTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeOverlapsPrecisionLeftPossiblyStartsAndEndsDuringRight",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -19551,63 +57098,27 @@
                 }
               },
               {
-                "name": "DecimalIntervalEquivalentFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeOverlapsPrecisionRightPossiblyStartsDuringLeftButEndsDuringLeft",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -19615,63 +57126,27 @@
                 }
               },
               {
-                "name": "QuantityIntervalEquivalentTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeOverlapsPrecisionRightStartsDuringLeftAndPossiblyEndsDuringLeft",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -19679,195 +57154,820 @@
                 }
               },
               {
-                "name": "QuantityIntervalEquivalentFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeOverlapsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeOverlapsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestOverlapsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalOverlapsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalOverlapsTrue2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalOverlapsTrue3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalOverlapsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsTrue2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsTrue3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsTrue4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsFalse2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsFalse3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsFalse4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalOverlapsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalOverlapsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalOverlapsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalOverlapsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsPrecisionLeftPossiblyStartsDuringRight",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsPrecisioLeftPossiblyEndsDuringRight",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsPrecisionLeftPossiblyStartsAndEndsDuringRight",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsPrecisionRightPossiblyStartsDuringLeftButEndsDuringLeft",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsPrecisionRightStartsDuringLeftAndPossiblyEndsDuringLeft",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeOverlapsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeOverlapsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "DateTimeEquivalentTrue",
+                "name": "TestOverlapsNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (Interval[null, null] should overlap everything)",
                         "annotation": []
                       }
                     }
@@ -19875,15 +57975,40 @@
                 }
               },
               {
-                "name": "DateTimeEquivalentFalse",
+                "name": "IntegerIntervalOverlapsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Equivalent",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -19892,51 +58017,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           },
                           {
@@ -19944,51 +58046,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -19998,8 +58077,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -20007,15 +58087,40 @@
                 }
               },
               {
-                "name": "TimeEquivalentTrue",
+                "name": "IntegerIntervalOverlapsTrue2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Equivalent",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -20024,63 +58129,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           },
                           {
@@ -20088,63 +58158,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -20154,6 +58189,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -20163,80 +58199,70 @@
                 }
               },
               {
-                "name": "TimeEquivalentFalse",
+                "name": "IntegerIntervalOverlapsTrue3",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Equivalent",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
                             }
                           },
                           {
@@ -20244,63 +58270,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "58",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -20310,80 +58301,108 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Meets",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestMeetsNull",
+                "name": "IntegerIntervalOverlapsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
-                            "lowClosed": false,
+                            "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                              "value": "10",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": false,
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
+                              "value": "20",
                               "annotation": []
                             }
                           }
@@ -20393,7 +58412,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -20401,31 +58423,67 @@
                 }
               },
               {
-                "name": "IntegerIntervalMeetsTrue",
+                "name": "IntegerIntervalExclusiveOverlapsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -20434,18 +58492,29 @@
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
+                              "value": "10",
                               "annotation": []
                             }
                           }
@@ -20456,6 +58525,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -20465,33 +58535,69 @@
                 }
               },
               {
-                "name": "IntegerIntervalMeetsFalse",
+                "name": "IntegerIntervalExclusiveOverlapsTrue2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "11",
                               "annotation": []
                             }
                           },
@@ -20500,16 +58606,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "44",
+                              "value": "10",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "50",
+                              "value": "20",
                               "annotation": []
                             }
                           }
@@ -20520,8 +58637,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -20529,15 +58647,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalMeetsTrue",
+                "name": "IntegerIntervalExclusiveOverlapsTrue3",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -20546,34 +58689,56 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "3.01",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "5.00000001",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
-                            "lowClosed": true,
+                            "lowClosed": false,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "5.00000002",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "8.50",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
                               "annotation": []
                             }
                           }
@@ -20584,6 +58749,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -20593,51 +58759,98 @@
                 }
               },
               {
-                "name": "DecimalIntervalMeetsFalse",
+                "name": "IntegerIntervalExclusiveOverlapsTrue4",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "3.01",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "5.00000001",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
-                            "lowClosed": true,
+                            "lowClosed": false,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "5.5",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "8.50",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
                               "annotation": []
                             }
                           }
@@ -20648,8 +58861,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -20657,15 +58871,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalMeetsTrue",
+                "name": "IntegerIntervalExclusiveOverlapsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -20674,34 +58913,56 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 3.01,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 5.00000001,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
-                            "lowClosed": true,
+                            "lowClosed": false,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 5.00000002,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 8.5,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
                               "annotation": []
                             }
                           }
@@ -20712,8 +58973,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -20721,33 +58983,69 @@
                 }
               },
               {
-                "name": "QuantityIntervalMeetsFalse",
+                "name": "IntegerIntervalExclusiveOverlapsFalse2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 3.01,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 5.00000001,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             }
                           },
@@ -20756,16 +59054,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 5.5,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 8.5,
-                              "unit": "g",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
                               "annotation": []
                             }
                           }
@@ -20776,6 +59085,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -20785,120 +59095,99 @@
                 }
               },
               {
-                "name": "DateTimeMeetsTrue",
+                "name": "IntegerIntervalExclusiveOverlapsFalse3",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
-                            "lowClosed": true,
+                            "lowClosed": false,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
                             }
                           }
                         ]
@@ -20908,8 +59197,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -20917,120 +59207,99 @@
                 }
               },
               {
-                "name": "DateTimeMeetsFalse",
+                "name": "IntegerIntervalExclusiveOverlapsFalse4",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
-                            "lowClosed": true,
+                            "lowClosed": false,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
                             }
                           }
                         ]
@@ -21040,6 +59309,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -21049,15 +59319,40 @@
                 }
               },
               {
-                "name": "TimeMeetsTrue",
+                "name": "DecimalIntervalOverlapsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -21066,63 +59361,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
                             }
                           },
                           {
@@ -21130,63 +59390,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "4.0",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
                             }
                           }
                         ]
@@ -21196,6 +59421,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -21205,15 +59431,40 @@
                 }
               },
               {
-                "name": "TimeMeetsFalse",
+                "name": "DecimalIntervalOverlapsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -21222,63 +59473,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
                             }
                           },
                           {
@@ -21286,63 +59502,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "11.0",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "20.0",
+                              "annotation": []
                             }
                           }
                         ]
@@ -21352,6 +59533,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -21359,73 +59541,100 @@
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "MeetsBefore",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestMeetsBeforeNull",
+                "name": "QuantityIntervalOverlapsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "MeetsBefore",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
-                            "lowClosed": false,
+                            "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
-                            "lowClosed": false,
+                            "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
+                              "unit": "g",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "25",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           }
@@ -21435,7 +59644,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -21443,15 +59655,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalMeetsBeforeTrue",
+                "name": "QuantityIntervalOverlapsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "MeetsBefore",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -21460,16 +59697,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
@@ -21478,16 +59726,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 11,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 20,
+                              "unit": "g",
                               "annotation": []
                             }
                           }
@@ -21498,8 +59757,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -21507,15 +59767,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalMeetsBeforeFalse",
+                "name": "DateTimeOverlapsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "MeetsBefore",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -21524,17 +59809,68 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -21542,17 +59878,68 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "44",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "50",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "28",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
@@ -21562,8 +59949,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -21571,15 +59959,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalMeetsBeforeTrue",
+                "name": "DateTimeOverlapsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "MeetsBefore",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -21588,17 +60001,68 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "3.50000001",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "5.00000011",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -21606,17 +60070,68 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "5.00000012",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "26",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "8.50",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "28",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
@@ -21626,8 +60141,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -21635,15 +60151,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalMeetsBeforeFalse",
+                "name": "DateTimeOverlapsPrecisionLeftPossiblyStartsDuringRight",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "MeetsBefore",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -21652,17 +60193,68 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "8.01",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "15.00000001",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "3",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "26",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -21670,17 +60262,61 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "15.00000000",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "18.50",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
@@ -21689,9 +60325,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -21699,15 +60334,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalMeetsBeforeTrue",
+                "name": "DateTimeOverlapsPrecisioLeftPossiblyEndsDuringRight",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "MeetsBefore",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -21716,17 +60376,68 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 3.50000001,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 5.00000011,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "26",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -21734,17 +60445,61 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 5.00000012,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 8.5,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "3",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "28",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
@@ -21753,9 +60508,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -21763,15 +60517,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalMeetsBeforeFalse",
+                "name": "DateTimeOverlapsPrecisionLeftPossiblyStartsAndEndsDuringRight",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "MeetsBefore",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -21780,17 +60559,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 8.01,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 15.00000001,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "3",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -21798,17 +60614,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 15,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2011",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 18.5,
-                              "unit": "g",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
@@ -21817,9 +60670,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -21827,15 +60679,40 @@
                 }
               },
               {
-                "name": "DateTimeMeetsBeforeTrue",
+                "name": "DateTimeOverlapsPrecisionRightPossiblyStartsDuringLeftButEndsDuringLeft",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -21844,49 +60721,45 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
-                                "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "2013",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
+                                "value": "3",
                                 "annotation": []
                               }
                             }
@@ -21896,49 +60769,52 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                                "value": "2",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "2013",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
+                                "value": "2",
                                 "annotation": []
                               }
                             }
@@ -21950,6 +60826,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -21959,15 +60836,40 @@
                 }
               },
               {
-                "name": "DateTimeMeetsBeforeFalse",
+                "name": "DateTimeOverlapsPrecisionRightStartsDuringLeftAndPossiblyEndsDuringLeft",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -21976,49 +60878,45 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
+                                "value": "2",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
+                                "value": "2013",
                                 "annotation": []
                               }
                             }
@@ -22028,49 +60926,52 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
+                                "value": "3",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
+                                "value": "2013",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
+                                "value": "2",
                                 "annotation": []
                               }
                             }
@@ -22082,8 +60983,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -22091,15 +60993,40 @@
                 }
               },
               {
-                "name": "TimeMeetsBeforeTrue",
+                "name": "TimeOverlapsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -22108,43 +61035,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
+                                "value": "10",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "0",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
+                                "value": "19",
                                 "annotation": []
                               },
                               "minute": {
@@ -22172,14 +61110,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "12",
                                 "annotation": []
                               },
                               "minute": {
@@ -22203,12 +61151,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
+                                "value": "21",
                                 "annotation": []
                               },
                               "minute": {
@@ -22238,6 +61187,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -22247,15 +61197,40 @@
                 }
               },
               {
-                "name": "TimeMeetsBeforeFalse",
+                "name": "TimeOverlapsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -22264,43 +61239,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
+                                "value": "10",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "0",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
+                                "value": "19",
                                 "annotation": []
                               },
                               "minute": {
@@ -22328,20 +61314,30 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "20",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "0",
                                 "annotation": []
                               },
                               "second": {
@@ -22359,12 +61355,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
+                                "value": "21",
                                 "annotation": []
                               },
                               "minute": {
@@ -22392,94 +61389,238 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "OverlapsBefore",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestOverlapsBeforeNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalOverlapsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalOverlapsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalOverlapsBeforeFalse2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsBeforeTrue2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsBeforeTrue3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "MeetsAfter",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestMeetsAfterNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalExclusiveOverlapsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MeetsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": false,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -22487,63 +61628,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalMeetsAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalExclusiveOverlapsBeforeFalse2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MeetsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -22551,63 +61656,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalMeetsAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalExclusiveOverlapsBeforeFalse3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MeetsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "44",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "50",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -22615,63 +61684,27 @@
                 }
               },
               {
-                "name": "DecimalIntervalMeetsAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalOverlapsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MeetsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "55.00000123",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "128.032156",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "12.00258",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "55.00000122",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -22679,63 +61712,27 @@
                 }
               },
               {
-                "name": "DecimalIntervalMeetsAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalOverlapsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MeetsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "55.00000124",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "150.222222",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "12.00258",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "55.00000122",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -22743,63 +61740,27 @@
                 }
               },
               {
-                "name": "QuantityIntervalMeetsAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalOverlapsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MeetsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 55.00000123,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 128.032156,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 12.00258,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 55.00000122,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -22807,63 +61768,27 @@
                 }
               },
               {
-                "name": "QuantityIntervalMeetsAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalOverlapsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "MeetsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 55.00000124,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 150.222222,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 12.00258,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 55.00000122,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -22871,131 +61796,55 @@
                 }
               },
               {
-                "name": "DateTimeMeetsAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeOverlapsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Meets",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeOverlapsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -23003,131 +61852,27 @@
                 }
               },
               {
-                "name": "DateTimeMeetsAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeOverlapsBeforeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Meets",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "14",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -23135,155 +61880,568 @@
                 }
               },
               {
-                "name": "TimeMeetsAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeOverlapsBeforeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Meets",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestOverlapsBeforeNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalOverlapsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalOverlapsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalOverlapsBeforeFalse2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsBeforeTrue2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsBeforeTrue3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsBeforeFalse2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsBeforeFalse3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalOverlapsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalOverlapsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalOverlapsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalOverlapsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeOverlapsBeforeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeOverlapsBeforeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestOverlapsBeforeNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (Interval[null, null] should overlap before anything but another interval w/ null low closed boundary)",
                         "annotation": []
                       }
                     }
@@ -23291,15 +62449,40 @@
                 }
               },
               {
-                "name": "TimeMeetsAfterFalse",
+                "name": "IntegerIntervalOverlapsBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Meets",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -23308,63 +62491,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           },
                           {
@@ -23372,63 +62520,28 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -23438,89 +62551,121 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "NotEqual",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "IntegerIntervalNotEqualTrue",
+                "name": "IntegerIntervalOverlapsBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Not",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Equal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
-                          ]
-                        }
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -23528,66 +62673,109 @@
                 }
               },
               {
-                "name": "IntegerIntervalNotEqualFalse",
+                "name": "IntegerIntervalOverlapsBeforeFalse2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Not",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Equal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
-                          ]
-                        }
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -23597,66 +62785,109 @@
                 }
               },
               {
-                "name": "DecimalIntervalNotEqualTrue",
+                "name": "IntegerIntervalExclusiveOverlapsBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Not",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Equal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "1.0",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "10.0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "11.0",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "20.0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
-                          ]
-                        }
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -23666,68 +62897,111 @@
                 }
               },
               {
-                "name": "DecimalIntervalNotEqualFalse",
+                "name": "IntegerIntervalExclusiveOverlapsBeforeTrue2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Not",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Equal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "1.0",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "10.0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "1.0",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "10.0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
-                          ]
-                        }
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -23735,66 +63009,109 @@
                 }
               },
               {
-                "name": "QuantityIntervalNotEqualTrue",
+                "name": "IntegerIntervalExclusiveOverlapsBeforeTrue3",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Not",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Equal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 1,
-                                "unit": "g",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 10,
-                                "unit": "g",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 11,
-                                "unit": "g",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 20,
-                                "unit": "g",
-                                "annotation": []
-                              }
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
-                          ]
-                        }
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -23804,66 +63121,109 @@
                 }
               },
               {
-                "name": "QuantityIntervalNotEqualFalse",
+                "name": "IntegerIntervalExclusiveOverlapsBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Not",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Equal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 1,
-                                "unit": "g",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 10,
-                                "unit": "g",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 1,
-                                "unit": "g",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 10,
-                                "unit": "g",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
-                          ]
-                        }
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -23873,232 +63233,111 @@
                 }
               },
               {
-                "name": "DateTimeNotEqualTrue",
+                "name": "IntegerIntervalExclusiveOverlapsBeforeFalse2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Not",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Equal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                },
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "25",
-                                  "annotation": []
-                                },
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
                               }
                             },
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                },
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "25",
-                                  "annotation": []
-                                },
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "22",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
-                          ]
-                        }
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -24106,230 +63345,109 @@
                 }
               },
               {
-                "name": "DateTimeNotEqualFalse",
+                "name": "IntegerIntervalExclusiveOverlapsBeforeFalse3",
                 "value": {
                   "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Not",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Equal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                },
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "25",
-                                  "annotation": []
-                                },
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
                               }
                             },
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": false,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                },
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "25",
-                                  "annotation": []
-                                },
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
-                          ]
-                        }
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -24339,158 +63457,109 @@
                 }
               },
               {
-                "name": "TimeNotEqualTrue",
+                "name": "DecimalIntervalOverlapsBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Not",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Equal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "19",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
                               }
                             },
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "19",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "4.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
                             }
-                          ]
-                        }
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -24500,158 +63569,109 @@
                 }
               },
               {
-                "name": "TimeNotEqualFalse",
+                "name": "DecimalIntervalOverlapsBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Not",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Equal",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "low": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "19",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
                               }
                             },
-                            {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "0",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "19",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "4.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
                             }
-                          ]
-                        }
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -24659,29 +63679,42 @@
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "OnOrAfter",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestOnOrAfterNull",
+                "name": "QuantityIntervalOverlapsBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrAfter",
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -24690,70 +63723,169 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Date",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Date",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2013",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
                             }
-                          },
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalOverlapsBeforeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "OverlapsBefore",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
                           {
-                            "type": "As",
-                            "strict": false,
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
+                              "unit": "g",
                               "annotation": []
                             },
-                            "asTypeSpecifier": {
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
                               "type": "IntervalTypeSpecifier",
                               "annotation": [],
                               "pointType": {
                                 "type": "NamedTypeSpecifier",
-                                "name": "{urn:hl7-org:elm-types:r1}Date",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
+                              "annotation": []
                             }
                           }
                         ]
@@ -24762,7 +63894,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -24770,16 +63905,40 @@
                 }
               },
               {
-                "name": "TestOnOrAfterDateTrue",
+                "name": "DateTimeOverlapsBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrAfter",
-                        "precision": "Month",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -24788,138 +63947,136 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Date",
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "5",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "Date",
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2013",
+                                "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "25",
                                 "annotation": []
                               }
                             }
                           },
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
-                              "low": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
                               },
-                              "high": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "28",
+                                "annotation": []
                               }
                             }
                           }
@@ -24930,6 +64087,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -24939,104 +64097,109 @@
                 }
               },
               {
-                "name": "TestOnOrAfterDateFalse",
+                "name": "DateTimeOverlapsBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrAfter",
-                        "precision": "Month",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
+                            "low": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
+                            "high": {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
-                              "low": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
                               },
-                              "high": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
                               }
                             }
                           },
@@ -25045,49 +64208,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Date",
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "26",
                                 "annotation": []
                               }
                             },
                             "high": {
-                              "type": "Date",
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2013",
+                                "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "28",
                                 "annotation": []
                               }
                             }
@@ -25099,6 +64279,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -25108,16 +64289,40 @@
                 }
               },
               {
-                "name": "TestOnOrAfterTimeTrue",
+                "name": "TimeOverlapsBeforeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrAfter",
-                        "precision": "Hour",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -25126,8 +64331,18 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -25157,6 +64372,7 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -25190,14 +64406,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "8",
+                                "value": "12",
                                 "annotation": []
                               },
                               "minute": {
@@ -25221,12 +64447,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
+                                "value": "21",
                                 "annotation": []
                               },
                               "minute": {
@@ -25256,6 +64483,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -25265,16 +64493,40 @@
                 }
               },
               {
-                "name": "TestOnOrAfterTimeFalse",
+                "name": "TimeOverlapsBeforeFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrAfter",
-                        "precision": "Hour",
+                        "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -25283,8 +64535,18 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -25314,6 +64576,7 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -25347,14 +64610,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "8",
+                                "value": "20",
                                 "annotation": []
                               },
                               "minute": {
@@ -25378,12 +64651,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
+                                "value": "21",
                                 "annotation": []
                               },
                               "minute": {
@@ -25408,13 +64682,1062 @@
                           }
                         ]
                       }
-                    },
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "OverlapsAfter",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestOverlapsAfterNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalOverlapsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalOverlapsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalOverlapsAfterFalse2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsAfterTrue2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsAfterTrue3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsAfterFalse2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsAfterFalse3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalOverlapsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalOverlapsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalOverlapsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalOverlapsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeOverlapsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeOverlapsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeOverlapsAfterTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeOverlapsAfterFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestOverlapsAfterNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalOverlapsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalOverlapsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalOverlapsAfterFalse2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsAfterTrue2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsAfterTrue3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsAfterFalse2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalExclusiveOverlapsAfterFalse3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalOverlapsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalOverlapsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalOverlapsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalOverlapsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeOverlapsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeOverlapsAfterTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeOverlapsAfterFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TestOverlapsAfterNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (Interval[null, null] should overlap after anything but another interval w/ null high closed boundary)",
                         "annotation": []
                       }
                     }
@@ -25422,15 +65745,40 @@
                 }
               },
               {
-                "name": "TestOnOrAfterIntegerTrue",
+                "name": "IntegerIntervalOverlapsAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrAfter",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -25439,54 +65787,57 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "6",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "15",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "6",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
                               "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "6",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "6",
-                                "annotation": []
-                              }
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -25496,6 +65847,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -25505,53 +65857,70 @@
                 }
               },
               {
-                "name": "TestOnOrAfterDecimalFalse",
+                "name": "IntegerIntervalOverlapsAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrAfter",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "2.5",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
                               "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "2.5",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "2.5",
-                                "annotation": []
-                              }
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           },
                           {
@@ -25559,16 +65928,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.666",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "2.50000001",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             }
                           }
@@ -25579,6 +65959,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -25588,53 +65969,70 @@
                 }
               },
               {
-                "name": "TestOnOrAfterQuantityTrue",
+                "name": "IntegerIntervalOverlapsAfterFalse2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrAfter",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Quantity",
-                                "value": 2.5,
-                                "unit": "mg",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
                               "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 2.5,
-                                "unit": "mg",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 2.5,
-                                "unit": "mg",
-                                "annotation": []
-                              }
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           },
                           {
@@ -25642,16 +66040,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 1.666,
-                              "unit": "mg",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 2.5,
-                              "unit": "mg",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             }
                           }
@@ -25662,275 +66071,109 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "OnOrBefore",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TestOnOrBeforeNull",
+                "name": "IntegerIntervalExclusiveOverlapsAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrBefore",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2013",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "strict": false,
+                            "highClosed": false,
                             "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "asTypeSpecifier": {
+                            "resultTypeSpecifier": {
                               "type": "IntervalTypeSpecifier",
                               "annotation": [],
                               "pointType": {
                                 "type": "NamedTypeSpecifier",
-                                "name": "{urn:hl7-org:elm-types:r1}Date",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TestOnOrBeforeDateTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "SameOrBefore",
-                        "precision": "Month",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
-                            }
-                          },
-                          {
-                            "type": "If",
-                            "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
-                              }
-                            },
-                            "then": {
-                              "type": "Null",
-                              "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
+                              "annotation": []
                             }
                           }
                         ]
@@ -25940,6 +66183,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -25949,157 +66193,99 @@
                 }
               },
               {
-                "name": "TestOnOrBeforeDateFalse",
+                "name": "IntegerIntervalExclusiveOverlapsAfterTrue2",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrBefore",
-                        "precision": "Month",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": false,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
                               "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
-                              },
-                              "high": {
-                                "type": "Date",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "11",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                }
-                              }
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
-                            "low": {
-                              "type": "Date",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Date",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2013",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -26109,8 +66295,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -26118,16 +66305,40 @@
                 }
               },
               {
-                "name": "TestOnOrBeforeTimeTrue",
+                "name": "IntegerIntervalExclusiveOverlapsAfterTrue3",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrBefore",
-                        "precision": "Hour",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -26136,127 +66347,57 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "7",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "8",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "9",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -26266,6 +66407,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -26275,145 +66417,211 @@
                 }
               },
               {
-                "name": "TestOnOrBeforeTimeFalse",
+                "name": "IntegerIntervalExclusiveOverlapsAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrBefore",
-                        "precision": "Hour",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": true,
+                            "highClosed": false,
                             "annotation": [],
-                            "low": {
-                              "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "8",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                              }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalExclusiveOverlapsAfterFalse2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": false,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
                             "high": {
-                              "type": "Time",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "11",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
+                            },
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
+                              "annotation": []
+                            },
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -26423,6 +66631,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -26432,15 +66641,40 @@
                 }
               },
               {
-                "name": "TestOnOrBeforeIntegerTrue",
+                "name": "IntegerIntervalExclusiveOverlapsAfterFalse3",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrBefore",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -26449,54 +66683,57 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "6",
+                              "value": "10",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": false,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "6",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "4",
                               "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "6",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "6",
-                                "annotation": []
-                              }
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "11",
+                              "annotation": []
                             }
                           }
                         ]
@@ -26506,8 +66743,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -26515,53 +66753,70 @@
                 }
               },
               {
-                "name": "TestOnOrBeforeDecimalFalse",
+                "name": "DecimalIntervalOverlapsAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrBefore",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "1.6667",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "4.0",
                               "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "1.6667",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                "value": "1.6667",
-                                "annotation": []
-                              }
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "15.0",
+                              "annotation": []
                             }
                           },
                           {
@@ -26569,16 +66824,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.666",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "2.50000001",
+                              "value": "10.0",
                               "annotation": []
                             }
                           }
@@ -26589,8 +66855,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -26598,53 +66865,70 @@
                 }
               },
               {
-                "name": "TestOnOrBeforeQuantityTrue",
+                "name": "DecimalIntervalOverlapsAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "SameOrBefore",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "If",
+                            "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "condition": {
-                              "type": "IsNull",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Quantity",
-                                "value": 1.666,
-                                "unit": "mg",
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": []
                               }
                             },
-                            "then": {
-                              "type": "Null",
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "4.0",
                               "annotation": []
                             },
-                            "else": {
-                              "type": "Interval",
-                              "lowClosed": true,
-                              "highClosed": true,
-                              "annotation": [],
-                              "low": {
-                                "type": "Quantity",
-                                "value": 1.666,
-                                "unit": "mg",
-                                "annotation": []
-                              },
-                              "high": {
-                                "type": "Quantity",
-                                "value": 1.666,
-                                "unit": "mg",
-                                "annotation": []
-                              }
+                            "high": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
                             }
                           },
                           {
@@ -26652,16 +66936,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Quantity",
-                              "value": 1.666,
-                              "unit": "mg",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Quantity",
-                              "value": 2.5,
-                              "unit": "mg",
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
                               "annotation": []
                             }
                           }
@@ -26672,38 +66967,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Overlaps",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "TestOverlapsNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (Interval[null, null] should overlap everything)",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -26711,15 +66977,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalOverlapsTrue",
+                "name": "QuantityIntervalOverlapsAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -26728,16 +67019,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 15,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
@@ -26746,16 +67048,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           }
@@ -26766,6 +67079,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -26775,15 +67089,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalOverlapsTrue2",
+                "name": "QuantityIntervalOverlapsAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "OverlapsAfter",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -26792,16 +67131,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           },
@@ -26810,16 +67160,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
+                              "unit": "g",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
+                              "unit": "g",
                               "annotation": []
                             }
                           }
@@ -26830,8 +67191,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -26839,15 +67201,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalOverlapsTrue3",
+                "name": "DateTimeOverlapsAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -26856,17 +67243,68 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "28",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -26874,17 +67312,68 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
@@ -26894,6 +67383,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -26903,15 +67393,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalOverlapsFalse",
+                "name": "DateTimeOverlapsAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -26920,17 +67435,68 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "26",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "28",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -26938,17 +67504,68 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "25",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
@@ -26958,6 +67575,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -26967,52 +67585,191 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsTrue",
+                "name": "TimeOverlapsAfterTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": false,
+                            "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "12",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "21",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             }
                           },
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": false,
+                            "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "19",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
@@ -27022,6 +67779,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -27031,34 +67789,116 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsTrue2",
+                "name": "TimeOverlapsAfterFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Overlaps",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": false,
+                            "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "20",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "21",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             }
                           },
                           {
@@ -27066,92 +67906,296 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "0",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "19",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
                             }
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "PointFrom",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestPointFromNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestPointFromInteger",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestPointFromDecimal",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TestPointFromQuantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestPointFromNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestPointFromInteger",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
+                },
+                {
+                  "name": "TestPointFromDecimal",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TestPointFromQuantity",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "IntegerIntervalExclusiveOverlapsTrue3",
+                "name": "TestPointFromNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "PointFrom not implemented",
                         "annotation": []
                       }
                     }
@@ -27159,63 +68203,33 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsTrue4",
+                "name": "TestPointFromInteger",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": false,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "PointFrom not implemented",
                         "annotation": []
                       }
                     }
@@ -27223,63 +68237,33 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsFalse",
+                "name": "TestPointFromDecimal",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "PointFrom not implemented",
                         "annotation": []
                       }
                     }
@@ -27287,127 +68271,64 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsFalse2",
+                "name": "TestPointFromQuantity",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": false,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "PointFrom not implemented",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              },
+              }
+            ]
+          }
+        },
+        {
+          "name": "ProperContains",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
               {
-                "name": "IntegerIntervalExclusiveOverlapsFalse3",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeProperContainsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": false,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -27415,63 +68336,37 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsFalse4",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeProperContainsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": false,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
-                    },
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeProperContainsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
                     {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -27479,63 +68374,37 @@
                 }
               },
               {
-                "name": "DecimalIntervalOverlapsTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeProperContainsPrecisionTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
-                    },
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeProperContainsPrecisionFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
                     {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -27543,63 +68412,178 @@
                 }
               },
               {
-                "name": "DecimalIntervalOverlapsFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeProperContainsPrecisionNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TimeProperContainsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "11.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "20.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperContainsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperContainsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperContainsPrecisionTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperContainsPrecisionFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperContainsPrecisionNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TimeProperContainsTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperContains not implemented",
                         "annotation": []
                       }
                     }
@@ -27607,63 +68591,33 @@
                 }
               },
               {
-                "name": "QuantityIntervalOverlapsTrue",
+                "name": "TimeProperContainsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 5,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperContains not implemented",
                         "annotation": []
                       }
                     }
@@ -27671,63 +68625,33 @@
                 }
               },
               {
-                "name": "QuantityIntervalOverlapsFalse",
+                "name": "TimeProperContainsNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 11,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 20,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperContains not implemented",
                         "annotation": []
                       }
                     }
@@ -27735,131 +68659,33 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsTrue",
+                "name": "TimeProperContainsPrecisionTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperContains not implemented",
                         "annotation": []
                       }
                     }
@@ -27867,131 +68693,33 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsFalse",
+                "name": "TimeProperContainsPrecisionFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "26",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperContains not implemented",
                         "annotation": []
                       }
                     }
@@ -27999,123 +68727,64 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsPrecisionLeftPossiblyStartsDuringRight",
+                "name": "TimeProperContainsPrecisionNull",
                 "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "3",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "26",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperContains not implemented",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "ProperIn",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TimeProperInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -28123,123 +68792,37 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsPrecisioLeftPossiblyEndsDuringRight",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeProperInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "26",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "3",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
-                    },
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeProperInNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
                     {
-                      "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -28247,105 +68830,37 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsPrecisionLeftPossiblyStartsAndEndsDuringRight",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeProperInPrecisionTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "3",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2011",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
-                    },
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeProperInPrecisionFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
                     {
-                      "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -28353,101 +68868,178 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsPrecisionRightPossiblyStartsDuringLeftButEndsDuringLeft",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeProperInPrecisionNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TimeProperInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2013",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "3",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2013",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperInNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperInPrecisionTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperInPrecisionFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperInPrecisionNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TimeProperInTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperIn not implemented",
                         "annotation": []
                       }
                     }
@@ -28455,101 +69047,67 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsPrecisionRightStartsDuringLeftAndPossiblyEndsDuringLeft",
+                "name": "TimeProperInFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "expression",
+                      "name": "skipped",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperIn not implemented",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeProperInNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2013",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "3",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2013",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperIn not implemented",
                         "annotation": []
                       }
                     }
@@ -28557,155 +69115,33 @@
                 }
               },
               {
-                "name": "TimeOverlapsTrue",
+                "name": "TimeProperInPrecisionTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Overlaps",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "21",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperIn not implemented",
                         "annotation": []
                       }
                     }
@@ -28713,155 +69149,67 @@
                 }
               },
               {
-                "name": "TimeOverlapsFalse",
+                "name": "TimeProperInPrecisionFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "expression",
+                      "name": "skipped",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperIn not implemented",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeProperInPrecisionNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "21",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperIn not implemented",
                         "annotation": []
                       }
                     }
@@ -28872,26 +69220,36 @@
           }
         },
         {
-          "name": "OverlapsBefore",
+          "name": "ProperlyIncludes",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "TestOverlapsBeforeNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "NullBoundariesProperlyIncludesIntegerInterval",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (Interval[null, null] should overlap before anything but another interval w/ null low closed boundary)",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -28899,63 +69257,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalOverlapsBeforeTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalProperlyIncludesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsBefore",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -28963,63 +69285,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalOverlapsBeforeFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalProperlyIncludesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsBefore",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -29027,63 +69313,83 @@
                 }
               },
               {
-                "name": "IntegerIntervalOverlapsBeforeFalse2",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalProperlyIncludesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsBefore",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalProperlyIncludesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalProperlyIncludesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -29091,63 +69397,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsBeforeTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalProperlyIncludesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsBefore",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -29155,63 +69425,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsBeforeTrue2",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeProperlyIncludesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsBefore",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -29219,63 +69453,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsBeforeTrue3",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeProperlyIncludesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsBefore",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": false,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -29283,49 +69481,494 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsBeforeFalse",
+                "name": "TimeProperlyIncludesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeProperlyIncludesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "NullBoundariesProperlyIncludesIntegerInterval",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalProperlyIncludesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalProperlyIncludesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalProperlyIncludesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalProperlyIncludesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalProperlyIncludesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalProperlyIncludesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeProperlyIncludesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeProperlyIncludesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperlyIncludesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperlyIncludesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "NullBoundariesProperlyIncludesIntegerInterval",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsBefore",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
-                            "lowClosed": false,
+                            "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
-                              "annotation": []
+                              "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "strict": false,
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              },
+                              "asTypeSpecifier": {
+                                "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
+                              "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "strict": false,
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              },
+                              "asTypeSpecifier": {
+                                "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
                             }
                           },
                           {
                             "type": "Interval",
-                            "lowClosed": false,
+                            "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -29338,8 +69981,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -29347,31 +69991,67 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsBeforeFalse2",
+                "name": "IntegerIntervalProperlyIncludesTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsBefore",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
-                            "lowClosed": false,
+                            "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -29382,14 +70062,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -29402,8 +70093,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -29411,15 +70103,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsBeforeFalse3",
+                "name": "IntegerIntervalProperlyIncludesFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsBefore",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -29428,14 +70145,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -29443,19 +70171,30 @@
                           },
                           {
                             "type": "Interval",
-                            "lowClosed": false,
+                            "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "15",
                               "annotation": []
                             }
                           }
@@ -29466,6 +70205,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -29475,15 +70215,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalOverlapsBeforeTrue",
+                "name": "DecimalIntervalProperlyIncludesTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsBefore",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -29492,14 +70257,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.0",
                               "annotation": []
@@ -29510,14 +70286,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.0",
                               "annotation": []
@@ -29530,6 +70317,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -29539,15 +70327,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalOverlapsBeforeFalse",
+                "name": "DecimalIntervalProperlyIncludesFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsBefore",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -29556,14 +70369,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.0",
                               "annotation": []
@@ -29574,16 +70398,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "value": "4.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "value": "15.0",
                               "annotation": []
                             }
                           }
@@ -29594,6 +70429,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -29603,15 +70439,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalOverlapsBeforeTrue",
+                "name": "QuantityIntervalProperlyIncludesTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsBefore",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -29620,14 +70481,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 1,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 10,
                               "unit": "g",
                               "annotation": []
@@ -29638,14 +70510,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 5,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 10,
                               "unit": "g",
                               "annotation": []
@@ -29658,6 +70541,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -29667,15 +70551,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalOverlapsBeforeFalse",
+                "name": "QuantityIntervalProperlyIncludesFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsBefore",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -29684,14 +70593,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
-                              "value": 5,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 10,
                               "unit": "g",
                               "annotation": []
@@ -29702,15 +70622,26 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
-                              "value": 1,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
-                              "value": 10,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 15,
                               "unit": "g",
                               "annotation": []
                             }
@@ -29722,6 +70653,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -29731,15 +70663,40 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsBeforeTrue",
+                "name": "DateTimeProperlyIncludesTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -29748,49 +70705,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "15",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
+                                "value": "28",
                                 "annotation": []
                               }
                             }
@@ -29800,49 +70774,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                                "value": "16",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
+                                "value": "27",
                                 "annotation": []
                               }
                             }
@@ -29854,6 +70845,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -29863,15 +70855,40 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsBeforeFalse",
+                "name": "DateTimeProperlyIncludesFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -29880,49 +70897,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "15",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
+                                "value": "28",
                                 "annotation": []
                               }
                             }
@@ -29932,49 +70966,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "26",
+                                "value": "16",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
+                                "value": "29",
                                 "annotation": []
                               }
                             }
@@ -29986,6 +71037,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -29995,15 +71047,40 @@
                 }
               },
               {
-                "name": "TimeOverlapsBeforeTrue",
+                "name": "TimeProperlyIncludesTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -30012,14 +71089,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "12",
                                 "annotation": []
                               },
                               "minute": {
@@ -30043,12 +71130,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
+                                "value": "21",
                                 "annotation": []
                               },
                               "minute": {
@@ -30076,8 +71164,18 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -30089,13 +71187,13 @@
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "1",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "1",
                                 "annotation": []
                               },
                               "millisecond": {
@@ -30107,6 +71205,7 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -30130,7 +71229,7 @@
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "998",
                                 "annotation": []
                               }
                             }
@@ -30142,6 +71241,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -30151,15 +71251,40 @@
                 }
               },
               {
-                "name": "TimeOverlapsBeforeFalse",
+                "name": "TimeProperlyIncludesFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -30168,14 +71293,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "12",
                                 "annotation": []
                               },
                               "minute": {
@@ -30199,12 +71334,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
+                                "value": "21",
                                 "annotation": []
                               },
                               "minute": {
@@ -30232,26 +71368,36 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
+                                "value": "12",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "1",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "1",
                                 "annotation": []
                               },
                               "millisecond": {
@@ -30263,30 +71409,31 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "21",
+                                "value": "22",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "0",
                                 "annotation": []
                               }
                             }
@@ -30298,6 +71445,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -30310,26 +71458,36 @@
           }
         },
         {
-          "name": "OverlapsAfter",
+          "name": "ProperlyIncludedIn",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "TestOverlapsAfterNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalProperlyIncludedInNullBoundaries",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (Interval[null, null] should overlap after anything but another interval w/ null high closed boundary)",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -30337,63 +71495,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalOverlapsAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalProperlyIncludedInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -30401,63 +71523,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalOverlapsAfterFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalProperlyIncludedInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -30465,63 +71551,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalOverlapsAfterFalse2",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalProperlyIncludedInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -30529,63 +71579,111 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsAfterTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalProperlyIncludedInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": false,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalProperlyIncludedInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalProperlyIncludedInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeProperlyIncludedInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -30593,63 +71691,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsAfterTrue2",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeProperlyIncludedInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": false,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": false,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -30657,63 +71719,27 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsAfterTrue3",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeProperlyIncludedInTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "OverlapsAfter",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": false,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -30721,52 +71747,554 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsAfterFalse",
+                "name": "TimeProperlyIncludedInFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerIntervalProperlyIncludedInNullBoundaries",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalProperlyIncludedInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalProperlyIncludedInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalProperlyIncludedInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalProperlyIncludedInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalProperlyIncludedInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalProperlyIncludedInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeProperlyIncludedInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeProperlyIncludedInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperlyIncludedInTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeProperlyIncludedInFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "IntegerIntervalProperlyIncludedInNullBoundaries",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsAfter",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": false,
+                            "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
+                              "value": "10",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": false,
                             "annotation": [],
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Property",
+                                "path": "low",
+                                "annotation": [],
+                                "source": {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": true,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            },
+                            "lowClosedExpression": {
+                              "type": "Property",
+                              "path": "lowClosed",
+                              "annotation": [],
+                              "source": {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
-                              "annotation": []
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Property",
+                                "path": "high",
+                                "annotation": [],
+                                "source": {
+                                  "type": "Interval",
+                                  "lowClosed": true,
+                                  "highClosed": true,
+                                  "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "IntervalTypeSpecifier",
+                                    "annotation": [],
+                                    "pointType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
+                                  "low": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  },
+                                  "high": {
+                                    "type": "Null",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                }
+                              }
+                            },
+                            "highClosedExpression": {
+                              "type": "Property",
+                              "path": "highClosed",
+                              "annotation": [],
+                              "source": {
+                                "type": "Interval",
+                                "lowClosed": true,
+                                "highClosed": true,
+                                "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "IntervalTypeSpecifier",
+                                  "annotation": [],
+                                  "pointType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
+                                "low": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                },
+                                "high": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
                             }
                           }
                         ]
@@ -30776,8 +72304,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -30785,33 +72314,69 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsAfterFalse2",
+                "name": "IntegerIntervalProperlyIncludedInTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsAfter",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": false,
+                            "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
+                              "value": "10",
                               "annotation": []
                             }
                           },
@@ -30820,14 +72385,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -30840,8 +72416,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "value": "true",
                         "annotation": []
                       }
                     }
@@ -30849,15 +72426,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalExclusiveOverlapsAfterFalse3",
+                "name": "IntegerIntervalProperlyIncludedInFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsAfter",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -30866,34 +72468,56 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "15",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
                             "lowClosed": true,
-                            "highClosed": false,
+                            "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "11",
+                              "value": "10",
                               "annotation": []
                             }
                           }
@@ -30904,6 +72528,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -30913,15 +72538,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalOverlapsAfterTrue",
+                "name": "DecimalIntervalProperlyIncludedInTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsAfter",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -30930,16 +72580,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "15.0",
+                              "value": "10.0",
                               "annotation": []
                             }
                           },
@@ -30948,14 +72609,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.0",
                               "annotation": []
@@ -30968,6 +72640,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -30977,15 +72650,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalOverlapsAfterFalse",
+                "name": "DecimalIntervalProperlyIncludedInFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsAfter",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -30994,16 +72692,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "value": "15.0",
                               "annotation": []
                             }
                           },
@@ -31012,14 +72721,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.0",
                               "annotation": []
@@ -31032,6 +72752,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -31041,15 +72762,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalOverlapsAfterTrue",
+                "name": "QuantityIntervalProperlyIncludedInTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsAfter",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -31058,15 +72804,26 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 5,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
-                              "value": 15,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
                               "unit": "g",
                               "annotation": []
                             }
@@ -31076,14 +72833,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 1,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 10,
                               "unit": "g",
                               "annotation": []
@@ -31096,6 +72864,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -31105,15 +72874,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalOverlapsAfterFalse",
+                "name": "QuantityIntervalProperlyIncludedInFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "OverlapsAfter",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -31122,14 +72916,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
-                              "value": 5,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 10,
                               "unit": "g",
                               "annotation": []
@@ -31140,15 +72945,26 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
-                              "value": 1,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
-                              "value": 10,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 15,
                               "unit": "g",
                               "annotation": []
                             }
@@ -31160,6 +72976,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -31169,15 +72986,40 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsAfterTrue",
+                "name": "DateTimeProperlyIncludedInTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -31186,49 +73028,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                                "value": "16",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
+                                "value": "27",
                                 "annotation": []
                               }
                             }
@@ -31238,49 +73097,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "15",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
+                                "value": "28",
                                 "annotation": []
                               }
                             }
@@ -31292,6 +73168,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -31301,15 +73178,40 @@
                 }
               },
               {
-                "name": "DateTimeOverlapsAfterFalse",
+                "name": "DateTimeProperlyIncludedInFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -31318,49 +73220,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "26",
+                                "value": "16",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
+                                "value": "29",
                                 "annotation": []
                               }
                             }
@@ -31370,49 +73289,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "15",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
+                                "value": "28",
                                 "annotation": []
                               }
                             }
@@ -31424,6 +73360,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -31433,15 +73370,40 @@
                 }
               },
               {
-                "name": "TimeOverlapsAfterTrue",
+                "name": "TimeProperlyIncludedInTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -31450,8 +73412,18 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -31463,13 +73435,13 @@
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "1",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "1",
                                 "annotation": []
                               },
                               "millisecond": {
@@ -31481,6 +73453,7 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -31504,7 +73477,7 @@
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "998",
                                 "annotation": []
                               }
                             }
@@ -31514,14 +73487,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "12",
                                 "annotation": []
                               },
                               "minute": {
@@ -31545,12 +73528,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
+                                "value": "21",
                                 "annotation": []
                               },
                               "minute": {
@@ -31580,6 +73564,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -31589,15 +73574,40 @@
                 }
               },
               {
-                "name": "TimeOverlapsAfterFalse",
+                "name": "TimeProperlyIncludedInFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Overlaps",
+                        "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -31606,26 +73616,36 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
+                                "value": "12",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "1",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "1",
                                 "annotation": []
                               },
                               "millisecond": {
@@ -31637,30 +73657,31 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "21",
+                                "value": "22",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
+                                "value": "0",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
+                                "value": "0",
                                 "annotation": []
                               }
                             }
@@ -31670,14 +73691,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
+                                "value": "12",
                                 "annotation": []
                               },
                               "minute": {
@@ -31701,12 +73732,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "19",
+                                "value": "21",
                                 "annotation": []
                               },
                               "minute": {
@@ -31736,6 +73768,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -31748,44 +73781,36 @@
           }
         },
         {
-          "name": "PointFrom",
+          "name": "Start",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "TestPointFromNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalStart",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "PointFrom not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TestPointFromInteger",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "PointFrom not implemented",
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -31793,83 +73818,55 @@
                 }
               },
               {
-                "name": "TestPointFromDecimal",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalStart",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "PointFrom not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TestPointFromQuantity",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "PointFrom not implemented",
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "ProperContains",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TimeProperContainsTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalStart",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperContains not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": []
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeProperContainsFalse",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperContains not implemented",
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": []
                       }
                     }
@@ -31877,35 +73874,27 @@
                 }
               },
               {
-                "name": "TimeProperContainsNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeIntervalStart",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperContains not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": []
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeProperContainsPrecisionTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperContains not implemented",
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": []
                       }
                     }
@@ -31913,35 +73902,27 @@
                 }
               },
               {
-                "name": "TimeProperContainsPrecisionFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeIntervalStart",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperContains not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": []
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeProperContainsPrecisionNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperContains not implemented",
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": []
                       }
                     }
@@ -31949,213 +73930,313 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "ProperIn",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
-            "element": [
-              {
-                "name": "TimeProperInTrue",
-                "value": {
-                  "type": "Tuple",
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerIntervalStart",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperIn not implemented",
-                        "annotation": []
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeProperInFalse",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalStart",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperIn not implemented",
-                        "annotation": []
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeProperInNull",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalStart",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperIn not implemented",
-                        "annotation": []
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeProperInPrecisionTrue",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIntervalStart",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperIn not implemented",
-                        "annotation": []
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeIntervalStart",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "TimeProperInPrecisionFalse",
+                "name": "IntegerIntervalStart",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperIn not implemented",
-                        "annotation": []
+                        "type": "Start",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "high": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          }
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeProperInPrecisionNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperIn not implemented",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "ProperlyIncludes",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "NullBoundariesProperlyIncludesIntegerInterval",
+                "name": "DecimalIntervalStart",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludes",
+                        "type": "Start",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "As",
-                              "strict": false,
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
-                                "annotation": []
-                              },
-                              "asTypeSpecifier": {
-                                "type": "NamedTypeSpecifier",
-                                "name": "{urn:hl7-org:elm-types:r1}Integer",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "As",
-                              "strict": false,
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
-                                "annotation": []
-                              },
-                              "asTypeSpecifier": {
-                                "type": "NamedTypeSpecifier",
-                                "name": "{urn:hl7-org:elm-types:r1}Integer",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
                               "annotation": []
                             }
+                          },
+                          "low": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.0",
+                            "annotation": []
+                          },
+                          "high": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "10.0",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     }
@@ -32163,63 +74244,80 @@
                 }
               },
               {
-                "name": "IntegerIntervalProperlyIncludesTrue",
+                "name": "QuantityIntervalStart",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludes",
+                        "type": "Start",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
                               "annotation": []
                             }
                           },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
+                          "low": {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 1,
+                            "unit": "g",
+                            "annotation": []
+                          },
+                          "high": {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 10,
+                            "unit": "g",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "value": 1,
+                        "unit": "g",
                         "annotation": []
                       }
                     }
@@ -32227,191 +74325,393 @@
                 }
               },
               {
-                "name": "IntegerIntervalProperlyIncludesFalse",
+                "name": "DateTimeIntervalStart",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludes",
+                        "type": "Start",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2016",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "day": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
-                            "high": {
+                            "hour": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             }
                           },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                          "high": {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
-                            "low": {
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "value": "2016",
                               "annotation": []
                             },
-                            "high": {
+                            "month": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
+                              "value": "5",
                               "annotation": []
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DecimalIntervalProperlyIncludesTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "ProperIncludes",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
+                            },
+                            "day": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
                               "annotation": []
                             },
-                            "high": {
+                            "hour": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
+                            },
+                            "minute": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             },
-                            "high": {
+                            "second": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             }
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "year": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2016",
+                          "annotation": []
+                        },
+                        "month": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "5",
+                          "annotation": []
+                        },
+                        "day": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalProperlyIncludesFalse",
+                "name": "TimeIntervalStart",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludes",
+                        "type": "Start",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             },
-                            "high": {
+                            "minute": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "0",
                               "annotation": []
                             }
                           },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                          "high": {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
-                            "low": {
+                            "signature": [],
+                            "hour": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "23",
                               "annotation": []
                             },
-                            "high": {
+                            "minute": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "15.0",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "599",
                               "annotation": []
                             }
                           }
-                        ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Starts",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestStartsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -32419,63 +74719,27 @@
                 }
               },
               {
-                "name": "QuantityIntervalProperlyIncludesTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalStartsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ProperIncludes",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 5,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -32483,63 +74747,27 @@
                 }
               },
               {
-                "name": "QuantityIntervalProperlyIncludesFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalStartsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ProperIncludes",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 5,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 15,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -32547,131 +74775,27 @@
                 }
               },
               {
-                "name": "DateTimeProperlyIncludesTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalStartsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ProperIncludes",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "16",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "27",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -32679,287 +74803,55 @@
                 }
               },
               {
-                "name": "DateTimeProperlyIncludesFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalStartsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ProperIncludes",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "16",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "29",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
                   ]
                 }
               },
-              {
-                "name": "TimeProperlyIncludesTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "ProperIncludes",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "21",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "21",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "998",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+              {
+                "name": "QuantityIntervalStartsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -32967,155 +74859,139 @@
                 }
               },
               {
-                "name": "TimeProperlyIncludesFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalStartsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ProperIncludes",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "21",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "22",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeStartsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeStartsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeStartsTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeStartsFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -33123,27 +74999,360 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "ProperlyIncludedIn",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestStartsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalStartsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalStartsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalStartsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalStartsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalStartsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalStartsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeStartsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeStartsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeStartsTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeStartsFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
-                "name": "IntegerIntervalProperlyIncludedInNullBoundaries",
+                "name": "TestStartsNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -33152,109 +75361,53 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Interval",
+                            "lowClosed": true,
+                            "highClosed": true,
                             "annotation": [],
-                            "low": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
                               "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Property",
-                                "path": "low",
-                                "annotation": [],
-                                "source": {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": true,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  }
-                                }
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
                               }
                             },
-                            "lowClosedExpression": {
-                              "type": "Property",
-                              "path": "lowClosed",
-                              "annotation": [],
-                              "source": {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Null",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
+                            "low": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
                             },
                             "high": {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Property",
-                                "path": "high",
-                                "annotation": [],
-                                "source": {
-                                  "type": "Interval",
-                                  "lowClosed": true,
-                                  "highClosed": true,
-                                  "annotation": [],
-                                  "low": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  },
-                                  "high": {
-                                    "type": "Null",
-                                    "annotation": []
-                                  }
-                                }
-                              }
-                            },
-                            "highClosedExpression": {
-                              "type": "Property",
-                              "path": "highClosed",
-                              "annotation": [],
-                              "source": {
-                                "type": "Interval",
-                                "lowClosed": true,
-                                "highClosed": true,
-                                "annotation": [],
-                                "low": {
-                                  "type": "Null",
-                                  "annotation": []
-                                },
-                                "high": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             }
                           }
                         ]
@@ -33263,9 +75416,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -33273,15 +75425,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalProperlyIncludedInTrue",
+                "name": "IntegerIntervalStartsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -33290,14 +75467,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -33308,16 +75496,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "15",
                               "annotation": []
                             }
                           }
@@ -33328,6 +75527,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -33337,15 +75537,40 @@
                 }
               },
               {
-                "name": "IntegerIntervalProperlyIncludedInFalse",
+                "name": "IntegerIntervalStartsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -33354,16 +75579,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
+                              "value": "10",
                               "annotation": []
                             }
                           },
@@ -33372,14 +75608,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -33392,6 +75639,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -33401,15 +75649,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalProperlyIncludedInTrue",
+                "name": "DecimalIntervalStartsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -33418,14 +75691,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.0",
                               "annotation": []
@@ -33436,16 +75720,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "value": "4.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "value": "15.0",
                               "annotation": []
                             }
                           }
@@ -33456,6 +75751,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -33465,15 +75761,40 @@
                 }
               },
               {
-                "name": "DecimalIntervalProperlyIncludedInFalse",
+                "name": "DecimalIntervalStartsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -33482,16 +75803,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "15.0",
+                              "value": "10.0",
                               "annotation": []
                             }
                           },
@@ -33500,14 +75832,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
+                              "value": "4.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.0",
                               "annotation": []
@@ -33520,6 +75863,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -33529,15 +75873,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalProperlyIncludedInTrue",
+                "name": "QuantityIntervalStartsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -33546,14 +75915,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 5,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 10,
                               "unit": "g",
                               "annotation": []
@@ -33564,15 +75944,26 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
-                              "value": 1,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 5,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
-                              "value": 10,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 15,
                               "unit": "g",
                               "annotation": []
                             }
@@ -33584,6 +75975,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -33593,15 +75985,40 @@
                 }
               },
               {
-                "name": "QuantityIntervalProperlyIncludedInFalse",
+                "name": "QuantityIntervalStartsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -33610,14 +76027,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 1,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 10,
                               "unit": "g",
                               "annotation": []
@@ -33628,15 +76056,26 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 5,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
-                              "value": 15,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 10,
                               "unit": "g",
                               "annotation": []
                             }
@@ -33648,6 +76087,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -33657,15 +76097,40 @@
                 }
               },
               {
-                "name": "DateTimeProperlyIncludedInTrue",
+                "name": "DateTimeStartsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -33674,49 +76139,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "16",
+                                "value": "5",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "27",
+                                "value": "25",
                                 "annotation": []
                               }
                             }
@@ -33726,49 +76208,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                                "value": "5",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
+                                "value": "27",
                                 "annotation": []
                               }
                             }
@@ -33780,6 +76279,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -33789,15 +76289,40 @@
                 }
               },
               {
-                "name": "DateTimeProperlyIncludedInFalse",
+                "name": "DateTimeStartsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -33806,49 +76331,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "16",
+                                "value": "5",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "29",
+                                "value": "25",
                                 "annotation": []
                               }
                             }
@@ -33858,49 +76400,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
+                                "value": "6",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
+                                "value": "27",
                                 "annotation": []
                               }
                             }
@@ -33912,6 +76471,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -33921,15 +76481,40 @@
                 }
               },
               {
-                "name": "TimeProperlyIncludedInTrue",
+                "name": "TimeStartsTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -33938,43 +76523,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "5",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "999",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "21",
+                                "value": "15",
                                 "annotation": []
                               },
                               "minute": {
@@ -33992,7 +76588,7 @@
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "998",
+                                "value": "999",
                                 "annotation": []
                               }
                             }
@@ -34002,43 +76598,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "5",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "59",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "59",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "999",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "21",
+                                "value": "17",
                                 "annotation": []
                               },
                               "minute": {
@@ -34068,6 +76675,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -34077,15 +76685,40 @@
                 }
               },
               {
-                "name": "TimeProperlyIncludedInFalse",
+                "name": "TimeStartsFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "ProperIncludedIn",
+                        "type": "Starts",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -34094,61 +76727,72 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "5",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
+                                "value": "59",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "999",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "22",
+                                "value": "15",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "59",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "59",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "999",
                                 "annotation": []
                               }
                             }
@@ -34158,43 +76802,54 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "12",
+                                "value": "4",
                                 "annotation": []
                               },
                               "minute": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "59",
                                 "annotation": []
                               },
                               "second": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "59",
                                 "annotation": []
                               },
                               "millisecond": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "0",
+                                "value": "999",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "21",
+                                "value": "17",
                                 "annotation": []
                               },
                               "minute": {
@@ -34222,66 +76877,110 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Union",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TestUnionNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalUnion1To15",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Start",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "IntegerIntervalStart",
-                "value": {
-                  "type": "Tuple",
+                "name": "IntegerIntervalUnionNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Start",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
-                          "annotation": [],
-                          "low": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "high": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
-                          }
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -34289,87 +76988,67 @@
                 }
               },
               {
-                "name": "DecimalIntervalStart",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalUnion1To15",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Start",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
-                          "annotation": [],
-                          "low": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.0",
-                            "annotation": []
-                          },
-                          "high": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "10.0",
-                            "annotation": []
-                          }
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "QuantityIntervalStart",
-                "value": {
-                  "type": "Tuple",
+                "name": "DecimalIntervalUnionNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Start",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
-                          "annotation": [],
-                          "low": {
-                            "type": "Quantity",
-                            "value": 1,
-                            "unit": "g",
-                            "annotation": []
-                          },
-                          "high": {
-                            "type": "Quantity",
-                            "value": 10,
-                            "unit": "g",
-                            "annotation": []
-                          }
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Quantity",
-                        "value": 1,
-                        "unit": "g",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -34377,165 +77056,170 @@
                 }
               },
               {
-                "name": "DateTimeIntervalStart",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalUnion1To15",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Start",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
-                          "annotation": [],
-                          "low": {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2016",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          "high": {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2016",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          }
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "DateTime",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "year": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2016",
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
                           "annotation": []
-                        },
-                        "month": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "5",
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalUnionNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
                           "annotation": []
-                        },
-                        "day": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeUnion",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": []
-                        },
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeUnionNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeUnion",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
                           "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
                           "annotation": []
                         }
                       }
@@ -34544,182 +77228,436 @@
                 }
               },
               {
-                "name": "TimeIntervalStart",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeUnionNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Start",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TestUnionNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalUnion1To15",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "0",
-                              "annotation": []
-                            }
-                          },
-                          "high": {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "23",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "599",
-                              "annotation": []
-                            }
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalUnionNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalUnion1To15",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalUnionNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalUnion1To15",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalUnionNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeUnion",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeUnionNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
                           }
                         }
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Time",
+                      },
+                      {
+                        "name": "output",
                         "annotation": [],
-                        "signature": [],
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
                           "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeUnion",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeUnionNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
                           "annotation": []
                         }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Starts",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
-                "name": "TestStartsNull",
+                "name": "TestUnionNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Starts",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (Interval[null, null] union any valid interval of the same point type is Interval[null, null])",
                         "annotation": []
                       }
                     }
@@ -34727,16 +77665,57 @@
                 }
               },
               {
-                "name": "IntegerIntervalStartsTrue",
+                "name": "IntegerIntervalUnion1To15",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Starts",
+                        "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -34744,14 +77723,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -34762,14 +77752,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "15",
                               "annotation": []
@@ -34781,26 +77782,86 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "high": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "15",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "IntegerIntervalStartsFalse",
+                "name": "IntegerIntervalUnionNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Starts",
+                        "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -34808,14 +77869,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -34826,16 +77898,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "value": "44",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "50",
                               "annotation": []
                             }
                           }
@@ -34845,9 +77928,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -34855,16 +77937,57 @@
                 }
               },
               {
-                "name": "DecimalIntervalStartsTrue",
+                "name": "DecimalIntervalUnion1To15",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Starts",
+                        "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -34872,14 +77995,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
+                              "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.0",
                               "annotation": []
@@ -34890,14 +78024,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "4.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "15.0",
                               "annotation": []
@@ -34909,26 +78054,86 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        },
+                        "high": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "15.0",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalStartsFalse",
+                "name": "DecimalIntervalUnionNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Starts",
+                        "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -34936,14 +78141,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "1.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "10.0",
                               "annotation": []
@@ -34954,16 +78170,27 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
+                              "value": "14.0",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
+                              "value": "15.0",
                               "annotation": []
                             }
                           }
@@ -34973,9 +78200,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -34983,16 +78209,57 @@
                 }
               },
               {
-                "name": "QuantityIntervalStartsTrue",
+                "name": "QuantityIntervalUnion1To15",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Starts",
+                        "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -35000,14 +78267,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
-                              "value": 5,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 1,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 10,
                               "unit": "g",
                               "annotation": []
@@ -35018,14 +78296,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 5,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 15,
                               "unit": "g",
                               "annotation": []
@@ -35037,26 +78326,86 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "value": 1,
+                          "unit": "g",
+                          "annotation": []
+                        },
+                        "high": {
+                          "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "value": 15,
+                          "unit": "g",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "QuantityIntervalStartsFalse",
+                "name": "QuantityIntervalUnionNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Starts",
+                        "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -35064,14 +78413,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 1,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                               "value": 10,
                               "unit": "g",
                               "annotation": []
@@ -35082,15 +78442,26 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Quantity",
-                              "value": 5,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 14,
                               "unit": "g",
                               "annotation": []
                             },
                             "high": {
                               "type": "Quantity",
-                              "value": 10,
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "value": 15,
                               "unit": "g",
                               "annotation": []
                             }
@@ -35101,9 +78472,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -35111,16 +78481,57 @@
                 }
               },
               {
-                "name": "DateTimeStartsTrue",
+                "name": "DateTimeUnion",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Starts",
+                        "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -35128,24 +78539,37 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -35153,22 +78577,26 @@
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "25",
                                 "annotation": []
@@ -35180,49 +78608,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "25",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "27",
+                                "value": "28",
                                 "annotation": []
                               }
                             }
@@ -35233,26 +78678,120 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2012",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "5",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": [],
+                          "signature": [],
+                          "year": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2012",
+                            "annotation": []
+                          },
+                          "month": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "day": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "28",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DateTimeStartsFalse",
+                "name": "DateTimeUnionNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Starts",
+                        "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -35260,24 +78799,37 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
@@ -35285,22 +78837,26 @@
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "25",
                                 "annotation": []
@@ -35312,49 +78868,66 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "6",
+                                "value": "27",
                                 "annotation": []
                               }
                             },
                             "high": {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "27",
+                                "value": "28",
                                 "annotation": []
                               }
                             }
@@ -35365,9 +78938,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -35375,16 +78947,57 @@
                 }
               },
               {
-                "name": "TimeStartsTrue",
+                "name": "TimeUnion",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Starts",
+                        "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -35392,8 +79005,18 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -35423,6 +79046,7 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -35456,14 +79080,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
+                                "value": "10",
                                 "annotation": []
                               },
                               "minute": {
@@ -35487,12 +79121,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "17",
+                                "value": "20",
                                 "annotation": []
                               },
                               "minute": {
@@ -35521,26 +79156,132 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "type": "Interval",
+                        "lowClosed": true,
+                        "highClosed": true,
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "low": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "5",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "999",
+                            "annotation": []
+                          }
+                        },
+                        "high": {
+                          "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": [],
+                          "signature": [],
+                          "hour": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "20",
+                            "annotation": []
+                          },
+                          "minute": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "second": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "59",
+                            "annotation": []
+                          },
+                          "millisecond": {
+                            "type": "Literal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "999",
+                            "annotation": []
+                          }
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "TimeStartsFalse",
+                "name": "TimeUnionNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Starts",
+                        "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -35548,8 +79289,18 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -35579,6 +79330,7 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -35612,14 +79364,24 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "4",
+                                "value": "16",
                                 "annotation": []
                               },
                               "minute": {
@@ -35643,12 +79405,13 @@
                             },
                             "high": {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
                                 "type": "Literal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "17",
+                                "value": "20",
                                 "annotation": []
                               },
                               "minute": {
@@ -35677,9 +79440,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -35690,26 +79452,690 @@
           }
         },
         {
-          "name": "Union",
+          "name": "Width",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IntegerIntervalTestWidth9",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntervalTestWidthNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalTestWidth11",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalTestWidth5",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeWidth",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeWidth",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerIntervalTestWidth9",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntervalTestWidthNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalTestWidth11",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalTestWidth5",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeWidth",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeWidth",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
-                "name": "TestUnionNull",
+                "name": "IntegerIntervalTestWidth9",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Width",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          "high": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "9",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntervalTestWidthNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Width",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "strict": false,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "localId": "14851",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "localId": "14852",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalTestWidth11",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Width",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "4.0",
+                            "annotation": []
+                          },
+                          "high": {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "15.0",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "11.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalTestWidth5",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
-                      "name": "skipped",
+                      "name": "expression",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (Interval[null, null] union any valid interval of the same point type is Interval[null, null])",
+                        "type": "Width",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 5,
+                            "unit": "g",
+                            "annotation": []
+                          },
+                          "high": {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 10,
+                            "unit": "g",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "value": 5,
+                        "unit": "g",
                         "annotation": []
                       }
                     }
@@ -35717,212 +80143,762 @@
                 }
               },
               {
-                "name": "IntegerIntervalUnion1To15",
+                "name": "DateTimeWidth",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Union",
+                        "type": "Width",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
-                            "high": {
+                            "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "5",
                               "annotation": []
                             }
                           },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                          "high": {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
-                            "low": {
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "4",
+                              "value": "2012",
                               "annotation": []
                             },
-                            "high": {
+                            "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "25",
                               "annotation": []
                             }
                           }
-                        ]
+                        }
                       }
                     },
                     {
-                      "name": "output",
+                      "name": "invalid",
                       "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
-                        "annotation": [],
-                        "low": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        },
-                        "high": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "15",
-                          "annotation": []
-                        }
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "IntegerIntervalUnionNull",
+                "name": "TimeWidth",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Union",
+                        "type": "Width",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                        "operand": {
+                          "type": "Interval",
+                          "lowClosed": true,
+                          "highClosed": true,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "low": {
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
+                          "low": {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "5",
                               "annotation": []
                             },
-                            "high": {
+                            "minute": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
                               "annotation": []
                             }
                           },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
+                          "high": {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
-                            "low": {
+                            "signature": [],
+                            "hour": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "44",
+                              "value": "15",
                               "annotation": []
                             },
-                            "high": {
+                            "minute": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "50",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
                               "annotation": []
                             }
                           }
-                        ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Interval",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IntegerIntervalTest",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalTest2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalTest3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalTest4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerIntervalTest5",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalTest",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalTest2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalTest3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalTest4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalIntervalTest5",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalTest",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalTest2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "QuantityIntervalTest3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalIntervalUnion1To15",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalTest4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Union",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "4.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "15.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "low": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
-                          "annotation": []
-                        },
-                        "high": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "15.0",
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
                           "annotation": []
                         }
                       }
@@ -35931,136 +80907,70 @@
                 }
               },
               {
-                "name": "DecimalIntervalUnionNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "QuantityIntervalTest5",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Union",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "1.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "14.0",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "15.0",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "QuantityIntervalUnion1To15",
-                "value": {
-                  "type": "Tuple",
+                "name": "DateTimeIntervalTest",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Union",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 5,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 15,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "low": {
-                          "type": "Quantity",
-                          "value": 1,
-                          "unit": "g",
-                          "annotation": []
-                        },
-                        "high": {
-                          "type": "Quantity",
-                          "value": 15,
-                          "unit": "g",
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": []
                         }
                       }
@@ -36069,237 +80979,77 @@
                 }
               },
               {
-                "name": "QuantityIntervalUnionNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "TimeIntervalTest",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Union",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 1,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 10,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Quantity",
-                              "value": 14,
-                              "unit": "g",
-                              "annotation": []
-                            },
-                            "high": {
-                              "type": "Quantity",
-                              "value": 15,
-                              "unit": "g",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DateTimeUnion",
-                "value": {
-                  "type": "Tuple",
+                "name": "CollapseIntervalTestInteger",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Union",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
-                                "annotation": []
-                              }
-                            }
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
                           }
-                        ]
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "low": {
-                          "type": "DateTime",
-                          "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2012",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "5",
-                            "annotation": []
-                          }
-                        },
-                        "high": {
-                          "type": "DateTime",
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "year": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2012",
-                            "annotation": []
-                          },
-                          "month": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          "day": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "28",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
                           }
                         }
@@ -36309,129 +81059,31 @@
                 }
               },
               {
-                "name": "DateTimeUnionNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "InvalidIntegerInterval",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "expression",
-                      "value": {
-                        "type": "Union",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "25",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "27",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "28",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
+                        "annotation": [],
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
                     },
                     {
-                      "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -36439,745 +81091,806 @@
                 }
               },
               {
-                "name": "TimeUnion",
-                "value": {
-                  "type": "Tuple",
+                "name": "InvalidIntegerIntervalA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Union",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "IntervalTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          }
-                        ]
+                        "pointType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
                     },
                     {
-                      "name": "output",
-                      "value": {
-                        "type": "Interval",
-                        "lowClosed": true,
-                        "highClosed": true,
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerIntervalTest",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "low": {
-                          "type": "Time",
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "5",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalTest2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "999",
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
                           }
-                        },
-                        "high": {
-                          "type": "Time",
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalTest3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "hour": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "20",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          "minute": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          "second": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "59",
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalTest4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
-                          },
-                          "millisecond": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "999",
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": []
                           }
                         }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeUnionNull",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerIntervalTest5",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Union",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Interval",
-                            "lowClosed": true,
-                            "highClosed": true,
-                            "annotation": [],
-                            "low": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "16",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            "high": {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            }
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
                           }
-                        ]
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalTest",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
                       }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Width",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "IntegerIntervalTestWidth9",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalTest2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalTest3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalTest4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalIntervalTest5",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalTest",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalTest2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalTest3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalTest4",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Width",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
                             "annotation": []
-                          },
-                          "high": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
                             "annotation": []
                           }
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "9",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "IntervalTestWidthNull",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "QuantityIntervalTest5",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Width",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "strict": false,
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
                             "annotation": []
-                          },
-                          "asTypeSpecifier": {
-                            "type": "IntervalTypeSpecifier",
-                            "annotation": [],
-                            "pointType": {
-                              "type": "NamedTypeSpecifier",
-                              "name": "{urn:hl7-org:elm-types:r1}Any",
-                              "annotation": []
-                            }
                           }
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Null",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DecimalIntervalTestWidth11",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeIntervalTest",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Width",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "4.0",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": []
-                          },
-                          "high": {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "15.0",
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": []
                           }
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "11.0",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "QuantityIntervalTestWidth5",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeIntervalTest",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Width",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "Quantity",
-                            "value": 5,
-                            "unit": "g",
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": []
-                          },
-                          "high": {
-                            "type": "Quantity",
-                            "value": 10,
-                            "unit": "g",
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": []
                           }
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Quantity",
-                        "value": 5,
-                        "unit": "g",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DateTimeWidth",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "CollapseIntervalTestInteger",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Width",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "DateTime",
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": []
                             }
-                          },
-                          "high": {
-                            "type": "DateTime",
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
                             "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "25",
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": []
                             }
                           }
                         }
                       }
-                    },
-                    {
-                      "name": "invalid",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "TimeWidth",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "InvalidIntegerInterval",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Width",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Interval",
-                          "lowClosed": true,
-                          "highClosed": true,
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
                           "annotation": [],
-                          "low": {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
-                          },
-                          "high": {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
                           }
                         }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "invalid",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "InvalidIntegerIntervalA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Interval",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "IntegerIntervalTest",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37186,14 +81899,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "10",
                           "annotation": []
@@ -37207,14 +81931,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "10",
                           "annotation": []
@@ -37229,6 +81964,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37237,14 +82004,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "11",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "20",
                           "annotation": []
@@ -37258,14 +82036,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "11",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "20",
                           "annotation": []
@@ -37280,6 +82069,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37288,14 +82109,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "44",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "50",
                           "annotation": []
@@ -37309,14 +82141,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "44",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "50",
                           "annotation": []
@@ -37331,6 +82174,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37339,14 +82214,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "4",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "10",
                           "annotation": []
@@ -37360,14 +82246,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "4",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "10",
                           "annotation": []
@@ -37382,6 +82279,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37390,14 +82319,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "4",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "15",
                           "annotation": []
@@ -37411,14 +82351,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "4",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "15",
                           "annotation": []
@@ -37433,6 +82384,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37441,14 +82424,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "1.0",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "10.0",
                           "annotation": []
@@ -37462,14 +82456,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "1.0",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "10.0",
                           "annotation": []
@@ -37484,6 +82489,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37492,14 +82529,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "11.0",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "20.0",
                           "annotation": []
@@ -37513,14 +82561,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "11.0",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "20.0",
                           "annotation": []
@@ -37535,6 +82594,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37543,14 +82634,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "4.0",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "10.0",
                           "annotation": []
@@ -37564,14 +82666,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "4.0",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "10.0",
                           "annotation": []
@@ -37586,6 +82699,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37594,14 +82739,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "4.0",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "15.0",
                           "annotation": []
@@ -37615,14 +82771,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "4.0",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "15.0",
                           "annotation": []
@@ -37637,6 +82804,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37645,14 +82844,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "14.0",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "15.0",
                           "annotation": []
@@ -37666,14 +82876,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "14.0",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "15.0",
                           "annotation": []
@@ -37688,6 +82909,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37696,14 +82949,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 1,
                           "unit": "g",
                           "annotation": []
                         },
                         "high": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 10,
                           "unit": "g",
                           "annotation": []
@@ -37717,14 +82981,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 1,
                           "unit": "g",
                           "annotation": []
                         },
                         "high": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 10,
                           "unit": "g",
                           "annotation": []
@@ -37739,6 +83014,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37747,14 +83054,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 11,
                           "unit": "g",
                           "annotation": []
                         },
                         "high": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 20,
                           "unit": "g",
                           "annotation": []
@@ -37768,14 +83086,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 11,
                           "unit": "g",
                           "annotation": []
                         },
                         "high": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 20,
                           "unit": "g",
                           "annotation": []
@@ -37790,6 +83119,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37798,14 +83159,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 5,
                           "unit": "g",
                           "annotation": []
                         },
                         "high": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 10,
                           "unit": "g",
                           "annotation": []
@@ -37819,14 +83191,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 5,
                           "unit": "g",
                           "annotation": []
                         },
                         "high": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 10,
                           "unit": "g",
                           "annotation": []
@@ -37841,6 +83224,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37849,14 +83264,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 5,
                           "unit": "g",
                           "annotation": []
                         },
                         "high": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 15,
                           "unit": "g",
                           "annotation": []
@@ -37870,14 +83296,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 5,
                           "unit": "g",
                           "annotation": []
                         },
                         "high": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 15,
                           "unit": "g",
                           "annotation": []
@@ -37892,6 +83329,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37900,14 +83369,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 14,
                           "unit": "g",
                           "annotation": []
                         },
                         "high": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 15,
                           "unit": "g",
                           "annotation": []
@@ -37921,14 +83401,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 14,
                           "unit": "g",
                           "annotation": []
                         },
                         "high": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 15,
                           "unit": "g",
                           "annotation": []
@@ -37943,6 +83434,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -37951,8 +83474,18 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": [],
                           "signature": [],
                           "year": {
@@ -38000,6 +83533,7 @@
                         },
                         "high": {
                           "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": [],
                           "signature": [],
                           "year": {
@@ -38054,8 +83588,18 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": [],
                           "signature": [],
                           "year": {
@@ -38103,6 +83647,7 @@
                         },
                         "high": {
                           "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": [],
                           "signature": [],
                           "year": {
@@ -38158,6 +83703,38 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -38166,8 +83743,18 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                           "annotation": [],
                           "signature": [],
                           "hour": {
@@ -38197,6 +83784,7 @@
                         },
                         "high": {
                           "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                           "annotation": [],
                           "signature": [],
                           "hour": {
@@ -38233,8 +83821,18 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                           "annotation": [],
                           "signature": [],
                           "hour": {
@@ -38264,6 +83862,7 @@
                         },
                         "high": {
                           "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                           "annotation": [],
                           "signature": [],
                           "hour": {
@@ -38301,26 +83900,90 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
                         "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -38331,14 +83994,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "11",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "20",
                               "annotation": []
@@ -38349,14 +84023,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "44",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "50",
                               "annotation": []
@@ -38370,20 +84055,44 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "IntervalTypeSpecifier",
+                            "annotation": [],
+                            "pointType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          }
+                        },
                         "element": [
                           {
                             "type": "Interval",
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -38394,14 +84103,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "11",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "20",
                               "annotation": []
@@ -38412,14 +84132,25 @@
                             "lowClosed": true,
                             "highClosed": true,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "IntervalTypeSpecifier",
+                              "annotation": [],
+                              "pointType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "low": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "44",
                               "annotation": []
                             },
                             "high": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "50",
                               "annotation": []
@@ -38436,6 +84167,34 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -38444,14 +84203,25 @@
                         "lowClosed": true,
                         "highClosed": true,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "5",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "3",
                           "annotation": []
@@ -38462,6 +84232,7 @@
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -38475,6 +84246,34 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
@@ -38483,14 +84282,25 @@
                         "lowClosed": true,
                         "highClosed": false,
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "IntervalTypeSpecifier",
+                          "annotation": [],
+                          "pointType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "low": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "5",
                           "annotation": []
                         },
                         "high": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "5",
                           "annotation": []
@@ -38501,6 +84311,7 @@
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
diff --git a/test/spec-tests/cql/CqlListOperatorsTest.json b/test/spec-tests/cql/CqlListOperatorsTest.json
index a30b07c5d..7f43bbcb7 100644
--- a/test/spec-tests/cql/CqlListOperatorsTest.json
+++ b/test/spec-tests/cql/CqlListOperatorsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       },
       {
@@ -378,22 +378,23 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
                 "name": "simpleSortAsc",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong output: Queries return distinct lists by default; need to use \"all\" to retain duplicates",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -402,16 +403,17 @@
               },
               {
                 "name": "simpleSortDesc",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong output: Queries return distinct lists by default; need to use \"all\" to retain duplicates",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -420,132 +422,35 @@
               },
               {
                 "name": "simpleSortStringAsc",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Query",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "source": [
-                          {
-                            "alias": "sls",
-                            "annotation": [],
-                            "expression": {
-                              "type": "List",
-                              "annotation": [],
-                              "element": [
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "back",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "aardvark",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "alligator",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "zebra",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "iguana",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "Wolf",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "Armadillo",
-                                  "annotation": []
-                                }
-                              ]
-                            }
-                          }
-                        ],
-                        "let": [],
-                        "relationship": [],
-                        "sort": {
-                          "annotation": [],
-                          "by": [
-                            {
-                              "type": "ByDirection",
-                              "direction": "asc",
-                              "annotation": []
-                            }
-                          ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Armadillo",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Wolf",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "aardvark",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "alligator",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "back",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "iguana",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "zebra",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
@@ -553,132 +458,35 @@
               },
               {
                 "name": "simpleSortStringDesc",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Query",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "source": [
-                          {
-                            "alias": "sls",
-                            "annotation": [],
-                            "expression": {
-                              "type": "List",
-                              "annotation": [],
-                              "element": [
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "back",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "aardvark",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "alligator",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "zebra",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "iguana",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "Wolf",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                  "value": "Armadillo",
-                                  "annotation": []
-                                }
-                              ]
-                            }
-                          }
-                        ],
-                        "let": [],
-                        "relationship": [],
-                        "sort": {
-                          "annotation": [],
-                          "by": [
-                            {
-                              "type": "ByDirection",
-                              "direction": "desc",
-                              "annotation": []
-                            }
-                          ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "zebra",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "iguana",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "back",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "alligator",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "aardvark",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Wolf",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Armadillo",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
@@ -686,256 +494,35 @@
               },
               {
                 "name": "SortDatesAsc",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Query",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "source": [
-                          {
-                            "alias": "S",
-                            "annotation": [],
-                            "expression": {
-                              "type": "List",
-                              "annotation": [],
-                              "element": [
-                                {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  }
-                                },
-                                {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  }
-                                },
-                                {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "12",
-                                    "annotation": []
-                                  }
-                                },
-                                {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  }
-                                }
-                              ]
-                            }
-                          }
-                        ],
-                        "let": [],
-                        "relationship": [],
-                        "sort": {
-                          "annotation": [],
-                          "by": [
-                            {
-                              "type": "ByDirection",
-                              "direction": "asc",
-                              "annotation": []
-                            }
-                          ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
@@ -943,256 +530,35 @@
               },
               {
                 "name": "SortDatesDesc",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Query",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "source": [
-                          {
-                            "alias": "S",
-                            "annotation": [],
-                            "expression": {
-                              "type": "List",
-                              "annotation": [],
-                              "element": [
-                                {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  },
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  }
-                                },
-                                {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  }
-                                },
-                                {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "1",
-                                    "annotation": []
-                                  },
-                                  "hour": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "12",
-                                    "annotation": []
-                                  }
-                                },
-                                {
-                                  "type": "DateTime",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "year": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2012",
-                                    "annotation": []
-                                  },
-                                  "month": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "10",
-                                    "annotation": []
-                                  },
-                                  "day": {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "5",
-                                    "annotation": []
-                                  }
-                                }
-                              ]
-                            }
-                          }
-                        ],
-                        "let": [],
-                        "relationship": [],
-                        "sort": {
-                          "annotation": [],
-                          "by": [
-                            {
-                              "type": "ByDirection",
-                              "direction": "desc",
-                              "annotation": []
-                            }
-                          ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
@@ -1200,62 +566,35 @@
               },
               {
                 "name": "intList",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "3",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "3",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
@@ -1263,62 +602,35 @@
               },
               {
                 "name": "decimalList",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "3.8",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.4",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.9",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "3.8",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "2.4",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "1.9",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
@@ -1326,62 +638,35 @@
               },
               {
                 "name": "quantityList",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Quantity",
-                            "value": 19.99,
-                            "unit": "[lb_av]",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 17.33,
-                            "unit": "[lb_av]",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 10.66,
-                            "unit": "[lb_av]",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Quantity",
-                            "value": 19.99,
-                            "unit": "[lb_av]",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 17.33,
-                            "unit": "[lb_av]",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Quantity",
-                            "value": 10.66,
-                            "unit": "[lb_av]",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
@@ -1389,92 +674,35 @@
               },
               {
                 "name": "dateTimeList",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2016",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2015",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2010",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2016",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2015",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2010",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
@@ -1482,339 +710,442 @@
               },
               {
                 "name": "timeList",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "13",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "12",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "13",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Contains",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
-            "element": [
-              {
-                "name": "ContainsABNullHasNull",
-                "value": {
-                  "type": "Tuple",
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "simpleSortAsc",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                "value": "a",
-                                "annotation": []
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                "value": "b",
-                                "annotation": []
-                              },
-                              {
-                                "type": "As",
-                                "asType": "{urn:hl7-org:elm-types:r1}String",
-                                "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}String",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "simpleSortDesc",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ContainsNullFirst",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "simpleSortStringAsc",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "As",
-                                "asType": "{urn:hl7-org:elm-types:r1}String",
-                                "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Null",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                "value": "b",
-                                "annotation": []
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                "value": "c",
-                                "annotation": []
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
                             "annotation": []
                           }
-                        ]
+                        }
                       }
-                    },
+                    ]
+                  }
+                },
+                {
+                  "name": "simpleSortStringDesc",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SortDatesAsc",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SortDatesDesc",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "intList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "decimalList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "quantityList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "dateTimeList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "timeList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "simpleSortAsc",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong output: Queries return distinct lists by default; need to use \"all\" to retain duplicates",
                         "annotation": []
                       }
                     }
@@ -1822,57 +1153,33 @@
                 }
               },
               {
-                "name": "ContainsABCHasA",
+                "name": "simpleSortDesc",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                "value": "a",
-                                "annotation": []
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                "value": "b",
-                                "annotation": []
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                "value": "c",
-                                "annotation": []
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          }
-                        ]
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong output: Queries return distinct lists by default; need to use \"all\" to retain duplicates",
                         "annotation": []
                       }
                     }
@@ -1880,800 +1187,773 @@
                 }
               },
               {
-                "name": "ContainsJan2012True",
+                "name": "simpleSortStringAsc",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Contains",
+                        "type": "Query",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "source": [
                           {
-                            "type": "List",
+                            "alias": "sls",
                             "annotation": [],
-                            "element": [
-                              {
-                                "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
+                            "expression": {
+                              "type": "List",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
                                 "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
-                                  "annotation": []
-                                },
-                                "month": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
-                                  "annotation": []
-                                },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "5",
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
                                   "annotation": []
                                 }
                               },
-                              {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
+                              "element": [
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "back",
                                   "annotation": []
                                 },
-                                "month": {
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "9",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "aardvark",
                                   "annotation": []
                                 },
-                                "day": {
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "5",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "alligator",
                                   "annotation": []
-                                }
-                              },
-                              {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
+                                },
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "zebra",
                                   "annotation": []
                                 },
-                                "month": {
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "iguana",
                                   "annotation": []
                                 },
-                                "day": {
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "Wolf",
+                                  "annotation": []
+                                },
+                                {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "Armadillo",
                                   "annotation": []
                                 }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                              ]
                             }
                           }
-                        ]
+                        ],
+                        "let": [],
+                        "relationship": [],
+                        "sort": {
+                          "annotation": [],
+                          "by": [
+                            {
+                              "type": "ByDirection",
+                              "direction": "asc",
+                              "annotation": []
+                            }
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Armadillo",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Wolf",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "aardvark",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "alligator",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "back",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "iguana",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "zebra",
+                            "annotation": []
+                          }
+                        ]
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "ContainsJan2012False",
+                "name": "simpleSortStringDesc",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Contains",
+                        "type": "Query",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "source": [
                           {
-                            "type": "List",
+                            "alias": "sls",
                             "annotation": [],
-                            "element": [
-                              {
-                                "type": "DateTime",
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
+                            "expression": {
+                              "type": "List",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
                                 "annotation": [],
-                                "signature": [],
-                                "year": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
                                   "annotation": []
-                                },
-                                "month": {
+                                }
+                              },
+                              "element": [
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "back",
                                   "annotation": []
                                 },
-                                "day": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "5",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "aardvark",
                                   "annotation": []
                                 },
-                                "month": {
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "9",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "alligator",
                                   "annotation": []
                                 },
-                                "day": {
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "5",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "zebra",
                                   "annotation": []
-                                }
-                              },
-                              {
-                                "type": "DateTime",
-                                "annotation": [],
-                                "signature": [],
-                                "year": {
+                                },
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2012",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "iguana",
                                   "annotation": []
                                 },
-                                "month": {
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "10",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "Wolf",
                                   "annotation": []
                                 },
-                                "day": {
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                  "value": "Armadillo",
                                   "annotation": []
                                 }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "DateTime",
-                            "annotation": [],
-                            "signature": [],
-                            "year": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
-                              "annotation": []
-                            },
-                            "month": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            "day": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                              ]
                             }
                           }
-                        ]
+                        ],
+                        "let": [],
+                        "relationship": [],
+                        "sort": {
+                          "annotation": [],
+                          "by": [
+                            {
+                              "type": "ByDirection",
+                              "direction": "desc",
+                              "annotation": []
+                            }
+                          ]
+                        }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ContainsTimeTrue",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
+                        "type": "List",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
                           {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "5",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "20",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              }
-                            ]
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "zebra",
+                            "annotation": []
                           },
                           {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "iguana",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "back",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "alligator",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "aardvark",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Wolf",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Armadillo",
+                            "annotation": []
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
                     }
                   ]
                 }
               },
               {
-                "name": "ContainsTimeFalse",
+                "name": "SortDatesAsc",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Contains",
+                        "type": "Query",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "source": [
                           {
-                            "type": "List",
+                            "alias": "S",
                             "annotation": [],
-                            "element": [
-                              {
-                                "type": "Time",
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "expression": {
+                              "type": "List",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
                                 "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "15",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": []
                                 }
                               },
-                              {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "5",
-                                  "annotation": []
-                                },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
-                                },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
-                                }
-                              },
-                              {
-                                "type": "Time",
-                                "annotation": [],
-                                "signature": [],
-                                "hour": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "20",
-                                  "annotation": []
+                              "element": [
+                                {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "hour": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  }
                                 },
-                                "minute": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
+                                {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  }
                                 },
-                                "second": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "59",
-                                  "annotation": []
+                                {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "hour": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "12",
+                                    "annotation": []
+                                  }
                                 },
-                                "millisecond": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "999",
-                                  "annotation": []
+                                {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  }
                                 }
-                              }
-                            ]
+                              ]
+                            }
+                          }
+                        ],
+                        "let": [],
+                        "relationship": [],
+                        "sort": {
+                          "annotation": [],
+                          "by": [
+                            {
+                              "type": "ByDirection",
+                              "direction": "asc",
+                              "annotation": []
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
                           },
                           {
-                            "type": "Time",
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
-                            "hour": {
+                            "year": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "8",
+                              "value": "2012",
                               "annotation": []
                             },
-                            "minute": {
+                            "month": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
+                              "value": "1",
                               "annotation": []
                             },
-                            "second": {
+                            "day": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
+                              "value": "1",
                               "annotation": []
                             },
-                            "millisecond": {
+                            "hour": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
+                              "value": "12",
                               "annotation": []
                             }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "ContainsNullLeft",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Contains",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
+                          },
                           {
-                            "type": "As",
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
-                            "operand": {
-                              "type": "Null",
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
                               "annotation": []
                             },
-                            "asTypeSpecifier": {
-                              "type": "ListTypeSpecifier",
-                              "annotation": [],
-                              "elementType": {
-                                "type": "NamedTypeSpecifier",
-                                "name": "{urn:hl7-org:elm-types:r1}String",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Descendents",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "DescendentsEmptyList",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Descendents not implemented",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Distinct",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "DistinctEmptyList",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Distinct",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "List",
-                          "annotation": [],
-                          "element": []
-                        }
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DistinctNullNullNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Distinct",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "List",
-                          "annotation": [],
-                          "element": [
-                            {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Null",
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             },
-                            {
-                              "type": "Null",
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
                               "annotation": []
                             }
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
+                          },
                           {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DistinctANullANull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Distinct",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "List",
-                          "annotation": [],
-                          "element": [
-                            {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "a",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
                               "annotation": []
                             },
-                            {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}String",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
-                                "annotation": []
-                              }
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
                             },
-                            {
+                            "day": {
                               "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "a",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
                               "annotation": []
                             },
-                            {
-                              "type": "As",
-                              "asType": "{urn:hl7-org:elm-types:r1}String",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Null",
-                                "annotation": []
-                              }
-                            }
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}String",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
                               "annotation": []
                             }
                           }
@@ -2684,255 +1964,463 @@
                 }
               },
               {
-                "name": "Distinct112233",
+                "name": "SortDatesDesc",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Distinct",
+                        "type": "Query",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "List",
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
                           "annotation": [],
-                          "element": [
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "source": [
+                          {
+                            "alias": "S",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
                             },
+                            "expression": {
+                              "type": "List",
+                              "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              },
+                              "element": [
+                                {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  },
+                                  "hour": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "1",
+                                    "annotation": []
+                                  },
+                                  "hour": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "12",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "year": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2012",
+                                    "annotation": []
+                                  },
+                                  "month": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "10",
+                                    "annotation": []
+                                  },
+                                  "day": {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "5",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        ],
+                        "let": [],
+                        "relationship": [],
+                        "sort": {
+                          "annotation": [],
+                          "by": [
                             {
+                              "type": "ByDirection",
+                              "direction": "desc",
+                              "annotation": []
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
+                              "value": "2012",
                               "annotation": []
                             },
-                            {
+                            "month": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
+                              "value": "10",
                               "annotation": []
                             },
-                            {
+                            "day": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
+                              "value": "5",
                               "annotation": []
                             },
-                            {
+                            "hour": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
+                              "value": "10",
                               "annotation": []
                             }
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "3",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "Distinct123123",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Distinct",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "List",
-                          "annotation": [],
-                          "element": [
-                            {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "2012",
                               "annotation": []
                             },
-                            {
+                            "month": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
+                              "value": "10",
                               "annotation": []
                             },
-                            {
+                            "day": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
                               "annotation": []
                             },
-                            {
+                            "month": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
-                            {
+                            "day": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2",
+                              "value": "1",
                               "annotation": []
                             },
-                            {
+                            "hour": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "3",
+                              "value": "12",
                               "annotation": []
                             }
-                          ]
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "intList",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
                         }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "expression",
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
+                            "value": "3",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "3",
+                            "value": "1",
                             "annotation": []
                           }
                         ]
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DistinctAABBCC",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Distinct",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "List",
-                          "annotation": [],
-                          "element": [
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "a",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "a",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "b",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "b",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "c",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "c",
-                              "annotation": []
-                            }
-                          ]
-                        }
-                      }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "3",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "c",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
                             "annotation": []
                           }
                         ]
@@ -2942,59 +2430,80 @@
                 }
               },
               {
-                "name": "DistinctABCABC",
+                "name": "decimalList",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Distinct",
+                        "type": "List",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "List",
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
                           "annotation": [],
-                          "element": [
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "a",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "b",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "c",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "a",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "b",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}String",
-                              "value": "c",
-                              "annotation": []
-                            }
-                          ]
-                        }
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "3.8",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.4",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.9",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
@@ -3002,23 +2511,35 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "3.8",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "2.4",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "c",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "1.9",
                             "annotation": []
                           }
                         ]
@@ -3028,92 +2549,80 @@
                 }
               },
               {
-                "name": "DistinctDateTime",
+                "name": "quantityList",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Distinct",
+                        "type": "List",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "List",
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
                           "annotation": [],
-                          "element": [
-                            {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "10",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "5",
-                                "annotation": []
-                              }
-                            },
-                            {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            },
-                            {
-                              "type": "DateTime",
-                              "annotation": [],
-                              "signature": [],
-                              "year": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2012",
-                                "annotation": []
-                              },
-                              "month": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              },
-                              "day": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            }
-                          ]
-                        }
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 19.99,
+                            "unit": "[lb_av]",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 17.33,
+                            "unit": "[lb_av]",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 10.66,
+                            "unit": "[lb_av]",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
@@ -3121,50 +2630,186 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 19.99,
+                            "unit": "[lb_av]",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 17.33,
+                            "unit": "[lb_av]",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Quantity",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                            "value": 10.66,
+                            "unit": "[lb_av]",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "dateTimeList",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
+                              "value": "2016",
                               "annotation": []
-                            },
-                            "month": {
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
+                              "value": "2015",
                               "annotation": []
-                            },
-                            "day": {
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "5",
+                              "value": "2010",
                               "annotation": []
                             }
-                          },
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "2012",
+                              "value": "2016",
                               "annotation": []
-                            },
-                            "month": {
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "2015",
                               "annotation": []
-                            },
-                            "day": {
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
                               "type": "Literal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
+                              "value": "2010",
                               "annotation": []
                             }
                           }
@@ -3175,175 +2820,4937 @@
                 }
               },
               {
-                "name": "DistinctTime",
+                "name": "timeList",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Distinct",
+                        "type": "List",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "List",
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
                           "annotation": [],
-                          "element": [
-                            {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "15",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
-                            },
-                            {
-                              "type": "Time",
-                              "annotation": [],
-                              "signature": [],
-                              "hour": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "20",
-                                "annotation": []
-                              },
-                              "minute": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "second": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "59",
-                                "annotation": []
-                              },
-                              "millisecond": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "999",
-                                "annotation": []
-                              }
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
                             }
-                          ]
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "13",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "12",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "13",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Contains",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ContainsABNullHasNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsNullFirst",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsABCHasA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsJan2012True",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsJan2012False",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsNullLeft",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ContainsABNullHasNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ContainsNullFirst",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ContainsABCHasA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ContainsJan2012True",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ContainsJan2012False",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ContainsTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ContainsTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ContainsNullLeft",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "ContainsABNullHasNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                "value": "a",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                "value": "b",
+                                "annotation": []
+                              },
+                              {
+                                "type": "As",
+                                "asType": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsNullFirst",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "As",
+                                "asType": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                "value": "b",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                "value": "c",
+                                "annotation": []
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsABCHasA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                "value": "a",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                "value": "b",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                "value": "c",
+                                "annotation": []
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsJan2012True",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "5",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "9",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "5",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsJan2012False",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "5",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "9",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "5",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": [],
+                                "signature": [],
+                                "year": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2012",
+                                  "annotation": []
+                                },
+                                "month": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "10",
+                                  "annotation": []
+                                },
+                                "day": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsTimeTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "5",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "20",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsTimeFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "15",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "5",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": [],
+                                "signature": [],
+                                "hour": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "20",
+                                  "annotation": []
+                                },
+                                "minute": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "second": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "59",
+                                  "annotation": []
+                                },
+                                "millisecond": {
+                                  "type": "Literal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "999",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "8",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ContainsNullLeft",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Descendents",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "DescendentsEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "DescendentsEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "DescendentsEmptyList",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Descendents not implemented",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Distinct",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "DistinctEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctNullNullNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctANullANull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Distinct112233",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Distinct123123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctAABBCC",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctABCABC",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "DistinctEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DistinctNullNullNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DistinctANullANull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Distinct112233",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Distinct123123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DistinctAABBCC",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DistinctABCABC",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DistinctDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DistinctTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "DistinctEmptyList",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Distinct",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          "element": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "element": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctNullNullNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Distinct",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctANullANull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Distinct",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "a",
+                              "annotation": []
+                            },
+                            {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "a",
+                              "annotation": []
+                            },
+                            {
+                              "type": "As",
+                              "asType": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Distinct112233",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Distinct",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "3",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Distinct123123",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Distinct",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "3",
+                              "annotation": []
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "3",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctAABBCC",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Distinct",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "a",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "a",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "b",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "b",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "c",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "c",
+                              "annotation": []
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "c",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctABCABC",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Distinct",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "a",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "b",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "c",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "a",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "b",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "valueType": "{urn:hl7-org:elm-types:r1}String",
+                              "value": "c",
+                              "annotation": []
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "c",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctDateTime",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Distinct",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "10",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "5",
+                                "annotation": []
+                              }
+                            },
+                            {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            },
+                            {
+                              "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": [],
+                              "signature": [],
+                              "year": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2012",
+                                "annotation": []
+                              },
+                              "month": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              },
+                              "day": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "5",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": [],
+                            "signature": [],
+                            "year": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "2012",
+                              "annotation": []
+                            },
+                            "month": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            },
+                            "day": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DistinctTime",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Distinct",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "operand": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "15",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            },
+                            {
+                              "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": [],
+                              "signature": [],
+                              "hour": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "20",
+                                "annotation": []
+                              },
+                              "minute": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "second": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "59",
+                                "annotation": []
+                              },
+                              "millisecond": {
+                                "type": "Literal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "999",
+                                "annotation": []
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "15",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": [],
+                            "signature": [],
+                            "hour": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "20",
+                              "annotation": []
+                            },
+                            "minute": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "second": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "59",
+                              "annotation": []
+                            },
+                            "millisecond": {
+                              "type": "Literal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "999",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Equal",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "EqualNullNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EqualEmptyListNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EqualNullEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EqualEmptyListAndEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EqualABCAndABC",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EqualABCAndAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EqualABCAnd123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Equal123AndABC",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Equal123AndString123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Equal12And123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Equal123And12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Equal123And123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EqualDateTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EqualDateTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EqualTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EqualTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "EqualNullNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EqualEmptyListNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EqualNullEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EqualEmptyListAndEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EqualABCAndABC",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EqualABCAndAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EqualABCAnd123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Equal123AndABC",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Equal123AndString123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Equal12And123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Equal123And12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Equal123And123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EqualDateTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EqualDateTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EqualTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
+                    ]
+                  }
+                },
+                {
+                  "name": "EqualTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "15",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Time",
-                            "annotation": [],
-                            "signature": [],
-                            "hour": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "20",
-                              "annotation": []
-                            },
-                            "minute": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "second": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "59",
-                              "annotation": []
-                            },
-                            "millisecond": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "999",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Equal",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "EqualNullNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Wrong output: According to spec, if either list contains a null, the result is null",
                         "annotation": []
@@ -3357,11 +7764,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3369,17 +7801,47 @@
                             "type": "As",
                             "strict": false,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "signature": [],
                             "operand": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
                               "element": []
                             },
                             "asTypeSpecifier": {
                               "type": "ListTypeSpecifier",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "localId": "1544",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "localId": "1545",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
+                                  "annotation": []
+                                }
+                              },
                               "elementType": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "name": "{urn:hl7-org:elm-types:r1}String",
                                 "annotation": []
                               }
@@ -3391,6 +7853,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
@@ -3410,6 +7873,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3421,11 +7885,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -3435,6 +7924,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
@@ -3451,17 +7941,47 @@
                             "type": "As",
                             "strict": false,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "signature": [],
                             "operand": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
                               "element": []
                             },
                             "asTypeSpecifier": {
                               "type": "ListTypeSpecifier",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "localId": "1567",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "localId": "1568",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
+                                  "annotation": []
+                                }
+                              },
                               "elementType": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "name": "{urn:hl7-org:elm-types:r1}String",
                                 "annotation": []
                               }
@@ -3474,6 +7994,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3485,22 +8006,65 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -3510,6 +8074,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3523,32 +8088,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "c",
                                 "annotation": []
@@ -3558,21 +8160,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "c",
                                 "annotation": []
@@ -3586,6 +8200,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -3599,32 +8214,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "c",
                                 "annotation": []
@@ -3634,15 +8286,26 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
@@ -3656,6 +8319,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3669,32 +8333,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "c",
                                 "annotation": []
@@ -3704,21 +8405,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -3732,6 +8445,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3745,32 +8459,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -3780,21 +8531,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "c",
                                 "annotation": []
@@ -3808,6 +8571,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3821,32 +8585,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -3856,21 +8657,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "3",
                                 "annotation": []
@@ -3884,6 +8697,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3897,26 +8711,62 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -3926,21 +8776,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -3954,6 +8816,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -3967,32 +8830,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -4002,15 +8902,26 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -4024,6 +8935,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -4037,32 +8949,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -4072,21 +9021,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -4100,6 +9061,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -4113,60 +9075,102 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 "hour": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "minute": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "second": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "millisecond": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
@@ -4174,46 +9178,54 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 "hour": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "minute": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "second": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "millisecond": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
@@ -4224,49 +9236,66 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 "hour": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "minute": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "second": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "millisecond": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
@@ -4274,46 +9303,54 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 "hour": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "minute": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "second": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "millisecond": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
@@ -4328,6 +9365,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -4341,60 +9379,102 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 "hour": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "minute": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "second": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "millisecond": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
@@ -4402,46 +9482,54 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 "hour": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "minute": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "second": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "millisecond": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
@@ -4452,49 +9540,66 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 "hour": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "minute": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "second": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "millisecond": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
@@ -4502,46 +9607,54 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 "hour": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "minute": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "second": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
                                 },
                                 "millisecond": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "0",
                                   "annotation": []
@@ -4556,6 +9669,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -4569,20 +9683,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4612,6 +9761,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4641,6 +9791,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4673,9 +9824,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4705,6 +9866,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4734,6 +9896,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4770,6 +9933,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -4783,20 +9947,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4826,6 +10025,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4855,6 +10055,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4887,9 +10088,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4919,6 +10130,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4948,6 +10160,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -4982,49 +10195,553 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Except",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ExceptEmptyListAndEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Except1234And23",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Except23And1234",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptDateTimeList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptTimeList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExceptNullRight",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Except",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ExceptEmptyListAndEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Except1234And23",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Except23And1234",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExceptDateTimeList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExceptTimeList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExceptNullRight",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "ExceptEmptyListAndEmptyList",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Except",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -5035,6 +10752,15 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "element": []
                       }
                     }
@@ -5046,38 +10772,92 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Except",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
@@ -5087,15 +10867,26 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -5110,15 +10901,26 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "4",
                             "annotation": []
@@ -5134,26 +10936,78 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Except",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -5163,27 +11017,40 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
@@ -5198,6 +11065,15 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "element": []
                       }
                     }
@@ -5209,36 +11085,90 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Except",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -5246,22 +11176,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -5269,22 +11203,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2010",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
@@ -5295,25 +11233,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -5321,22 +11272,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2010",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
@@ -5352,9 +11307,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -5387,20 +11352,71 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Except",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -5430,6 +11446,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -5459,6 +11476,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -5491,9 +11509,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -5523,6 +11551,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -5560,9 +11589,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -5601,26 +11640,78 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Except",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
@@ -5633,6 +11724,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
@@ -5647,58 +11739,507 @@
                           }
                         ]
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "4",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Exists",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ExistsEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExistsListNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Exists1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Exists12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExistsDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExistsTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExistsNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ExistsEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExistsListNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Exists1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Exists12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExistsDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExistsTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ExistsNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "4",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Exists",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "ExistsEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Exists",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
                           "element": []
                         }
                       }
@@ -5707,6 +12248,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -5720,19 +12262,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Exists",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           ]
@@ -5743,6 +12320,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -5756,19 +12334,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Exists",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -5781,6 +12394,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -5794,25 +12408,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Exists",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -5825,6 +12475,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -5838,35 +12489,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Exists",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -5874,22 +12563,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2014",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "12",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -5903,6 +12596,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -5916,19 +12610,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Exists",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -5958,6 +12687,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -5991,96 +12721,568 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ExistsNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Exists",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Flatten",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "FlattenEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FlattenListNullAndNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FlattenList12And34",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FlattenDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "ExistsNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "FlattenTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Exists",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          },
-                          "asTypeSpecifier": {
-                            "type": "ListTypeSpecifier",
-                            "annotation": [],
-                            "elementType": {
-                              "type": "NamedTypeSpecifier",
-                              "name": "{urn:hl7-org:elm-types:r1}Any",
-                              "annotation": []
-                            }
-                          }
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Flatten",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "FlattenEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FlattenListNullAndNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FlattenList12And34",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FlattenDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FlattenTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "FlattenEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Flatten",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            }
+                          },
                           "element": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
                               "element": []
                             },
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
                               "element": []
                             }
                           ]
@@ -6092,6 +13294,15 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "element": []
                       }
                     }
@@ -6103,23 +13314,87 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Flatten",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            }
+                          },
                           "element": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               ]
@@ -6127,9 +13402,19 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               ]
@@ -6143,13 +13428,24 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         ]
@@ -6163,29 +13459,94 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Flatten",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            }
+                          },
                           "element": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
@@ -6195,15 +13556,26 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
@@ -6219,27 +13591,40 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "4",
                             "annotation": []
@@ -6255,39 +13640,106 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Flatten",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            }
+                          },
                           "element": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2012",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "5",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "10",
                                     "annotation": []
@@ -6298,25 +13750,38 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2014",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "12",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "10",
                                     "annotation": []
@@ -6333,9 +13798,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -6359,6 +13834,7 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -6391,23 +13867,87 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Flatten",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            }
+                          },
                           "element": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                   "annotation": [],
                                   "signature": [],
                                   "hour": {
@@ -6440,9 +13980,19 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Time",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Time",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                   "annotation": [],
                                   "signature": [],
                                   "hour": {
@@ -6481,9 +14031,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -6513,6 +14073,7 @@
                           },
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -6554,25 +14115,407 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "FirstEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FirstNull1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "First1Null",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "First12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FirstDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FirstTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "FirstEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FirstNull1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "First1Null",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "First12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FirstDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FirstTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "FirstEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "First",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
                           "element": []
                         }
                       }
@@ -6581,6 +14524,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -6592,16 +14536,50 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "First",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "As",
@@ -6610,11 +14588,13 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -6627,6 +14607,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -6638,19 +14619,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "First",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -6662,6 +14678,7 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             }
@@ -6673,6 +14690,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -6686,25 +14704,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "First",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -6717,6 +14771,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -6730,35 +14785,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "First",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -6766,22 +14859,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2014",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "12",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -6795,6 +14892,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -6825,19 +14923,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "First",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -6867,6 +15000,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -6902,6 +15036,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -6929,42 +15064,593 @@
                           "annotation": []
                         }
                       }
-                    }
-                  ]
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "In",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "InNullEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "InNullAnd1Null",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "In1Null",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "In1And12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "In3And12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "InDateTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "InDateTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "InTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "InTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "InNullEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "InNullAnd1Null",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "In1Null",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "In1And12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "In3And12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "InDateTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "InDateTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "InTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "InTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "In",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "InNullEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -6974,6 +15660,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -6987,24 +15674,60 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
@@ -7016,6 +15739,7 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               }
@@ -7028,6 +15752,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7041,16 +15766,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -7061,6 +15812,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
@@ -7080,6 +15832,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -7093,16 +15846,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -7110,15 +15889,26 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -7132,6 +15922,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7145,16 +15936,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
@@ -7162,15 +15979,26 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -7184,6 +16012,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -7197,32 +16026,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2012",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -7231,25 +16089,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -7257,22 +16128,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -7280,22 +16155,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -7310,6 +16189,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7323,32 +16203,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2012",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "6",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
@@ -7357,25 +16266,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -7383,22 +16305,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -7406,22 +16332,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -7436,6 +16366,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -7449,16 +16380,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -7489,9 +16446,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -7521,6 +16488,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -7550,6 +16518,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -7586,6 +16555,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7599,16 +16569,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -7639,9 +16635,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -7671,6 +16677,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -7700,6 +16707,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -7734,10 +16742,322 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Includes",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IncludesEmptyAndEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludesListNullAndListNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Includes123AndEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Includes123And2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Includes123And4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludesDateTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludesDateTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludesTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludesTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludesNullLeft",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludesNullRight",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -7745,38 +17065,380 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Includes",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IncludesEmptyAndEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludesListNullAndListNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Includes123AndEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Includes123And2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Includes123And4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludesDateTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludesDateTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludesTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludesTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludesNullLeft",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludesNullRight",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "IncludesEmptyAndEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -7786,6 +17448,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7799,20 +17462,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             ]
@@ -7820,9 +17518,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             ]
@@ -7834,6 +17542,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7847,32 +17556,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -7889,6 +17635,15 @@
                                 "expression": {
                                   "type": "List",
                                   "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "ListTypeSpecifier",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
                                   "element": []
                                 }
                               }
@@ -7918,6 +17673,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7931,32 +17687,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -7966,9 +17759,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -7982,6 +17785,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -7995,32 +17799,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -8030,9 +17871,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
@@ -8046,6 +17897,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -8059,36 +17911,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -8096,22 +17986,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -8119,22 +18013,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -8145,25 +18043,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -8178,6 +18089,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8191,36 +18103,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -8228,22 +18178,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -8251,22 +18205,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -8277,25 +18235,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -8310,6 +18281,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -8323,20 +18295,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -8366,6 +18373,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -8395,6 +18403,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -8426,6 +18435,7 @@
                           },
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -8460,6 +18470,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8473,20 +18484,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Contains",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -8516,6 +18562,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -8545,6 +18592,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -8576,6 +18624,7 @@
                           },
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -8608,10 +18657,290 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludesNullLeft",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Includes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludesNullRight",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Treats null as point overload, translating to \"Contains\" operator, which has different semantics (and different result)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "IncludedIn",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IncludedInEmptyAndEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludedInListNullAndListNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludedInEmptyAnd123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludedIn2And123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludedIn4And123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -8619,55 +18948,27 @@
                 }
               },
               {
-                "name": "IncludesNullLeft",
-                "value": {
-                  "type": "Tuple",
+                "name": "IncludedInDateTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Includes",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "asTypeSpecifier": {
-                              "type": "ListTypeSpecifier",
-                              "annotation": [],
-                              "elementType": {
-                                "type": "NamedTypeSpecifier",
-                                "name": "{urn:hl7-org:elm-types:r1}Integer",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -8675,17 +18976,121 @@
                 }
               },
               {
-                "name": "IncludesNullRight",
-                "value": {
-                  "type": "Tuple",
+                "name": "IncludedInDateTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludedInTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludedInTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludedInNullLeft",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Treats null as point overload, translating to \"Contains\" operator, which has different semantics (and different result)",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IncludedInNullRight",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -8693,38 +19098,371 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "IncludedIn",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IncludedInEmptyAndEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludedInListNullAndListNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludedInEmptyAnd123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludedIn2And123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludedIn4And123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludedInDateTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludedInDateTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludedInTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludedInTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludedInNullLeft",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IncludedInNullRight",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "IncludedInEmptyAndEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -8734,6 +19472,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8747,20 +19486,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             ]
@@ -8768,9 +19542,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             ]
@@ -8782,6 +19566,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8795,37 +19580,83 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -8839,6 +19670,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8852,20 +19684,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -8875,21 +19742,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -8903,6 +19782,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -8916,20 +19796,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
@@ -8939,21 +19854,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -8967,6 +19894,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -8980,36 +19908,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -9020,25 +19986,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -9046,22 +20025,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -9069,22 +20052,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -9099,6 +20086,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -9112,36 +20100,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -9152,25 +20178,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -9178,22 +20217,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -9201,22 +20244,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -9231,6 +20278,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -9244,16 +20292,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -9284,9 +20358,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -9316,6 +20400,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -9345,6 +20430,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -9381,6 +20467,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -9394,16 +20481,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "In",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -9434,9 +20547,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -9466,6 +20589,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -9495,6 +20619,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -9531,6 +20656,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -9544,11 +20670,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Treats null as point overload, translating to \"In\" operator, which has different semantics (and different result)",
                         "annotation": []
@@ -9562,11 +20704,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Converts included in to in, which has different semantics when second argument is null",
                         "annotation": []
@@ -9576,27 +20734,456 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Indexer",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          }
+        },
+        {
+          "name": "Indexer",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IndexerNull1List",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Indexer0Of12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Indexer1Of12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Indexer2Of12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerNeg1Of12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IndexerNull1List",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Indexer0Of12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Indexer1Of12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Indexer2Of12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexerNeg1Of12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexerDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexerTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "IndexerNull1List",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -9604,16 +21191,38 @@
                             "type": "As",
                             "strict": false,
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
                               "type": "ListTypeSpecifier",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "localId": "4263",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "localId": "4264",
+                                  "name": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
                               "elementType": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "name": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
@@ -9621,6 +21230,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -9632,6 +21242,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -9643,26 +21254,62 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -9671,6 +21318,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "0",
                             "annotation": []
@@ -9682,6 +21330,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -9695,26 +21344,62 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -9723,6 +21408,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -9734,6 +21420,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -9747,26 +21434,62 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -9775,6 +21498,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
@@ -9786,6 +21510,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -9797,26 +21522,62 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -9825,10 +21586,12 @@
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -9841,6 +21604,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -9852,36 +21616,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -9889,22 +21691,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -9912,22 +21718,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -9937,6 +21747,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -9948,6 +21759,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -9978,20 +21790,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -10021,6 +21868,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -10050,6 +21898,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -10081,6 +21930,7 @@
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -10090,70 +21940,566 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Time",
-                        "annotation": [],
-                        "signature": [],
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "15",
-                          "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "59",
-                          "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "59",
-                          "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "999",
-                          "annotation": []
-                        }
+                      "value": {
+                        "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "15",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "59",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "59",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "999",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "IndexOf",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IndexOfEmptyNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexOfNullEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexOfNullIn1Null",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexOf1In12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexOf2In12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexOf3In12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexOfDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexOfTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "IndexOf",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IndexOfEmptyNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexOfNullEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexOfNullIn1Null",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexOf1In12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexOf2In12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexOf3In12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexOfDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexOfTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "IndexOfEmptyNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IndexOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
                           "element": []
                         },
                         "element": {
                           "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                           "annotation": []
                         }
                       }
@@ -10162,6 +22508,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -10173,11 +22520,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IndexOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
@@ -10186,6 +22558,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           "asTypeSpecifier": {
@@ -10201,6 +22574,15 @@
                         "element": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
                           "element": []
                         }
                       }
@@ -10209,6 +22591,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -10220,19 +22603,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IndexOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -10244,6 +22662,7 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             }
@@ -10256,6 +22675,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -10265,6 +22685,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -10276,25 +22697,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IndexOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -10303,6 +22760,7 @@
                         },
                         "element": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
@@ -10313,6 +22771,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "0",
                         "annotation": []
@@ -10326,25 +22785,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IndexOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -10353,6 +22848,7 @@
                         },
                         "element": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "2",
                           "annotation": []
@@ -10363,6 +22859,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -10376,25 +22873,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IndexOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -10403,6 +22936,7 @@
                         },
                         "element": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "3",
                           "annotation": []
@@ -10413,10 +22947,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
@@ -10431,35 +22967,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IndexOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2001",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "9",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "11",
                                 "annotation": []
@@ -10467,22 +23041,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -10490,22 +23068,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2014",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "12",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -10515,22 +23097,26 @@
                         },
                         "element": {
                           "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": [],
                           "signature": [],
                           "year": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2014",
                             "annotation": []
                           },
                           "month": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "12",
                             "annotation": []
                           },
                           "day": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "10",
                             "annotation": []
@@ -10542,6 +23128,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -10555,19 +23142,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IndexOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -10597,6 +23219,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -10626,6 +23249,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -10657,6 +23281,7 @@
                         },
                         "element": {
                           "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                           "annotation": [],
                           "signature": [],
                           "hour": {
@@ -10690,6 +23315,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -10706,31 +23332,462 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IntersectEmptyListAndEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Intersect1234And23",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Intersect23And1234",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntersectDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntersectTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntersectEmptyListAndEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Intersect1234And23",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Intersect23And1234",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntersectDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntersectTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "IntersectEmptyListAndEmptyList",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Intersect",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -10741,6 +23798,15 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "element": []
                       }
                     }
@@ -10752,38 +23818,92 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Intersect",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
@@ -10793,15 +23913,26 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -10816,15 +23947,26 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
@@ -10840,26 +23982,78 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Intersect",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -10869,27 +24063,40 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
@@ -10904,15 +24111,26 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
@@ -10928,36 +24146,90 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Intersect",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -10965,22 +24237,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -10988,22 +24264,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -11014,25 +24294,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -11040,22 +24333,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -11063,22 +24360,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2000",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -11094,9 +24395,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -11120,6 +24431,7 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -11152,20 +24464,71 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Intersect",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -11195,6 +24558,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -11224,6 +24588,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -11256,9 +24621,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -11288,6 +24663,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -11317,6 +24693,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -11354,9 +24731,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -11386,6 +24773,7 @@
                           },
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -11427,25 +24815,407 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "LastEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastNull1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Last1Null",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Last12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "LastEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LastNull1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Last1Null",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Last12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LastDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LastTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "LastEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Last",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
                           "element": []
                         }
                       }
@@ -11454,6 +25224,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -11465,16 +25236,50 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Last",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "As",
@@ -11483,11 +25288,13 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -11500,6 +25307,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -11513,19 +25321,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Last",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -11537,6 +25380,7 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             }
@@ -11548,6 +25392,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -11559,25 +25404,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Last",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -11590,6 +25471,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -11603,35 +25485,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Last",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -11639,22 +25559,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2014",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "12",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -11668,6 +25592,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -11698,19 +25623,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Last",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -11740,6 +25700,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -11775,6 +25736,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -11814,25 +25776,463 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "LengthEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LengthNull1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Length1Null",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Length12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LengthDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LengthTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LengthNullList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "LengthEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LengthNull1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Length1Null",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Length12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LengthDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LengthTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LengthNullList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "LengthEmptyList",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
                           "element": []
                         }
                       }
@@ -11841,6 +26241,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "0",
                         "annotation": []
@@ -11854,16 +26255,50 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "As",
@@ -11872,11 +26307,13 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -11889,6 +26326,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -11902,19 +26340,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -11926,6 +26399,7 @@
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             }
@@ -11937,6 +26411,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -11950,25 +26425,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -11981,6 +26492,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "2",
                         "annotation": []
@@ -11994,35 +26506,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2001",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "9",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "11",
                                 "annotation": []
@@ -12030,22 +26580,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -12053,22 +26607,26 @@
                             },
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2014",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "12",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -12082,6 +26640,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "3",
                         "annotation": []
@@ -12095,19 +26654,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -12137,6 +26731,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -12166,6 +26761,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -12195,6 +26791,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -12224,6 +26821,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -12253,6 +26851,7 @@
                             },
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -12286,10 +26885,312 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "6",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "6",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LengthNullList",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "strict": false,
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "localId": "5379",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "localId": "5380",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Equivalent",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "EquivalentEmptyAndEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivalentABCAndABC",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivalentABCAndAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivalentABCAnd123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Equivalent123AndABC",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Equivalent123AndString123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivalentDateTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -12297,44 +27198,139 @@
                 }
               },
               {
-                "name": "LengthNullList",
-                "value": {
-                  "type": "Tuple",
+                "name": "EquivalentDateTimeNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Length",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "strict": false,
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          },
-                          "asTypeSpecifier": {
-                            "type": "ListTypeSpecifier",
-                            "annotation": [],
-                            "elementType": {
-                              "type": "NamedTypeSpecifier",
-                              "name": "{urn:hl7-org:elm-types:r1}Any",
-                              "annotation": []
-                            }
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivalentDateTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivalentTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivalentTimeNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EquivalentTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -12342,38 +27338,417 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Equivalent",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "EquivalentEmptyAndEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivalentABCAndABC",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivalentABCAndAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivalentABCAnd123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Equivalent123AndABC",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Equivalent123AndString123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivalentDateTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivalentDateTimeNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivalentDateTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivalentTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivalentTimeNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EquivalentTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "EquivalentEmptyAndEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -12383,6 +27758,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -12396,32 +27772,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "c",
                                 "annotation": []
@@ -12431,21 +27844,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "c",
                                 "annotation": []
@@ -12459,6 +27884,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -12472,32 +27898,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "c",
                                 "annotation": []
@@ -12507,15 +27970,26 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
@@ -12529,6 +28003,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -12542,32 +28017,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "c",
                                 "annotation": []
@@ -12577,21 +28089,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -12605,6 +28129,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -12618,32 +28143,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -12653,21 +28215,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "b",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "c",
                                 "annotation": []
@@ -12681,6 +28255,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -12694,32 +28269,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -12729,21 +28341,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "3",
                                 "annotation": []
@@ -12757,6 +28381,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -12770,36 +28395,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -12807,22 +28470,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -12830,22 +28497,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -12858,6 +28529,7 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               }
@@ -12866,25 +28538,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -12892,22 +28577,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -12915,22 +28604,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -12943,6 +28636,7 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               }
@@ -12955,6 +28649,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -12968,36 +28663,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -13005,22 +28738,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -13028,22 +28765,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -13054,25 +28795,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -13080,22 +28834,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -13103,22 +28861,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -13131,6 +28893,7 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               }
@@ -13143,6 +28906,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -13156,36 +28920,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -13193,22 +28995,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -13216,22 +29022,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -13242,25 +29052,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -13268,22 +29091,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -13291,22 +29118,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
@@ -13321,6 +29152,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -13334,20 +29166,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13377,6 +29244,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13409,9 +29277,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13441,6 +29319,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13477,6 +29356,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -13490,20 +29370,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13533,6 +29448,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13565,9 +29481,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13597,6 +29523,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13631,6 +29558,7 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               }
@@ -13643,6 +29571,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -13656,20 +29585,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equivalent",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13699,6 +29663,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13731,9 +29696,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13763,6 +29738,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -13797,10 +29773,303 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "NotEqual",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "NotEqualEmptyAndEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotEqualABCAndABC",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotEqualABCAndAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotEqualABCAnd123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotEqual123AndABC",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotEqual123AndString123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotEqualDateTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotEqualDateTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotEqualTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotEqualTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -13808,42 +30077,366 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "NotEqual",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "NotEqualEmptyAndEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotEqualABCAndABC",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotEqualABCAndAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotEqualABCAnd123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotEqual123AndABC",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotEqual123AndString123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotEqualDateTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotEqualDateTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotEqualTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotEqualTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "NotEqualEmptyAndEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
                               "element": []
                             },
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Any",
+                                  "annotation": []
+                                }
+                              },
                               "element": []
                             }
                           ]
@@ -13854,6 +30447,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -13867,36 +30461,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "a",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "b",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "c",
                                   "annotation": []
@@ -13906,21 +30538,33 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "a",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "b",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "c",
                                   "annotation": []
@@ -13935,6 +30579,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -13948,36 +30593,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "a",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "b",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "c",
                                   "annotation": []
@@ -13987,15 +30670,26 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "a",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "b",
                                   "annotation": []
@@ -14010,6 +30704,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -14023,36 +30718,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "a",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "b",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "c",
                                   "annotation": []
@@ -14062,21 +30795,33 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
@@ -14091,6 +30836,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -14104,36 +30850,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
@@ -14143,21 +30927,33 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "a",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "b",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "c",
                                   "annotation": []
@@ -14172,6 +30968,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -14185,36 +30982,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
@@ -14224,21 +31059,33 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}String",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                   "valueType": "{urn:hl7-org:elm-types:r1}String",
                                   "value": "3",
                                   "annotation": []
@@ -14253,6 +31100,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -14266,64 +31114,107 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2001",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "9",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "11",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14331,46 +31222,54 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2012",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "5",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "10",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14378,46 +31277,54 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2014",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "12",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "10",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14428,49 +31335,66 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2001",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "9",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "11",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14478,46 +31402,54 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2012",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "5",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "10",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14525,46 +31457,54 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2014",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "12",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "1",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14580,6 +31520,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -14593,64 +31534,107 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Equal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2001",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "9",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "11",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14658,46 +31642,54 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2012",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "5",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "10",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14705,46 +31697,54 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2014",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "12",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "10",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14755,49 +31755,66 @@
                             {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2001",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "9",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "11",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14805,46 +31822,54 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2012",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "5",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "10",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14852,46 +31877,54 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "2014",
                                     "annotation": []
                                   },
                                   "month": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "12",
                                     "annotation": []
                                   },
                                   "day": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "10",
                                     "annotation": []
                                   },
                                   "hour": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "minute": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "second": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
                                   },
                                   "millisecond": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "0",
                                     "annotation": []
@@ -14907,6 +31940,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -14920,20 +31954,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -14963,6 +32032,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -14995,9 +32065,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -15027,6 +32107,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -15063,6 +32144,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -15076,20 +32158,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Equal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -15119,6 +32236,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -15151,9 +32269,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -15183,6 +32311,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -15214,13 +32343,326 @@
                           }
                         ]
                       }
-                    },
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "ProperContains",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ProperContainsNullRightFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperContainsNullRightTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperContainsTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperContainsTimeNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ProperContainsNullRightFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperContainsNullRightTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperContainsTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperContainsTimeNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "ProperContainsNullRightFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperContains not implemented",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperContainsNullRightTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperContains not implemented",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperContainsTimeTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperContains not implemented",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperContainsTimeNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "skipped",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ProperContains not implemented",
                         "annotation": []
                       }
                     }
@@ -15231,26 +32673,206 @@
           }
         },
         {
-          "name": "ProperContains",
+          "name": "ProperIn",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ProperInNullRightFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperInNullRightTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperInTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperInTimeNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ProperInNullRightFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperInNullRightTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperInTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperInTimeNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
-                "name": "ProperContainsNullRightFalse",
+                "name": "ProperInNullRightFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperContains not implemented",
+                        "value": "ProperIn not implemented",
                         "annotation": []
                       }
                     }
@@ -15258,17 +32880,33 @@
                 }
               },
               {
-                "name": "ProperContainsNullRightTrue",
+                "name": "ProperInNullRightTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperContains not implemented",
+                        "value": "ProperIn not implemented",
                         "annotation": []
                       }
                     }
@@ -15276,17 +32914,33 @@
                 }
               },
               {
-                "name": "ProperContainsTimeTrue",
+                "name": "ProperInTimeTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperContains not implemented",
+                        "value": "ProperIn not implemented",
                         "annotation": []
                       }
                     }
@@ -15294,17 +32948,33 @@
                 }
               },
               {
-                "name": "ProperContainsTimeNull",
+                "name": "ProperInTimeNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperContains not implemented",
+                        "value": "ProperIn not implemented",
                         "annotation": []
                       }
                     }
@@ -15315,26 +32985,36 @@
           }
         },
         {
-          "name": "ProperIn",
+          "name": "ProperlyIncludes",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "ProperInNullRightFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "ProperIncludesEmptyAndEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperIn not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -15342,17 +33022,195 @@
                 }
               },
               {
-                "name": "ProperInNullRightTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "ProperIncludesListNullAndListNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperIn not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludes123AndEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludes123And2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludes123And4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludesDateTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludesDateTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludesTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -15360,17 +33218,27 @@
                 }
               },
               {
-                "name": "ProperInTimeTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "ProperIncludesTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperIn not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -15378,17 +33246,27 @@
                 }
               },
               {
-                "name": "ProperInTimeNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "ProperlyIncludesNullLeft",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ProperIn not implemented",
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -15396,38 +33274,361 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "ProperlyIncludes",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ProperIncludesEmptyAndEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludesListNullAndListNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludes123AndEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludes123And2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludes123And4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludesDateTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludesDateTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludesTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludesTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperlyIncludesNullLeft",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "ProperIncludesEmptyAndEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -15437,6 +33638,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -15450,20 +33652,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             ]
@@ -15471,9 +33708,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             ]
@@ -15485,6 +33732,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -15498,32 +33746,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -15540,6 +33825,15 @@
                                 "expression": {
                                   "type": "List",
                                   "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "ListTypeSpecifier",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
                                   "element": []
                                 }
                               }
@@ -15569,6 +33863,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -15582,32 +33877,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -15617,9 +33949,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -15633,6 +33975,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -15646,32 +33989,69 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -15681,9 +34061,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
@@ -15697,6 +34087,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -15710,36 +34101,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -15747,22 +34176,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -15770,22 +34203,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -15796,25 +34233,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -15822,22 +34272,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -15852,6 +34306,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -15865,36 +34320,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -15902,22 +34395,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -15925,22 +34422,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -15951,25 +34452,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -15977,22 +34491,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -16000,22 +34518,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -16030,6 +34552,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -16043,20 +34566,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16086,6 +34644,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16115,6 +34674,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16147,9 +34707,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16179,6 +34749,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16215,6 +34786,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -16228,20 +34800,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16271,6 +34878,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16300,6 +34908,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16332,9 +34941,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16364,6 +34983,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16393,6 +35013,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -16427,10 +35048,340 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperlyIncludesNullLeft",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "ProperIncludes",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            }
+                          },
+                          {
+                            "type": "List",
+                            "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            "element": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "ProperlyIncludedIn",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ProperIncludedInEmptyAndEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludedInListNullAndListNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludedInEmptyAnd123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludedIn2And123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludedIn4And123",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludedInDateTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludedInDateTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperIncludedInTimeTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -16438,55 +35389,46 @@
                 }
               },
               {
-                "name": "ProperlyIncludesNullLeft",
-                "value": {
-                  "type": "Tuple",
+                "name": "ProperIncludedInTimeFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ProperIncludes",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "asTypeSpecifier": {
-                              "type": "ListTypeSpecifier",
-                              "annotation": [],
-                              "elementType": {
-                                "type": "NamedTypeSpecifier",
-                                "name": "{urn:hl7-org:elm-types:r1}Integer",
-                                "annotation": []
-                              }
-                            }
-                          },
-                          {
-                            "type": "List",
-                            "annotation": [],
-                            "element": [
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ProperlyIncludedInNulRight",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -16494,38 +35436,352 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "ProperlyIncludedIn",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ProperIncludedInEmptyAndEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludedInListNullAndListNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludedInEmptyAnd123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludedIn2And123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludedIn4And123",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludedInDateTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludedInDateTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludedInTimeTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperIncludedInTimeFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ProperlyIncludedInNulRight",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "ProperIncludedInEmptyAndEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -16535,6 +35791,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -16548,20 +35805,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             ]
@@ -16569,9 +35861,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             ]
@@ -16583,6 +35885,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -16596,37 +35899,83 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -16640,6 +35989,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -16653,20 +36003,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -16676,21 +36061,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -16704,6 +36101,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -16717,20 +36115,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
@@ -16740,21 +36173,33 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -16768,6 +36213,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -16781,36 +36227,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -16818,22 +36302,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -16844,25 +36332,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -16870,22 +36371,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -16893,22 +36398,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -16923,6 +36432,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -16936,36 +36446,74 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -16973,22 +36521,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -16996,22 +36548,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -17022,25 +36578,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -17048,22 +36617,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -17071,22 +36644,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -17101,6 +36678,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -17114,20 +36692,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17157,6 +36770,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17189,9 +36803,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17221,6 +36845,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17250,6 +36875,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17286,6 +36912,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -17299,20 +36926,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ProperIncludedIn",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17342,6 +37004,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17371,6 +37034,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17403,9 +37067,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17435,6 +37109,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17464,6 +37139,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -17500,6 +37176,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -17513,11 +37190,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "ProperIn not implemented",
                         "annotation": []
@@ -17534,25 +37227,407 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "SingletonFromEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SingletonFromListNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SingletonFrom1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SingletonFrom12",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SingletonFromDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SingletonFromTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SingletonFromEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SingletonFromListNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SingletonFrom1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SingletonFrom12",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SingletonFromDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SingletonFromTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "SingletonFromEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "SingletonFrom",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
                           "element": []
                         }
                       }
@@ -17561,6 +37636,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -17572,19 +37648,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "SingletonFrom",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           ]
@@ -17595,6 +37706,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -17606,19 +37718,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "SingletonFrom",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
@@ -17631,6 +37778,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -17644,25 +37792,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "SingletonFrom",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -17675,6 +37859,7 @@
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -17688,35 +37873,73 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "SingletonFrom",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "DateTime",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                               "annotation": [],
                               "signature": [],
                               "year": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2012",
                                 "annotation": []
                               },
                               "month": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "5",
                                 "annotation": []
                               },
                               "day": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "10",
                                 "annotation": []
@@ -17730,6 +37953,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -17760,19 +37984,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "SingletonFrom",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Time",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Time",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                               "annotation": [],
                               "signature": [],
                               "hour": {
@@ -17808,6 +38067,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -17847,21 +38107,422 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "SkipNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SkipEven",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SkipOdd",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SkipNone",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SkipAll",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SkipNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SkipEven",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SkipOdd",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SkipNone",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SkipAll",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "SkipNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "As",
@@ -17869,6 +38530,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           "asTypeSpecifier": {
@@ -17883,12 +38545,14 @@
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "3",
                           "annotation": []
                         },
                         "endIndex": {
                           "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": []
                         }
                       }
@@ -17897,6 +38561,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -17908,43 +38573,98 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -17953,12 +38673,14 @@
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "2",
                           "annotation": []
                         },
                         "endIndex": {
                           "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": []
                         }
                       }
@@ -17968,21 +38690,33 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "4",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "5",
                             "annotation": []
@@ -17998,43 +38732,98 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -18043,12 +38832,14 @@
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "3",
                           "annotation": []
                         },
                         "endIndex": {
                           "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": []
                         }
                       }
@@ -18058,15 +38849,26 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "4",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "5",
                             "annotation": []
@@ -18082,43 +38884,98 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -18127,12 +38984,14 @@
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "0",
                           "annotation": []
                         },
                         "endIndex": {
                           "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": []
                         }
                       }
@@ -18142,33 +39001,47 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "4",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "5",
                             "annotation": []
@@ -18184,43 +39057,98 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -18229,12 +39157,14 @@
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "5",
                           "annotation": []
                         },
                         "endIndex": {
                           "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": []
                         }
                       }
@@ -18244,6 +39174,15 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "element": []
                       }
                     }
@@ -18258,21 +39197,422 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TailNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TailEven",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TailOdd",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TailEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TailOneElement",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TailNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TailEven",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TailOdd",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TailEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TailOneElement",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "TailNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "As",
@@ -18280,6 +39620,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           "asTypeSpecifier": {
@@ -18300,6 +39641,7 @@
                         },
                         "endIndex": {
                           "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": []
                         }
                       }
@@ -18308,6 +39650,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -18319,37 +39662,91 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
@@ -18364,6 +39761,7 @@
                         },
                         "endIndex": {
                           "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": []
                         }
                       }
@@ -18373,21 +39771,33 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "4",
                             "annotation": []
@@ -18403,43 +39813,98 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
@@ -18454,6 +39919,7 @@
                         },
                         "endIndex": {
                           "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": []
                         }
                       }
@@ -18463,27 +39929,40 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "4",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "5",
                             "annotation": []
@@ -18495,115 +39974,709 @@
                 }
               },
               {
-                "name": "TailEmpty",
-                "value": {
-                  "type": "Tuple",
+                "name": "TailEmpty",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Slice",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "source": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          "element": []
+                        },
+                        "startIndex": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "endIndex": {
+                          "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "element": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TailOneElement",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Slice",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
+                        "signature": [],
+                        "source": {
+                          "type": "List",
+                          "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
+                          "element": [
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          ]
+                        },
+                        "startIndex": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        },
+                        "endIndex": {
+                          "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "element": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Take",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TakeNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TakeNullEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TakeEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TakeEven",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TakeOdd",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Slice",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "source": {
-                          "type": "List",
-                          "annotation": [],
-                          "element": []
-                        },
-                        "startIndex": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        },
-                        "endIndex": {
-                          "type": "Null",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": []
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "TailOneElement",
-                "value": {
-                  "type": "Tuple",
+                "name": "TakeAll",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Slice",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "signature": [],
-                        "source": {
-                          "type": "List",
-                          "annotation": [],
-                          "element": [
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          ]
-                        },
-                        "startIndex": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        },
-                        "endIndex": {
-                          "type": "Null",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "List",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
                         "annotation": [],
-                        "element": []
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Take",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TakeNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TakeNullEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TakeEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TakeEven",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TakeOdd",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TakeAll",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "TakeNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "As",
@@ -18611,6 +40684,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           "asTypeSpecifier": {
@@ -18636,6 +40710,7 @@
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
@@ -18654,6 +40729,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -18665,31 +40741,84 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
@@ -18709,15 +40838,18 @@
                           "operand": [
                             {
                               "type": "As",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "strict": false,
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               },
                               "asTypeSpecifier": {
                                 "type": "NamedTypeSpecifier",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": []
                               }
@@ -18737,6 +40869,15 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "element": []
                       }
                     }
@@ -18748,31 +40889,84 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
@@ -18792,6 +40986,7 @@
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "0",
                               "annotation": []
@@ -18811,6 +41006,15 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "element": []
                       }
                     }
@@ -18822,37 +41026,91 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
@@ -18872,6 +41130,7 @@
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
@@ -18891,15 +41150,26 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
@@ -18915,37 +41185,91 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
@@ -18965,6 +41289,7 @@
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
@@ -18984,21 +41309,33 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
@@ -19014,37 +41351,91 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Slice",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "1",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "3",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
@@ -19064,6 +41455,7 @@
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
@@ -19083,70 +41475,658 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "4",
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "4",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Union",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "UnionEmptyAndEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UnionListNullAndListNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Union123AndEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Union123And2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Union123And4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UnionDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UnionTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "UnionEmptyAndEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UnionListNullAndListNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Union123AndEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Union123And2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Union123And4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UnionDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UnionTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": []
                           }
-                        ]
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Union",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "UnionEmptyAndEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           },
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -19157,6 +42137,15 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "element": []
                       }
                     }
@@ -19168,20 +42157,71 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             ]
@@ -19189,9 +42229,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Null",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                 "annotation": []
                               }
                             ]
@@ -19204,9 +42254,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         ]
@@ -19220,32 +42280,85 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -19262,6 +42375,15 @@
                                 "expression": {
                                   "type": "List",
                                   "annotation": [],
+                                  "resultTypeSpecifier": {
+                                    "type": "ListTypeSpecifier",
+                                    "annotation": [],
+                                    "elementType": {
+                                      "type": "NamedTypeSpecifier",
+                                      "name": "{urn:hl7-org:elm-types:r1}Any",
+                                      "annotation": []
+                                    }
+                                  },
                                   "element": []
                                 }
                               }
@@ -19292,21 +42414,33 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
@@ -19322,32 +42456,85 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -19357,9 +42544,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
@@ -19374,21 +42571,33 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
@@ -19404,32 +42613,85 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "1",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "2",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "3",
                                 "annotation": []
@@ -19439,9 +42701,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "4",
                                 "annotation": []
@@ -19456,27 +42728,40 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "4",
                             "annotation": []
@@ -19492,36 +42777,90 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2001",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "9",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "11",
                                   "annotation": []
@@ -19532,25 +42871,38 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -19558,22 +42910,26 @@
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2014",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "12",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
@@ -19589,9 +42945,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -19615,6 +42981,7 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -19638,6 +43005,7 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -19670,20 +43038,71 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Union",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -19713,6 +43132,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -19742,6 +43162,7 @@
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -19774,9 +43195,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -19814,9 +43245,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Time",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -19846,6 +43287,7 @@
                           },
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -19875,6 +43317,7 @@
                           },
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -19904,6 +43347,7 @@
                           },
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
diff --git a/test/spec-tests/cql/CqlLogicalOperatorsTest.json b/test/spec-tests/cql/CqlLogicalOperatorsTest.json
index 07d3c85a2..6288d619f 100644
--- a/test/spec-tests/cql/CqlLogicalOperatorsTest.json
+++ b/test/spec-tests/cql/CqlLogicalOperatorsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,44 +66,32 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
                 "name": "TrueAndTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "And",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -112,38 +100,26 @@
               },
               {
                 "name": "TrueAndFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "And",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -152,40 +128,26 @@
               },
               {
                 "name": "TrueAndNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "And",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -194,38 +156,26 @@
               },
               {
                 "name": "FalseAndTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "And",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -234,38 +184,26 @@
               },
               {
                 "name": "FalseAndFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "And",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -274,42 +212,26 @@
               },
               {
                 "name": "FalseAndNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "And",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -318,40 +240,26 @@
               },
               {
                 "name": "NullAndTrue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "And",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -360,42 +268,26 @@
               },
               {
                 "name": "NullAndFalse",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "And",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -404,44 +296,26 @@
               },
               {
                 "name": "NullAndNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "And",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -449,38 +323,317 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Implies",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
-            "element": [
-              {
-                "name": "TrueImpliesTrue",
-                "value": {
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TrueAndTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TrueAndFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TrueAndNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseAndTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseAndFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseAndNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullAndTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullAndFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullAndNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TrueAndTrue",
+                "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Implies",
+                        "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
@@ -492,6 +645,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -501,26 +655,53 @@
                 }
               },
               {
-                "name": "TrueImpliesFalse",
+                "name": "TrueAndFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Implies",
+                        "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
@@ -532,6 +713,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -541,20 +723,46 @@
                 }
               },
               {
-                "name": "TrueImpliesNull",
+                "name": "TrueAndNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Implies",
+                        "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
@@ -566,6 +774,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -576,6 +785,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -583,26 +793,53 @@
                 }
               },
               {
-                "name": "FalseImpliesTrue",
+                "name": "FalseAndTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Implies",
+                        "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
@@ -614,8 +851,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -623,26 +861,53 @@
                 }
               },
               {
-                "name": "FalseImpliesFalse",
+                "name": "FalseAndFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Implies",
+                        "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
@@ -654,8 +919,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -663,20 +929,46 @@
                 }
               },
               {
-                "name": "FalseImpliesNull",
+                "name": "FalseAndNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Implies",
+                        "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
@@ -688,6 +980,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -698,8 +991,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -707,15 +1001,40 @@
                 }
               },
               {
-                "name": "NullImpliesTrue",
+                "name": "NullAndTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Implies",
+                        "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -726,11 +1045,13 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
@@ -741,9 +1062,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -751,15 +1071,40 @@
                 }
               },
               {
-                "name": "NullImpliesFalse",
+                "name": "NullAndFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Implies",
+                        "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -770,11 +1115,13 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
@@ -785,7 +1132,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -793,15 +1143,40 @@
                 }
               },
               {
-                "name": "NullImpliesNull",
+                "name": "NullAndNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Implies",
+                        "type": "And",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -812,6 +1187,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
@@ -822,6 +1198,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -832,6 +1209,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -842,40 +1220,36 @@
           }
         },
         {
-          "name": "Not",
+          "name": "Implies",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "NotTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "TrueImpliesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Not",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                          "value": "true",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -883,29 +1257,2150 @@
                 }
               },
               {
-                "name": "NotFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "TrueImpliesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Not",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                          "value": "false",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TrueImpliesNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseImpliesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseImpliesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseImpliesNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NullImpliesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NullImpliesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NullImpliesNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TrueImpliesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TrueImpliesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TrueImpliesNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseImpliesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseImpliesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseImpliesNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullImpliesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullImpliesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullImpliesNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TrueImpliesTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Implies",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TrueImpliesFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Implies",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TrueImpliesNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Implies",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseImpliesTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Implies",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseImpliesFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Implies",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseImpliesNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Implies",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NullImpliesTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Implies",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NullImpliesFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Implies",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NullImpliesNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Implies",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Not",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "NotTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "NotTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NotNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "NotTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "value": "true",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "value": "false",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NotNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Not",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Or",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TrueOrTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TrueOrFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TrueOrNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseOrTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseOrFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseOrNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NullOrTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NullOrFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NullOrNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TrueOrTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TrueOrFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TrueOrNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseOrTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseOrFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseOrNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullOrTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullOrFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullOrNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "TrueOrTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Or",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TrueOrFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Or",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "false",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -915,72 +3410,125 @@
                 }
               },
               {
-                "name": "NotNull",
+                "name": "TrueOrNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Not",
+                        "type": "Or",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "value": "true",
                             "annotation": []
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           }
-                        }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Or",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "TrueOrTrue",
+                "name": "FalseOrTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Or",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
+                            "value": "false",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
@@ -992,6 +3540,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1001,26 +3550,53 @@
                 }
               },
               {
-                "name": "TrueOrFalse",
+                "name": "FalseOrFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Or",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
+                            "value": "false",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
@@ -1032,8 +3608,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "value": "false",
                         "annotation": []
                       }
                     }
@@ -1041,22 +3618,48 @@
                 }
               },
               {
-                "name": "TrueOrNull",
+                "name": "FalseOrNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Or",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
+                            "value": "false",
                             "annotation": []
                           },
                           {
@@ -1066,6 +3669,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -1075,9 +3679,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1085,26 +3688,57 @@
                 }
               },
               {
-                "name": "FalseOrTrue",
+                "name": "NullOrTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Or",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
@@ -1116,6 +3750,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1125,26 +3760,57 @@
                 }
               },
               {
-                "name": "FalseOrFalse",
+                "name": "NullOrFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Or",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
@@ -1155,9 +3821,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1165,23 +3830,53 @@
                 }
               },
               {
-                "name": "FalseOrNull",
+                "name": "NullOrNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Or",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           },
                           {
                             "type": "As",
@@ -1190,6 +3885,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -1198,8 +3894,161 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Xor",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "TrueXorTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TrueXorFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TrueXorNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseXorTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "FalseXorFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1207,43 +4056,27 @@
                 }
               },
               {
-                "name": "NullOrTrue",
-                "value": {
-                  "type": "Tuple",
+                "name": "FalseXorNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Or",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "true",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1251,41 +4084,27 @@
                 }
               },
               {
-                "name": "NullOrFalse",
-                "value": {
-                  "type": "Tuple",
+                "name": "NullXorTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Or",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "value": "false",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1293,45 +4112,55 @@
                 }
               },
               {
-                "name": "NullOrNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "NullXorFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Or",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Boolean",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NullXorNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1339,38 +4168,317 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Xor",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "TrueXorTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TrueXorFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TrueXorNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseXorTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseXorFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "FalseXorNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullXorTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullXorFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NullXorNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "TrueXorTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Xor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
@@ -1382,6 +4490,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -1395,22 +4504,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Xor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
@@ -1422,6 +4558,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1435,16 +4572,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Xor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
@@ -1456,6 +4619,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -1466,6 +4630,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1477,22 +4642,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Xor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
@@ -1504,6 +4696,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1517,22 +4710,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Xor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
@@ -1544,6 +4764,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -1557,16 +4778,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Xor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
@@ -1578,6 +4825,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -1588,6 +4836,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1599,11 +4848,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Xor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -1614,11 +4888,13 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "true",
                             "annotation": []
@@ -1630,6 +4906,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1641,11 +4918,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Xor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -1656,11 +4958,13 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                             "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                             "value": "false",
                             "annotation": []
@@ -1672,6 +4976,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1683,11 +4988,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Xor",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -1698,6 +5028,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
@@ -1708,6 +5039,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -1718,6 +5050,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
diff --git a/test/spec-tests/cql/CqlNullologicalOperatorsTest.json b/test/spec-tests/cql/CqlNullologicalOperatorsTest.json
index 5e9a7447a..3a0815ac8 100644
--- a/test/spec-tests/cql/CqlNullologicalOperatorsTest.json
+++ b/test/spec-tests/cql/CqlNullologicalOperatorsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,25 +66,711 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "CoalesceANull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CoalesceNullA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CoalesceEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CoalesceListFirstA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CoalesceListLastA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CoalesceFirstList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CoalesceLastList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeCoalesce",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeListCoalesce",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeCoalesce",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeListCoalesce",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "CoalesceANull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CoalesceNullA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CoalesceEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CoalesceListFirstA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CoalesceListLastA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CoalesceFirstList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CoalesceLastList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeCoalesce",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeListCoalesce",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeCoalesce",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeListCoalesce",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "CoalesceANull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
@@ -96,6 +782,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -106,6 +793,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "a",
                         "annotation": []
@@ -119,11 +807,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -134,11 +847,13 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
@@ -150,6 +865,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "a",
                         "annotation": []
@@ -163,17 +879,51 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Any",
+                                "annotation": []
+                              }
+                            },
                             "element": []
                           }
                         ]
@@ -183,6 +933,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -194,20 +945,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
@@ -219,6 +1005,7 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               },
@@ -229,6 +1016,7 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               }
@@ -241,6 +1029,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "a",
                         "annotation": []
@@ -254,17 +1043,51 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "As",
@@ -273,6 +1096,7 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               },
@@ -283,11 +1107,13 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
@@ -301,6 +1127,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "a",
                         "annotation": []
@@ -314,20 +1141,71 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
@@ -340,6 +1218,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
@@ -358,6 +1237,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
@@ -378,9 +1258,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
@@ -396,12 +1286,53 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "operand": [
                           {
@@ -410,6 +1341,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
@@ -428,6 +1360,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             },
                             "asTypeSpecifier": {
@@ -443,9 +1376,19 @@
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}String",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
                                 "value": "a",
                                 "annotation": []
@@ -460,9 +1403,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
@@ -478,40 +1431,71 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "2012",
                               "annotation": []
                             },
                             "month": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "5",
                               "annotation": []
                             },
                             "day": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "18",
                               "annotation": []
@@ -524,6 +1508,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -554,17 +1539,51 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "As",
@@ -573,6 +1592,7 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               },
@@ -583,27 +1603,32 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               },
                               {
                                 "type": "DateTime",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                 "annotation": [],
                                 "signature": [],
                                 "year": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2012",
                                   "annotation": []
                                 },
                                 "month": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 "day": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "18",
                                   "annotation": []
@@ -618,6 +1643,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -648,24 +1674,52 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           {
                             "type": "Time",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                             "annotation": [],
                             "signature": [],
                             "hour": {
@@ -700,6 +1754,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -736,17 +1791,51 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Coalesce",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "List",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Time",
+                                "annotation": []
+                              }
+                            },
                             "element": [
                               {
                                 "type": "As",
@@ -755,6 +1844,7 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               },
@@ -765,11 +1855,13 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "Null",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "annotation": []
                                 }
                               },
                               {
                                 "type": "Time",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                                 "annotation": [],
                                 "signature": [],
                                 "hour": {
@@ -806,6 +1898,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -833,36 +1926,354 @@
                           "annotation": []
                         }
                       }
-                    }
-                  ]
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "IsNull",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IsNullTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IsNullFalseEmptyString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IsNullAlsoFalseAbcString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IsNullAlsoFalseNumber1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IsNullAlsoFalseNumberZero",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IsNullTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IsNullFalseEmptyString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IsNullAlsoFalseAbcString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IsNullAlsoFalseNumber1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IsNullAlsoFalseNumberZero",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "IsNull",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "IsNullTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsNull",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Null",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                           "annotation": []
                         }
                       }
@@ -871,6 +2282,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -884,15 +2296,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsNull",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "",
                           "annotation": []
@@ -903,6 +2341,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -916,15 +2355,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsNull",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "abc",
                           "annotation": []
@@ -935,6 +2400,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -948,15 +2414,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsNull",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
@@ -967,6 +2459,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -980,15 +2473,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsNull",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "0",
                           "annotation": []
@@ -999,6 +2518,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -1015,24 +2535,230 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IsFalseFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IsFalseTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IsFalseNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IsFalseFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IsFalseTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IsFalseNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "IsFalseFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsFalse",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                           "value": "false",
                           "annotation": []
@@ -1043,6 +2769,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1056,15 +2783,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsFalse",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                           "value": "true",
                           "annotation": []
@@ -1075,6 +2828,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -1088,11 +2842,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsFalse",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
@@ -1102,6 +2881,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -1111,6 +2891,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -1127,24 +2908,230 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IsTrueTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IsTrueFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IsTrueNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IsTrueTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IsTrueFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IsTrueNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "IsTrueTrue",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                           "value": "true",
                           "annotation": []
@@ -1155,6 +3142,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1168,15 +3156,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                           "value": "false",
                           "annotation": []
@@ -1187,6 +3201,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -1200,11 +3215,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsTrue",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
@@ -1214,6 +3254,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -1223,6 +3264,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
diff --git a/test/spec-tests/cql/CqlOverloadMatching.json b/test/spec-tests/cql/CqlOverloadMatching.json
index e37cbac39..6f9d8e034 100644
--- a/test/spec-tests/cql/CqlOverloadMatching.json
+++ b/test/spec-tests/cql/CqlOverloadMatching.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,20 +66,86 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "SimpleOverloadMatching",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SimpleOverloadMatching",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "SimpleOverloadMatching",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Test <library> tag not supported in cql-execution test runner",
                         "annotation": []
diff --git a/test/spec-tests/cql/CqlQueryTests.json b/test/spec-tests/cql/CqlQueryTests.json
index 7dc681e26..2f0c5cd3a 100644
--- a/test/spec-tests/cql/CqlQueryTests.json
+++ b/test/spec-tests/cql/CqlQueryTests.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,27 +66,326 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "NonListSource",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "NonListSourceWithReturn",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MultiSource",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "TupleTypeSpecifier",
+                          "annotation": [],
+                          "element": [
+                            {
+                              "name": "A",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            {
+                              "name": "B",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "TupleTypeSpecifier",
+                          "annotation": [],
+                          "element": [
+                            {
+                              "name": "A",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
+                            {
+                              "name": "B",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "NonListSource",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "NonListSourceWithReturn",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MultiSource",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "TupleTypeSpecifier",
+                            "annotation": [],
+                            "element": [
+                              {
+                                "name": "A",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "B",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "TupleTypeSpecifier",
+                            "annotation": [],
+                            "element": [
+                              {
+                                "name": "A",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "B",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "NonListSource",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "alias": "l",
                             "annotation": [],
                             "expression": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
@@ -101,6 +400,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "4",
                         "annotation": []
@@ -114,18 +414,45 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "source": [
                           {
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "alias": "l",
                             "annotation": [],
                             "expression": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
@@ -135,9 +462,11 @@
                         "let": [],
                         "relationship": [],
                         "return": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": [],
                           "expression": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Hello World",
                             "annotation": []
@@ -149,6 +478,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Hello World",
                         "annotation": []
@@ -162,28 +492,146 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "TupleTypeSpecifier",
+                            "annotation": [],
+                            "element": [
+                              {
+                                "name": "A",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "B",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "TupleTypeSpecifier",
+                            "annotation": [],
+                            "element": [
+                              {
+                                "name": "A",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "B",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "TupleTypeSpecifier",
+                            "annotation": [],
+                            "element": [
+                              {
+                                "name": "A",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "B",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        },
                         "source": [
                           {
                             "alias": "A",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
@@ -194,18 +642,38 @@
                           {
                             "alias": "B",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "6",
                                   "annotation": []
@@ -249,15 +717,68 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "TupleTypeSpecifier",
+                            "annotation": [],
+                            "element": [
+                              {
+                                "name": "A",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
+                              {
+                                "name": "B",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          }
+                        },
                         "element": [
                           {
                             "type": "Tuple",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "A",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "B",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
                             "element": [
                               {
                                 "name": "A",
                                 "value": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
@@ -267,6 +788,7 @@
                                 "name": "B",
                                 "value": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -277,11 +799,36 @@
                           {
                             "type": "Tuple",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "A",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "B",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
                             "element": [
                               {
                                 "name": "A",
                                 "value": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
@@ -291,6 +838,7 @@
                                 "name": "B",
                                 "value": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "6",
                                   "annotation": []
@@ -301,11 +849,36 @@
                           {
                             "type": "Tuple",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "A",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "B",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
                             "element": [
                               {
                                 "name": "A",
                                 "value": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
@@ -315,6 +888,7 @@
                                 "name": "B",
                                 "value": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "5",
                                   "annotation": []
@@ -325,11 +899,36 @@
                           {
                             "type": "Tuple",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "TupleTypeSpecifier",
+                              "annotation": [],
+                              "element": [
+                                {
+                                  "name": "A",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                },
+                                {
+                                  "name": "B",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "annotation": []
+                                  }
+                                }
+                              ]
+                            },
                             "element": [
                               {
                                 "name": "A",
                                 "value": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
@@ -339,6 +938,7 @@
                                 "name": "B",
                                 "value": {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "6",
                                   "annotation": []
@@ -360,43 +960,405 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IntegerDescending",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerAscending",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeDescending",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeAscending",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerDescending",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerAscending",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeDescending",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeAscending",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "IntegerDescending",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "source": [
                           {
                             "alias": "l",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
@@ -424,21 +1386,33 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -454,34 +1428,96 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "source": [
                           {
                             "alias": "l",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
@@ -509,21 +1545,33 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "3",
                             "annotation": []
@@ -539,22 +1587,82 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "source": [
                           {
                             "alias": "l",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
@@ -608,6 +1716,7 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
@@ -661,6 +1770,7 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
@@ -735,9 +1845,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -791,6 +1911,7 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -844,6 +1965,7 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -906,22 +2028,82 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "source": [
                           {
                             "alias": "l",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
@@ -975,6 +2157,7 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
@@ -1028,6 +2211,7 @@
                                 },
                                 {
                                   "type": "DateTime",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                                   "annotation": [],
                                   "signature": [],
                                   "year": {
@@ -1102,9 +2286,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -1158,6 +2352,7 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -1211,6 +2406,7 @@
                           },
                           {
                             "type": "DateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "year": {
@@ -1276,55 +2472,395 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "MultiplyIntegers",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MultiplyIntegersAll",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MultiplyIntegersDistinct",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "MultiplyIntegersNoStartingExpression",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Multi-Source",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "MultiplyIntegers",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MultiplyIntegersAll",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MultiplyIntegersDistinct",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MultiplyIntegersNoStartingExpression",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Multi-Source",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "MultiplyIntegers",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "L",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
@@ -1336,20 +2872,24 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "A",
                           "annotation": [],
                           "expression": {
                             "type": "Multiply",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "QueryLetRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "A",
                                 "annotation": []
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "L",
                                 "annotation": []
                               }
@@ -1357,6 +2897,7 @@
                           },
                           "starting": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -1368,6 +2909,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "72",
                         "annotation": []
@@ -1381,46 +2923,94 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "L",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
@@ -1432,21 +3022,25 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "A",
                           "distinct": false,
                           "annotation": [],
                           "expression": {
                             "type": "Multiply",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "QueryLetRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "A",
                                 "annotation": []
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "L",
                                 "annotation": []
                               }
@@ -1454,6 +3048,7 @@
                           },
                           "starting": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -1465,6 +3060,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "72",
                         "annotation": []
@@ -1478,46 +3074,94 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "L",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "4",
                                   "annotation": []
@@ -1529,21 +3173,25 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "A",
                           "distinct": true,
                           "annotation": [],
                           "expression": {
                             "type": "Multiply",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "QueryLetRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "A",
                                 "annotation": []
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "L",
                                 "annotation": []
                               }
@@ -1551,6 +3199,7 @@
                           },
                           "starting": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -1562,6 +3211,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "24",
                         "annotation": []
@@ -1575,34 +3225,80 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "L",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
@@ -1614,10 +3310,12 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "A",
                           "annotation": [],
                           "expression": {
                             "type": "Multiply",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
@@ -1628,12 +3326,14 @@
                                 "signature": [],
                                 "operand": {
                                   "type": "QueryLetRef",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                   "name": "A",
                                   "annotation": []
                                 }
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "L",
                                 "annotation": []
                               }
@@ -1641,6 +3341,7 @@
                           },
                           "starting": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -1650,6 +3351,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1661,34 +3363,80 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Query",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "source": [
                           {
                             "alias": "B",
                             "annotation": [],
+                            "resultTypeSpecifier": {
+                              "type": "ListTypeSpecifier",
+                              "annotation": [],
+                              "elementType": {
+                                "type": "NamedTypeSpecifier",
+                                "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": []
+                              }
+                            },
                             "expression": {
                               "type": "List",
                               "annotation": [],
+                              "resultTypeSpecifier": {
+                                "type": "ListTypeSpecifier",
+                                "annotation": [],
+                                "elementType": {
+                                  "type": "NamedTypeSpecifier",
+                                  "name": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": []
+                                }
+                              },
                               "element": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "1",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "2",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "3",
                                   "annotation": []
@@ -1697,10 +3445,12 @@
                             }
                           },
                           {
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "alias": "C",
                             "annotation": [],
                             "expression": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "4",
                               "annotation": []
@@ -1710,15 +3460,18 @@
                         "let": [],
                         "relationship": [],
                         "aggregate": {
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "identifier": "A",
                           "annotation": [],
                           "expression": {
                             "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "Add",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "annotation": [],
                                 "signature": [],
                                 "operand": [
@@ -1729,12 +3482,14 @@
                                     "signature": [],
                                     "operand": {
                                       "type": "QueryLetRef",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                                       "name": "A",
                                       "annotation": []
                                     }
                                   },
                                   {
                                     "type": "AliasRef",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "name": "B",
                                     "annotation": []
                                   }
@@ -1742,6 +3497,7 @@
                               },
                               {
                                 "type": "AliasRef",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "name": "C",
                                 "annotation": []
                               }
@@ -1749,6 +3505,7 @@
                           },
                           "starting": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -1758,6 +3515,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
diff --git a/test/spec-tests/cql/CqlStringOperatorsTest.json b/test/spec-tests/cql/CqlStringOperatorsTest.json
index 946f21fc0..430bcf316 100644
--- a/test/spec-tests/cql/CqlStringOperatorsTest.json
+++ b/test/spec-tests/cql/CqlStringOperatorsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,20 +66,281 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "CombineNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CombineEmptyList",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CombineABC",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CombineABCSepDash",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "CombineNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CombineEmptyList",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CombineABC",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CombineABCSepDash",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "CombineNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Combine",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "source": {
@@ -88,6 +349,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           },
                           "asTypeSpecifier": {
@@ -106,6 +368,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -117,11 +380,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Combine",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "source": {
@@ -134,6 +422,15 @@
                               "expression": {
                                 "type": "List",
                                 "annotation": [],
+                                "resultTypeSpecifier": {
+                                  "type": "ListTypeSpecifier",
+                                  "annotation": [],
+                                  "elementType": {
+                                    "type": "NamedTypeSpecifier",
+                                    "name": "{urn:hl7-org:elm-types:r1}Any",
+                                    "annotation": []
+                                  }
+                                },
                                 "element": []
                               }
                             }
@@ -162,6 +459,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -173,31 +471,68 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Combine",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "a",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "b",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "c",
                               "annotation": []
@@ -210,6 +545,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "abc",
                         "annotation": []
@@ -223,31 +559,68 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Combine",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "source": {
                           "type": "List",
                           "annotation": [],
+                          "resultTypeSpecifier": {
+                            "type": "ListTypeSpecifier",
+                            "annotation": [],
+                            "elementType": {
+                              "type": "NamedTypeSpecifier",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
+                          },
                           "element": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "a",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "b",
                               "annotation": []
                             },
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                               "valueType": "{urn:hl7-org:elm-types:r1}String",
                               "value": "c",
                               "annotation": []
@@ -256,6 +629,7 @@
                         },
                         "separator": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "-",
                           "annotation": []
@@ -266,6 +640,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "a-b-c",
                         "annotation": []
@@ -282,50 +657,32 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
                 "name": "ConcatenateNullNull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Concatenate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}String",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}String",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -334,40 +691,26 @@
               },
               {
                 "name": "ConcatenateANull",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Concatenate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}String",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -376,40 +719,26 @@
               },
               {
                 "name": "ConcatenateNullB",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Concatenate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}String",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -418,38 +747,26 @@
               },
               {
                 "name": "ConcatenateAB",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Concatenate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ab",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -458,38 +775,26 @@
               },
               {
                 "name": "ConcatenateABWithAdd",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Concatenate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ab",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -497,27 +802,192 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "EndsWith",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ConcatenateNullNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ConcatenateANull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ConcatenateNullB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ConcatenateAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ConcatenateABWithAdd",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
-                "name": "EndsWithNull",
+                "name": "ConcatenateNullNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "EndsWith",
+                        "type": "Concatenate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -528,6 +998,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
@@ -538,6 +1009,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -548,6 +1020,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -555,29 +1028,60 @@
                 }
               },
               {
-                "name": "EndsWithTrue",
+                "name": "ConcatenateANull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "EndsWith",
+                        "type": "Concatenate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Chris Schuler is the man!!",
+                            "value": "a",
                             "annotation": []
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "n!!",
-                            "annotation": []
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
                           }
                         ]
                       }
@@ -585,9 +1089,8 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -595,94 +1098,60 @@
                 }
               },
               {
-                "name": "EndsWithFalse",
+                "name": "ConcatenateNullB",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "EndsWith",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "Chris Schuler is the man!!",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "n!",
-                            "annotation": []
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
-                        "annotation": []
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Indexer",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
-              {
-                "name": "IndexerNullNull",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Indexer",
+                        "type": "Concatenate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "As",
-                            "strict": false,
+                            "asType": "{urn:hl7-org:elm-types:r1}String",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Null",
-                              "annotation": []
-                            },
-                            "asTypeSpecifier": {
-                              "type": "NamedTypeSpecifier",
-                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
                           {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
                           }
                         ]
                       }
@@ -691,6 +1160,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -698,33 +1168,56 @@
                 }
               },
               {
-                "name": "IndexerANull",
+                "name": "ConcatenateAB",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Indexer",
+                        "type": "Concatenate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a",
                             "annotation": []
                           },
                           {
-                            "type": "As",
-                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
                           }
                         ]
                       }
@@ -732,7 +1225,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ab",
                         "annotation": []
                       }
                     }
@@ -740,46 +1236,2347 @@
                 }
               },
               {
-                "name": "IndexerNull1String",
+                "name": "ConcatenateABWithAdd",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Indexer",
+                        "type": "Concatenate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "As",
-                            "strict": false,
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Null",
-                              "annotation": []
-                            },
-                            "asTypeSpecifier": {
-                              "type": "NamedTypeSpecifier",
-                              "name": "{urn:hl7-org:elm-types:r1}String",
-                              "annotation": []
-                            }
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
                           },
                           {
                             "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
                             "annotation": []
                           }
                         ]
                       }
                     },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ab",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "EndsWith",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "EndsWithNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EndsWithTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EndsWithFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "EndsWithNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EndsWithTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "EndsWithFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "EndsWithNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "EndsWith",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EndsWithTrue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "EndsWith",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Chris Schuler is the man!!",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "n!!",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "EndsWithFalse",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "EndsWith",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "Chris Schuler is the man!!",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "n!",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Indexer",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IndexerNullNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerANull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerNull1String",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerAB0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerAB1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerAB2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerABNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IndexerNullNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexerANull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexerNull1String",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexerAB0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexerAB1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexerAB2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IndexerABNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "IndexerNullNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "strict": false,
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "NamedTypeSpecifier",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerANull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "As",
+                            "asType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerNull1String",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "As",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "strict": false,
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                              "annotation": []
+                            },
+                            "asTypeSpecifier": {
+                              "type": "NamedTypeSpecifier",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                              "name": "{urn:hl7-org:elm-types:r1}String",
+                              "annotation": []
+                            }
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerAB0",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "ab",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "0",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "a",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerAB1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "ab",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "1",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "b",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerAB2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "ab",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "2",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IndexerABNeg1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Indexer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "ab",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "1",
+                              "annotation": []
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "LastPositionOf",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "LastPositionOfNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastPositionOfNull1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastPositionOfNull2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastPositionOf1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastPositionOf2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "LastPositionOfNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LastPositionOfNull1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LastPositionOfNull2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LastPositionOf1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LastPositionOf2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "LastPositionOfNull",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "LastPositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "pattern": {
+                          "type": "As",
+                          "asType": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "string": {
+                          "type": "As",
+                          "asType": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastPositionOfNull1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "LastPositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "pattern": {
+                          "type": "As",
+                          "asType": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        },
+                        "string": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "hi",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastPositionOfNull2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "LastPositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "pattern": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "hi",
+                          "annotation": []
+                        },
+                        "string": {
+                          "type": "As",
+                          "asType": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastPositionOf1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "LastPositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "pattern": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "hi",
+                          "annotation": []
+                        },
+                        "string": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "Ohio is the place to be!",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LastPositionOf2",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "LastPositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "pattern": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "hi",
+                          "annotation": []
+                        },
+                        "string": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "Say hi to Ohio!",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "11",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Length",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "LengthNullString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LengthEmptyString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LengthA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LengthAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "LengthNullString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LengthEmptyString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LengthA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LengthAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "LengthNullString",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "As",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "strict": false,
+                          "annotation": [],
+                          "signature": [],
+                          "operand": {
+                            "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                            "annotation": []
+                          },
+                          "asTypeSpecifier": {
+                            "type": "NamedTypeSpecifier",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    },
                     {
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -787,39 +3584,244 @@
                 }
               },
               {
-                "name": "IndexerAB0",
+                "name": "LengthEmptyString",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LengthA",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "a",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LengthAB",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Length",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "ab",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Lower",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "LowerNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "LowerEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Indexer",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "ab",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "0",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "a",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -827,39 +3829,27 @@
                 }
               },
               {
-                "name": "IndexerAB1",
-                "value": {
-                  "type": "Tuple",
+                "name": "LowerA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Indexer",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "ab",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "1",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "b",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -867,37 +3857,27 @@
                 }
               },
               {
-                "name": "IndexerAB2",
-                "value": {
-                  "type": "Tuple",
+                "name": "LowerB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Indexer",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "ab",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "2",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -905,42 +3885,27 @@
                 }
               },
               {
-                "name": "IndexerABNeg1",
-                "value": {
-                  "type": "Tuple",
+                "name": "LowerAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Indexer",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "ab",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "1",
-                              "annotation": []
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -948,46 +3913,202 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "LastPositionOf",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "LowerNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LowerEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LowerA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LowerB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "LowerAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
-                "name": "LastPositionOfNull",
+                "name": "LowerNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LastPositionOf",
+                        "type": "Lower",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
-                        "pattern": {
-                          "type": "As",
-                          "asType": "{urn:hl7-org:elm-types:r1}String",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        },
-                        "string": {
+                        "operand": {
                           "type": "As",
                           "asType": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -997,6 +4118,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1004,31 +4126,47 @@
                 }
               },
               {
-                "name": "LastPositionOfNull1",
+                "name": "LowerEmpty",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LastPositionOf",
+                        "type": "Lower",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
-                        "pattern": {
-                          "type": "As",
-                          "asType": "{urn:hl7-org:elm-types:r1}String",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        },
-                        "string": {
+                        "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "hi",
+                          "value": "",
                           "annotation": []
                         }
                       }
@@ -1036,7 +4174,10 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "",
                         "annotation": []
                       }
                     }
@@ -1044,39 +4185,58 @@
                 }
               },
               {
-                "name": "LastPositionOfNull2",
+                "name": "LowerA",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LastPositionOf",
+                        "type": "Lower",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
-                        "pattern": {
+                        "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "hi",
+                          "value": "A",
                           "annotation": []
-                        },
-                        "string": {
-                          "type": "As",
-                          "asType": "{urn:hl7-org:elm-types:r1}String",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          }
                         }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Null",
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "a",
                         "annotation": []
                       }
                     }
@@ -1084,27 +4244,47 @@
                 }
               },
               {
-                "name": "LastPositionOf1",
+                "name": "LowerB",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "LastPositionOf",
-                        "annotation": [],
-                        "signature": [],
-                        "pattern": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "hi",
-                          "annotation": []
-                        },
-                        "string": {
+                      "value": {
+                        "type": "Lower",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "Ohio is the place to be!",
+                          "value": "b",
                           "annotation": []
                         }
                       }
@@ -1113,8 +4293,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "b",
                         "annotation": []
                       }
                     }
@@ -1122,27 +4303,47 @@
                 }
               },
               {
-                "name": "LastPositionOf2",
+                "name": "LowerAB",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "LastPositionOf",
+                        "type": "Lower",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
-                        "pattern": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "hi",
-                          "annotation": []
-                        },
-                        "string": {
+                        "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "Say hi to Ohio!",
+                          "value": "Ab",
                           "annotation": []
                         }
                       }
@@ -1151,8 +4352,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "11",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ab",
                         "annotation": []
                       }
                     }
@@ -1163,47 +4365,36 @@
           }
         },
         {
-          "name": "Length",
+          "name": "Matches",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "LengthNullString",
-                "value": {
-                  "type": "Tuple",
+                "name": "MatchesNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Length",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "strict": false,
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          },
-                          "asTypeSpecifier": {
-                            "type": "NamedTypeSpecifier",
-                            "name": "{urn:hl7-org:elm-types:r1}String",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1211,31 +4402,27 @@
                 }
               },
               {
-                "name": "LengthEmptyString",
-                "value": {
-                  "type": "Tuple",
+                "name": "MatchesNumberFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Length",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1243,31 +4430,27 @@
                 }
               },
               {
-                "name": "LengthA",
-                "value": {
-                  "type": "Tuple",
+                "name": "MatchesNumberTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Length",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "a",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1275,77 +4458,55 @@
                 }
               },
               {
-                "name": "LengthAB",
-                "value": {
-                  "type": "Tuple",
+                "name": "MatchesAllTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Length",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "ab",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Lower",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "LowerNull",
-                "value": {
-                  "type": "Tuple",
+                "name": "MatchesWordsAndSpacesTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Lower",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "As",
-                          "asType": "{urn:hl7-org:elm-types:r1}String",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": {
-                            "type": "Null",
-                            "annotation": []
-                          }
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1353,31 +4514,27 @@
                 }
               },
               {
-                "name": "LowerEmpty",
-                "value": {
-                  "type": "Tuple",
+                "name": "MatchesWordsAndSpacesFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Lower",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1385,31 +4542,27 @@
                 }
               },
               {
-                "name": "LowerA",
-                "value": {
-                  "type": "Tuple",
+                "name": "MatchesNotWords",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Lower",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "A",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "a",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": []
                       }
                     }
@@ -1417,96 +4570,310 @@
                 }
               },
               {
-                "name": "LowerB",
-                "value": {
-                  "type": "Tuple",
+                "name": "MatchesWhiteSpace",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Lower",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "MatchesNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "b",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MatchesNumberFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MatchesNumberTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MatchesAllTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "MatchesWordsAndSpacesTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": []
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "b",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "MatchesWordsAndSpacesFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "LowerAB",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "MatchesNotWords",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Lower",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "Ab",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": []
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ab",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "MatchesWhiteSpace",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Matches",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "MatchesNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Matches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Not all who wander are lost",
                             "annotation": []
@@ -1518,6 +4885,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -1528,6 +4896,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1539,22 +4908,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Matches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Not all who wander are lost",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": ".*\\d+",
                             "annotation": []
@@ -1566,6 +4962,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -1579,22 +4976,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Matches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Not all who wander are lost - circa 2017",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": ".*\\d+",
                             "annotation": []
@@ -1606,6 +5030,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1619,22 +5044,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Matches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Not all who wander are lost",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": ".*",
                             "annotation": []
@@ -1646,6 +5098,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1659,22 +5112,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Matches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Not all who wander are lost",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "[\\w|\\s]+",
                             "annotation": []
@@ -1686,6 +5166,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1699,22 +5180,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Matches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Not all who wander are lost - circa 2017",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "^[\\w\\s]+$",
                             "annotation": []
@@ -1726,6 +5234,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -1739,22 +5248,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Matches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "   ",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "\\W+",
                             "annotation": []
@@ -1766,6 +5302,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1779,35 +5316,243 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Matches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": " \n\t",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "\\s+",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "PositionOf",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "PositionOfNullNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PositionOfANull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PositionOfNullA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PositionOfAInAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PositionOfBInAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "PositionOfCInAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Matches",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": " \n\t",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "\\s+",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -1815,27 +5560,220 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "PositionOf",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "PositionOfNullNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PositionOfANull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PositionOfNullA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PositionOfAInAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PositionOfBInAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "PositionOfCInAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "PositionOfNullNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "PositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "pattern": {
@@ -1845,6 +5783,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         },
@@ -1855,6 +5794,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -1864,6 +5804,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1875,15 +5816,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "PositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "pattern": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "a",
                           "annotation": []
@@ -1895,6 +5862,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -1904,6 +5872,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1915,11 +5884,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "PositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "pattern": {
@@ -1929,11 +5923,13 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         },
                         "string": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "a",
                           "annotation": []
@@ -1944,6 +5940,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1955,21 +5952,48 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "PositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "pattern": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "a",
                           "annotation": []
                         },
                         "string": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "ab",
                           "annotation": []
@@ -1980,6 +6004,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "0",
                         "annotation": []
@@ -1993,21 +6018,48 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "PositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "pattern": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "b",
                           "annotation": []
                         },
                         "string": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "ab",
                           "annotation": []
@@ -2018,6 +6070,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                         "value": "1",
                         "annotation": []
@@ -2031,71 +6084,362 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "PositionOf",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "pattern": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "c",
+                          "annotation": []
+                        },
+                        "string": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "ab",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "ReplaceMatches",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ReplaceMatchesNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ReplaceMatchesAll",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ReplaceMatchesMany",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ReplaceMatchesSpaces",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ReplaceMatchesNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ReplaceMatchesAll",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ReplaceMatchesMany",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "pattern": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "c",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": []
-                        },
-                        "string": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "ab",
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": []
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Negate",
+                    ]
+                  }
+                },
+                {
+                  "name": "ReplaceMatchesSpaces",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": []
                         }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "ReplaceMatches",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "ReplaceMatchesNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ReplaceMatches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Not all who wander are lost",
                             "annotation": []
@@ -2107,11 +6451,13 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "But I am...",
                             "annotation": []
@@ -2123,6 +6469,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2134,28 +6481,56 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ReplaceMatches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Not all who wander are lost",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Not all who wander are lost",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "But still waters run deep",
                             "annotation": []
@@ -2167,6 +6542,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "But still waters run deep",
                         "annotation": []
@@ -2180,28 +6556,56 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ReplaceMatches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Who put the bop in the bop she bop she bop?",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "bop",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "bang",
                             "annotation": []
@@ -2213,6 +6617,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Who put the bang in the bang she bang she bang?",
                         "annotation": []
@@ -2226,28 +6631,56 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ReplaceMatches",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "All that glitters is not gold",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "\\s",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "\\$",
                             "annotation": []
@@ -2259,6 +6692,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "All$that$glitters$is$not$gold",
                         "annotation": []
@@ -2275,21 +6709,414 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "SplitNullNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SplitNullComma",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SplitABNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SplitABDash",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SplitABComma",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "ListTypeSpecifier",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SplitNullNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SplitNullComma",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SplitABNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SplitABDash",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SplitABComma",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "SplitNullNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Split",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "stringToSplit": {
                           "type": "As",
@@ -2298,6 +7125,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         },
@@ -2308,6 +7136,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -2317,6 +7146,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2328,12 +7158,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Split",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "stringToSplit": {
                           "type": "As",
@@ -2342,11 +7209,13 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         },
                         "separator": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": ",",
                           "annotation": []
@@ -2357,6 +7226,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2368,15 +7238,57 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Split",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "stringToSplit": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "a,b",
                           "annotation": []
@@ -2388,6 +7300,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -2398,9 +7311,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a,b",
                             "annotation": []
@@ -2416,21 +7339,64 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Split",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "stringToSplit": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "a,b",
                           "annotation": []
                         },
                         "separator": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "-",
                           "annotation": []
@@ -2442,9 +7408,19 @@
                       "value": {
                         "type": "List",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "element": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "a,b",
                             "annotation": []
@@ -2460,73 +7436,444 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Split",
                         "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
                         "signature": [],
                         "stringToSplit": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "a,b",
                           "annotation": []
                         },
                         "separator": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": ",",
                           "annotation": []
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "List",
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "List",
+                        "annotation": [],
+                        "resultTypeSpecifier": {
+                          "type": "ListTypeSpecifier",
+                          "annotation": [],
+                          "elementType": {
+                            "type": "NamedTypeSpecifier",
+                            "name": "{urn:hl7-org:elm-types:r1}String",
+                            "annotation": []
+                          }
+                        },
+                        "element": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "a",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                            "valueType": "{urn:hl7-org:elm-types:r1}String",
+                            "value": "b",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "StartsWith",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "StartsWithNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StartsWithNull1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StartsWithNull2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StartsWithTrue1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StartsWithFalse1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "StartsWithNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StartsWithNull1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StartsWithNull2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StartsWithTrue1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StartsWithFalse1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "element": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "a",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}String",
-                            "value": "b",
-                            "annotation": []
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "StartsWith",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "StartsWithNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "StartsWith",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -2537,6 +7884,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
@@ -2547,6 +7895,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -2557,6 +7906,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2568,16 +7918,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "StartsWith",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "hi",
                             "annotation": []
@@ -2589,6 +7965,7 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           }
@@ -2599,6 +7976,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2610,11 +7988,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "StartsWith",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
@@ -2625,11 +8028,13 @@
                             "signature": [],
                             "operand": {
                               "type": "Null",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                               "annotation": []
                             }
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "hi",
                             "annotation": []
@@ -2641,6 +8046,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2652,22 +8058,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "StartsWith",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Breathe deep the gathering gloom",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Bre",
                             "annotation": []
@@ -2679,6 +8112,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -2692,22 +8126,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "StartsWith",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "Breathe deep the gathering gloom",
                             "annotation": []
                           },
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                             "valueType": "{urn:hl7-org:elm-types:r1}String",
                             "value": "bre",
                             "annotation": []
@@ -2717,10 +8178,303 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Substring",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "SubstringNullNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SubstringANull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SubstringNull1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SubstringAB0",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SubstringAB1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SubstringAB2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SubstringABNeg1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SubstringAB0To1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SubstringABC1To1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "SubstringAB0To3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -2728,27 +8482,332 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Substring",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "SubstringNullNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SubstringANull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SubstringNull1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SubstringAB0",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SubstringAB1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SubstringAB2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SubstringABNeg1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SubstringAB0To1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SubstringABC1To1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "SubstringAB0To3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "SubstringNullNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Substring",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "stringToSub": {
@@ -2758,6 +8817,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         },
@@ -2768,6 +8828,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -2777,6 +8838,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2788,15 +8850,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Substring",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "stringToSub": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "a",
                           "annotation": []
@@ -2808,6 +8896,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -2817,6 +8906,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2828,11 +8918,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Substring",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "stringToSub": {
@@ -2842,11 +8957,13 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
@@ -2857,6 +8974,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2868,21 +8986,48 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Substring",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "stringToSub": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "ab",
                           "annotation": []
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "0",
                           "annotation": []
@@ -2893,6 +9038,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "ab",
                         "annotation": []
@@ -2906,21 +9052,48 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Substring",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "stringToSub": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "ab",
                           "annotation": []
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
@@ -2931,6 +9104,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "b",
                         "annotation": []
@@ -2944,21 +9118,48 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Substring",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "stringToSub": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "ab",
                           "annotation": []
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "2",
                           "annotation": []
@@ -2969,6 +9170,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -2980,25 +9182,53 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Substring",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "stringToSub": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "ab",
                           "annotation": []
                         },
                         "startIndex": {
                           "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -3010,6 +9240,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3021,27 +9252,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Substring",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "stringToSub": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "ab",
                           "annotation": []
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "0",
                           "annotation": []
                         },
                         "length": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
@@ -3052,6 +9311,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "a",
                         "annotation": []
@@ -3065,27 +9325,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Substring",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "stringToSub": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "abc",
                           "annotation": []
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
                         },
                         "length": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "1",
                           "annotation": []
@@ -3096,6 +9384,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "b",
                         "annotation": []
@@ -3109,27 +9398,55 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Substring",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "stringToSub": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "ab",
                           "annotation": []
                         },
                         "startIndex": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "0",
                           "annotation": []
                         },
                         "length": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "3",
                           "annotation": []
@@ -3138,10 +9455,163 @@
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "ab",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "ab",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Upper",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "UpperNull",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UpperEmpty",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UpperA",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UpperB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "UpperAB",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -3149,27 +9619,192 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Upper",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "UpperNull",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UpperEmpty",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UpperA",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UpperB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "UpperAB",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "UpperNull",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Upper",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
@@ -3179,6 +9814,7 @@
                           "signature": [],
                           "operand": {
                             "type": "Null",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                             "annotation": []
                           }
                         }
@@ -3188,6 +9824,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -3199,15 +9836,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Upper",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "",
                           "annotation": []
@@ -3218,6 +9881,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "",
                         "annotation": []
@@ -3231,15 +9895,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Upper",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "a",
                           "annotation": []
@@ -3250,6 +9940,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "A",
                         "annotation": []
@@ -3263,15 +9954,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Upper",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "B",
                           "annotation": []
@@ -3282,6 +9999,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "B",
                         "annotation": []
@@ -3295,15 +10013,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Upper",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "aB",
                           "annotation": []
@@ -3314,6 +10058,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "AB",
                         "annotation": []
@@ -3330,24 +10075,324 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "QuantityToString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeToString1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeToString2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DateTimeToString3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "TimeToString1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "QuantityToString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeToString1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeToString2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DateTimeToString3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "TimeToString1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "QuantityToString",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToString",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 125,
                           "unit": "cm",
                           "annotation": []
@@ -3358,6 +10403,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "125 'cm'",
                         "annotation": []
@@ -3371,31 +10417,60 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToString",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": [],
                           "signature": [],
                           "year": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2000",
                             "annotation": []
                           },
                           "month": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           "day": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
@@ -3407,6 +10482,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "2000-01-01",
                         "annotation": []
@@ -3420,11 +10496,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Answer does not include timezone offset, but default offset depends on test environment",
                         "annotation": []
@@ -3438,55 +10530,88 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToString",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": [],
                           "signature": [],
                           "year": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2000",
                             "annotation": []
                           },
                           "month": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           "day": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "1",
                             "annotation": []
                           },
                           "hour": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "8",
                             "annotation": []
                           },
                           "minute": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "25",
                             "annotation": []
                           },
                           "second": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "25",
                             "annotation": []
                           },
                           "millisecond": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "300",
                             "annotation": []
@@ -3497,10 +10622,12 @@
                             "signature": [],
                             "operand": {
                               "type": "Negate",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "7",
                                 "annotation": []
@@ -3514,6 +10641,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "2000-01-01T08:25:25.300-07:00",
                         "annotation": []
@@ -3527,15 +10655,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToString",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Time",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                           "annotation": [],
                           "signature": [],
                           "hour": {
@@ -3569,6 +10723,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "09:30:01.003",
                         "annotation": []
diff --git a/test/spec-tests/cql/CqlTypeOperatorsTest.json b/test/spec-tests/cql/CqlTypeOperatorsTest.json
index 018a1a621..68578b7b7 100644
--- a/test/spec-tests/cql/CqlTypeOperatorsTest.json
+++ b/test/spec-tests/cql/CqlTypeOperatorsTest.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,31 +66,238 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "AsQuantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "CastAsQuantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "AsDateTime",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "AsQuantity",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "CastAsQuantity",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "AsDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "AsQuantity",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "As",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "strict": false,
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 45.5,
                           "unit": "g",
                           "annotation": []
                         },
                         "asTypeSpecifier": {
                           "type": "NamedTypeSpecifier",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "name": "{urn:hl7-org:elm-types:r1}Quantity",
                           "annotation": []
                         }
@@ -100,6 +307,7 @@
                       "name": "output",
                       "value": {
                         "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "value": 45.5,
                         "unit": "g",
                         "annotation": []
@@ -113,22 +321,49 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "As",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "strict": true,
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 45.5,
                           "unit": "g",
                           "annotation": []
                         },
                         "asTypeSpecifier": {
                           "type": "NamedTypeSpecifier",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "name": "{urn:hl7-org:elm-types:r1}Quantity",
                           "annotation": []
                         }
@@ -138,6 +373,7 @@
                       "name": "output",
                       "value": {
                         "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "value": 45.5,
                         "unit": "g",
                         "annotation": []
@@ -151,32 +387,61 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "As",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "strict": false,
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "DateTime",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": [],
                           "signature": [],
                           "year": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "2014",
                             "annotation": []
                           },
                           "month": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "01",
                             "annotation": []
                           },
                           "day": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "01",
                             "annotation": []
@@ -184,6 +449,7 @@
                         },
                         "asTypeSpecifier": {
                           "type": "NamedTypeSpecifier",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                           "name": "{urn:hl7-org:elm-types:r1}DateTime",
                           "annotation": []
                         }
@@ -193,6 +459,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -226,36 +493,32 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
                 "name": "IntegerToDecimal",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ToDecimal",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "5",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "5.0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": []
                       }
                     }
@@ -264,30 +527,26 @@
               },
               {
                 "name": "IntegerToString",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ToString",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "5",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "5",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -296,28 +555,26 @@
               },
               {
                 "name": "StringToIntegerError",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ToInteger",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "foo",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -326,16 +583,17 @@
               },
               {
                 "name": "StringToDateTime",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Wrong answer (different offsets)",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": []
                       }
                     }
@@ -344,54 +602,27 @@
               },
               {
                 "name": "StringToTime",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ToTime",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "T14:30:00.0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Time",
-                        "annotation": [],
-                        "signature": [],
-                        "hour": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "14",
-                          "annotation": []
-                        },
-                        "minute": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "30",
-                          "annotation": []
-                        },
-                        "second": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        },
-                        "millisecond": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
                       }
                     }
                   ]
@@ -399,28 +630,26 @@
               },
               {
                 "name": "StringToDateTimeMalformed",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ToDateTime",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "2014/01/01",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Null",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -428,75 +657,1044 @@
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "Is",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
-            "element": [
-              {
-                "name": "IntegerIsInteger",
-                "value": {
-                  "type": "Tuple",
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerToDecimal",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerToString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StringToIntegerError",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StringToDateTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StringToTime",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StringToDateTimeMalformed",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "IntegerToDecimal",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "ToDecimal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "5",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "5.0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerToString",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "ToString",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "5",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "5",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StringToIntegerError",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "ToInteger",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "foo",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StringToDateTime",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                        "valueType": "{urn:hl7-org:elm-types:r1}String",
+                        "value": "Wrong answer (different offsets)",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StringToTime",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "ToTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "T14:30:00.0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": [],
+                        "signature": [],
+                        "hour": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "14",
+                          "annotation": []
+                        },
+                        "minute": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "30",
+                          "annotation": []
+                        },
+                        "second": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        },
+                        "millisecond": {
+                          "type": "Literal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StringToDateTimeMalformed",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "ToDateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "2014/01/01",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Is",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IntegerIsInteger",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StringIsInteger",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ValueSetIsVocabulary",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerIsInteger",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "StringIsInteger",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ValueSetIsVocabulary",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "IntegerIsInteger",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
                         "type": "Is",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "5",
                           "annotation": []
-                        },
-                        "isTypeSpecifier": {
+                        },
+                        "isTypeSpecifier": {
+                          "type": "NamedTypeSpecifier",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "StringIsInteger",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Is",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                          "valueType": "{urn:hl7-org:elm-types:r1}String",
+                          "value": "5",
+                          "annotation": []
+                        },
+                        "isTypeSpecifier": {
+                          "type": "NamedTypeSpecifier",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "false",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ValueSetIsVocabulary",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Is",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Instance",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}ValueSet",
+                          "classType": "{urn:hl7-org:elm-types:r1}ValueSet",
+                          "annotation": [],
+                          "element": [
+                            {
+                              "name": "id",
+                              "value": {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                "value": "123",
+                                "annotation": []
+                              }
+                            }
+                          ]
+                        },
+                        "isTypeSpecifier": {
+                          "type": "NamedTypeSpecifier",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Vocabulary",
+                          "name": "{urn:hl7-org:elm-types:r1}Vocabulary",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "ToBoolean",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "StringNoToBoolean",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "StringNoToBoolean",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
                           "type": "NamedTypeSpecifier",
-                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
                           "annotation": []
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
-                      }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "StringIsInteger",
+                "name": "StringNoToBoolean",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Is",
+                        "type": "ToBoolean",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "5",
-                          "annotation": []
-                        },
-                        "isTypeSpecifier": {
-                          "type": "NamedTypeSpecifier",
-                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "NO",
                           "annotation": []
                         }
                       }
@@ -505,6 +1703,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -512,49 +1711,179 @@
                     }
                   ]
                 }
-              },
+              }
+            ]
+          }
+        },
+        {
+          "name": "ToConcept",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
               {
-                "name": "ValueSetIsVocabulary",
+                "name": "CodeToConcept1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Concept",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Concept",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "CodeToConcept1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Concept",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Concept",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "CodeToConcept1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Concept",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Concept",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Is",
+                        "type": "ToConcept",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Concept",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Instance",
-                          "classType": "{urn:hl7-org:elm-types:r1}ValueSet",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Code",
+                          "classType": "{urn:hl7-org:elm-types:r1}Code",
                           "annotation": [],
                           "element": [
                             {
-                              "name": "id",
+                              "name": "code",
                               "value": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                                 "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                "value": "123",
+                                "value": "8480-6",
                                 "annotation": []
                               }
                             }
                           ]
-                        },
-                        "isTypeSpecifier": {
-                          "type": "NamedTypeSpecifier",
-                          "name": "{urn:hl7-org:elm-types:r1}Vocabulary",
-                          "annotation": []
                         }
                       }
                     },
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "type": "Instance",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Concept",
+                        "classType": "{urn:hl7-org:elm-types:r1}Concept",
+                        "annotation": [],
+                        "element": [
+                          {
+                            "name": "codes",
+                            "value": {
+                              "type": "ToList",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": {
+                                "type": "Instance",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Code",
+                                "classType": "{urn:hl7-org:elm-types:r1}Code",
+                                "annotation": [],
+                                "element": [
+                                  {
+                                    "name": "code",
+                                    "value": {
+                                      "type": "Literal",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}String",
+                                      "value": "8480-6",
+                                      "annotation": []
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          }
+                        ]
                       }
                     }
                   ]
@@ -564,147 +1893,502 @@
           }
         },
         {
-          "name": "ToBoolean",
+          "name": "ToDateTime",
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
-                "name": "StringNoToBoolean",
-                "value": {
-                  "type": "Tuple",
+                "name": "ToDateTime1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToDateTime2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToDateTime3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToDateTime4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToDateTime5",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToDateTime6",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToDateTimeMalformed",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToDateTimeDate",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ToBoolean",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}String",
-                          "value": "NO",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "false",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": []
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "ToConcept",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "CodeToConcept1",
-                "value": {
-                  "type": "Tuple",
+                "name": "ToDateTimeTimeUnspecified",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "ToConcept",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Instance",
-                          "classType": "{urn:hl7-org:elm-types:r1}Code",
-                          "annotation": [],
-                          "element": [
-                            {
-                              "name": "code",
-                              "value": {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                "value": "8480-6",
-                                "annotation": []
-                              }
-                            }
-                          ]
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Instance",
-                        "classType": "{urn:hl7-org:elm-types:r1}Concept",
-                        "annotation": [],
-                        "element": [
-                          {
-                            "name": "codes",
-                            "value": {
-                              "type": "ToList",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": {
-                                "type": "Instance",
-                                "classType": "{urn:hl7-org:elm-types:r1}Code",
-                                "annotation": [],
-                                "element": [
-                                  {
-                                    "name": "code",
-                                    "value": {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}String",
-                                      "value": "8480-6",
-                                      "annotation": []
-                                    }
-                                  }
-                                ]
-                              }
-                            }
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
                       }
                     }
                   ]
                 }
               }
             ]
-          }
-        },
-        {
-          "name": "ToDateTime",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ToDateTime1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToDateTime2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToDateTime3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToDateTime4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToDateTime5",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToDateTime6",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToDateTimeMalformed",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToDateTimeDate",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToDateTimeTimeUnspecified",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "ToDateTime1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Wrong answer (different offsets)",
                         "annotation": []
@@ -718,11 +2402,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Wrong answer (different offsets)",
                         "annotation": []
@@ -736,11 +2436,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Wrong answer (different offsets)",
                         "annotation": []
@@ -754,15 +2470,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToDateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "2014-01-01T12:05:05.955+01:30",
                           "annotation": []
@@ -773,6 +2515,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -833,15 +2576,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToDateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "2014-01-01T12:05:05.955-01:15",
                           "annotation": []
@@ -852,6 +2621,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -912,15 +2682,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToDateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "2014-01-01T12:05:05.955Z",
                           "annotation": []
@@ -931,6 +2727,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -991,15 +2788,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToDateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "2014/01/01T12:05:05.955Z",
                           "annotation": []
@@ -1010,6 +2833,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -1021,15 +2845,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}DateTime",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToDateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Date",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                           "annotation": [],
                           "signature": [],
                           "year": {
@@ -1057,6 +2907,7 @@
                       "name": "output",
                       "value": {
                         "type": "DateTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                         "annotation": [],
                         "signature": [],
                         "year": {
@@ -1087,24 +2938,52 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "IsNull",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "DateTimeComponentFrom",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "precision": "Hour",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "ToDateTime",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}DateTime",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Date",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Date",
                               "annotation": [],
                               "signature": [],
                               "year": {
@@ -1134,6 +3013,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -1150,24 +3030,118 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "String25D5ToDecimal",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "String25D5ToDecimal",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "String25D5ToDecimal",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToDecimal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "+25.5",
                           "annotation": []
@@ -1178,6 +3152,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "25.5",
                         "annotation": []
@@ -1194,24 +3169,118 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "StringNeg25ToInteger",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "StringNeg25ToInteger",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "StringNeg25ToInteger",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToInteger",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "-25",
                           "annotation": []
@@ -1222,10 +3291,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                           "value": "25",
                           "annotation": []
@@ -1243,72 +3314,430 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "String5D5CMToQuantity",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "String5D5CMToQuantity",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "String5D5CMToQuantity",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Quantity",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToQuantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "5.5 'cm'",
                           "annotation": []
                         }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Quantity",
-                        "value": 5.5,
-                        "unit": "cm",
-                        "annotation": []
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Quantity",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
+                        "value": 5.5,
+                        "unit": "cm",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "ToString",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "IntegerNeg5ToString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Decimal18D55ToString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Quantity5D5CMToString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "BooleanTrueToString",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerNeg5ToString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Decimal18D55ToString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Quantity5D5CMToString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "BooleanTrueToString",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "ToString",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
+              ]
+            },
             "element": [
               {
                 "name": "IntegerNeg5ToString",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToString",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Negate",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "5",
                             "annotation": []
@@ -1320,6 +3749,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "-5",
                         "annotation": []
@@ -1333,15 +3763,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToString",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "18.55",
                           "annotation": []
@@ -1352,6 +3808,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "18.55",
                         "annotation": []
@@ -1365,15 +3822,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToString",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Quantity",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Quantity",
                           "value": 5.5,
                           "unit": "cm",
                           "annotation": []
@@ -1384,6 +3867,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "5.5 'cm'",
                         "annotation": []
@@ -1397,15 +3881,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToString",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                           "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                           "value": "true",
                           "annotation": []
@@ -1416,6 +3926,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "true",
                         "annotation": []
@@ -1432,24 +3943,342 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "ToTime1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToTime2",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToTime3",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToTime4",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "ToTimeMalformed",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Time",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "ToTime1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToTime2",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToTime3",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToTime4",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "ToTimeMalformed",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "ToTime1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "T14:30:00.0",
                           "annotation": []
@@ -1460,6 +4289,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -1496,15 +4326,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "T14:30:00.0+05:30",
                           "annotation": []
@@ -1515,6 +4371,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -1551,15 +4408,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "T14:30:00.0-05:45",
                           "annotation": []
@@ -1570,6 +4453,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -1606,15 +4490,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "T14:30:00.0Z",
                           "annotation": []
@@ -1625,6 +4535,7 @@
                       "name": "output",
                       "value": {
                         "type": "Time",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "hour": {
@@ -1661,15 +4572,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Time",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "ToTime",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Time",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                           "valueType": "{urn:hl7-org:elm-types:r1}String",
                           "value": "T14-30-00.0",
                           "annotation": []
@@ -1680,6 +4617,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
diff --git a/test/spec-tests/cql/ValueLiteralsAndSelectors.cql b/test/spec-tests/cql/ValueLiteralsAndSelectors.cql
index f76996513..b35236771 100644
--- a/test/spec-tests/cql/ValueLiteralsAndSelectors.cql
+++ b/test/spec-tests/cql/ValueLiteralsAndSelectors.cql
@@ -169,39 +169,29 @@ define "Decimal": Tuple{
     output: -2147483647.0
   },
   "Decimal2Pow31": Tuple{
-    skipped: 'Overflows because it thinks it is an integer'
-    /*
     expression: Power(2.0,30.0)+Power(2.0,30.0),
     output: 2147483648.0
-    */  },
+  },
   "DecimalPos2Pow31": Tuple{
-    skipped: 'Overflows because it thinks it is an integer'
-    /*
     expression: +Power(2.0,30.0)+Power(2.0,30.0),
     output: 2147483648.0
-    */  },
+  },
   "DecimalNeg2Pow31": Tuple{
     expression: -Power(2.0,30.0)-Power(2.0,30.0),
     output: -2147483648.0
   },
   "Decimal2Pow31ToInf1": Tuple{
-    skipped: 'Overflows because it thinks it is an integer'
-    /*
     expression: Power(2.0,30.0)+1.0+Power(2.0,30.0),
     output: 2147483649.0
-    */  },
+  },
   "DecimalPos2Pow31ToInf1": Tuple{
-    skipped: 'Overflows because it thinks it is an integer'
-    /*
     expression: +Power(2.0,30.0)+1.0+Power(2.0,30.0),
     output: 2147483649.0
-    */  },
+  },
   "DecimalNeg2Pow31ToInf1": Tuple{
-    skipped: 'Underflows because it thinks it is an integer'
-    /*
     expression: -Power(2.0,30.0)-1.0-Power(2.0,30.0),
     output: -2147483649.0
-    */  },
+  },
   "DecimalZeroStep": Tuple{
     expression: 0.00000000,
     output: 0.00000000
diff --git a/test/spec-tests/cql/ValueLiteralsAndSelectors.json b/test/spec-tests/cql/ValueLiteralsAndSelectors.json
index 01843faae..cf0af1a01 100644
--- a/test/spec-tests/cql/ValueLiteralsAndSelectors.json
+++ b/test/spec-tests/cql/ValueLiteralsAndSelectors.json
@@ -4,7 +4,7 @@
       {
         "type": "CqlToElmInfo",
         "translatorVersion": "4.2.0",
-        "translatorOptions": "",
+        "translatorOptions": "EnableResultTypes",
         "signatureLevel": "None"
       }
     ],
@@ -66,20 +66,113 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "Null",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Any",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "Null",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "Null",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Any",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     },
@@ -87,6 +180,7 @@
                       "name": "output",
                       "value": {
                         "type": "Null",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Any",
                         "annotation": []
                       }
                     }
@@ -101,20 +195,169 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "BooleanFalse",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "BooleanTrue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
           "expression": {
             "type": "Tuple",
             "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "BooleanFalse",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "BooleanTrue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
             "element": [
               {
                 "name": "BooleanFalse",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -124,6 +367,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "false",
                         "annotation": []
@@ -137,11 +381,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -151,6 +420,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -167,31 +437,32 @@
           "context": "Patient",
           "accessLevel": "Public",
           "annotation": [],
-          "expression": {
-            "type": "Tuple",
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
             "annotation": [],
             "element": [
               {
                 "name": "IntegerZero",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -200,25 +471,26 @@
               },
               {
                 "name": "IntegerPosZero",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -227,30 +499,26 @@
               },
               {
                 "name": "IntegerNegZero",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "0",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "0",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -259,25 +527,26 @@
               },
               {
                 "name": "IntegerOne",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -286,25 +555,26 @@
               },
               {
                 "name": "IntegerPosOne",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -313,36 +583,27 @@
               },
               {
                 "name": "IntegerNegOne",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     }
                   ]
@@ -350,25 +611,26 @@
               },
               {
                 "name": "IntegerTwo",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -377,25 +639,26 @@
               },
               {
                 "name": "IntegerPosTwo",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -404,36 +667,27 @@
               },
               {
                 "name": "IntegerNegTwo",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     }
                   ]
@@ -441,38 +695,26 @@
               },
               {
                 "name": "Integer10Pow9",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "9",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1000000000",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -481,38 +723,26 @@
               },
               {
                 "name": "IntegerPos10Pow9",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Power",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "10",
-                            "annotation": []
-                          },
-                          {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                            "value": "9",
-                            "annotation": []
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "1000000000",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -521,49 +751,27 @@
               },
               {
                 "name": "IntegerNeg10Pow9",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Power",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "10",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                              "value": "9",
-                              "annotation": []
-                            }
-                          ]
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "1000000000",
-                          "annotation": []
-                        }
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     }
                   ]
@@ -571,77 +779,26 @@
               },
               {
                 "name": "Integer2Pow31ToZero1IntegerMaxValue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Add",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Subtract",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": [
-                              {
-                                "type": "Power",
-                                "annotation": [],
-                                "signature": [],
-                                "operand": [
-                                  {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2",
-                                    "annotation": []
-                                  },
-                                  {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "30",
-                                    "annotation": []
-                                  }
-                                ]
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Power",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": [
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "30",
-                                "annotation": []
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
                       }
                     },
                     {
                       "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2147483647",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": []
                       }
                     }
@@ -650,193 +807,4652 @@
               },
               {
                 "name": "IntegerPos2Pow31ToZero1IntegerMaxValue",
-                "value": {
-                  "type": "Tuple",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
                   "annotation": [],
                   "element": [
                     {
                       "name": "expression",
-                      "value": {
-                        "type": "Add",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Subtract",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": [
-                              {
-                                "type": "Power",
-                                "annotation": [],
-                                "signature": [],
-                                "operand": [
-                                  {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "2",
-                                    "annotation": []
-                                  },
-                                  {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                    "value": "30",
-                                    "annotation": []
-                                  }
-                                ]
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Power",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": [
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "30",
-                                "annotation": []
-                              }
-                            ]
-                          }
-                        ]
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerNeg2Pow31ToZero1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Integer2Pow31",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerPos2Pow31",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerNeg2Pow31IntegerMinValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Integer2Pow31ToInf1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerPos2Pow31ToInf1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerNeg2Pow31ToInf1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "IntegerZero",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerPosZero",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerNegZero",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerOne",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerPosOne",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerNegOne",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerTwo",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerPosTwo",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerNegTwo",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Integer10Pow9",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerPos10Pow9",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerNeg10Pow9",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Integer2Pow31ToZero1IntegerMaxValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerPos2Pow31ToZero1IntegerMaxValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerNeg2Pow31ToZero1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Integer2Pow31",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerPos2Pow31",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerNeg2Pow31IntegerMinValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Integer2Pow31ToInf1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerPos2Pow31ToInf1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "IntegerNeg2Pow31ToInf1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "element": [
+              {
+                "name": "IntegerZero",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerPosZero",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerNegZero",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "0",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "0",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerOne",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerPosOne",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerNegOne",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerTwo",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerPosTwo",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerNegTwo",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Integer10Pow9",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "9",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1000000000",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerPos10Pow9",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "10",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                            "value": "9",
+                            "annotation": []
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "1000000000",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerNeg10Pow9",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Power",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "10",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                              "value": "9",
+                              "annotation": []
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "1000000000",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Integer2Pow31ToZero1IntegerMaxValue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Subtract",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Power",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": [
+                                  {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2",
+                                    "annotation": []
+                                  },
+                                  {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "30",
+                                    "annotation": []
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "30",
+                                "annotation": []
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2147483647",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerPos2Pow31ToZero1IntegerMaxValue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Subtract",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Power",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": [
+                                  {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "2",
+                                    "annotation": []
+                                  },
+                                  {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                    "value": "30",
+                                    "annotation": []
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "30",
+                                "annotation": []
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2147483647",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerNeg2Pow31ToZero1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Negate",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Power",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "operand": [
+                                    {
+                                      "type": "Literal",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "2",
+                                      "annotation": []
+                                    },
+                                    {
+                                      "type": "Literal",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                      "value": "30",
+                                      "annotation": []
+                                    }
+                                  ]
+                                }
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "1",
+                                "annotation": []
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "30",
+                                "annotation": []
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2147483647",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Integer2Pow31",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2147483648",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerPos2Pow31",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2147483648",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerNeg2Pow31IntegerMinValue",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": {
+                              "type": "Power",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": [
+                                {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "2",
+                                  "annotation": []
+                                },
+                                {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "30",
+                                  "annotation": []
+                                }
+                              ]
+                            }
+                          },
+                          {
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "2",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                "value": "30",
+                                "annotation": []
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2147483648",
+                          "annotation": []
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Integer2Pow31ToInf1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2147483649",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerPos2Pow31ToInf1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                        "value": "2147483649",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "IntegerNeg2Pow31ToInf1",
+                "value": {
+                  "type": "Tuple",
+                  "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
+                  "element": [
+                    {
+                      "name": "expression",
+                      "value": {
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                          "value": "2147483649",
+                          "annotation": []
+                        }
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "value": "true",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "Decimal",
+          "context": "Patient",
+          "accessLevel": "Public",
+          "annotation": [],
+          "resultTypeSpecifier": {
+            "type": "TupleTypeSpecifier",
+            "annotation": [],
+            "element": [
+              {
+                "name": "DecimalZero",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPosZero",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNegZero",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalOne",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPosOne",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNegOne",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalTwo",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPosTwo",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNegTwo",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Decimal10Pow9",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPos10Pow9",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNeg10Pow9",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Decimal2Pow31ToZero1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPos2Pow31ToZero1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNeg2Pow31ToZero1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Decimal2Pow31",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPos2Pow31",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNeg2Pow31",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Decimal2Pow31ToInf1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPos2Pow31ToInf1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNeg2Pow31ToInf1",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalZeroStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPosZeroStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNegZeroStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalOneStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPosOneStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNegOneStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalTwoStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPosTwoStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNegTwoStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalTenStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPosTenStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNegTenStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Integer",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "output",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalTenthStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPosTenthStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNegTenthStep",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Decimal10Pow28ToZeroOneStepDecimalMaxValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPos10Pow28ToZeroOneStepDecimalMaxValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNeg10Pow28ToZeroOneStepDecimalMinValue",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "skipped",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}String",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "Decimal10Pow28",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalPos10Pow28",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "DecimalNeg10Pow28",
+                "annotation": [],
+                "elementType": {
+                  "type": "TupleTypeSpecifier",
+                  "annotation": [],
+                  "element": [
+                    {
+                      "name": "expression",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": []
+                      }
+                    },
+                    {
+                      "name": "invalid",
+                      "annotation": [],
+                      "elementType": {
+                        "type": "NamedTypeSpecifier",
+                        "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                        "annotation": []
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "Tuple",
+            "annotation": [],
+            "resultTypeSpecifier": {
+              "type": "TupleTypeSpecifier",
+              "annotation": [],
+              "element": [
+                {
+                  "name": "DecimalZero",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPosZero",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNegZero",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalOne",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPosOne",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNegOne",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalTwo",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPosTwo",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNegTwo",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Decimal10Pow9",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPos10Pow9",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNeg10Pow9",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Decimal2Pow31ToZero1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPos2Pow31ToZero1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNeg2Pow31ToZero1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Decimal2Pow31",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPos2Pow31",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNeg2Pow31",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "Decimal2Pow31ToInf1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPos2Pow31ToInf1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNeg2Pow31ToInf1",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalZeroStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPosZeroStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNegZeroStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalOneStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPosOneStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNegOneStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalTwoStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPosTwoStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNegTwoStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalTenStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPosTenStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNegTenStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalTenthStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPosTenthStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNegTenthStep",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2147483647",
-                        "annotation": []
+                    ]
+                  }
+                },
+                {
+                  "name": "Decimal10Pow28ToZeroOneStepDecimalMaxValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "IntegerNeg2Pow31ToZero1",
-                "value": {
-                  "type": "Tuple",
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPos10Pow28ToZeroOneStepDecimalMaxValue",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Subtract",
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Add",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": [
-                              {
-                                "type": "Negate",
-                                "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Power",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "operand": [
-                                    {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "2",
-                                      "annotation": []
-                                    },
-                                    {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                      "value": "30",
-                                      "annotation": []
-                                    }
-                                  ]
-                                }
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "1",
-                                "annotation": []
-                              }
-                            ]
-                          },
-                          {
-                            "type": "Power",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": [
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "30",
-                                "annotation": []
-                              }
-                            ]
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
                       }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Negate",
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNeg10Pow28ToZeroOneStepDecimalMinValue",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2147483647",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
                           "annotation": []
                         }
                       }
-                    }
-                  ]
+                    ]
+                  }
+                },
+                {
+                  "name": "Decimal10Pow28",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalPos10Pow28",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name": "DecimalNeg10Pow28",
+                  "annotation": [],
+                  "elementType": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  }
                 }
-              },
+              ]
+            },
+            "element": [
               {
-                "name": "Integer2Pow31",
+                "name": "DecimalZero",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2147483648",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
                         "annotation": []
                       }
                     },
                     {
-                      "name": "invalid",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
                         "annotation": []
                       }
                     }
@@ -844,26 +5460,52 @@
                 }
               },
               {
-                "name": "IntegerPos2Pow31",
+                "name": "DecimalPosZero",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2147483648",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
                         "annotation": []
                       }
                     },
                     {
-                      "name": "invalid",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
                         "annotation": []
                       }
                     }
@@ -871,102 +5513,111 @@
                 }
               },
               {
-                "name": "IntegerNeg2Pow31IntegerMinValue",
+                "name": "DecimalNegZero",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Subtract",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": [
-                          {
-                            "type": "Negate",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": {
-                              "type": "Power",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": [
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "2",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "30",
-                                  "annotation": []
-                                }
-                              ]
-                            }
-                          },
-                          {
-                            "type": "Power",
-                            "annotation": [],
-                            "signature": [],
-                            "operand": [
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "2",
-                                "annotation": []
-                              },
-                              {
-                                "type": "Literal",
-                                "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                "value": "30",
-                                "annotation": []
-                              }
-                            ]
-                          }
-                        ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
                       }
-                    },
+                    ]
+                  },
+                  "element": [
                     {
-                      "name": "output",
+                      "name": "expression",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2147483648",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "0.0",
                           "annotation": []
                         }
                       }
+                    },
+                    {
+                      "name": "output",
+                      "value": {
+                        "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "0.0",
+                        "annotation": []
+                      }
                     }
                   ]
                 }
               },
               {
-                "name": "Integer2Pow31ToInf1",
+                "name": "DecimalOne",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2147483649",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     },
                     {
-                      "name": "invalid",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     }
@@ -974,26 +5625,52 @@
                 }
               },
               {
-                "name": "IntegerPos2Pow31ToInf1",
+                "name": "DecimalPosOne",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                        "value": "2147483649",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     },
                     {
-                      "name": "invalid",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "1.0",
                         "annotation": []
                       }
                     }
@@ -1001,61 +5678,107 @@
                 }
               },
               {
-                "name": "IntegerNeg2Pow31ToInf1",
+                "name": "DecimalNegOne",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                          "value": "2147483649",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
                           "annotation": []
                         }
                       }
                     },
                     {
-                      "name": "invalid",
+                      "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
-                        "value": "true",
-                        "annotation": []
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "1.0",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
-              }
-            ]
-          }
-        },
-        {
-          "name": "Decimal",
-          "context": "Patient",
-          "accessLevel": "Public",
-          "annotation": [],
-          "expression": {
-            "type": "Tuple",
-            "annotation": [],
-            "element": [
+              },
               {
-                "name": "DecimalZero",
+                "name": "DecimalTwo",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                        "value": "2.0",
                         "annotation": []
                       }
                     },
@@ -1063,8 +5786,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                        "value": "2.0",
                         "annotation": []
                       }
                     }
@@ -1072,17 +5796,42 @@
                 }
               },
               {
-                "name": "DecimalPosZero",
+                "name": "DecimalPosTwo",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                        "value": "2.0",
                         "annotation": []
                       }
                     },
@@ -1090,8 +5839,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
+                        "value": "2.0",
                         "annotation": []
                       }
                     }
@@ -1099,21 +5849,47 @@
                 }
               },
               {
-                "name": "DecimalNegZero",
+                "name": "DecimalNegTwo",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "0.0",
+                          "value": "2.0",
                           "annotation": []
                         }
                       }
@@ -1121,36 +5897,84 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "0.0",
-                        "annotation": []
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "2.0",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalOne",
+                "name": "Decimal10Pow9",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
-                        "annotation": []
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "10.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "9.0",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                        "value": "1000000000.0",
                         "annotation": []
                       }
                     }
@@ -1158,26 +5982,67 @@
                 }
               },
               {
-                "name": "DecimalPosOne",
+                "name": "DecimalPos10Pow9",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
-                        "annotation": []
+                        "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "10.0",
+                            "annotation": []
+                          },
+                          {
+                            "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "value": "9.0",
+                            "annotation": []
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1.0",
+                        "value": "1000000000.0",
                         "annotation": []
                       }
                     }
@@ -1185,22 +6050,63 @@
                 }
               },
               {
-                "name": "DecimalNegOne",
+                "name": "DecimalNeg10Pow9",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
-                          "annotation": []
+                          "type": "Power",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": [],
+                          "signature": [],
+                          "operand": [
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "10.0",
+                              "annotation": []
+                            },
+                            {
+                              "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "value": "9.0",
+                              "annotation": []
+                            }
+                          ]
                         }
                       }
                     },
@@ -1208,12 +6114,14 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1.0",
+                          "value": "1000000000.0",
                           "annotation": []
                         }
                       }
@@ -1222,26 +6130,117 @@
                 }
               },
               {
-                "name": "DecimalTwo",
+                "name": "Decimal2Pow31ToZero1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2.0",
-                        "annotation": []
+                        "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Subtract",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Power",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": [
+                                  {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "value": "2.0",
+                                    "annotation": []
+                                  },
+                                  {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "value": "30.0",
+                                    "annotation": []
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "ToDecimal",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "2.0",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "30.0",
+                                "annotation": []
+                              }
+                            ]
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2.0",
+                        "value": "2147483647.0",
                         "annotation": []
                       }
                     }
@@ -1249,26 +6248,117 @@
                 }
               },
               {
-                "name": "DecimalPosTwo",
+                "name": "DecimalPos2Pow31ToZero1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2.0",
-                        "annotation": []
+                        "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": [
+                          {
+                            "type": "Subtract",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Power",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": [
+                                  {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "value": "2.0",
+                                    "annotation": []
+                                  },
+                                  {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "value": "30.0",
+                                    "annotation": []
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "ToDecimal",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
+                                  "value": "1",
+                                  "annotation": []
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "2.0",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "30.0",
+                                "annotation": []
+                              }
+                            ]
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2.0",
+                        "value": "2147483647.0",
                         "annotation": []
                       }
                     }
@@ -1276,35 +6366,123 @@
                 }
               },
               {
-                "name": "DecimalNegTwo",
+                "name": "DecimalNeg2Pow31ToZero1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Negate",
+                        "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "2.0",
-                          "annotation": []
-                        }
+                        "operand": [
+                          {
+                            "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Negate",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Power",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "operand": [
+                                    {
+                                      "type": "Literal",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                      "value": "2.0",
+                                      "annotation": []
+                                    },
+                                    {
+                                      "type": "Literal",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                      "value": "30.0",
+                                      "annotation": []
+                                    }
+                                  ]
+                                }
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "1.0",
+                                "annotation": []
+                              }
+                            ]
+                          },
+                          {
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "2.0",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "30.0",
+                                "annotation": []
+                              }
+                            ]
+                          }
+                        ]
                       }
                     },
                     {
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "2.0",
+                          "value": "2147483647.0",
                           "annotation": []
                         }
                       }
@@ -1313,29 +6491,86 @@
                 }
               },
               {
-                "name": "Decimal10Pow9",
+                "name": "Decimal2Pow31",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Power",
+                        "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "10.0",
-                            "annotation": []
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "2.0",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "30.0",
+                                "annotation": []
+                              }
+                            ]
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "9.0",
-                            "annotation": []
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "2.0",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "30.0",
+                                "annotation": []
+                              }
+                            ]
                           }
                         ]
                       }
@@ -1344,8 +6579,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1000000000.0",
+                        "value": "2147483648.0",
                         "annotation": []
                       }
                     }
@@ -1353,29 +6589,86 @@
                 }
               },
               {
-                "name": "DecimalPos10Pow9",
+                "name": "DecimalPos2Pow31",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Power",
+                        "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "10.0",
-                            "annotation": []
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "2.0",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "30.0",
+                                "annotation": []
+                              }
+                            ]
                           },
                           {
-                            "type": "Literal",
-                            "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                            "value": "9.0",
-                            "annotation": []
+                            "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                            "annotation": [],
+                            "signature": [],
+                            "operand": [
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "2.0",
+                                "annotation": []
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "30.0",
+                                "annotation": []
+                              }
+                            ]
                           }
                         ]
                       }
@@ -1384,8 +6677,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "1000000000.0",
+                        "value": "2147483648.0",
                         "annotation": []
                       }
                     }
@@ -1393,118 +6687,87 @@
                 }
               },
               {
-                "name": "DecimalNeg10Pow9",
+                "name": "DecimalNeg2Pow31",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
-                  "element": [
-                    {
-                      "name": "expression",
-                      "value": {
-                        "type": "Negate",
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Power",
-                          "annotation": [],
-                          "signature": [],
-                          "operand": [
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "10.0",
-                              "annotation": []
-                            },
-                            {
-                              "type": "Literal",
-                              "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                              "value": "9.0",
-                              "annotation": []
-                            }
-                          ]
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
                         }
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Negate",
+                      },
+                      {
+                        "name": "output",
                         "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "1000000000.0",
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
                           "annotation": []
                         }
                       }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "Decimal2Pow31ToZero1",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Add",
+                        "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Subtract",
+                            "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
-                            "operand": [
-                              {
-                                "type": "Power",
-                                "annotation": [],
-                                "signature": [],
-                                "operand": [
-                                  {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                    "value": "2.0",
-                                    "annotation": []
-                                  },
-                                  {
-                                    "type": "Literal",
-                                    "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                    "value": "30.0",
-                                    "annotation": []
-                                  }
-                                ]
-                              },
-                              {
-                                "type": "ToDecimal",
-                                "annotation": [],
-                                "signature": [],
-                                "operand": {
+                            "operand": {
+                              "type": "Power",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                              "annotation": [],
+                              "signature": [],
+                              "operand": [
+                                {
                                   "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "2.0",
+                                  "annotation": []
+                                },
+                                {
+                                  "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "value": "30.0",
                                   "annotation": []
                                 }
-                              }
-                            ]
+                              ]
+                            }
                           },
                           {
                             "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "value": "2.0",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "value": "30.0",
                                 "annotation": []
@@ -1517,46 +6780,82 @@
                     {
                       "name": "output",
                       "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2147483647.0",
-                        "annotation": []
+                        "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "annotation": [],
+                        "signature": [],
+                        "operand": {
+                          "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "value": "2147483648.0",
+                          "annotation": []
+                        }
                       }
                     }
                   ]
                 }
               },
               {
-                "name": "DecimalPos2Pow31ToZero1",
+                "name": "Decimal2Pow31ToInf1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Subtract",
+                            "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "Power",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": [],
                                 "signature": [],
                                 "operand": [
                                   {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                     "value": "2.0",
                                     "annotation": []
                                   },
                                   {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                     "value": "30.0",
                                     "annotation": []
@@ -1564,31 +6863,30 @@
                                 ]
                               },
                               {
-                                "type": "ToDecimal",
-                                "annotation": [],
-                                "signature": [],
-                                "operand": {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Integer",
-                                  "value": "1",
-                                  "annotation": []
-                                }
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "1.0",
+                                "annotation": []
                               }
                             ]
                           },
                           {
                             "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "value": "2.0",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "value": "30.0",
                                 "annotation": []
@@ -1602,8 +6900,9 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                        "value": "2147483647.0",
+                        "value": "2147483649.0",
                         "annotation": []
                       }
                     }
@@ -1611,49 +6910,74 @@
                 }
               },
               {
-                "name": "DecimalNeg2Pow31ToZero1",
+                "name": "DecimalPos2Pow31ToInf1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
-                        "type": "Subtract",
+                        "type": "Add",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Add",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
-                                "type": "Negate",
+                                "type": "Power",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "annotation": [],
                                 "signature": [],
-                                "operand": {
-                                  "type": "Power",
-                                  "annotation": [],
-                                  "signature": [],
-                                  "operand": [
-                                    {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                      "value": "2.0",
-                                      "annotation": []
-                                    },
-                                    {
-                                      "type": "Literal",
-                                      "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                      "value": "30.0",
-                                      "annotation": []
-                                    }
-                                  ]
-                                }
+                                "operand": [
+                                  {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "value": "2.0",
+                                    "annotation": []
+                                  },
+                                  {
+                                    "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                    "value": "30.0",
+                                    "annotation": []
+                                  }
+                                ]
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "value": "1.0",
                                 "annotation": []
@@ -1662,17 +6986,20 @@
                           },
                           {
                             "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "value": "2.0",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "value": "30.0",
                                 "annotation": []
@@ -1680,55 +7007,15 @@
                             ]
                           }
                         ]
-                      }
-                    },
-                    {
-                      "name": "output",
-                      "value": {
-                        "type": "Negate",
-                        "annotation": [],
-                        "signature": [],
-                        "operand": {
-                          "type": "Literal",
-                          "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "2147483647.0",
-                          "annotation": []
-                        }
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "Decimal2Pow31",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Overflows because it thinks it is an integer",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DecimalPos2Pow31",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
+                      }
+                    },
                     {
-                      "name": "skipped",
+                      "name": "output",
                       "value": {
                         "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Overflows because it thinks it is an integer",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                        "value": "2147483649.0",
                         "annotation": []
                       }
                     }
@@ -1736,55 +7023,102 @@
                 }
               },
               {
-                "name": "DecimalNeg2Pow31",
+                "name": "DecimalNeg2Pow31ToInf1",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Subtract",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
-                            "type": "Negate",
+                            "type": "Subtract",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
-                            "operand": {
-                              "type": "Power",
-                              "annotation": [],
-                              "signature": [],
-                              "operand": [
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "2.0",
-                                  "annotation": []
-                                },
-                                {
-                                  "type": "Literal",
-                                  "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                                  "value": "30.0",
-                                  "annotation": []
+                            "operand": [
+                              {
+                                "type": "Negate",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "annotation": [],
+                                "signature": [],
+                                "operand": {
+                                  "type": "Power",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                  "annotation": [],
+                                  "signature": [],
+                                  "operand": [
+                                    {
+                                      "type": "Literal",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                      "value": "2.0",
+                                      "annotation": []
+                                    },
+                                    {
+                                      "type": "Literal",
+                                      "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                      "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                      "value": "30.0",
+                                      "annotation": []
+                                    }
+                                  ]
                                 }
-                              ]
-                            }
+                              },
+                              {
+                                "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
+                                "value": "1.0",
+                                "annotation": []
+                              }
+                            ]
                           },
                           {
                             "type": "Power",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": [
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "value": "2.0",
                                 "annotation": []
                               },
                               {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                                 "value": "30.0",
                                 "annotation": []
@@ -1798,12 +7132,14 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
-                          "value": "2147483648.0",
+                          "value": "2147483649.0",
                           "annotation": []
                         }
                       }
@@ -1811,70 +7147,41 @@
                   ]
                 }
               },
-              {
-                "name": "Decimal2Pow31ToInf1",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Overflows because it thinks it is an integer",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DecimalPos2Pow31ToInf1",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Overflows because it thinks it is an integer",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "name": "DecimalNeg2Pow31ToInf1",
-                "value": {
-                  "type": "Tuple",
-                  "annotation": [],
-                  "element": [
-                    {
-                      "name": "skipped",
-                      "value": {
-                        "type": "Literal",
-                        "valueType": "{urn:hl7-org:elm-types:r1}String",
-                        "value": "Underflows because it thinks it is an integer",
-                        "annotation": []
-                      }
-                    }
-                  ]
-                }
-              },
               {
                 "name": "DecimalZeroStep",
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.00000000",
                         "annotation": []
@@ -1884,6 +7191,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.00000000",
                         "annotation": []
@@ -1897,11 +7205,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.00000000",
                         "annotation": []
@@ -1911,6 +7244,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.00000000",
                         "annotation": []
@@ -1924,15 +7258,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "0.00000000",
                           "annotation": []
@@ -1943,6 +7303,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.00000000",
                         "annotation": []
@@ -1956,26 +7317,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "10",
                             "annotation": []
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "8",
                               "annotation": []
@@ -1988,6 +7377,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.00000001",
                         "annotation": []
@@ -2001,26 +7391,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "10",
                             "annotation": []
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "8",
                               "annotation": []
@@ -2033,6 +7451,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.00000001",
                         "annotation": []
@@ -2046,30 +7465,59 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Power",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Negate",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "8",
                                 "annotation": []
@@ -2083,10 +7531,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "0.00000001",
                           "annotation": []
@@ -2101,16 +7551,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Multiply",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "2.0",
                             "annotation": []
@@ -2121,21 +7597,25 @@
                             "signature": [],
                             "operand": {
                               "type": "Power",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Negate",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "annotation": [],
                                   "signature": [],
                                   "operand": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "8",
                                     "annotation": []
@@ -2151,6 +7631,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.00000002",
                         "annotation": []
@@ -2164,16 +7645,42 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Multiply",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                             "value": "2.0",
                             "annotation": []
@@ -2184,21 +7691,25 @@
                             "signature": [],
                             "operand": {
                               "type": "Power",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Negate",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "annotation": [],
                                   "signature": [],
                                   "operand": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "8",
                                     "annotation": []
@@ -2214,6 +7725,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.00000002",
                         "annotation": []
@@ -2227,20 +7739,47 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Multiply",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                               "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                               "value": "2.0",
                               "annotation": []
@@ -2252,21 +7791,25 @@
                             "signature": [],
                             "operand": {
                               "type": "Power",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": [
                                 {
                                   "type": "Literal",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                   "value": "10",
                                   "annotation": []
                                 },
                                 {
                                   "type": "Negate",
+                                  "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                   "annotation": [],
                                   "signature": [],
                                   "operand": {
                                     "type": "Literal",
+                                    "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                     "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                     "value": "8",
                                     "annotation": []
@@ -2282,10 +7825,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "0.00000002",
                           "annotation": []
@@ -2300,26 +7845,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "10",
                             "annotation": []
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "7",
                               "annotation": []
@@ -2332,6 +7905,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.0000001",
                         "annotation": []
@@ -2345,26 +7919,54 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Power",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": [
                           {
                             "type": "Literal",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                             "value": "10",
                             "annotation": []
                           },
                           {
                             "type": "Negate",
+                            "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                             "annotation": [],
                             "signature": [],
                             "operand": {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "7",
                               "annotation": []
@@ -2377,6 +7979,7 @@
                       "name": "output",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.0000001",
                         "annotation": []
@@ -2390,30 +7993,59 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Integer",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "output",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Power",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                           "annotation": [],
                           "signature": [],
                           "operand": [
                             {
                               "type": "Literal",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                               "value": "10",
                               "annotation": []
                             },
                             {
                               "type": "Negate",
+                              "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                               "annotation": [],
                               "signature": [],
                               "operand": {
                                 "type": "Literal",
+                                "resultTypeName": "{urn:hl7-org:elm-types:r1}Integer",
                                 "valueType": "{urn:hl7-org:elm-types:r1}Integer",
                                 "value": "7",
                                 "annotation": []
@@ -2427,10 +8059,12 @@
                       "name": "output",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "0.0000001",
                           "annotation": []
@@ -2445,11 +8079,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.000000001",
                         "annotation": []
@@ -2459,6 +8118,7 @@
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -2472,11 +8132,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "0.000000001",
                         "annotation": []
@@ -2486,6 +8171,7 @@
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -2499,15 +8185,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "0.000000001",
                           "annotation": []
@@ -2518,6 +8230,7 @@
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -2531,11 +8244,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Wrong answer (null vs big number)",
                         "annotation": []
@@ -2549,11 +8278,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Wrong answer (null vs big number)",
                         "annotation": []
@@ -2567,11 +8312,27 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "skipped",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}String",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "skipped",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}String",
                         "valueType": "{urn:hl7-org:elm-types:r1}String",
                         "value": "Wrong answer (null vs big number)",
                         "annotation": []
@@ -2585,11 +8346,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "10000000000000000000000000000.00000000",
                         "annotation": []
@@ -2599,6 +8385,7 @@
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -2612,11 +8399,36 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                         "value": "10000000000000000000000000000.00000000",
                         "annotation": []
@@ -2626,6 +8438,7 @@
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
@@ -2639,15 +8452,41 @@
                 "value": {
                   "type": "Tuple",
                   "annotation": [],
+                  "resultTypeSpecifier": {
+                    "type": "TupleTypeSpecifier",
+                    "annotation": [],
+                    "element": [
+                      {
+                        "name": "expression",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Decimal",
+                          "annotation": []
+                        }
+                      },
+                      {
+                        "name": "invalid",
+                        "annotation": [],
+                        "elementType": {
+                          "type": "NamedTypeSpecifier",
+                          "name": "{urn:hl7-org:elm-types:r1}Boolean",
+                          "annotation": []
+                        }
+                      }
+                    ]
+                  },
                   "element": [
                     {
                       "name": "expression",
                       "value": {
                         "type": "Negate",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                         "annotation": [],
                         "signature": [],
                         "operand": {
                           "type": "Literal",
+                          "resultTypeName": "{urn:hl7-org:elm-types:r1}Decimal",
                           "valueType": "{urn:hl7-org:elm-types:r1}Decimal",
                           "value": "10000000000000000000000000000.00000000",
                           "annotation": []
@@ -2658,6 +8497,7 @@
                       "name": "invalid",
                       "value": {
                         "type": "Literal",
+                        "resultTypeName": "{urn:hl7-org:elm-types:r1}Boolean",
                         "valueType": "{urn:hl7-org:elm-types:r1}Boolean",
                         "value": "true",
                         "annotation": []
diff --git a/test/spec-tests/skip-list.txt b/test/spec-tests/skip-list.txt
index 6cd2dd313..1eab0378d 100644
--- a/test/spec-tests/skip-list.txt
+++ b/test/spec-tests/skip-list.txt
@@ -18,6 +18,9 @@ CqlListOperatorsTest.Sort.simpleSortDesc                        Wrong output: Qu
 # Potentially Incorrect Expected Output
 "CqlStringOperatorsTest.toString tests.DateTimeToString2"         Answer does not include timezone offset, but default offset depends on test environment
 
+# Equivalent answer but represented differently than expected output
+CqlIntervalOperatorsTest.Except.DecimalIntervalExcept1to3       Expected Interval[1.0, 3.99999999] but got Interval[1.0, 4) (closed boundary vs equivalent open boundary)
+
 # Incorrect answer
 CqlComparisonOperatorsTest.Equal.DateTimeEqNull                 Wrong answer (true vs null - due to not evaluating DateTime(null) as null)
 CqlIntervalOperatorsTest.Collapse.TestCollapseNull              Wrong answer (Interval(null, null) vs null)
@@ -48,18 +51,6 @@ ValueLiteralsAndSelectors.Decimal.Decimal10Pow28ToZeroOneStepDecimalMaxValue
 ValueLiteralsAndSelectors.Decimal.DecimalPos10Pow28ToZeroOneStepDecimalMaxValue Wrong answer (null vs big number)
 ValueLiteralsAndSelectors.Decimal.DecimalNeg10Pow28ToZeroOneStepDecimalMinValue Wrong answer (null vs big number)
 
-# Incorrect answer due to inability to distinguish integer and decimal for whole numbers (e.g., 1.0)
-CqlArithmeticFunctionsTest.Predecessor.PredecessorOf1D      Wrong answer (doesn't recognize 1.0 as decimal)
-CqlArithmeticFunctionsTest.Predecessor.PredecessorOf1QCM    Wrong answer (doesn't recognize 1.0 as decimal)
-CqlArithmeticFunctionsTest.Successor.SuccessorOf1D          Wrong answer (doesn't recognize 1.0 as decimal)
-CqlIntervalOperatorsTest.Except.DecimalIntervalExcept1to3   (Sort of) wrong answer (is open 4 end boundary 3 or 3.99999999?)
-CqlIntervalOperatorsTest.Except.QuantityIntervalExcept1to4  (Sort of) wrong answer (is open 5 end boundary 4 or 4.99999999?)
-ValueLiteralsAndSelectors.Decimal.Decimal2Pow31             Overflows because it thinks it is an integer
-ValueLiteralsAndSelectors.Decimal.DecimalPos2Pow31          Overflows because it thinks it is an integer
-ValueLiteralsAndSelectors.Decimal.Decimal2Pow31ToInf1       Overflows because it thinks it is an integer
-ValueLiteralsAndSelectors.Decimal.DecimalPos2Pow31ToInf1    Overflows because it thinks it is an integer
-ValueLiteralsAndSelectors.Decimal.DecimalNeg2Pow31ToInf1    Underflows because it thinks it is an integer
-
 # Unimplemented
 CqlArithmeticFunctionsTest.HighBoundary                 HighBoundary not implemented
 CqlArithmeticFunctionsTest.LowBoundary                  LowBoundary not implemented
@@ -73,23 +64,6 @@ CqlListOperatorsTest.ProperIn                           ProperIn not implemented
 CqlListOperatorsTest.ProperlyIncludedIn.ProperlyIncludedInNulRight  ProperIn not implemented
 
 # Unimplemented (New in CQL 1.5)
-CqlAggregateFunctionsTest.Product.ProductLong                         Long not implemented
-CqlAggregateFunctionsTest.Sum.SumTestLong                             Long not implemented
-CqlArithmeticFunctionsTest.Abs.AbsLong                                Long not implemented
-CqlArithmeticFunctionsTest.Add.Add1L1L                                Long not implemented
-CqlArithmeticFunctionsTest.Add.Add1L2L                                Long not implemented
-CqlArithmeticFunctionsTest.MinValue.LongMinValue                      Long not implemented
-CqlArithmeticFunctionsTest.MaxValue.LongMaxValue                      Long not implemented
-CqlArithmeticFunctionsTest.Modulo.Modulo4LBy2L                        Long not implemented
-CqlArithmeticFunctionsTest.Multiply.Multiply1By1L                     Long not implemented
-CqlArithmeticFunctionsTest.Multiply.Multiply2LBy3L                    Long not implemented
-CqlArithmeticFunctionsTest.Negate.NegateNeg1L                         Long not implemented
-CqlArithmeticFunctionsTest.Predecessor.PredecessorOf1L                Long not implemented
-CqlArithmeticFunctionsTest.Power.Power2LTo2L                          Long not implemented
-CqlArithmeticFunctionsTest.Power.Power2LTo3L                          Long not implemented
-CqlArithmeticFunctionsTest.Subtract.Subtract1LAnd1L                   Long not implemented
-CqlArithmeticFunctionsTest.Successor.SuccessorOf1L                    Long not implemented
-"CqlArithmeticFunctionsTest.Truncated Divide.TruncatedDivide10LBy3L"  Long not implemented
 CqlArithmeticFunctionsTest.Modulo.ModuloQuantity                      Modulo not implemented for Quantity
 CqlArithmeticFunctionsTest.Modulo.Modulo10By3Quantity                 Modulo not implemented for Quantity
 "CqlArithmeticFunctionsTest.Truncated Divide.TruncatedDivide10d1ByNeg3D1Quantity"     Truncated divide not implemented for Quantity
diff --git a/test/util/comparison-test.ts b/test/util/comparison-test.ts
index 7b7473da0..6998d687b 100644
--- a/test/util/comparison-test.ts
+++ b/test/util/comparison-test.ts
@@ -1,5 +1,14 @@
 import should from 'should';
-import { equals, equivalent } from '../../src/util/comparison';
+import { Date as CQLDate, DateTime as CQLDateTime } from '../../src/datatypes/datetime';
+import { Quantity } from '../../src/datatypes/quantity';
+import {
+  equals,
+  equivalent,
+  greaterThan,
+  greaterThanOrEquals,
+  lessThan,
+  lessThanOrEquals
+} from '../../src/util/comparison';
 import { Code, Concept } from '../../src/datatypes/clinical';
 
 describe('equals', () => {
@@ -11,6 +20,11 @@ describe('equals', () => {
     equals(1.2345, 1.23456).should.be.false();
   });
 
+  it('should detect equality/inequality for longs', () => {
+    equals(1n, 1n).should.be.true();
+    equals(1n, 2n).should.be.false();
+  });
+
   it('should detect equality/inequality for strings', () => {
     equals('', '').should.be.true();
     equals('a', 'a').should.be.true();
@@ -244,6 +258,7 @@ describe('equivalent', () => {
   it('should detect if parameters are not codes and return using equals', () => {
     equivalent('123', '123').should.be.true();
     equivalent(123, 123).should.be.true();
+    equivalent(123n, 123n).should.be.true();
     equivalent('123', new Code('123', 'test', '2016')).should.be.false();
   });
 
@@ -312,3 +327,78 @@ describe('equivalent', () => {
     equivalent('abc', 'abcd').should.be.false();
   });
 });
+
+describe('comparison helpers', () => {
+  const orderedCases = [
+    {
+      type: 'Number',
+      low: 1,
+      same: 1,
+      high: 2
+    },
+    {
+      type: 'CQL Long',
+      low: 1n,
+      same: 1n,
+      high: 2n
+    },
+    {
+      type: 'CQL Quantity',
+      low: new Quantity(1, 'mg'),
+      same: new Quantity(1, 'mg'),
+      high: new Quantity(2, 'mg')
+    },
+    {
+      type: 'CQL Date',
+      low: new CQLDate(2020, 1, 1),
+      same: new CQLDate(2020, 1, 1),
+      high: new CQLDate(2020, 1, 2)
+    },
+    {
+      type: 'CQL DateTime',
+      low: new CQLDateTime(2020, 1, 1, 12, 0, 0, 0, 0),
+      same: new CQLDateTime(2020, 1, 1, 12, 0, 0, 0, 0),
+      high: new CQLDateTime(2020, 1, 1, 13, 0, 0, 0, 0)
+    },
+    {
+      type: 'CQL Time',
+      low: new CQLDateTime(0, 1, 1, 12, 0, 0, 0, null),
+      same: new CQLDateTime(0, 1, 1, 12, 0, 0, 0, null),
+      high: new CQLDateTime(0, 1, 1, 13, 0, 0, 0, null)
+    },
+    {
+      type: 'String',
+      low: 'abc',
+      same: 'abc',
+      high: 'def'
+    }
+  ];
+
+  orderedCases.forEach(({ type, low, same, high }) => {
+    describe(type, () => {
+      it('should compare using lessThan', () => {
+        should(lessThan(low, high)).be.true();
+        should(lessThan(high, low)).be.false();
+        should(lessThan(low, same)).be.false();
+      });
+
+      it('should compare using lessThanOrEquals', () => {
+        should(lessThanOrEquals(low, high)).be.true();
+        should(lessThanOrEquals(low, same)).be.true();
+        should(lessThanOrEquals(high, low)).be.false();
+      });
+
+      it('should compare using greaterThan', () => {
+        should(greaterThan(high, low)).be.true();
+        should(greaterThan(low, high)).be.false();
+        should(greaterThan(low, same)).be.false();
+      });
+
+      it('should compare using greaterThanOrEquals', () => {
+        should(greaterThanOrEquals(high, low)).be.true();
+        should(greaterThanOrEquals(low, same)).be.true();
+        should(greaterThanOrEquals(low, high)).be.false();
+      });
+    });
+  });
+});
diff --git a/tsconfig.json b/tsconfig.json
index 98e758c84..7f3629ced 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "include": ["src"],
   "compilerOptions": {
-    "target": "ES2017",
-    "lib": ["es2015.core", "ESNext"],
+    "target": "ES2020",
+    "lib": ["ESNext"],
     "types": ["node", "mocha"],
     "outDir": "./lib",
     "rootDir": "./src",